birkirb-jsonbuilder 0.0.6 → 0.0.7

data/Rakefile

@@ -34,10 +34,19 @@ RDOC_OPTS = [
 task :default => [:spec]
 task :package => [:clean]
 
-Rake::TestTask.new("spec") do |t|
-  t.libs   << "spec"
-  t.pattern = "spec/**/*_spec.rb"
-  t.verbose = true
+begin
+  require 'spec/rake/spectask'
+
+  Spec::Rake::SpecTask.new('spec') do |t|
+    t.spec_opts = ["-f specdoc", "-c"]
+    t.spec_files = FileList['spec/*_spec.rb', 'spec/builder/*_spec.rb']
+  end
+
+rescue LoadError
+  desc 'Spec rake task not available'
+  task :spec do
+    abort 'Spec rake task is not available. Be sure to install rspec as a gem or plugin'
+  end
 end
 
 spec = Gem::Specification.new do |s|

data/lib/builder/abstract.rb

@@ -1,5 +1,4 @@
 module Builder
-
   class Abstract
     def nil?
       false

data/lib/builder/{hash.rb → hash_structure.rb}

@@ -1,5 +1,5 @@
 module Builder
-  class Hash < Abstract
+  class HashStructure < Abstract
 
     def initialize(options = {})
       # @default_content_key is used in such case: markup.key(value, :attr_key => attr_value)
@@ -35,6 +35,16 @@ module Builder
       end
     end
 
+    def root!(key, *attrs, &block)
+      @include_root = true
+      method_missing(key, *attrs, &block)
+    end
+
+    def content!(key, default_content_key, *attrs, &block)
+      @default_content_key = default_content_key
+      method_missing(key, *attrs, &block)
+    end
+
     def <<(_target)
       if @array_mode
         eval("#{_current} << _target")
@@ -44,7 +54,9 @@ module Builder
       end
     end
 
-    def text!(text)
+    def text!(text, default_content_key = nil)
+      @default_content_key = default_content_key unless default_content_key.nil?
+
       raise RuntimeError.new("cannot call inside array_mode block") if @array_mode
       if eval("#{_current}").is_a?(::Hash)
         eval("#{_current}.merge!({@default_content_key => text})")
@@ -61,10 +73,10 @@ module Builder
     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)
-      unless @root
-        _root(key, args, &block)
-      else
+      if @root
         _child(key, args, &block)
+      else
+        _root(key, args, &block)
       end
       target!
     end

data/lib/builder/{json.rb → json_format.rb}

@@ -1,8 +1,7 @@
 require 'json'
 
 module Builder
-
-  class Json < Hash
+  class JsonFormat < HashStructure
 
     def initialize(options = {})
       # @default_content_key is used in such case: markup.key(value, :attr_key => attr_value)
@@ -21,5 +20,4 @@ module Builder
       end
     end
   end
-
 end

data/lib/builder/xml_markup.rb

@@ -1,6 +1,19 @@
+require 'builder/xmlmarkup'
+
 module Builder
   class XmlMarkup
 
+    # Rooted element only needed by XML
+    def root!(key, *attrs, &block)
+      tag!(key, *attrs, &block)
+    end
+
+    alias :single_argument_cdata! :cdata!
+
+    def cdata!(key, default_content_key = nil)
+      single_argument_cdata!(key)
+    end
+
     # Add this no-op
     def array_mode(key = nil, &block)
       yield(self)

data/lib/jsonbuilder.rb

@@ -2,7 +2,7 @@ module JsonBuilder
   module Version
     MAJOR = 0
     MINOR = 0
-    REVISION = 6
+    REVISION = 7 
     class << self
       def to_version
         "#{MAJOR}.#{MINOR}.#{REVISION}"
@@ -16,6 +16,6 @@ module JsonBuilder
 end
 
 require 'builder/abstract'
-require 'builder/hash'
+require 'builder/hash_structure'
 require 'builder/xml_markup'
-require 'builder/json'
+require 'builder/json_format'

data/spec/builder/{hash_spec.rb → hash_structure_spec.rb}

@@ -1,15 +1,15 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
-describe Builder::Hash, ".new" do
+describe Builder::HashStructure, ".new" do
   it "should be accessible" do
-    Builder::Hash.should respond_to(:new)
+    Builder::HashStructure.should respond_to(:new)
   end
 end
 
-describe Builder::Hash do
+describe Builder::HashStructure do
 
   it "should remove the root tag" do
-    builder = Builder::Hash.new
+    builder = Builder::HashStructure.new
     # XML :: <root><tag>value</tag></root>
     builder.root do
       builder.tag "value"
@@ -17,8 +17,17 @@ describe Builder::Hash do
     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::Hash.new(:include_root => true)
+    builder = Builder::HashStructure.new(:include_root => true)
     # XML :: <root><tag>value</tag></root>
     builder.root do
       builder.tag "value"
@@ -27,7 +36,7 @@ describe Builder::Hash do
   end
 
   it "should use the default_content_key when both content and attributes exist" do
-    builder = Builder::Hash.new
+    builder = Builder::HashStructure.new
     # XML :: <root><tag id="1">value</tag></root>
     builder.root do
       builder.tag("value", :id => 1)
@@ -35,8 +44,17 @@ describe Builder::Hash do
     builder.target!.should == {:tag => {:id => 1, :content => "value"}}
   end
 
+  it "should use the specified default_content_key when both content and attributes exist" do
+    builder = Builder::HashStructure.new(:default_content_key => :text)
+    # XML :: <root><tag id="1">value</tag></root>
+    builder.root do
+      builder.tag("value", :id => 1)
+    end
+    builder.target!.should == {:tag => {:id => 1, :text => "value"}}
+  end
+
   it "should use the default_content_key when both cdata! and attributes exist" do
-    builder = Builder::Hash.new
+    builder = Builder::HashStructure.new
     # XML :: <root><tag id="1"><![CDATA[value]]></tag></root>
     builder.root do
       builder.tag(:id => 1) do
@@ -46,26 +64,46 @@ describe Builder::Hash 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
+    builder = Builder::HashStructure.new
+    # XML :: <quotes><quote id=\"1\"><![CDATA[All generalizations are false, including this one.]]></quote></quotes>
+    builder.quotes do
+      builder.quote(:id => 1) do
+        builder.cdata!("All generalizations are false, including this one.", :text)
+      end
+    end
+    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
+    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::Hash, "#target!" do
+describe Builder::HashStructure, "#target!" do
 
   it "should return a String when there is only a root value" do
-    builder = Builder::Hash.new
+    builder = Builder::HashStructure.new
     builder.root("value")
     builder.target!.should == "value"
   end
 
-  it "should return a Hash when there is only a root value and include_root option is true" do
-    builder = Builder::Hash.new(:include_root => true)
+  it "should return a HashStructure 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 Hash when root has deeper structure" do
-    builder = Builder::Hash.new
+  it "should return a HashStructure when root has deeper structure" do
+    builder = Builder::HashStructure.new
     builder.root do
       builder.item("value")
     end
@@ -74,10 +112,21 @@ describe Builder::Hash, "#target!" do
 
 end
 
-describe Builder::Hash, "#array_mode" do
+describe Builder::HashStructure, "#root!" do
+
+  it "should force the root tag" do
+    builder = Builder::HashStructure.new
+    builder.root!(:root) do
+      builder.tag "value"
+    end
+    builder.target!.should == {:root => {:tag => 'value'}}
+  end
+end
+
+describe Builder::HashStructure, "#array_mode" do
 
   it "should support <<(hash)" do
-    builder = Builder::Hash.new
+    builder = Builder::HashStructure.new
     # XML ::
     # <root>
     #   <items>
@@ -93,7 +142,7 @@ describe Builder::Hash, "#array_mode" do
       builder.items do
         builder.array_mode do
           2.times do |i|
-            _builder = Builder::Hash.new
+            _builder = Builder::HashStructure.new
             builder << _builder.item do
               _builder.text "hello world #{i}"
             end
@@ -107,7 +156,7 @@ describe Builder::Hash, "#array_mode" do
   end
 
   it "should generate a new key if needed" do
-    builder = Builder::Hash.new
+    builder = Builder::HashStructure.new
     # XML ::
     # <root>
     #   <items site="smart.fm">
@@ -123,7 +172,7 @@ describe Builder::Hash, "#array_mode" do
       builder.items(:site => "smart.fm") do
         builder.array_mode do
           2.times do |i|
-            _builder = Builder::Hash.new
+            _builder = Builder::HashStructure.new
             builder << _builder.item do
               _builder.text "hello world #{i}"
             end
@@ -145,7 +194,7 @@ describe Builder::Hash, "#array_mode" do
     #   <items>
     #   </items>
     # </root>
-    builder = Builder::Hash.new
+    builder = Builder::HashStructure.new
     builder.root do
       builder.items do
         builder.array_mode do
@@ -156,7 +205,7 @@ describe Builder::Hash, "#array_mode" do
   end
 
   it "should raise error if tag methods (method_missing) is used inside block"do
-    builder = Builder::Hash.new
+    builder = Builder::HashStructure.new
     builder.root do
       builder.items do
         lambda do
@@ -176,7 +225,7 @@ describe Builder::Hash, "#array_mode" do
   end
 
   it "should raise error if tag! is used inside block"do
-    builder = Builder::Hash.new
+    builder = Builder::HashStructure.new
     builder.root do
       builder.items do
         lambda do
@@ -189,7 +238,7 @@ describe Builder::Hash, "#array_mode" do
   end
 
   it "should raise error if cdata! (or text!) is used inside block"do
-    builder = Builder::Hash.new
+    builder = Builder::HashStructure.new
     builder.root do
       builder.items do
         lambda do
@@ -202,7 +251,7 @@ describe Builder::Hash, "#array_mode" do
   end
 
   it "should raise error if array_mode is used inside block"do
-    builder = Builder::Hash.new
+    builder = Builder::HashStructure.new
     builder.root do
       builder.items do
         lambda do

data/spec/builder/{json_spec.rb → json_format_spec.rb}

@@ -1,21 +1,21 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
-describe Builder::Json, ".new" do
+describe Builder::JsonFormat, ".new" do
   it "should be accessible" do
-    Builder::Hash.should respond_to(:new)
+    Builder::JsonFormat.should respond_to(:new)
   end
 end
 
-describe Builder::Json, "#target!" do
+describe Builder::JsonFormat, "#target!" do
 
   it "should return a String when there is only a root value" do
-    builder = Builder::Hash.new
+    builder = Builder::JsonFormat.new
     builder.root("value")
     builder.target!.should be_a(String)
   end
 
   it "should return a JSON string when root has deeper structure" do
-    builder = Builder::Json.new
+    builder = Builder::JsonFormat.new
     builder.root do
       builder.item("value")
     end

data/spec/builder/xml_markup_spec.rb

@@ -15,5 +15,28 @@ describe Builder::XmlMarkup, "#array_mode" do
     end
     builder.target!.should == builder2.target!
   end
+end
+
+describe Builder::XmlMarkup, "#xml_root!" do
+
+  it "should create an element as normal" do
+    builder = Builder::XmlMarkup.new
+    builder.root!("root") do
+      builder.tag "value"
+    end
+    builder.target!.should == "<root><tag>value</tag></root>"
+  end
+end
+
+describe Builder::XmlMarkup, "#cdata!" do
 
+  it "should support a second argument which does nothing" do
+    builder = Builder::XmlMarkup.new
+    builder.quotes do
+      builder.quote(:id => 1) do
+        builder.cdata!("All generalizations are false, including this one.", :text)
+      end
+    end
+    builder.target!.should == "<quotes><quote id=\"1\"><![CDATA[All generalizations are false, including this one.]]></quote></quotes>"
+  end
 end

data/spec/spec_helper.rb

@@ -1,10 +1,5 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  gem 'rspec'
-  require 'spec'
-end
+require 'rubygems'
+require 'spec'
+
 $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
-require 'builder'
 require 'jsonbuilder'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: birkirb-jsonbuilder
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - nov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-08 00:00:00 -07:00
+date: 2009-06-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,15 +36,15 @@ files:
 - ChangeLog
 - Rakefile
 - spec/builder
-- spec/builder/hash_spec.rb
-- spec/builder/json_spec.rb
+- spec/builder/hash_structure_spec.rb
+- spec/builder/json_format_spec.rb
 - spec/builder/xml_markup_spec.rb
 - spec/jsonbuilder_spec.rb
 - spec/spec_helper.rb
 - lib/builder
 - lib/builder/abstract.rb
-- lib/builder/hash.rb
-- lib/builder/json.rb
+- lib/builder/hash_structure.rb
+- lib/builder/json_format.rb
 - lib/builder/xml_markup.rb
 - lib/jsonbuilder.rb
 has_rdoc: true