jsonbuilder 0.0.4 → 0.0.5

data/lib/builder/jsonmarkup.rb

@@ -1,6 +1,7 @@
 module Builder
 
   class XmlMarkup
+    # Do nothing
     def array_mode(key = nil, &block)
       yield(self)
     end
@@ -8,8 +9,6 @@ module Builder
 
   class JsonMarkup
 
-    attr_accessor :path, :target
-
     def initialize(options = {})
       # @default_content_key is used in such case: markup.key(value, :attr_key => attr_value)
       # in this case, we need some key for value.
@@ -26,14 +25,14 @@ module Builder
     # NOTICE: you have to call this method to use array in json
     def array_mode(key = nil, &block)
       @array_mode = true
-      if eval("#{current}").is_a?(Hash)
+      if eval("#{_current}").is_a?(Hash)
         key ||= :entries
-        eval("#{current}.merge!(key => [])")
+        eval("#{_current}.merge!(key => [])")
         @path.push(key.to_sym)
         yield(self)
         @path.pop
       else
-        eval("#{current} = []")
+        eval("#{_current} = []")
         yield(self)
       end
       @array_mode = false
@@ -55,18 +54,18 @@ module Builder
 
     def <<(_target)
       if @array_mode
-        eval("#{current} << _target")
+        eval("#{_current} << _target")
       else
-        eval("#{current} ||= {}")
-        eval("#{current}.merge!(_target)")
+        eval("#{_current} ||= {}")
+        eval("#{_current}.merge!(_target)")
       end
     end
 
     def text!(text)
-      if eval("#{current}").is_a?(Hash)
-        eval("#{current}.merge!({@default_content_key => text})")
+      if eval("#{_current}").is_a?(Hash)
+        eval("#{_current}.merge!({@default_content_key => text})")
       else
-        eval("#{current} = text")
+        eval("#{_current} = text")
       end
     end
     alias_method :cdata!, :text!
@@ -79,43 +78,43 @@ module Builder
       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)
+        _root(key, args, &block)
       else
-        children(key, args, &block)
+        _child(key, args, &block)
       end
       target!
     end
 
     private
 
-    def root(root, args, &block)
+    def _root(root, args, &block)
       @root = root
       @target[root] = {}
       @path = [root]
-      set_args(args, &block)
+      _set_args(args, &block)
       yield(self) if block_given?
     end
 
-    def children(key, args, &block)
-      eval("#{current} ||= {}")
+    def _child(key, args, &block)
+      eval("#{_current} ||= {}")
       @path.push(key)
-      set_args(args, &block)
+      _set_args(args, &block)
       @path.pop
     end
 
-    def set_args(args, &block)
+    def _set_args(args, &block)
       args.each do |arg|
         case arg
         when Hash
           self << arg
         else
-          eval("#{current} = arg")
+          eval("#{_current} = arg")
         end
       end
       yield(self) if block_given?
     end
 
-    def current
+    def _current
       "@target[:\"#{@path.join('"][:"')}\"]"
     end
 

data/lib/jsonbuilder.rb

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

data/spec/builder/jsonmarkup_spec.rb

@@ -0,0 +1,164 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+describe Builder::JsonMarkup, ".new" do
+  it "should be accessible" do
+    Builder::JsonMarkup.should respond_to(:new)
+  end
+end
+
+describe Builder::JsonMarkup do
+
+  it "should remove root tag" do
+    markup = Builder::JsonMarkup.new
+    # XML :: <root><tag>value</tag></root>
+    markup.root do
+      markup.tag "value"
+    end
+    markup.target!.should == {:tag => "value"}
+  end
+
+  it "should not remove root tag when include_root is true" do
+    markup = Builder::JsonMarkup.new(:include_root => true)
+    # XML :: <root><tag>value</tag></root>
+    markup.root do
+      markup.tag "value"
+    end
+    markup.target!.should == {:root => {:tag => "value"}}
+  end
+
+  it "should use default_content_key when both content and attributes are exist" do
+    markup = Builder::JsonMarkup.new
+    # XML :: <root><tag id="1">value</tag></root>
+    markup.root do
+      markup.tag("value", :id => 1)
+    end
+    markup.target!.should == {:tag => {:id => 1, :content => "value"}}
+  end
+
+  it "should use default_content_key when both cdata! and attributes are exist" do
+    markup = Builder::JsonMarkup.new
+    # XML :: <root><tag id="1"><![CDATA[value]]></tag></root>
+    markup.root do
+      markup.tag(:id => 1) do
+        markup.cdata! "value"
+      end
+    end
+    markup.target!.should == {:tag => {:id => 1, :content => "value"}}
+  end
+
+end
+
+describe Builder::JsonMarkup, "#array_mode" do
+
+  it "should support <<" do
+    markup = Builder::JsonMarkup.new
+    # XML ::
+    # <root>
+    #   <items>
+    #     <item>
+    #       <text>hello world 0</text>
+    #     </item>
+    #     <item>
+    #       <text>hello world 1</text>
+    #     </item>
+    #   </items>
+    # </root>
+    markup.root do
+      markup.items do
+        markup.array_mode do
+          2.times do |i|
+            _markup = Builder::JsonMarkup.new
+            markup << _markup.item do
+              _markup.text "hello world #{i}"
+            end
+          end
+        end
+      end
+    end
+    markup.target!.should == {
+      :items => [{:text => "hello world 0"}, {:text => "hello world 1"}]
+    }
+  end
+
+  it "should generate new key if needed" do
+    markup = Builder::JsonMarkup.new
+    # XML ::
+    # <root>
+    #   <items site="smart.fm">
+    #     <item>
+    #       <text>hello world 0</text>
+    #     </item>
+    #     <item>
+    #       <text>hello world 1</text>
+    #     </item>
+    #   </items>
+    # </root>
+    markup.root do
+      markup.items(:site => "smart.fm") do
+        markup.array_mode do
+          2.times do |i|
+            _markup = Builder::JsonMarkup.new
+            markup << _markup.item do
+              _markup.text "hello world #{i}"
+            end
+          end
+        end
+      end
+    end
+    markup.target!.should == {
+      :items => {
+        :entries => [{:text => "hello world 0"}, {:text=>"hello world 1"}],
+        :site=>"smart.fm"
+      }
+    }
+  end
+
+  it "should treat blank block as blank Array" do
+    # XML ::
+    # <root>
+    #   <items>
+    #   </items>
+    # </root>
+    markup = Builder::JsonMarkup.new
+    markup.root do
+      markup.items do
+        markup.array_mode do
+        end
+      end
+    end
+    markup.target!.should == {:items => []}
+  end
+
+  it "should not support all methods except <<"do
+    markup = Builder::JsonMarkup.new
+    # XML ::
+    # <root>
+    #   <items>
+    #     <item>
+    #       <text>hello world 0</text>
+    #     </item>
+    #     <item>
+    #       <text>hello world 1</text>
+    #     </item>
+    #   </items>
+    # </root>
+    succeeded = true
+    markup.root do
+      markup.items do
+        begin
+          markup.array_mode do
+            2.times do
+              markup.item do
+                markup.text "hello world"
+              end
+            end
+          end
+        rescue
+          succeeded = false
+        end
+      end
+    end
+    succeeded.should_not be_true
+  end
+
+end

data/spec/jsonbuilder_spec.rb

@@ -0,0 +1,13 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe JsonBuilder::Version, "#to_version" do
+  it "should return version in 'X.Y.Z' format" do
+    JsonBuilder::Version.to_version.should =~ /\d+\.\d+\.\d+/
+  end
+end
+
+describe JsonBuilder::Version, "#to_name" do
+  it "should return version in 'X_Y_Z' format" do
+    JsonBuilder::Version.to_name.should =~ /\d+_\d+_\d+/
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jsonbuilder
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - nov
@@ -28,6 +28,7 @@ files:
 - Rakefile
 - spec/builder
 - spec/builder/jsonmarkup_spec.rb
+- spec/jsonbuilder_spec.rb
 - spec/spec_helper.rb
 - lib/builder
 - lib/builder/jsonmarkup.rb
@@ -69,5 +70,5 @@ rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Builder::XmlMarkup like JsonBuilder (Builder::JsonMarkup)
-test_files: []
-
+test_files: 
+- spec/jsonbuilder_spec.rb