From 15d4862b913f6d555ce8a79075d69bba74b5b9bc Mon Sep 17 00:00:00 2001
From: marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 28 Oct 2012 21:18:53 +0000
Subject: * lib/ostruct.rb (each_pair): Add #each_pair [#1400]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37372 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 NEWS                         |  1 +
 lib/ostruct.rb               | 14 ++++++++++++++
 test/ostruct/test_ostruct.rb |  7 +++++++
 3 files changed, 22 insertions(+)

diff --git a/NEWS b/NEWS
index 967196dcd8..f76f676728 100644
--- a/NEWS
+++ b/NEWS
@@ -118,6 +118,7 @@ with all sufficient information, see the ChangeLog file.
 
 * ostruct
   * new methods:
+    * OpenStruct#each_pair
     * OpenStruct#to_h converts the struct to a hash.
 
 * pathname
diff --git a/lib/ostruct.rb b/lib/ostruct.rb
index 894abce89f..e22fca3e46 100644
--- a/lib/ostruct.rb
+++ b/lib/ostruct.rb
@@ -113,6 +113,20 @@ class OpenStruct
     @table.dup
   end
 
+  #
+  # Yields all attributes (as a symbol) along with the corresponding values
+  # or returns an enumerator if not block is given.
+  # Example:
+  #
+  #   require 'ostruct'
+  #   data = OpenStruct.new("country" => "Australia", :population => 20_000_000)
+  #   data.each_pair.to_a  # => [[:country, "Australia"], [:population, 20000000]]
+  #
+  def each_pair
+    return to_enum __method__ unless block_given?
+    @table.each_pair{|p| yield p}
+  end
+
   #
   # Provides marshalling support for use by the Marshal library.
   #
diff --git a/test/ostruct/test_ostruct.rb b/test/ostruct/test_ostruct.rb
index 1826e40e53..9b125fc055 100644
--- a/test/ostruct/test_ostruct.rb
+++ b/test/ostruct/test_ostruct.rb
@@ -85,4 +85,11 @@ class TC_OpenStruct < Test::Unit::TestCase
 
     assert_equal(h, OpenStruct.new("name" => "John Smith", "age" => 70, pension: 300).to_h)
   end
+
+  def test_each_pair
+    h = {name: "John Smith", age: 70, pension: 300}
+    os = OpenStruct.new(h)
+    assert_equal '#<Enumerator: #<OpenStruct name="John Smith", age=70, pension=300>:each_pair>', os.each_pair.inspect
+    assert_equal [[:name, "John Smith"], [:age, 70], [:pension, 300]], os.each_pair.to_a
+  end
 end
-- 
cgit v1.2.3