jsonbuilder 0.1.3 → 0.2.0

data/Rakefile

@@ -13,7 +13,7 @@ include FileUtils
 NAME              = "jsonbuilder"
 AUTHOR            = "nov"
 EMAIL             = "nov@matake.jp"
-DESCRIPTION       = "Builder::XmlMarkup like JsonBuilder (Builder::JsonMarkup)"
+DESCRIPTION       = "Builder::XmlMarkup like JsonBuilder"
 RUBYFORGE_PROJECT = NAME
 HOMEPATH          = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 BIN_FILES         = %w(  )

data/lib/builder/hash_structure.rb

@@ -6,26 +6,24 @@ module Builder
       # in this case, we need some key for value.
       @default_content_key  = (options[:default_content_key] || :content).to_sym
       @include_root = options[:include_root]
-      @target = {}
+      @target = StackableHash.new
       @array_mode = false
     end
 
     # NOTICE: you have to call this method to use array in json
     def array_mode(key = nil, &block)
-      if eval("#{_current}").is_a?(::Hash)
+      if @target.current.is_a?(Hash) && !@target.current.empty?
         key ||= :entry
-        eval("#{_current}.merge!(key => [])")
-        _move_current(key.to_sym) do
+        _setup_key(key.to_sym) do
           _array_mode(&block)
         end
       else
-        eval("#{_current} = []")
         _array_mode(&block)
       end
     end
 
     def target!
-      if @include_root
+      if @include_root || @target.is_a?(Array)
         @target
       else
         @target[@root]
@@ -48,25 +46,22 @@ module Builder
 
     def <<(_target)
       if @array_mode
-        key = @path.pop
-        eval("#{_current} << _target")
-        @path.push(key)
+        @target.current << _target
+      elsif _target.is_a?(Hash)
+        @target.current.merge!(_target)
       else
-        if _target.is_a?(String)
-          eval("#{_current} = _target")
-        else
-          eval("#{_current} ||= {}")
-          eval("#{_current}.merge!(_target)")
-        end
+        @target.current = _target
       end
     end
 
     def text!(text, default_content_key = nil)
-      @default_content_key = default_content_key.to_sym unless default_content_key.nil?
-      if eval("#{_current}").is_a?(::Hash)
-        eval("#{_current}.merge!({@default_content_key => text})")
+      if @target.current.is_a?(Array)
+        @target.current << text
+      elsif @target.current.is_a?(Hash) && !@target.current.empty?
+        @default_content_key = default_content_key.to_sym unless default_content_key.nil?
+        @target.current.merge!(StackableHash.new.replace(@default_content_key => text))
       else
-        eval("#{_current} = text")
+        @target.current = text
       end
     end
     alias_method :cdata!, :text!
@@ -76,40 +71,30 @@ module Builder
     end
 
     def method_missing(key, *args, &block)
-      key = args.first.is_a?(Symbol) ? "#{key}:#{args.shift}".to_sym : key.to_sym
-      args[0] = {@default_content_key => args[0]} if args.size > 1 && !args[0].is_a?(::Hash)
-      if @root
-        _child(key, args, &block)
-      else
-        _root(key, args, &block)
+      key, args = _explore_key_and_args(key, *args)
+      _setup_key(key) do
+        _set_args(args, &block)
       end
       target!
     end
 
     private
 
-    def _root(root, args, &block)
-      @root = root
-      @target[root] = {}
-      @path = [root]
-      _set_args(args, &block)
-      yield(self) if block_given?
-    end
-
-    def _child(key, args, &block)
-      eval("#{_current} ||= {}") unless @array_mode
-      _move_current(key) do
-        _set_args(args, &block)
+    def _explore_key_and_args(key, *args)
+      key = (args.first.is_a?(Symbol) ? "#{key}:#{args.shift}" : key.to_s).gsub(/[-:]/, "_").to_sym
+      if args.size > 1 && !args[0].is_a?(Hash)
+        args[0] = StackableHash.new.replace(@default_content_key => args[0])
       end
+      [key, args]
     end
 
     def _set_args(args, &block)
       args.each do |arg|
-        case arg
-        when ::Hash
-          self << arg
+        case arg 
+        when Hash
+          self << StackableHash.new.replace(arg)
         else
-          eval("#{_current} = arg")
+          @target.current = arg
         end
       end
       if @array_mode && block_given?
@@ -121,24 +106,17 @@ module Builder
       end
     end
 
-    def _current
-      current_path = @path.inject('') do |current_path, key|
-        current_path += key.is_a?(Integer) ? "[#{key}]" : "[:\"#{key}\"]"
-      end
-      "@target#{current_path}"
-    end
-
-    def _move_current(key, &block)
-      @path.push(key) unless @array_mode
+    def _setup_key(key, &block)
+      @root = key unless @root
+      @target = @target.child(key) unless @array_mode
       yield
-      @array_mode ? @path[@path.size - 1] += 1 : @path.pop
+      @target = @target.parent unless @array_mode
     end
 
     def _array_mode(&block)
       @array_mode = true
-      @path.push(0)
+      @target.current = StackableArray.new
       yield
-      @path.pop
       @array_mode = false
     end
 

data/lib/builder/json_format.rb

@@ -22,18 +22,7 @@ module Builder
         _target.symbolize_keys! if _target.is_a?(Hash)
       end
 
-      if @array_mode
-        key = @path.pop
-        eval("#{_current} << _target")
-        @path.push(key)
-      else
-        if _target.is_a?(String)
-          eval("#{_current} = _target")
-        else
-          eval("#{_current} ||= {}")
-          eval("#{_current}.merge!(_target)")
-        end
-      end
+      super(_target)
     end
 
     def target!

data/lib/ext/stackable_array.rb

@@ -0,0 +1,35 @@
+class StackableArray < Array
+  attr_accessor :parent, :current_key
+
+  def child(key)
+    hash = StackableHash.new
+    hash[key] = StackableHash.new
+
+    new_target = self.current
+    new_target.merge!(hash)
+    new_target.current_key = key
+    new_target.parent = self
+    new_target
+  end
+
+  def merge!(hash)
+    if self.last.is_a?(Hash) && !self.last.key?(hash.keys.first)
+      self.last.merge!(hash)
+    else
+      self << hash
+    end
+  end
+
+  def current=(value)
+    if self.current.is_a?(Hash)
+      self.last[current_key] = value
+    else
+      self << value
+    end
+  end
+
+  def current
+    self.current_key ? self.last[current_key] : self.last
+  end
+
+end

data/lib/ext/stackable_hash.rb

@@ -0,0 +1,27 @@
+class StackableHash < Hash
+  attr_accessor :parent, :current_key
+
+  def child(key)
+    hash = StackableHash.new
+    hash[key] = StackableHash.new
+
+    new_target = self.current || self
+    new_target.merge!(hash)
+    new_target.current_key = key
+    new_target.parent = self
+    new_target
+  end
+
+  def <<(value)
+    self[current_key] << value
+  end
+
+  def current=(value)
+    self[current_key] = value
+  end
+
+  def current
+    self[current_key]
+  end
+
+end

data/lib/jsonbuilder.rb

@@ -1,8 +1,8 @@
 module JsonBuilder
   module Version
     MAJOR = 0
-    MINOR = 1
-    REVISION = 3
+    MINOR = 2
+    REVISION = 0
     class << self
       def to_version
         "#{MAJOR}.#{MINOR}.#{REVISION}"
@@ -19,3 +19,5 @@ require 'builder/abstract'
 require 'builder/xml_markup'
 require 'builder/hash_structure'
 require 'builder/json_format'
+require 'ext/stackable_hash'
+require 'ext/stackable_array'

data/spec/builder/hash_structure_spec.rb

@@ -13,6 +13,16 @@ end
 
 describe Builder::HashStructure do
 
+  it "should replace ':' and '-' with '_' if those characters are used as a key" do
+    builder = Builder::HashStructure.new
+    builder.root do
+      builder.atom :name, "atom:name" # atom:name
+      builder.thr :"in-reply-to", "thr:in-reply-to" # thr:in-reply-to
+      builder.tag! :"dc:creator", "dc:creator" # thr:in-reply-to
+    end
+    builder.target!.should == {:atom_name => "atom:name", :thr_in_reply_to => "thr:in-reply-to", :dc_creator => "dc:creator"}
+  end
+
   it "should remove the root tag" do
     builder = Builder::HashStructure.new
     # XML :: <root><tag>value</tag></root>
@@ -58,7 +68,25 @@ describe Builder::HashStructure do
     builder.target!.should == {:tag => {:id => 1, :text => "value"}}
   end
 
-  it "should use the default_content_key when both cdata! and attributes exist" do
+  it "should accept strings for insertion" do
+    builder = Builder::HashStructure.new
+    sub_builder = Builder::HashStructure.new
+    sub_builder.tag('value')
+
+    # XML :: <root><tag id="1">value</tag></root>
+    builder.root do
+      builder.tags do |tag|
+        builder << sub_builder.target!
+      end
+    end
+    builder.target!.should == {:tags => "value"}
+  end
+
+end
+
+describe Builder::HashStructure, "#cdata!" do
+
+  it "should use the default_content_key when called with attributes" do
     builder = Builder::HashStructure.new
     # XML :: <root><tag id="1"><![CDATA[value]]></tag></root>
     builder.root do
@@ -69,7 +97,18 @@ describe Builder::HashStructure do
     builder.target!.should == {:tag => {:id => 1, :content => "value"}}
   end
 
-  it "should allow the default_content_key to be specified as a second argument to cdata!" do
+  it "should not use the default_content_key when called without attributes" do
+    builder = Builder::HashStructure.new
+    # XML :: <root><tag><![CDATA[value]]></tag></root>
+    builder.root do
+      builder.tag do
+        builder.cdata! "value"
+      end
+    end
+    builder.target!.should == {:tag => "value"}
+  end
+
+  it "should allow the default_content_key to be specified as a second argument" do
     builder = Builder::HashStructure.new
     # XML :: <quotes><quote id=\"1\"><![CDATA[All generalizations are false, including this one.]]></quote></quotes>
     builder.quotes do
@@ -80,31 +119,45 @@ describe Builder::HashStructure do
     builder.target!.should == {:quote => {:id => 1, :text => "All generalizations are false, including this one."}}
   end
 
-  it "should use the specified default_content_key when it and content and attributes are specified via the content!" do
+  it "should overwrite previous value when called multiple times out of array mode" do
     builder = Builder::HashStructure.new
-    # XML :: <root><tag id="1">value</tag></root>
+    # XML :: <root><tag><![CDATA[value1]]><![CDATA[value2]]></tag></root>
     builder.root do
-      builder.content!(:tag, :text, "value", :id => 1)
+      builder.tag do
+        builder.cdata! "value1"
+        builder.cdata! "value2"
+      end
     end
-    builder.target!.should == {:tag => {:id => 1, :text => "value"}}
+    builder.target!.should == {:tag => "value2"}
   end
 
-  it "should accept strings for insertion" do
+  it "should add new value when called multiple times in array mode" do
     builder = Builder::HashStructure.new
-    sub_builder = Builder::HashStructure.new
-    sub_builder.tag('value')
-
-    # XML :: <root><tag id="1">value</tag></root>
+    # XML :: <root><tag id="1"><![CDATA[value]]></tag></root>
     builder.root do
-      builder.tags do |tag|
-        builder << sub_builder.target!
+      builder.tag do
+        builder.array_mode do
+          builder.cdata! "value1"
+          builder.cdata! "value2"
+        end
       end
     end
-    builder.target!.should == {:tags => "value"}
+    builder.target!.should == {:tag => ["value1", "value2"]}
   end
 
 end
 
+describe Builder::HashStructure, "#content!" do
+  it "should use the specified default_content_key when it and content and attributes are specified via the content!" do
+    builder = Builder::HashStructure.new
+    # XML :: <root><tag id="1">value</tag></root>
+    builder.root do
+      builder.content!(:tag, :text, "value", :id => 1)
+    end
+    builder.target!.should == {:tag => {:id => 1, :text => "value"}}
+  end
+end
+
 describe Builder::HashStructure, '#serialization_method!' do
   it 'should report the to_hash method' do
     Builder::HashStructure.new.serialization_method!.should == :to_hash
@@ -126,7 +179,6 @@ describe Builder::HashStructure, "#target!" do
     builder.target!.should == {:root => "value"}
   end
 
-
   it "should return a HashStructure when root has deeper structure" do
     builder = Builder::HashStructure.new
     builder.root do
@@ -138,7 +190,6 @@ describe Builder::HashStructure, "#target!" do
 end
 
 describe Builder::HashStructure, "#root!" do
-
   it "should force the root tag" do
     builder = Builder::HashStructure.new
     builder.root!(:root) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jsonbuilder
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - nov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-02 00:00:00 +09:00
+date: 2009-07-27 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: Builder::XmlMarkup like JsonBuilder (Builder::JsonMarkup)
+description: Builder::XmlMarkup like JsonBuilder
 email: nov@matake.jp
 executables: []
 
@@ -47,6 +47,9 @@ files:
 - lib/builder/hash_structure.rb
 - lib/builder/json_format.rb
 - lib/builder/xml_markup.rb
+- lib/ext
+- lib/ext/stackable_array.rb
+- lib/ext/stackable_hash.rb
 - lib/jsonbuilder.rb
 - lib/patch
 - lib/patch/active_support_json_decode.rb
@@ -86,6 +89,6 @@ rubyforge_project: jsonbuilder
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: Builder::XmlMarkup like JsonBuilder (Builder::JsonMarkup)
+summary: Builder::XmlMarkup like JsonBuilder
 test_files: 
 - spec/jsonbuilder_spec.rb