diff options
-rw-r--r-- | ext/psych/lib/psych/coder.rb | 11 | ||||
-rw-r--r-- | test/psych/test_coder.rb | 25 |
2 files changed, 35 insertions, 1 deletions
diff --git a/ext/psych/lib/psych/coder.rb b/ext/psych/lib/psych/coder.rb index 79e46dab1b..eff0cc3dcb 100644 --- a/ext/psych/lib/psych/coder.rb +++ b/ext/psych/lib/psych/coder.rb @@ -7,7 +7,7 @@ module Psych # called, respectively. class Coder attr_accessor :tag, :style, :implicit - attr_reader :type, :map, :scalar, :seq + attr_reader :type, :scalar, :seq def initialize tag @map = {} @@ -19,6 +19,14 @@ module Psych @scalar = nil end + # Emit a map. The coder will be yielded to the block. + def map tag = @tag, style = @style + @tag = tag + @style = style + yield self if block_given? + @map + end + # Emit a scalar with +value+ and +tag+ def represent_scalar tag, value self.tag = tag @@ -53,6 +61,7 @@ module Psych @type = :map @map[k] = v end + alias :add :[]= def [] k @type = :map diff --git a/test/psych/test_coder.rb b/test/psych/test_coder.rb index deef6f2a22..0fa01ca3b6 100644 --- a/test/psych/test_coder.rb +++ b/test/psych/test_coder.rb @@ -89,6 +89,31 @@ module Psych end end + def test_map_takes_block + coder = Psych::Coder.new 'foo' + tag = coder.tag + style = coder.style + coder.map { |map| map.add 'foo', 'bar' } + assert_equal 'bar', coder['foo'] + assert_equal tag, coder.tag + assert_equal style, coder.style + end + + def test_map_with_tag + coder = Psych::Coder.new 'foo' + coder.map('hello') { |map| map.add 'foo', 'bar' } + assert_equal 'bar', coder['foo'] + assert_equal 'hello', coder.tag + end + + def test_map_with_tag_and_style + coder = Psych::Coder.new 'foo' + coder.map('hello', 'world') { |map| map.add 'foo', 'bar' } + assert_equal 'bar', coder['foo'] + assert_equal 'hello', coder.tag + assert_equal 'world', coder.style + end + def test_represent_map thing = Psych.load(Psych.dump(RepresentWithMap.new)) assert_equal({ 'a' => 'b' }, thing.map) |