diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-04 16:00:22 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-04 16:20:18 -0300 |
| commit | 758e223c45fdd41bdb397e3830553d13686c8dc1 (patch) | |
| tree | 9cf66d46db27b03674134d83adec819d2bd277aa /activesupport | |
| parent | 065c20890a11a940e78078fc1c6488a655f41420 (diff) | |
| download | rails-758e223c45fdd41bdb397e3830553d13686c8dc1.tar.gz rails-758e223c45fdd41bdb397e3830553d13686c8dc1.tar.bz2 rails-758e223c45fdd41bdb397e3830553d13686c8dc1.zip | |
Remove Struct#to_h backport
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext.rb | 3 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/struct.rb | 9 | ||||
| -rw-r--r-- | activesupport/test/core_ext/struct_test.rb | 10 |
3 files changed, 5 insertions, 17 deletions
diff --git a/activesupport/lib/active_support/core_ext.rb b/activesupport/lib/active_support/core_ext.rb index 199aa91020..52706c3d7a 100644 --- a/activesupport/lib/active_support/core_ext.rb +++ b/activesupport/lib/active_support/core_ext.rb @@ -1,3 +1,4 @@ -Dir["#{File.dirname(__FILE__)}/core_ext/*.rb"].each do |path| +DEPRECATED_FILES = ["#{File.dirname(__FILE__)}/core_ext/struct.rb"] +(Dir["#{File.dirname(__FILE__)}/core_ext/*.rb"] - DEPRECATED_FILES).each do |path| require path end diff --git a/activesupport/lib/active_support/core_ext/struct.rb b/activesupport/lib/active_support/core_ext/struct.rb index c2c30044f2..1fde3db070 100644 --- a/activesupport/lib/active_support/core_ext/struct.rb +++ b/activesupport/lib/active_support/core_ext/struct.rb @@ -1,6 +1,3 @@ -# Backport of Struct#to_h from Ruby 2.0 -class Struct # :nodoc: - def to_h - Hash[members.zip(values)] - end -end unless Struct.instance_methods.include?(:to_h) +require 'active_support/deprecation' + +ActiveSupport::Deprecation.warn("This file is deprecated and will be removed in Rails 5.1 with no replacement.") diff --git a/activesupport/test/core_ext/struct_test.rb b/activesupport/test/core_ext/struct_test.rb deleted file mode 100644 index 0dff7b32d2..0000000000 --- a/activesupport/test/core_ext/struct_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require 'abstract_unit' -require 'active_support/core_ext/struct' - -class StructExt < ActiveSupport::TestCase - def test_to_h - x = Struct.new(:foo, :bar) - z = x.new(1, 2) - assert_equal({ foo: 1, bar: 2 }, z.to_h) - end -end |