json 1.4.4-java → 1.4.5-java

data/lib/json/common.rb

@@ -11,9 +11,9 @@ module JSON
     # generate and parse for their documentation.
     def [](object, opts = {})
       if object.respond_to? :to_str
-        JSON.parse(object.to_str, opts => {})
+        JSON.parse(object.to_str, opts)
       else
-        JSON.generate(object, opts => {})
+        JSON.generate(object, opts)
       end
     end
 
@@ -63,20 +63,20 @@ module JSON
       end
       self.state = generator::State
       const_set :State, self.state
-      const_set :SAFE_STATE_PROTOTYPE, State.new.freeze
+      const_set :SAFE_STATE_PROTOTYPE, State.new
       const_set :FAST_STATE_PROTOTYPE, State.new(
         :indent         => '',
         :space          => '',
         :object_nl      => "",
         :array_nl       => "",
         :max_nesting    => false
-      ).freeze
+      )
       const_set :PRETTY_STATE_PROTOTYPE, State.new(
         :indent         => '  ',
         :space          => ' ',
         :object_nl      => "\n",
         :array_nl       => "\n"
-      ).freeze
+      )
     end
 
     # Returns the JSON generator modul, that is used by JSON. This might be
@@ -196,6 +196,7 @@ module JSON
   # amount of sanity checks, and the pretty_generate method for some
   # defaults for a pretty output.
   def generate(obj, opts = nil)
+    state = SAFE_STATE_PROTOTYPE.dup
     if opts
       if opts.respond_to? :to_hash
         opts = opts.to_hash
@@ -204,10 +205,7 @@ module JSON
       else
         raise TypeError, "can't convert #{opts.class} into Hash"
       end
-      state = SAFE_STATE_PROTOTYPE.dup
       state = state.configure(opts)
-    else
-      state = SAFE_STATE_PROTOTYPE
     end
     state.generate(obj)
   end
@@ -225,6 +223,7 @@ module JSON
   # *WARNING*: Be careful not to pass any Ruby data structures with circles as
   # _obj_ argument, because this will cause JSON to go into an infinite loop.
   def fast_generate(obj, opts = nil)
+    state = FAST_STATE_PROTOTYPE.dup
     if opts
       if opts.respond_to? :to_hash
         opts = opts.to_hash
@@ -233,10 +232,7 @@ module JSON
       else
         raise TypeError, "can't convert #{opts.class} into Hash"
       end
-      state = FAST_STATE_PROTOTYPE.dup
       state.configure(opts)
-    else
-      state = FAST_STATE_PROTOTYPE
     end
     state.generate(obj)
   end
@@ -254,6 +250,7 @@ module JSON
   # The _opts_ argument can be used to configure the generator, see the
   # generate method for a more detailed explanation.
   def pretty_generate(obj, opts = nil)
+    state = PRETTY_STATE_PROTOTYPE.dup
     if opts
       if opts.respond_to? :to_hash
         opts = opts.to_hash
@@ -262,10 +259,7 @@ module JSON
       else
         raise TypeError, "can't convert #{opts.class} into Hash"
       end
-      state = PRETTY_STATE_PROTOTYPE.dup
       state.configure(opts)
-    else
-      state = PRETTY_STATE_PROTOTYPE
     end
     state.generate(obj)
   end
@@ -377,11 +371,11 @@ module ::Kernel
   #
   # The _opts_ argument is passed through to generate/parse respectively, see
   # generate and parse for their documentation.
-  def JSON(object, opts = {})
+  def JSON(object, *args)
     if object.respond_to? :to_str
-      JSON.parse(object.to_str, opts)
+      JSON.parse(object.to_str, args.first)
     else
-      JSON.generate(object, opts)
+      JSON.generate(object, args.first)
     end
   end
 end

data/lib/json/pure/generator.rb

@@ -163,6 +163,10 @@ module JSON
         # the generated JSON, max_nesting = 0 if no maximum is checked.
         attr_accessor :max_nesting
 
+        # This integer returns the current depth data structure nesting in the
+        # generated JSON.
+        attr_accessor :depth
+
         def check_max_nesting(depth) # :nodoc:
           return if @max_nesting.zero?
           current_nesting = depth + 1
@@ -196,6 +200,7 @@ module JSON
           @array_nl       = opts[:array_nl] if opts.key?(:array_nl)
           @allow_nan      = !!opts[:allow_nan] if opts.key?(:allow_nan)
           @ascii_only     = opts[:ascii_only] if opts.key?(:ascii_only)
+          @depth          = opts[:depth] || 0
           if !opts.key?(:max_nesting) # defaults to 19
             @max_nesting = 19
           elsif opts[:max_nesting]
@@ -210,7 +215,7 @@ module JSON
         # passed to the configure method.
         def to_h
           result = {}
-          for iv in %w[indent space space_before object_nl array_nl allow_nan max_nesting]
+          for iv in %w[indent space space_before object_nl array_nl allow_nan max_nesting ascii_only depth]
             result[iv.intern] = instance_variable_get("@#{iv}")
           end
           result

data/lib/json/pure/parser.rb

@@ -69,41 +69,42 @@ module JSON
       # * *object_class*: Defaults to Hash
       # * *array_class*: Defaults to Array
       def initialize(source, opts = {})
-          if defined?(::Encoding)
-            if source.encoding == ::Encoding::ASCII_8BIT
-              b = source[0, 4].bytes.to_a
-              source = case
-                       when b.size >= 4 && b[0] == 0 && b[1] == 0 && b[2] == 0
-                         source.dup.force_encoding(::Encoding::UTF_32BE).encode!(::Encoding::UTF_8)
-                       when b.size >= 4 && b[0] == 0 && b[2] == 0
-                         source.dup.force_encoding(::Encoding::UTF_16BE).encode!(::Encoding::UTF_8)
-                       when b.size >= 4 && b[1] == 0 && b[2] == 0 && b[3] == 0
-                         source.dup.force_encoding(::Encoding::UTF_32LE).encode!(::Encoding::UTF_8)
-
-                       when b.size >= 4 && b[1] == 0 && b[3] == 0
-                         source.dup.force_encoding(::Encoding::UTF_16LE).encode!(::Encoding::UTF_8)
-                       else
-                         source.dup
-                       end
-            else
-              source = source.encode(::Encoding::UTF_8)
-            end
-            source.force_encoding(::Encoding::ASCII_8BIT)
-          else
-            b = source
+        opts ||= {}
+        if defined?(::Encoding)
+          if source.encoding == ::Encoding::ASCII_8BIT
+            b = source[0, 4].bytes.to_a
             source = case
                      when b.size >= 4 && b[0] == 0 && b[1] == 0 && b[2] == 0
-                       JSON.iconv('utf-8', 'utf-32be', b)
+                       source.dup.force_encoding(::Encoding::UTF_32BE).encode!(::Encoding::UTF_8)
                      when b.size >= 4 && b[0] == 0 && b[2] == 0
-                       JSON.iconv('utf-8', 'utf-16be', b)
+                       source.dup.force_encoding(::Encoding::UTF_16BE).encode!(::Encoding::UTF_8)
                      when b.size >= 4 && b[1] == 0 && b[2] == 0 && b[3] == 0
-                       JSON.iconv('utf-8', 'utf-32le', b)
+                       source.dup.force_encoding(::Encoding::UTF_32LE).encode!(::Encoding::UTF_8)
+
                      when b.size >= 4 && b[1] == 0 && b[3] == 0
-                       JSON.iconv('utf-8', 'utf-16le', b)
+                       source.dup.force_encoding(::Encoding::UTF_16LE).encode!(::Encoding::UTF_8)
                      else
-                       b
+                       source.dup
                      end
+          else
+            source = source.encode(::Encoding::UTF_8)
           end
+          source.force_encoding(::Encoding::ASCII_8BIT)
+        else
+          b = source
+          source = case
+                   when b.size >= 4 && b[0] == 0 && b[1] == 0 && b[2] == 0
+                     JSON.iconv('utf-8', 'utf-32be', b)
+                   when b.size >= 4 && b[0] == 0 && b[2] == 0
+                     JSON.iconv('utf-8', 'utf-16be', b)
+                   when b.size >= 4 && b[1] == 0 && b[2] == 0 && b[3] == 0
+                     JSON.iconv('utf-8', 'utf-32le', b)
+                   when b.size >= 4 && b[1] == 0 && b[3] == 0
+                     JSON.iconv('utf-8', 'utf-16le', b)
+                   else
+                     b
+                   end
+        end
         super source
         if !opts.key?(:max_nesting) # defaults to 19
           @max_nesting = 19

data/lib/json/version.rb

@@ -1,6 +1,6 @@
 module JSON
   # JSON version
-  VERSION         = '1.4.4'
+  VERSION         = '1.4.5'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/tests/test_json_generate.rb

@@ -102,6 +102,51 @@ EOT
     assert s[:check_circular?]
   end
 
+  def test_pretty_state
+    state = PRETTY_STATE_PROTOTYPE.dup
+    assert_equal({
+      :allow_nan    => false,
+      :array_nl     => "\n",
+      :ascii_only   => false,
+      :depth        => 0,
+      :indent       => "  ",
+      :max_nesting  => 19,
+      :object_nl    => "\n",
+      :space        => " ",
+      :space_before => "",
+    }.sort_by { |n,| n.to_s }, state.to_h.sort_by { |n,| n.to_s })
+  end
+
+  def test_safe_state
+    state = SAFE_STATE_PROTOTYPE.dup
+    assert_equal({
+      :allow_nan    => false,
+      :array_nl     => "",
+      :ascii_only   => false,
+      :depth        => 0,
+      :indent       => "",
+      :max_nesting  => 19,
+      :object_nl    => "",
+      :space        => "",
+      :space_before => "",
+    }.sort_by { |n,| n.to_s }, state.to_h.sort_by { |n,| n.to_s })
+  end
+
+  def test_fast_state
+    state = FAST_STATE_PROTOTYPE.dup
+    assert_equal({
+      :allow_nan    => false,
+      :array_nl     => "",
+      :ascii_only   => false,
+      :depth        => 0,
+      :indent       => "",
+      :max_nesting  => 0,
+      :object_nl    => "",
+      :space        => "",
+      :space_before => "",
+    }.sort_by { |n,| n.to_s }, state.to_h.sort_by { |n,| n.to_s })
+  end
+
   def test_allow_nan
     assert_raises(GeneratorError) { generate([JSON::NaN]) }
     assert_equal '[NaN]', generate([JSON::NaN], :allow_nan => true)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 1
     - 4
-    - 4
-  version: 1.4.4
+    - 5
+  version: 1.4.5
 platform: java
 authors: 
   - Daniel Luz
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-06 00:00:00 -05:00
+date: 2010-08-07 00:00:00 -05:00
 default_executable: 
 dependencies: []