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)
@@ -12,6 +12,7 @@ module Builder
 
     # NOTICE: you have to call this method to use array in json
     def array_mode(key = nil, &block)
+      raise RuntimeError.new("cannot call inside array_mode block") if @array_mode
       @array_mode = true
       if eval("#{_current}").is_a?(::Hash)
         key ||= :entry
@@ -44,6 +45,7 @@ module Builder
     end
 
     def text!(text)
+      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})")
       else

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,3 +1,5 @@
+require 'builder/xmlmarkup'
+
 module Builder
   class XmlMarkup
 

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"
@@ -18,7 +18,7 @@ describe Builder::Hash do
   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 +27,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)
@@ -36,7 +36,7 @@ describe Builder::Hash do
   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
@@ -48,28 +48,36 @@ describe Builder::Hash do
 
 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 be_a(String)
+    builder.target!.should == "value"
   end
 
-  it "should return Hash when root has deeper structure" do
-    builder = Builder::Hash.new
+  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 HashStructure when root has deeper structure" do
+    builder = Builder::HashStructure.new
     builder.root do
       builder.item("value")
     end
-    builder.target!.should be_a(Hash)
+    builder.target!.should == {:item => 'value'}
   end
 
 end
 
-describe Builder::Hash, "#array_mode" do
+describe Builder::HashStructure, "#array_mode" do
 
-  it "should support <<" do
-    builder = Builder::Hash.new
+  it "should support <<(hash)" do
+    builder = Builder::HashStructure.new
     # XML ::
     # <root>
     #   <items>
@@ -85,7 +93,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
@@ -99,7 +107,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">
@@ -115,7 +123,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
@@ -137,7 +145,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
@@ -147,36 +155,64 @@ describe Builder::Hash, "#array_mode" do
     builder.target!.should == {:items => []}
   end
 
-  it "should only support the << operator for insertion"do
-    builder = Builder::Hash.new
-    # XML ::
-    # <root>
-    #   <items>
-    #     <item>
-    #       <text>hello world 0</text>
-    #     </item>
-    #     <item>
-    #       <text>hello world 1</text>
-    #     </item>
-    #   </items>
-    # </root>
-    succeeded = true
+  it "should raise error if tag methods (method_missing) is used inside block"do
+    builder = Builder::HashStructure.new
     builder.root do
       builder.items do
-        begin
+        lambda do
+          builder.array_mode do
+            builder.item("hello world")
+          end
+        end.should raise_error
+        lambda do
           builder.array_mode do
-            2.times do
-              builder.item do
-                builder.text "hello world"
-              end
+            builder.item do
+              builder.text("hello world")
             end
           end
-        rescue
-          succeeded = false
-        end
+        end.should raise_error
+      end
+    end
+  end
+
+  it "should raise error if tag! is used inside block"do
+    builder = Builder::HashStructure.new
+    builder.root do
+      builder.items do
+        lambda do
+          builder.array_mode do
+            builder.tag!("item", "item1")
+          end
+        end.should raise_error
+      end
+    end
+  end
+
+  it "should raise error if cdata! (or text!) is used inside block"do
+    builder = Builder::HashStructure.new
+    builder.root do
+      builder.items do
+        lambda do
+          builder.array_mode do
+            builder.cdata!("text")
+          end
+        end.should raise_error
+      end
+    end
+  end
+
+  it "should raise error if array_mode is used inside block"do
+    builder = Builder::HashStructure.new
+    builder.root do
+      builder.items do
+        lambda do
+          builder.array_mode do
+            builder.array_mode do
+            end
+          end
+        end.should raise_error
       end
     end
-    succeeded.should_not be_true
   end
 
 end

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/spec_helper.rb

@@ -1,19 +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'
-
-def be_a(klass)
-  be_is_a(klass)
-end
-
-def rand_string(length = 100)
-  chars = ('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a
-  Array.new(length){ chars[rand(chars.size)] }.join
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: 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 +09:00
+date: 2009-06-11 00:00:00 +09: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