diff options
| author | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2012-01-04 13:30:57 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2012-01-04 13:30:57 -0300 |
| commit | 761b049b2e51a035eaf9c18f4d0200409848a28e (patch) | |
| tree | bdfed99b3d0b46ca7e2b079a46d46fa241549eab /activesupport | |
| parent | 0bf51e9805260243ec0bbe5fca8f8b9364fdd970 (diff) | |
| download | rails-761b049b2e51a035eaf9c18f4d0200409848a28e.tar.gz rails-761b049b2e51a035eaf9c18f4d0200409848a28e.tar.bz2 rails-761b049b2e51a035eaf9c18f4d0200409848a28e.zip | |
No need to use rescue block to require psych
Diffstat (limited to 'activesupport')
4 files changed, 12 insertions, 29 deletions
diff --git a/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb b/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb index 403e8beac5..c2faa1ebe0 100644 --- a/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb +++ b/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb @@ -1,10 +1,5 @@ require 'bigdecimal' - -begin - require 'psych' -rescue LoadError -end - +require 'psych' require 'yaml' class BigDecimal diff --git a/activesupport/lib/active_support/ordered_hash.rb b/activesupport/lib/active_support/ordered_hash.rb index fdf4a2bda3..7fd4168363 100644 --- a/activesupport/lib/active_support/ordered_hash.rb +++ b/activesupport/lib/active_support/ordered_hash.rb @@ -1,8 +1,4 @@ -begin - require 'psych' -rescue LoadError -end - +require 'psych' require 'yaml' YAML.add_builtin_type("omap") do |type, val| diff --git a/activesupport/test/ordered_hash_test.rb b/activesupport/test/ordered_hash_test.rb index 8119b36491..841088e7e7 100644 --- a/activesupport/test/ordered_hash_test.rb +++ b/activesupport/test/ordered_hash_test.rb @@ -1,3 +1,4 @@ +require 'psych' require 'abstract_unit' require 'active_support/json' require 'active_support/core_ext/object/to_json' @@ -291,21 +292,16 @@ class OrderedHashTest < Test::Unit::TestCase assert_equal @ordered_hash.values, @deserialized_ordered_hash.values end - begin - require 'psych' + def test_psych_serialize + @deserialized_ordered_hash = Psych.load(Psych.dump(@ordered_hash)) - def test_psych_serialize - @deserialized_ordered_hash = Psych.load(Psych.dump(@ordered_hash)) - - values = @deserialized_ordered_hash.map { |_, value| value } - assert_equal @values, values - end + values = @deserialized_ordered_hash.map { |_, value| value } + assert_equal @values, values + end - def test_psych_serialize_tag - yaml = Psych.dump(@ordered_hash) - assert_match '!omap', yaml - end - rescue LoadError + def test_psych_serialize_tag + yaml = Psych.dump(@ordered_hash) + assert_match '!omap', yaml end def test_has_yaml_tag diff --git a/activesupport/test/safe_buffer_test.rb b/activesupport/test/safe_buffer_test.rb index 8d9911ea01..e569e04180 100644 --- a/activesupport/test/safe_buffer_test.rb +++ b/activesupport/test/safe_buffer_test.rb @@ -1,9 +1,5 @@ require 'abstract_unit' -begin - require 'psych' -rescue LoadError -end - +require 'psych' require 'active_support/core_ext/string/inflections' require 'yaml' |