jsonbuilder 0.1.0 → 0.1.2

data/lib/builder/hash_structure.rb

@@ -53,7 +53,6 @@ module Builder
         @path.push(key)
       else
         if _target.is_a?(String)
-          puts _current
           eval("#{_current} = _target")
         else
           eval("#{_current} ||= {}")

data/lib/builder/json_format.rb

@@ -1,4 +1,5 @@
 require 'activesupport'
+require 'patch/active_support_json_decode'
 
 module Builder
   class JsonFormat < HashStructure

data/lib/jsonbuilder.rb

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

data/lib/patch/active_support_json_decode.rb

@@ -0,0 +1,85 @@
+# Copy of rails 2.3.2 ActiveSupport::JSON since 2.2.2 doesn't correctly decode unicode.
+require 'yaml'
+require 'strscan'
+
+silence_warnings {
+  module ActiveSupport
+    module JSON
+      class ParseError < StandardError
+      end
+
+      class << self
+        # Converts a JSON string into a Ruby object.
+        def decode(json)
+          YAML.load(convert_json_to_yaml(json))
+        rescue ArgumentError => e
+          raise ParseError, "Invalid JSON string"
+        end
+
+        protected
+        # matches YAML-formatted dates
+        DATE_REGEX = /^(?:\d{4}-\d{2}-\d{2}|\d{4}-\d{1,2}-\d{1,2}[ \t]+\d{1,2}:\d{2}:\d{2}(\.[0-9]*)?(([ \t]*)Z|[-+]\d{2}?(:\d{2})?)?)$/
+
+          # Ensure that ":" and "," are always followed by a space
+          def convert_json_to_yaml(json) #:nodoc:
+            scanner, quoting, marks, pos, times = StringScanner.new(json), false, [], nil, []
+            while scanner.scan_until(/(\\['"]|['":,\\]|\\.)/)
+              case char = scanner[1]
+              when '"', "'"
+                if !quoting
+                  quoting = char
+                  pos = scanner.pos
+                elsif quoting == char
+                  if json[pos..scanner.pos-2] =~ DATE_REGEX
+                    # found a date, track the exact positions of the quotes so we can remove them later.
+                    # oh, and increment them for each current mark, each one is an extra padded space that bumps
+                    # the position in the final YAML output
+                    total_marks = marks.size
+                    times << pos+total_marks << scanner.pos+total_marks
+                  end
+                  quoting = false
+                end
+              when ":",","
+                marks << scanner.pos - 1 unless quoting
+              end
+            end
+
+            if marks.empty?
+              json.gsub(/\\([\\\/]|u[[:xdigit:]]{4})/) do
+                ustr = $1
+                if ustr.starts_with?('u')
+                  [ustr[1..-1].to_i(16)].pack("U")
+                elsif ustr == '\\'
+                  '\\\\'
+                else
+                  ustr
+                end
+              end
+            else
+              left_pos  = [-1].push(*marks)
+              right_pos = marks << scanner.pos + scanner.rest_size
+              output    = []
+              left_pos.each_with_index do |left, i|
+                scanner.pos = left.succ
+                output << scanner.peek(right_pos[i] - scanner.pos + 1).gsub(/\\([\\\/]|u[[:xdigit:]]{4})/) do
+                  ustr = $1
+                  if ustr.starts_with?('u')
+                    [ustr[1..-1].to_i(16)].pack("U")
+                  elsif ustr == '\\'
+                    '\\\\'
+                  else
+                    ustr
+                  end
+                end
+              end
+              output = output * " "
+
+              times.each { |i| output[i-1] = ' ' }
+              output.gsub!(/\\\//, '/')
+              output
+            end
+          end
+      end
+    end
+  end
+}

data/spec/builder/hash_structure_spec.rb

@@ -7,7 +7,7 @@ describe Builder::HashStructure, ".new" do
 
   it 'should create new instances of self with new!' do
     builder = Builder::HashStructure.new
-    builder.new!.should be_a Builder::HashStructure
+    builder.new!.should be_a(Builder::HashStructure)
   end
 end
 

data/spec/builder/json_format_spec.rb

@@ -35,9 +35,19 @@ 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
+    builder = Builder::JsonFormat.new
+    builder.objects do
+      builder << TestObject.new("テスト").to_json
+    end
+
+    builder.to_s.should == '{"text": "\u30c6\u30b9\u30c8"}'
+  end
+
+
   it 'should allow string inserts to support recursive calls' do
     builder = Builder::JsonFormat.new
     builder.objects do

data/spec/builder/xml_markup_spec.rb

@@ -4,7 +4,7 @@ describe Builder::XmlMarkup, "#new!" do
 
   it "should return new instance of same class" do
     builder = Builder::XmlMarkup.new
-    builder.new!.should be_a Builder::XmlMarkup
+    builder.new!.should be_a(Builder::XmlMarkup)
   end
 end
 
@@ -36,7 +36,7 @@ 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"
+      builder.tag("value")
     end
     builder.target!.should == "<root><tag>value</tag></root>"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jsonbuilder
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors: 
 - nov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-24 00:00:00 +09:00
+date: 2009-06-26 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,8 @@ files:
 - lib/builder/json_format.rb
 - lib/builder/xml_markup.rb
 - lib/jsonbuilder.rb
+- lib/patch
+- lib/patch/active_support_json_decode.rb
 has_rdoc: true
 homepage: http://jsonbuilder.rubyforge.org
 post_install_message: