diff options
author | marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-22 17:05:03 +0000 |
---|---|---|
committer | marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-22 17:05:03 +0000 |
commit | 1e30df6f77c79b07d1c65e450b0167861c180473 (patch) | |
tree | 68ad1f210e24af5733e27ed086bf9796fb6777a3 | |
parent | 8ef2aae2d0350506fb1b12eb0afd56b5b1f51b89 (diff) |
ostruct.rb: Accept block for to_h [#15451].
Patch by Shuji Kobayashi.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66496 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | NEWS | 7 | ||||
-rw-r--r-- | lib/ostruct.rb | 17 | ||||
-rw-r--r-- | spec/ruby/library/openstruct/to_h_spec.rb | 7 | ||||
-rw-r--r-- | test/ostruct/test_ostruct.rb | 7 |
4 files changed, 36 insertions, 2 deletions
@@ -239,6 +239,13 @@ sufficient information, see the ChangeLog file or Redmine * Numeric#step now returns an instance of Enumerator::ArithmeticSequence class rather than one of Enumerator class. +[OpenStruct] + + [Modified methods] + + * OpenStruct#to_h now maps keys and values to new keys and values + by the block if given. [Feature #15143] + [Proc] [New methods] diff --git a/lib/ostruct.rb b/lib/ostruct.rb index 67ba043535..a758a65979 100644 --- a/lib/ostruct.rb +++ b/lib/ostruct.rb @@ -105,15 +105,28 @@ class OpenStruct end # + # call-seq: + # ostruct.to_h -> hash + # ostruct.to_h {|name, value| block } -> hash + # # Converts the OpenStruct to a hash with keys representing # each attribute (as symbols) and their corresponding values. # + # If a block is given, the results of the block on each pair of + # the receiver will be used as pairs. + # # require "ostruct" # data = OpenStruct.new("country" => "Australia", :capital => "Canberra") # data.to_h # => {:country => "Australia", :capital => "Canberra" } + # data.to_h {|name, value| [name.to_s, value.upcase] } + # # => {"country" => "AUSTRALIA", "capital" => "CANBERRA" } # - def to_h - @table.dup + def to_h(&block) + if block_given? + @table.to_h(&block) + else + @table.dup + end end # diff --git a/spec/ruby/library/openstruct/to_h_spec.rb b/spec/ruby/library/openstruct/to_h_spec.rb index f3e157816b..1a8a87a94d 100644 --- a/spec/ruby/library/openstruct/to_h_spec.rb +++ b/spec/ruby/library/openstruct/to_h_spec.rb @@ -26,4 +26,11 @@ describe "OpenStruct#to_h" do @to_h[:age] = 71 @os.age.should == 70 end + + ruby_version_is "2.6" do + it "converts [key, value] pairs returned by the block to a hash" do + h = @os.to_h {|key, value| [key.to_s, value * 2]} + h.should == {"name" => "John SmithJohn Smith", "age" => 140, "pension" => 600} + end + end end diff --git a/test/ostruct/test_ostruct.rb b/test/ostruct/test_ostruct.rb index d89bc94cc3..61a4822810 100644 --- a/test/ostruct/test_ostruct.rb +++ b/test/ostruct/test_ostruct.rb @@ -141,6 +141,13 @@ class TC_OpenStruct < Test::Unit::TestCase assert_equal(h, OpenStruct.new("name" => "John Smith", "age" => 70, pension: 300).to_h) end + def test_to_h_with_block + os = OpenStruct.new("country" => "Australia", :capital => "Canberra") + assert_equal({"country" => "AUSTRALIA", "capital" => "CANBERRA" }, + os.to_h {|name, value| [name.to_s, value.upcase]}) + assert_equal("Australia", os.country) + end + def test_each_pair h = {name: "John Smith", age: 70, pension: 300} os = OpenStruct.new(h) |