jsonbuilder 0.3.0 → 0.3.1

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email = 'nov@matake.jp'
     gem.homepage = 'http://github.com/nov/jsonbuilder'
     gem.authors = ['nov matake']
-    gem.add_dependency 'activesupport'
+    gem.add_dependency 'activesupport', '>=2.3.2'
     gem.add_development_dependency 'rspec'
     gem.add_development_dependency 'rcov'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/jsonbuilder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jsonbuilder}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["nov matake"]
-  s.date = %q{2010-05-19}
+  s.date = %q{2010-08-11}
   s.description = %q{Builder::XmlMarkup like JsonBuilder}
   s.email = %q{nov@matake.jp}
   s.extra_rdoc_files = [
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
      "lib/ext/stackable_array.rb",
      "lib/ext/stackable_hash.rb",
      "lib/jsonbuilder.rb",
-     "lib/patch/active_support_json_decode.rb",
      "spec/builder/array_mode_spec.rb",
      "spec/builder/hash_structure_spec.rb",
      "spec/builder/json_format_spec.rb",
@@ -43,7 +42,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/nov/jsonbuilder}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Builder::XmlMarkup like JsonBuilder}
   s.test_files = [
     "spec/builder/array_mode_spec.rb",
@@ -59,17 +58,17 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.2"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 2.3.2"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 2.3.2"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rcov>, [">= 0"])
   end

data/lib/builder/json_format.rb

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

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jsonbuilder
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - nov matake
@@ -14,28 +15,34 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 +09:00
+date: 2010-08-11 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 3
+        - 2
+        version: 2.3.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -45,9 +52,11 @@ dependencies:
   name: rcov
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -76,7 +85,6 @@ files:
 - lib/ext/stackable_array.rb
 - lib/ext/stackable_hash.rb
 - lib/jsonbuilder.rb
-- lib/patch/active_support_json_decode.rb
 - spec/builder/array_mode_spec.rb
 - spec/builder/hash_structure_spec.rb
 - spec/builder/json_format_spec.rb
@@ -95,23 +103,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Builder::XmlMarkup like JsonBuilder

data/lib/patch/active_support_json_decode.rb

@@ -1,87 +0,0 @@
-# Copy of rails 2.3.2 ActiveSupport::JSON since 2.2.2 doesn't correctly decode unicode.
-require 'yaml'
-require 'strscan'
-require 'active_support/core_ext'
-require 'active_support/json'
-
-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
-}