@@ -2,27 +2,26 @@ Gem::Specification.new do |s| s.name = %q{jsonbuilder} - s.version = "0.2.2" + s.version = "0.2.3" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["nov"] - s.date = %q{2009-07-28} + s.date = %q{2009-10-07} s.description = %q{Builder::XmlMarkup like JsonBuilder} s.email = %q{nov@matake.jp} s.extra_rdoc_files = ["README", "ChangeLog"] - s.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"] - s.has_rdoc = true + s.files = ["README", "ChangeLog", "Rakefile", "spec/spec_helper.rb", "spec/builder", "spec/builder/xml_markup_spec.rb", "spec/builder/json_format_spec.rb", "spec/builder/array_mode_spec.rb", "spec/builder/hash_structure_spec.rb", "spec/ext", "spec/ext/stackable_hash_spec.rb", "spec/ext/stackable_array_spec.rb", "spec/jsonbuilder_spec.rb", "lib/builder", "lib/builder/json_format.rb", "lib/builder/abstract.rb", "lib/builder/xml_markup.rb", "lib/builder/hash_structure.rb", "lib/jsonbuilder.rb", "lib/patch", "lib/patch/active_support_json_decode.rb", "lib/ext", "lib/ext/stackable_array.rb", "lib/ext/stackable_hash.rb"] s.homepage = %q{http://jsonbuilder.rubyforge.org} s.rdoc_options = ["--title", "jsonbuilder documentation", "--charset", "utf-8", "--opname", "index.html", "--line-numbers", "--main", "README", "--inline-source", "--exclude", "^(examples)/"] s.require_paths = ["lib"] s.rubyforge_project = %q{jsonbuilder} - s.rubygems_version = %q{1.3.1} + s.rubygems_version = %q{1.3.5} s.summary = %q{Builder::XmlMarkup like JsonBuilder} s.test_files = ["spec/jsonbuilder_spec.rb"] if s.respond_to? :specification_version then current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION - s.specification_version = 2 + s.specification_version = 3 if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then s.add_runtime_dependency(%q<builder>, [">= 0"]) jsonbuilder.gemspec @@ -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 lib/builder/hash_structure.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' \ No newline at end of file +require 'ext/stackable_array' lib/jsonbuilder.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 \ No newline at end of file +end spec/builder/hash_structure_spec.rb f45ed406df2e7924a7bd1df7f5f58096c24d02db Birkir A. Barkarson birkirb@cerego.com http://github.com/nov/jsonbuilder/commit/ee73edeeaf67ecf88ed30c482a4d30fd31624a9b ee73edeeaf67ecf88ed30c482a4d30fd31624a9b 2009-10-07T03:16:48-07:00 2009-10-07T03:16:48-07:00 Support for inserting into hash structures without tags. d80aa26935bfabbf48b48bdc41b59290e16e65f1 Birkir A. Barkarson birkirb@cerego.com