jsonbuilder 0.2.2 → 0.2.3

data/lib/builder/hash_structure.rb

@@ -25,6 +25,8 @@ module Builder
     def target!
       if @include_root || @target.is_a?(Array)
         @target
+      elsif @root.nil?
+        @target
       else
         @target[@root]
       end
@@ -48,7 +50,11 @@ module Builder
       if @array_mode
         @target.current << _target
       elsif _target.is_a?(Hash)
-        @target.current.merge!(_target)
+        if @target.current.nil?
+          @target.merge!(_target)
+        else
+          @target.current.merge!(_target)
+        end
       else
         @target.current = _target
       end
@@ -89,7 +95,7 @@ module Builder
 
     def _set_args(args, &block)
       args.each do |arg|
-        case arg 
+        case arg
         when Hash
           self << arg.stackable
         else

data/lib/jsonbuilder.rb

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

data/spec/builder/array_mode_spec.rb

@@ -295,4 +295,17 @@ describe Builder::HashStructure, "#array_mode" do
     }
   end
 
+  it "should support root! with attributes" do
+    builder = Builder::HashStructure.new
+    builder.items do
+      builder.array_mode do
+        _builder = builder.class.new
+        builder << _builder.root!(:item, :id => 1) do
+          _builder.text 'hello'
+        end
+      end
+    end
+    builder.target!.should == [{:item => {:text => "hello", :id => 1}}]
+  end
+
 end

data/spec/builder/hash_structure_spec.rb

@@ -51,6 +51,17 @@ describe Builder::HashStructure, "#<<" do
     builder.target!.should == {:tags => "value"}
   end
 
+  it "should merge without any tags" do
+    builder = Builder::HashStructure.new
+    sub_builder = Builder::HashStructure.new
+    sub_builder.item do
+      sub_builder.text "hello"
+    end
+
+    builder << sub_builder.target!
+    builder.target!.should == {:text => "hello"}
+  end
+
   it "should merge its argument into current target" do
     builder = Builder::HashStructure.new
     sub_builder = Builder::HashStructure.new
@@ -256,4 +267,4 @@ describe Builder::HashStructure, "#_explore_key_and_args" do
     builder.target!.should == {:tag => nil}
   end
 
-end
+end

data/spec/builder/json_format_spec.rb

@@ -35,7 +35,7 @@ describe Builder::JsonFormat do
       builder << TestObject.new("Recursive Json!").to_json
     end
 
-    builder.to_s.should == '{"text": "Recursive Json!"}'
+    builder.to_s.should == '{"text":"Recursive Json!"}'
   end
 
   it 'should not double escape unicode strings inserts when supporting recursive calls' do
@@ -44,7 +44,7 @@ describe Builder::JsonFormat do
       builder << TestObject.new("テスト").to_json
     end
 
-    builder.to_s.should == '{"text": "\u30c6\u30b9\u30c8"}'
+    builder.to_s.should == '{"text":"\u30c6\u30b9\u30c8"}'
   end
 
 
@@ -67,7 +67,7 @@ describe Builder::JsonFormat do
       end
     end
 
-    builder.to_s.should == "{\"texts\": [\"my text\"]}"
+    builder.to_s.should == "{\"texts\":[\"my text\"]}"
   end
 
   it 'should allow string inserts to support recursive calls in array mode' do
@@ -97,7 +97,7 @@ describe Builder::JsonFormat, "#target!" do
       builder.item("value")
     end
     builder.target!.should be_a(Hash)
-    builder.to_s.should =="{\"item\": \"value\"}"
+    builder.to_s.should =="{\"item\":\"value\"}"
   end
 
   it "should return a Hash object when include_root is true" do
@@ -107,7 +107,7 @@ describe Builder::JsonFormat, "#target!" do
       builder.tag "value"
     end
     builder.target!.should be_a(Hash)
-    builder.to_s.should == '{"root": {"tag": "value"}}'
+    builder.to_s.should == '{"root":{"tag":"value"}}'
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jsonbuilder
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - nov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-28 00:00:00 +09:00
+date: 2009-10-07 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,29 +35,26 @@ files:
 - README
 - ChangeLog
 - Rakefile
-- spec/builder
 - spec/builder/array_mode_spec.rb
 - 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
 - lib/builder/abstract.rb
 - 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
 has_rdoc: true
 homepage: http://jsonbuilder.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --title
@@ -89,9 +86,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jsonbuilder
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Builder::XmlMarkup like JsonBuilder
 test_files: 
 - spec/jsonbuilder_spec.rb