jsonbuilder 0.2.1 → 0.2.2

data/Rakefile

@@ -39,7 +39,7 @@ begin
 
   Spec::Rake::SpecTask.new('spec') do |t|
     t.spec_opts = ["-f specdoc", "-c"]
-    t.spec_files = FileList['spec/*_spec.rb', 'spec/builder/*_spec.rb']
+    t.spec_files = FileList['spec/*_spec.rb', 'spec/builder/*_spec.rb', 'spec/ext/*_spec.rb']
   end
 
 rescue LoadError

data/lib/builder/hash_structure.rb

@@ -6,7 +6,7 @@ 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 = StackableHash.new
+      @target = {}.stackable
       @array_mode = false
     end
 
@@ -59,7 +59,7 @@ module Builder
         @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))
+        @target.current.merge!(@default_content_key => text)
       else
         @target.current = text
       end
@@ -71,7 +71,7 @@ module Builder
     end
 
     def method_missing(key, *args, &block)
-      key, args = _explore_key_and_args(key, *args)
+      key, args = _explore_key_and_args(key, *args, &block)
       _setup_key(key) do
         _set_args(args, &block)
       end
@@ -80,12 +80,10 @@ module Builder
 
     private
 
-    def _explore_key_and_args(key, *args)
+    def _explore_key_and_args(key, *args, &block)
       key = (args.first.is_a?(Symbol) ? "#{key}:#{args.shift}" : key.to_s).gsub(/[-:]/, "_").to_sym
-      args.reject! { |arg| arg.nil? }
-      if args.size > 1 && !args[0].is_a?(Hash)
-        args[0] = StackableHash.new.replace(@default_content_key => args[0])
-      end
+      args.reject! { |arg| arg.nil? } if block_given?
+      args[0] = {@default_content_key => args[0]} if args.size > 1 && !args[0].is_a?(Hash)
       [key, args]
     end
 
@@ -93,7 +91,7 @@ module Builder
       args.each do |arg|
         case arg 
         when Hash
-          self << StackableHash.new.replace(arg)
+          self << arg.stackable
         else
           @target.current = arg
         end

data/lib/ext/stackable_array.rb

@@ -2,9 +2,7 @@ class StackableArray < Array
   attr_accessor :parent, :current_key
 
   def child(key)
-    hash = StackableHash.new
-    hash[key] = StackableHash.new
-
+    hash = {key => StackableHash.new}.stackable
     new_target = self.current
     new_target.merge!(hash)
     new_target.current_key = key
@@ -21,15 +19,11 @@ class StackableArray < Array
   end
 
   def current=(value)
-    if self.current.is_a?(Hash)
-      self.last[current_key] = value
-    else
-      self << value
-    end
+    self.last[current_key] = value
   end
 
   def current
-    self.current_key ? self.last[current_key] : self.last
+    self.last[current_key]
   end
 
 end

data/lib/ext/stackable_hash.rb

@@ -1,10 +1,14 @@
+class Hash
+  def stackable
+    StackableHash.new.replace(self)
+  end
+end
+
 class StackableHash < Hash
   attr_accessor :parent, :current_key
 
   def child(key)
-    hash = StackableHash.new
-    hash[key] = StackableHash.new
-
+    hash = {key => StackableHash.new}.stackable
     new_target = self.current || self
     new_target.merge!(hash)
     new_target.current_key = key

data/lib/jsonbuilder.rb

@@ -2,7 +2,7 @@ module JsonBuilder
   module Version
     MAJOR = 0
     MINOR = 2
-    REVISION = 1
+    REVISION = 2
     class << self
       def to_version
         "#{MAJOR}.#{MINOR}.#{REVISION}"

data/spec/builder/hash_structure_spec.rb

@@ -1,6 +1,7 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 describe Builder::HashStructure, ".new" do
+
   it "should be accessible" do
     Builder::HashStructure.should respond_to(:new)
   end
@@ -9,65 +10,11 @@ describe Builder::HashStructure, ".new" do
     builder = Builder::HashStructure.new
     builder.new!.should be_a(Builder::HashStructure)
   end
+
 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 support root attributes" do
-    builder = Builder::HashStructure.new
-    # XML :: <root><tag>value</tag></root>
-    builder.root(:id => 1) do
-      builder.tag "value"
-    end
-    builder.target!.should == {:id => 1, :tag => "value"}
-  end
-
-  it "should ignore nil attributes" do
-    builder = Builder::HashStructure.new
-    # XML :: <root><tag>value</tag></root>
-    builder.root(nil) do
-      builder.tag "value"
-    end
-    builder.target!.should == {:tag => "value"}
-  end
-
-  it "should remove the root tag" do
-    builder = Builder::HashStructure.new
-    # XML :: <root><tag>value</tag></root>
-    builder.root do
-      builder.tag "value"
-    end
-    builder.target!.should == {:tag => "value"}
-  end
-
-  it "should remove the root tag, but keep the attributes" do
-    builder = Builder::HashStructure.new
-    # XML :: <root><tag>value</tag></root>
-    builder.root(:id => 1) do
-      builder.tag "value"
-    end
-    builder.target!.should == {:id => 1, :tag => "value"}
-  end
-
-  it "should not remove the root tag when include_root is true" do
-    builder = Builder::HashStructure.new(:include_root => true)
-    # XML :: <root><tag>value</tag></root>
-    builder.root do
-      builder.tag "value"
-    end
-    builder.target!.should == {:root => {:tag => "value"}}
-  end
-
   it "should use the default_content_key when both content and attributes exist" do
     builder = Builder::HashStructure.new
     # XML :: <root><tag id="1">value</tag></root>
@@ -86,6 +33,10 @@ describe Builder::HashStructure do
     builder.target!.should == {:tag => {:id => 1, :text => "value"}}
   end
 
+end
+
+describe Builder::HashStructure, "#<<" do
+
   it "should accept strings for insertion" do
     builder = Builder::HashStructure.new
     sub_builder = Builder::HashStructure.new
@@ -100,6 +51,36 @@ describe Builder::HashStructure do
     builder.target!.should == {:tags => "value"}
   end
 
+  it "should merge its argument into current target" do
+    builder = Builder::HashStructure.new
+    sub_builder = Builder::HashStructure.new
+    sub_builder.item do
+      sub_builder.text "hello"
+    end
+
+    builder.item do
+      builder << sub_builder.target!
+    end
+    builder.target!.should == {:text => "hello"}
+  end
+
+  it "should insert its argument into current target" do
+    builder = Builder::HashStructure.new
+    sub_builder = Builder::HashStructure.new
+    sub_builder.item do
+      sub_builder.text "hello"
+    end
+
+    builder.items do
+      builder.array_mode do
+        3.times do
+          builder << sub_builder.target!
+        end
+      end
+    end
+    builder.target!.should == [{:text => "hello"}, {:text => "hello"}, {:text => "hello"}]
+  end
+
 end
 
 describe Builder::HashStructure, "#cdata!" do
@@ -184,20 +165,38 @@ end
 
 describe Builder::HashStructure, "#target!" do
 
+  it "should remove the root tag" do
+    builder = Builder::HashStructure.new
+    # XML :: <root><tag>value</tag></root>
+    builder.root do
+      builder.tag "value"
+    end
+    builder.target!.should == {:tag => "value"}
+  end
+
+  it "should not remove the root tag when include_root is true" do
+    builder = Builder::HashStructure.new(:include_root => true)
+    # XML :: <root><tag>value</tag></root>
+    builder.root do
+      builder.tag "value"
+    end
+    builder.target!.should == {:root => {:tag => "value"}}
+  end
+
   it "should return a String when there is only a root value" do
     builder = Builder::HashStructure.new
     builder.root("value")
     builder.target!.should == "value"
   end
 
-  it "should return a HashStructure when there is only a root value and include_root option is true" do
+  it "should return a Hash when there is only a root value and include_root option is true" do
     builder = Builder::HashStructure.new(:include_root => true)
     # XML :: <root>value</root>
     builder.root "value"
     builder.target!.should == {:root => "value"}
   end
 
-  it "should return a HashStructure when root has deeper structure" do
+  it "should return a Hash when root has deeper structure" do
     builder = Builder::HashStructure.new
     builder.root do
       builder.item("value")
@@ -216,3 +215,45 @@ describe Builder::HashStructure, "#root!" do
     builder.target!.should == {:root => {:tag => 'value'}}
   end
 end
+
+
+describe Builder::HashStructure, "#_explore_key_and_args" 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 support root attributes" do
+    builder = Builder::HashStructure.new
+    # XML :: <root><tag>value</tag></root>
+    builder.root(:id => 1) do
+      builder.tag "value"
+    end
+    builder.target!.should == {:id => 1, :tag => "value"}
+  end
+
+  it "should ignore nil attributes when block given" do
+    builder = Builder::HashStructure.new
+    # XML :: <root><tag>value</tag></root>
+    builder.root(nil) do
+      builder.tag "value"
+    end
+    builder.target!.should == {:tag => "value"}
+  end
+
+  it "should not ignore nil attributes when block isn't given" do
+    builder = Builder::HashStructure.new
+    # XML :: <root><tag>value</tag></root>
+    builder.root do
+      builder.tag nil
+    end
+    builder.target!.should == {:tag => nil}
+  end
+
+end

data/spec/ext/stackable_array_spec.rb

@@ -0,0 +1,102 @@
+require File.join(File.dirname(__FILE__), '../spec_helper')
+
+describe StackableArray, "#child" do
+
+  before do
+    @grandparent = StackableHash.new
+    @parent = @grandparent.child(:parent)
+    @parent.current = StackableArray.new
+    @self = @parent.child(:self)
+    @child = @self.child(:child)
+  end
+
+  it "should set parent" do
+    @child.parent.should == @self
+  end
+
+  it "should return a StackableHash instance" do
+    @self.should be_instance_of(StackableArray)
+    @child.should be_instance_of(StackableHash)
+  end
+
+  describe "when duplicated key exists" do
+    it "should insert a StackableHash into itself" do
+      @brother = @parent.child(:self)
+      @self.should == [{:self => {:child => {}}}, {:self => {}}]
+    end
+  end
+
+  describe "when duplicated key doesn't exist" do
+    it "should merge a StackableHash into the last element" do
+      @brother = @parent.child(:brother)
+      @self.should == [{:self => {:child => {}}, :brother => {}}]
+    end
+  end
+
+end
+
+describe StackableArray, "#current" do
+
+  before do
+    @grandparent = StackableHash.new
+    @parent = @grandparent.child(:parent)
+    @parent.current = StackableArray.new
+    @brother1 = @parent.child(:brother)
+    @brother2 = @parent.child(:brother)
+    @self = @parent.child(:self)
+    @child = @self.child(:child)
+  end
+
+  it "should return the last element" do
+    [@self, @brother1, @brother2, @parent.current].each do |arr|
+      arr.current.should == {:child => {}}
+    end
+  end
+
+end
+
+describe StackableArray, "#current=" do
+
+  before do
+    @grandparent = StackableHash.new
+    @parent = @grandparent.child(:parent)
+    @parent.current = StackableArray.new
+    @self_dummy = @parent.child(:self)
+    @self_dummy.current.merge!(:name => "self dummy")
+    @self = @parent.child(:self)
+  end
+
+  it "should replace current of the last element" do
+    @self.current_key.should == :self
+    @self.current = "some text"
+    @self.should == [{:self => {:name => "self dummy"}}, {:self => "some text"}]
+    @self_dummy.current = "another text"
+    @self.should == [{:self => {:name => "self dummy"}}, {:self => "another text"}]
+  end
+
+end
+
+describe StackableArray, "#merge!" do
+
+  before do
+    @grandparent = StackableHash.new
+    @parent = @grandparent.child(:parent)
+    @parent.current = StackableArray.new
+    @self = @parent.child(:self)
+  end
+
+  describe "when duplicated key exists" do
+    it "should insert a StackableHash into itself" do
+      @self.merge!(:self => {})
+      @self.should == [{:self => {}}, {:self => {}}]
+    end
+  end
+
+  describe "when duplicated key doesn't exist" do
+    it "should merge a StackableHash into the last element" do
+      @self.merge!(:brother => {})
+      @self.should == [{:self => {}, :brother => {}}]
+    end
+  end
+
+end

data/spec/ext/stackable_hash_spec.rb

@@ -0,0 +1,73 @@
+require File.join(File.dirname(__FILE__), '../spec_helper')
+
+describe Hash, "#stackable" do
+  it "should return StackableHash instance" do
+    {:key => "value"}.stackable.should be_instance_of(StackableHash)
+  end
+end
+
+describe StackableHash, "#child" do
+
+  before do
+    @parent = StackableHash.new
+    @self = @parent.child(:self)
+    @child = @self.child(:child)
+  end
+
+  it "should return a StackableHash instance" do
+    [@self, @child].each do |hash|
+      hash.should be_instance_of(StackableHash)
+    end
+  end
+
+  it "should set parent" do
+    @self.parent.should == @parent
+    @child.parent.should == @self
+  end
+
+  it "should merge a new StackableHash instance into itself" do
+    @parent.should == {:self => {:child => {}}}
+    @self.should == {:self => {:child => {}}}
+    @child.should == {:child => {}}
+  end
+
+  describe "when current is a StackableArray instance" do
+
+    before do
+      @self = @parent.child(:self)
+      @self.current = StackableArray.new
+      @child1 = @self.child(:child)
+      @child2 = @self.child(:child)
+      @child3 = @self.child(:child)
+    end
+
+    it "should set parent" do
+      @self.parent.should == @parent
+      [@child1, @child2, @child3].each do |child|
+        child.parent.should == @self
+      end
+    end
+
+    it "should return a StackableArray instance" do
+      [@child1, @child2, @child3].each do |child|
+        child.should be_instance_of(StackableArray)
+      end
+    end
+
+    it "should insert a StackableHash instance into current" do
+      @self.current.should == [{:child => {}}, {:child => {}}, {:child => {}}]
+    end
+
+    describe "all children" do
+      it "should be same" do
+        [@child1, @child2, @child3].each do |child|
+          child.should == [{:child => {}}, {:child => {}}, {:child => {}}]
+        end
+      end
+    end
+
+  end
+
+end
+
+# TODO: needs more testing

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jsonbuilder
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - nov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-27 00:00:00 +09:00
+date: 2009-07-28 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,6 +40,9 @@ files:
 - spec/builder/hash_structure_spec.rb
 - spec/builder/json_format_spec.rb
 - spec/builder/xml_markup_spec.rb
+- spec/ext
+- spec/ext/stackable_array_spec.rb
+- spec/ext/stackable_hash_spec.rb
 - spec/jsonbuilder_spec.rb
 - spec/spec_helper.rb
 - lib/builder