multi_json 1.7.1 → 1.7.2

data/CHANGELOG.md

@@ -1,4 +1,11 @@
+1.7.2
+-----
+* [Renamed Jrjackson adapter to JrJackson](https://github.com/intridea/multi_json/commit/b36dc915fc0e6548cbad06b5db6f520e040c9c8b)
+* [Implemented jrjackson -> jr_jackson alias for back-compatability](https://github.com/intridea/multi_json/commit/aa50ab8b7bb646b8b75d5d65dfeadae8248a4f10)
+* [Update vendored OkJson module](https://github.com/intridea/multi_json/commit/30a3f474e17dd86a697c3fab04f468d1a4fd69d7)
+
 1.7.1
+-----
 * [Fix capitalization of JrJackson class](https://github.com/intridea/multi_json/commit/5373a5e38c647f02427a0477cb8e0e0dafad1b8d)
 
 1.7.0

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem 'rake', '>= 0.9'
 gem 'yard', '>= 0.8'
 
-platforms :ruby_18 do
+platforms :mri do
   gem 'json', '~> 1.4', :require => nil
 end
 
@@ -13,6 +13,7 @@ platforms :ruby, :mswin, :mingw do
   gem 'oj', '~> 2.0', :require => nil
   gem 'yajl-ruby', '~> 1.0', :require => nil
 end
+
 platforms :jruby do
   gem 'gson', '>= 0.6', :require => nil
   gem 'jrjackson', :require => nil

data/lib/multi_json.rb

@@ -1,4 +1,5 @@
 require 'multi_json/options'
+require 'multi_json/version'
 
 module MultiJson
   include Options
@@ -26,13 +27,17 @@ module MultiJson
     self.load_options = self.dump_options = value
   end
 
+  ALIASES = {
+    'jrjackson' => :jr_jackson
+  }
+
   REQUIREMENT_MAP = [
-    ['oj',        :oj],
-    ['yajl',      :yajl],
-    ['json',      :json_gem],
-    ['gson',      :gson],
-    ['jrjackson', :jrjackson],
-    ['json/pure', :json_pure]
+    ['oj',           :oj],
+    ['yajl',         :yajl],
+    ['json',         :json_gem],
+    ['gson',         :gson],
+    ['jrjackson_r',  :jr_jackson],
+    ['json/pure',    :json_pure]
   ]
 
   # The default adapter based on what you currently
@@ -88,8 +93,10 @@ module MultiJson
   def load_adapter(new_adapter)
     case new_adapter
     when String, Symbol
+      new_adapter = ALIASES.fetch(new_adapter.to_s, new_adapter)
       require "multi_json/adapters/#{new_adapter}"
-      MultiJson::Adapters.const_get(:"#{new_adapter.to_s.split('_').map{|s| s.capitalize}.join('')}")
+      klass_name = new_adapter.to_s.split('_').map(&:capitalize) * ''
+      MultiJson::Adapters.const_get(klass_name)
     when NilClass, FalseClass
       load_adapter default_adapter
     when Class, Module

data/lib/multi_json/adapters/oj.rb

@@ -5,7 +5,7 @@ module MultiJson
   module Adapters
     # Use the Oj library to dump/load.
     class Oj < Adapter
-      defaults :load, :mode => :strict
+      defaults :load, :mode => :strict, :symbolize_keys => false
       defaults :dump, :mode => :compat, :time_format => :ruby
 
       ParseError = if defined?(::Oj::ParseError)
@@ -15,7 +15,7 @@ module MultiJson
       end
 
       def load(string, options={})
-        options[:symbol_keys] = true if options.delete(:symbolize_keys)
+        options[:symbol_keys] = options.delete(:symbolize_keys)
         ::Oj.load(string, options)
       end
 

data/lib/multi_json/vendor/okjson.rb

@@ -29,6 +29,7 @@ require 'stringio'
 # http://golang.org/src/pkg/utf8/utf8.go
 module MultiJson
   module OkJson
+    Upstream = '42'
     extend self
 
 
@@ -50,12 +51,52 @@ module MultiJson
     end
 
 
+    # Encodes x into a json text. It may contain only
+    # Array, Hash, String, Numeric, true, false, nil.
+    # (Note, this list excludes Symbol.)
+    # X itself must be an Array or a Hash.
+    # No other value can be encoded, and an error will
+    # be raised if x contains any other value, such as
+    # Nan, Infinity, Symbol, and Proc, or if a Hash key
+    # is not a String.
+    # Strings contained in x must be valid UTF-8.
+    def encode(x)
+      case x
+      when Hash    then objenc(x)
+      when Array   then arrenc(x)
+      else valenc(x)
+      end
+    end
+
+
+    def valenc(x)
+      case x
+      when Hash    then objenc(x)
+      when Array   then arrenc(x)
+      when String  then strenc(x)
+      when Numeric then numenc(x)
+      when true    then "true"
+      when false   then "false"
+      when nil     then "null"
+      else
+        if x.respond_to?(:to_json)
+          x.to_json
+        else
+          raise Error, "cannot encode #{x.class}: #{x.inspect}"
+        end
+      end
+    end
+
+
+  private
+
+
     # Parses a "json text" in the sense of RFC 4627.
     # Returns the parsed value and any trailing tokens.
     # Note: this is almost the same as valparse,
     # except that it does not accept atomic values.
     def textparse(ts)
-      if ts.length < 0
+      if ts.length <= 0
         raise Error, 'empty'
       end
 
@@ -72,7 +113,7 @@ module MultiJson
     # Parses a "value" in the sense of RFC 4627.
     # Returns the parsed value and any trailing tokens.
     def valparse(ts)
-      if ts.length < 0
+      if ts.length <= 0
         raise Error, 'empty'
       end
 
@@ -201,21 +242,19 @@ module MultiJson
     # it is the lexeme.
     def tok(s)
       case s[0]
-      when ?{  then ['{', s[0,1], s[0,1]]
-      when ?}  then ['}', s[0,1], s[0,1]]
-      when ?:  then [':', s[0,1], s[0,1]]
-      when ?,  then [',', s[0,1], s[0,1]]
-      when ?[  then ['[', s[0,1], s[0,1]]
-      when ?]  then [']', s[0,1], s[0,1]]
-      when ?n  then nulltok(s)
-      when ?t  then truetok(s)
-      when ?f  then falsetok(s)
-      when ?"  then strtok(s)
-      when Spc then [:space, s[0,1], s[0,1]]
-      when ?\t then [:space, s[0,1], s[0,1]]
-      when ?\n then [:space, s[0,1], s[0,1]]
-      when ?\r then [:space, s[0,1], s[0,1]]
-      else          numtok(s)
+      when ?{ then ['{', s[0,1], s[0,1]]
+      when ?} then ['}', s[0,1], s[0,1]]
+      when ?: then [':', s[0,1], s[0,1]]
+      when ?, then [',', s[0,1], s[0,1]]
+      when ?[ then ['[', s[0,1], s[0,1]]
+      when ?] then [']', s[0,1], s[0,1]]
+      when ?n then nulltok(s)
+      when ?t then truetok(s)
+      when ?f then falsetok(s)
+      when ?" then strtok(s)
+      when Spc, ?\t, ?\n, ?\r then [:space, s[0,1], s[0,1]]
+      else
+        numtok(s)
       end
     end
 
@@ -228,12 +267,12 @@ module MultiJson
     def numtok(s)
       m = /-?([1-9][0-9]+|[0-9])([.][0-9]+)?([eE][+-]?[0-9]+)?/.match(s)
       if m && m.begin(0) == 0
-        if m[3] && !m[2]
-          [:val, m[0], Integer(m[1])*(10**Integer(m[3][1..-1]))]
+        if !m[2] && !m[3]
+          [:val, m[0], Integer(m[0])]
         elsif m[2]
           [:val, m[0], Float(m[0])]
         else
-          [:val, m[0], Integer(m[0])]
+          [:val, m[0], Integer(m[1])*(10**Integer(m[3][1..-1]))]
         end
       else
         []
@@ -265,17 +304,14 @@ module MultiJson
     def unquote(q)
       q = q[1...-1]
       a = q.dup # allocate a big enough string
-      rubydoesenc = false
       # In ruby >= 1.9, a[w] is a codepoint, not a byte.
-      if a.class.method_defined?(:force_encoding)
+      if rubydoesenc?
         a.force_encoding('UTF-8')
-        rubydoesenc = true
       end
       r, w = 0, 0
       while r < q.length
         c = q[r]
-        case true
-        when c == ?\\
+        if c == ?\\
           r += 1
           if r >= q.length
             raise Error, "string literal ends with a \"\\\": \"#{q}\""
@@ -308,7 +344,7 @@ module MultiJson
                 end
               end
             end
-            if rubydoesenc
+            if rubydoesenc?
               a[w] = '' << uchar
               w += 1
             else
@@ -317,7 +353,7 @@ module MultiJson
           else
             raise Error, "invalid escape char #{q[r]} in \"#{q}\""
           end
-        when c == ?", c < Spc
+        elsif c == ?" || c < Spc
           raise Error, "invalid character in string literal \"#{q}\""
         else
           # Copy anything else byte-for-byte.
@@ -338,15 +374,14 @@ module MultiJson
     # bytes in string a at position i.
     # Returns the number of bytes written.
     def ucharenc(a, i, u)
-      case true
-      when u <= Uchar1max
+      if u <= Uchar1max
         a[i] = (u & 0xff).chr
         1
-      when u <= Uchar2max
+      elsif u <= Uchar2max
         a[i+0] = (Utag2 | ((u>>6)&0xff)).chr
         a[i+1] = (Utagx | (u&Umaskx)).chr
         2
-      when u <= Uchar3max
+      elsif u <= Uchar3max
         a[i+0] = (Utag3 | ((u>>12)&0xff)).chr
         a[i+1] = (Utagx | ((u>>6)&Umaskx)).chr
         a[i+2] = (Utagx | (u&Umaskx)).chr
@@ -383,54 +418,15 @@ module MultiJson
 
 
     def nibble(c)
-      case true
-      when ?0 <= c && c <= ?9 then c.ord - ?0.ord
-      when ?a <= c && c <= ?z then c.ord - ?a.ord + 10
-      when ?A <= c && c <= ?Z then c.ord - ?A.ord + 10
+      if ?0 <= c && c <= ?9 then c.ord - ?0.ord
+      elsif ?a <= c && c <= ?z then c.ord - ?a.ord + 10
+      elsif ?A <= c && c <= ?Z then c.ord - ?A.ord + 10
       else
         raise Error, "invalid hex code #{c}"
       end
     end
 
 
-    # Encodes x into a json text. It may contain only
-    # Array, Hash, String, Numeric, true, false, nil.
-    # (Note, this list excludes Symbol.)
-    # X itself must be an Array or a Hash.
-    # No other value can be encoded, and an error will
-    # be raised if x contains any other value, such as
-    # Nan, Infinity, Symbol, and Proc, or if a Hash key
-    # is not a String.
-    # Strings contained in x must be valid UTF-8.
-    def encode(x)
-      case x
-      when Hash    then objenc(x)
-      when Array   then arrenc(x)
-      else
-        raise Error, 'root value must be an Array or a Hash'
-      end
-    end
-
-
-    def valenc(x)
-      case x
-      when Hash    then objenc(x)
-      when Array   then arrenc(x)
-      when String  then strenc(x)
-      when Numeric then numenc(x)
-      when true    then "true"
-      when false   then "false"
-      when nil     then "null"
-      else
-        if x.respond_to?(:to_json)
-          x.to_json
-        else
-          raise Error, "cannot encode #{x.class}: #{x.inspect}"
-        end
-      end
-    end
-
-
     def objenc(x)
       '{' + x.map{|k,v| keyenc(k) + ':' + valenc(v)}.join(',') + '}'
     end
@@ -455,9 +451,6 @@ module MultiJson
       t.putc(?")
       r = 0
 
-      # In ruby >= 1.9, s[r] is a codepoint, not a byte.
-      rubydoesenc = s.class.method_defined?(:encoding)
-
       while r < s.length
         case s[r]
         when ?"  then t.print('\\"')
@@ -469,15 +462,15 @@ module MultiJson
         when ?\t then t.print('\\t')
         else
           c = s[r]
-          case true
-          when rubydoesenc
+          # In ruby >= 1.9, s[r] is a codepoint, not a byte.
+          if rubydoesenc?
             begin
               c.ord # will raise an error if c is invalid UTF-8
               t.write(c)
             rescue
               t.write(Ustrerr)
             end
-          when Spc <= c && c <= ?~
+          elsif Spc <= c && c <= ?~
             t.putc(c)
           else
             n = ucharcopy(t, s, r) # ensure valid UTF-8 output
@@ -569,6 +562,11 @@ module MultiJson
     end
 
 
+    def rubydoesenc?
+      ::String.method_defined?(:force_encoding)
+    end
+
+
     class Utf8Error < ::StandardError
     end
 
@@ -577,15 +575,15 @@ module MultiJson
     end
 
 
-    Utagx = 0x80 # 1000 0000
-    Utag2 = 0xc0 # 1100 0000
-    Utag3 = 0xe0 # 1110 0000
-    Utag4 = 0xf0 # 1111 0000
-    Utag5 = 0xF8 # 1111 1000
-    Umaskx = 0x3f # 0011 1111
-    Umask2 = 0x1f # 0001 1111
-    Umask3 = 0x0f # 0000 1111
-    Umask4 = 0x07 # 0000 0111
+    Utagx = 0b1000_0000
+    Utag2 = 0b1100_0000
+    Utag3 = 0b1110_0000
+    Utag4 = 0b1111_0000
+    Utag5 = 0b1111_1000
+    Umaskx = 0b0011_1111
+    Umask2 = 0b0001_1111
+    Umask3 = 0b0000_1111
+    Umask4 = 0b0000_0111
     Uchar1max = (1<<7) - 1
     Uchar2max = (1<<11) - 1
     Uchar3max = (1<<16) - 1

data/lib/multi_json/version.rb

@@ -1,3 +1,3 @@
 module MultiJson
-  VERSION = '1.7.1' unless defined?(MultiJson::VERSION)
+  VERSION = '1.7.2' unless defined?(MultiJson::VERSION)
 end

data/spec/adapter_shared_example.rb

@@ -106,7 +106,7 @@ shared_examples_for 'an adapter' do |adapter|
 
     # This behavior is currently not supported by gson.rb
     # See discussion at https://github.com/intridea/multi_json/pull/71
-    unless %w(gson jrjackson).include?(adapter)
+    unless %w(gson jr_jackson).include?(adapter)
       it 'dumps custom objects that implement to_json' do
         klass = Class.new do
           def to_json(*)

data/spec/multi_json_spec.rb

@@ -129,6 +129,24 @@ describe 'MultiJson' do
         }.to_not change{Symbol.all_symbols.count}
       end
     end
+
+    context 'with Oj.default_settings' do
+
+      around do |example|
+        options = Oj.default_options
+        Oj.default_options = { :symbol_keys => true }
+        MultiJson.with_engine(:oj){ example.call }
+        Oj.default_options = options
+      end
+
+      it 'ignores global settings' do
+        MultiJson.with_engine(:oj) do
+          example = '{"a": 1, "b": 2}'
+          expected = { 'a' => 1, 'b' => 2 }
+          expect(MultiJson.load(example)).to eq expected
+        end
+      end
+    end
   end
 
   describe 'default options' do
@@ -148,8 +166,8 @@ describe 'MultiJson' do
 
   it_behaves_like 'has options', MultiJson
 
-  %w(gson jrjackson json_gem json_pure nsjsonserialization oj ok_json yajl).each do |adapter|
-    next if !jruby? && %w(gson jrjackson).include?(adapter)
+  %w(gson jr_jackson json_gem json_pure nsjsonserialization oj ok_json yajl).each do |adapter|
+    next if !jruby? && %w(gson jr_jackson).include?(adapter)
     next if !macruby? && adapter == 'nsjsonserialization'
     next if jruby? && %w(oj yajl).include?(adapter)
 
@@ -163,4 +181,21 @@ describe 'MultiJson' do
       it_behaves_like 'JSON-like adapter', adapter
     end
   end
-end
+
+  describe 'aliases' do
+    if jruby?
+      describe 'jrjackson' do
+        after{ expect(MultiJson.adapter).to eq(MultiJson::Adapters::JrJackson) }
+
+        it 'allows jrjackson alias as symbol' do
+          expect{ MultiJson.use :jrjackson }.not_to raise_error
+        end
+
+        it 'allows jrjackson alias as string' do
+          expect{ MultiJson.use 'jrjackson' }.not_to raise_error
+        end
+
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_json
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -39,7 +39,7 @@ cert_chain:
   U0xxV3ZRUnNCbHlwSGZoczZKSnVMbHlaUEdoVTNSL3YKU2YzbFZLcEJDV2dS
   cEdUdnk0NVhWcEIrNTl5MzNQSm1FdVExUFRFT1l2UXlhbzlVS01BQWFBTi83
   cVdRdGpsMApobHc9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,7 +85,7 @@ files:
 - spec/multi_json_spec.rb
 - lib/multi_json/adapter.rb
 - lib/multi_json/adapters/gson.rb
-- lib/multi_json/adapters/jrjackson.rb
+- lib/multi_json/adapters/jr_jackson.rb
 - lib/multi_json/adapters/json_common.rb
 - lib/multi_json/adapters/json_gem.rb
 - lib/multi_json/adapters/json_pure.rb