multi_json 1.5.1 → 1.6.0

data/lib/multi_json/adapters/gson.rb

@@ -0,0 +1,20 @@
+require 'gson' unless defined?(::Gson)
+
+module MultiJson
+  module Adapters
+    # Use the gson.rb library to dump/load.
+    module Gson
+      extend self
+
+      ParseError = ::Gson::DecodeError
+
+      def load(string, options={}) #:nodoc:
+        ::Gson::Decoder.new(options).decode(string)
+      end
+
+      def dump(object, options={}) #:nodoc:
+        ::Gson::Encoder.new(options).encode(object)
+      end
+    end
+  end
+end

data/lib/multi_json/adapters/json_common.rb

@@ -1,23 +1,33 @@
 module MultiJson
   module Adapters
     module JsonCommon
-
       def load(string, options={})
         string = string.read if string.respond_to?(:read)
-        ::JSON.parse(string, :symbolize_names => options[:symbolize_keys], :quirks_mode => true, :create_additions => false)
+        ::JSON.parse("[#{string}]", process_load_options!(options)).first
       end
 
       def dump(object, options={})
-        object.to_json(process_options(options))
+        ::JSON.generate([object], process_dump_options!(options)).strip[1..-2]
       end
 
     protected
 
-      def process_options(options={})
-        return options if options.empty?
-        opts = {}
-        opts.merge!(JSON::PRETTY_STATE_PROTOTYPE.to_h) if options.delete(:pretty)
-        opts.merge!(options)
+      def process_load_options!(options={})
+        process_options!({:create_additions => false}, options) do |opts|
+          opts.merge!(:symbolize_names => true) if options.delete(:symbolize_keys)
+        end
+      end
+
+      def process_dump_options!(options={})
+        process_options!({}, options) do |opts|
+          opts.merge!(::JSON::PRETTY_STATE_PROTOTYPE.to_h) if options.delete(:pretty)
+        end
+      end
+
+      def process_options!(default_options, options)
+        return default_options if options.empty?
+        yield default_options
+        default_options.merge!(options)
       end
 
     end

data/lib/multi_json/adapters/json_gem.rb

@@ -4,7 +4,7 @@ require 'multi_json/adapters/json_common'
 module MultiJson
   module Adapters
     # Use the JSON gem to dump/load.
-    class JsonGem
+    module JsonGem
       ParseError = ::JSON::ParserError
       extend JsonCommon
     end

data/lib/multi_json/adapters/json_pure.rb

@@ -4,7 +4,7 @@ require 'multi_json/adapters/json_common'
 module MultiJson
   module Adapters
     # Use JSON pure to dump/load.
-    class JsonPure
+    module JsonPure
       ParseError = ::JSON::ParserError
       extend JsonCommon
     end

data/lib/multi_json/adapters/nsjsonserialization.rb

@@ -3,10 +3,11 @@ require 'multi_json/adapters/ok_json'
 
 module MultiJson
   module Adapters
-    class Nsjsonserialization < MultiJson::Adapters::OkJson
+    module Nsjsonserialization
+      extend self, MultiJson::Adapters::OkJson
       ParseError = ::MultiJson::OkJson::Error
 
-      def self.load(string, options={})
+      def load(string, options={})
         string = string.read if string.respond_to?(:read)
         data = string.dataUsingEncoding(NSUTF8StringEncoding)
         object = NSJSONSerialization.JSONObjectWithData(data, options: NSJSONReadingMutableContainers | NSJSONReadingMutableLeaves, error: nil)
@@ -18,7 +19,7 @@ module MultiJson
         end
       end
 
-      def self.dump(object, options={})
+      def dump(object, options={})
         pretty = options[:pretty] ? NSJSONWritingPrettyPrinted : 0
         object = object.as_json if object.respond_to?(:as_json)
         if NSJSONSerialization.isValidJSONObject(object)

data/lib/multi_json/adapters/oj.rb

@@ -3,24 +3,26 @@ require 'oj' unless defined?(::Oj)
 module MultiJson
   module Adapters
     # Use the Oj library to dump/load.
-    class Oj
+    module Oj
+      extend self
+
+      DEFAULT_OPTIONS = {:mode => :compat, :time_format => :ruby}.freeze
+
       ParseError = if defined?(::Oj::ParseError)
         ::Oj::ParseError
       else
         SyntaxError
       end
 
-      ::Oj.default_options = {:mode => :compat}
-
-      def self.load(string, options={}) #:nodoc:
+      def load(string, options={}) #:nodoc:
         options.merge!(:symbol_keys => options[:symbolize_keys])
         options[:mode] = :strict
-        ::Oj.load(string, options)
+        ::Oj.load(string, DEFAULT_OPTIONS.merge(options))
       end
 
-      def self.dump(object, options={}) #:nodoc:
+      def dump(object, options={}) #:nodoc:
         options.merge!(:indent => 2) if options[:pretty]
-        ::Oj.dump(object, options)
+        ::Oj.dump(object, DEFAULT_OPTIONS.merge(options))
       end
     end
   end

data/lib/multi_json/adapters/ok_json.rb

@@ -2,45 +2,55 @@ require 'multi_json/vendor/okjson'
 
 module MultiJson
   module Adapters
-    class OkJson
+    module OkJson
+      extend self
+
       ParseError = ::MultiJson::OkJson::Error
 
-      def self.load(string, options={}) #:nodoc:
+      def load(string, options={}) #:nodoc:
         string = string.read if string.respond_to?(:read)
         result = ::MultiJson::OkJson.decode("[#{string}]").first
         options[:symbolize_keys] ? symbolize_keys(result) : result
       end
 
-      def self.dump(object, options={}) #:nodoc:
+      def dump(object, options={}) #:nodoc:
         ::MultiJson::OkJson.valenc(stringify_keys(object))
       end
 
-      def self.symbolize_keys(object) #:nodoc:
-        modify_keys(object) do |key|
+      def symbolize_keys(object) #:nodoc:
+        prepare_object(object) do |key|
           key.is_a?(String) ? key.to_sym : key
         end
       end
 
-      def self.stringify_keys(object) #:nodoc:
-        modify_keys(object) do |key|
+      def stringify_keys(object) #:nodoc:
+        prepare_object(object) do |key|
           key.respond_to?(:to_s) ? key.to_s : key
         end
       end
 
-      def self.modify_keys(object, &modifier) #:nodoc:
+      def prepare_object(object, &key_modifier) #:nodoc:
         case object
         when Array
           object.map do |value|
-            modify_keys(value, &modifier)
+            prepare_object(value, &key_modifier)
           end
         when Hash
           object.inject({}) do |result, (key, value)|
-            new_key   = modifier.call(key)
-            new_value = modify_keys(value, &modifier)
+            new_key   = key_modifier.call(key)
+            new_value = prepare_object(value, &key_modifier)
             result.merge! new_key => new_value
           end
-        else
+        when String, Numeric, true, false, nil
           object
+        else
+          if object.respond_to?(:to_json)
+            object
+          elsif object.respond_to?(:to_s)
+            object.to_s
+          else
+            object
+          end
         end
       end
     end

data/lib/multi_json/adapters/yajl.rb

@@ -3,14 +3,16 @@ require 'yajl' unless defined?(::Yajl)
 module MultiJson
   module Adapters
     # Use the Yajl-Ruby library to dump/load.
-    class Yajl
+    module Yajl
+      extend self
+
       ParseError = ::Yajl::ParseError
 
-      def self.load(string, options={}) #:nodoc:
+      def load(string, options={}) #:nodoc:
         ::Yajl::Parser.new(:symbolize_keys => options[:symbolize_keys]).parse(string)
       end
 
-      def self.dump(object, options={}) #:nodoc:
+      def dump(object, options={}) #:nodoc:
         ::Yajl::Encoder.encode(object, options)
       end
     end

data/lib/multi_json/version.rb

@@ -1,3 +1,3 @@
 module MultiJson
-  VERSION = "1.5.1" unless defined?(MultiJson::VERSION)
+  VERSION = "1.6.0" unless defined?(MultiJson::VERSION)
 end

data/multi_json.gemspec

@@ -1,23 +1,22 @@
-# encoding: utf-8
-require File.expand_path("../lib/multi_json/version", __FILE__)
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'multi_json/version'
 
-Gem::Specification.new do |gem|
-  gem.add_development_dependency 'rake', '>= 0.9'
-  gem.add_development_dependency 'rdoc', '>= 3.9'
-  gem.add_development_dependency 'rspec', '>= 2.6'
-  gem.add_development_dependency 'simplecov', '>= 0.4'
-  gem.authors = ["Michael Bleigh", "Josh Kalderimis", "Erik Michaels-Ober"]
-  gem.description = %q{A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.}
-  gem.email = ['michael@intridea.com', 'josh.kalderimis@gmail.com', 'sferik@gmail.com']
-  gem.extra_rdoc_files = ['LICENSE.md', 'README.md']
-  gem.files = Dir['LICENSE.md', 'README.md', 'Rakefile', 'multi_json.gemspec', 'Gemfile', '.document', '.rspec', '.travis.yml' ,'spec/**/*', 'lib/**/*']
-  gem.homepage = 'http://github.com/intridea/multi_json'
-  gem.licenses = ['MIT']
-  gem.name = 'multi_json'
-  gem.rdoc_options = ["--charset=UTF-8"]
-  gem.require_paths = ['lib']
-  gem.required_rubygems_version = Gem::Requirement.new(">= 1.3.6")
-  gem.summary = %q{A gem to provide swappable JSON backends.}
-  gem.test_files = Dir['spec/**/*']
-  gem.version = MultiJson::VERSION
+Gem::Specification.new do |spec|
+  spec.add_development_dependency 'bundler', '~> 1.0'
+  spec.authors       = ["Michael Bleigh", "Josh Kalderimis", "Erik Michaels-Ober", "Pavel Pravosud"]
+  spec.cert_chain    = %w(certs/sferik.pem)
+  spec.description   = %q{A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.}
+  spec.email         = ['michael@intridea.com', 'josh.kalderimis@gmail.com', 'sferik@gmail.com']
+  spec.files         = Dir['.yardopts', 'CHANGELOG.md', 'CONTRIBUTING.md', 'LICENSE.md', 'README.md', 'Rakefile', 'multi_json.gemspec', 'Gemfile', '.document', '.rspec', '.travis.yml' ,'spec/**/*', 'lib/**/*']
+  spec.homepage      = 'http://github.com/intridea/multi_json'
+  spec.licenses      = ['MIT']
+  spec.name          = 'multi_json'
+  spec.require_paths = ['lib']
+  spec.required_rubygems_version = '>= 1.3.6'
+  spec.signing_key   = File.expand_path("~/.gem/private_key.pem") if $0 =~ /gem\z/
+  spec.summary       = %q{A gem to provide swappable JSON backends.}
+  spec.test_files    = Dir['spec/**/*']
+  spec.version       = MultiJson::VERSION
 end

data/spec/adapter_shared_example.rb

@@ -1,4 +1,6 @@
-shared_examples_for "an adapter" do |adapter|
+# encoding: UTF-8
+
+shared_examples_for 'an adapter' do |adapter|
 
   before do
     begin
@@ -12,12 +14,31 @@ shared_examples_for "an adapter" do |adapter|
     it 'writes decodable JSON' do
       [
         {'abc' => 'def'},
-        [1, 2, 3, "4"],
+        [1, 2, 3, '4', true, false, nil]
       ].each do |example|
         expect(MultiJson.load(MultiJson.dump(example))).to eq example
       end
     end
 
+    unless 'json_pure' == adapter || 'json_gem' == adapter
+      it 'dumps time in correct format' do
+        time = Time.at(1355218745).utc
+
+        # time does not respond to to_json method
+        class << time
+          undef_method :to_json
+        end
+
+        dumped_json = MultiJson.dump(time)
+        expected = if RUBY_VERSION > '1.9'
+          '2012-12-11 09:39:05 UTC'
+        else
+          'Tue Dec 11 09:39:05 UTC 2012'
+        end
+        expect(MultiJson.load(dumped_json)).to eq expected
+      end
+    end
+
     it 'dumps symbol and fixnum keys as strings' do
       [
         [
@@ -43,8 +64,8 @@ shared_examples_for "an adapter" do |adapter|
     end
 
     it 'dumps rootless JSON' do
-      expect(MultiJson.dump("random rootless string")).to eq "\"random rootless string\""
-      expect(MultiJson.dump(123)).to eq "123"
+      expect(MultiJson.dump('random rootless string')).to eq '"random rootless string"'
+      expect(MultiJson.dump(123)).to eq '123'
     end
 
     it 'passes options to the adapter' do
@@ -52,24 +73,26 @@ shared_examples_for "an adapter" do |adapter|
       MultiJson.dump('foo', :bar => :baz)
     end
 
-    if adapter == 'json_gem' || adapter == 'json_pure'
-      describe 'with :pretty option set to true' do
-        it 'passes default pretty options' do
-          object = 'foo'
-          object.should_receive(:to_json).with(JSON::PRETTY_STATE_PROTOTYPE.to_h)
-          MultiJson.dump(object,:pretty => true)
+    # This behavior is currently not supported by gson.rb
+    # See discussion at https://github.com/intridea/multi_json/pull/71
+    unless adapter == 'gson'
+      it 'dumps custom objects that implement to_json' do
+        klass = Class.new do
+          def to_json(*)
+            '"foobar"'
+          end
         end
+        expect(MultiJson.dump(klass.new)).to eq '"foobar"'
       end
     end
 
-    it 'dumps custom objects which implement as_json' do
-      expect(MultiJson.dump(TimeWithZone.new)).to eq "\"2005-02-01T15:15:10Z\""
-    end
-
-    it 'allow to dump JSON values' do
+    it 'allows to dump JSON values' do
       expect(MultiJson.dump(42)).to eq '42'
     end
 
+    it 'allows to dump JSON with UTF-8 characters' do
+      expect(MultiJson.dump({'color' => 'żółć'})).to eq('{"color":"żółć"}')
+    end
   end
 
   describe '.load' do
@@ -77,11 +100,20 @@ shared_examples_for "an adapter" do |adapter|
       expect(MultiJson.load('{"abc":"def"}')).to eq({'abc' => 'def'})
     end
 
-    it 'raises MultiJson::DecodeError on invalid JSON' do
-      expect{MultiJson.load('{"abc"}')}.to raise_error(MultiJson::DecodeError)
+    it 'raises MultiJson::LoadError on invalid JSON' do
+      expect{MultiJson.load('{"abc"}')}.to raise_error(MultiJson::LoadError)
     end
 
-    it 'raises MultiJson::DecodeError with data on invalid JSON' do
+    it 'raises MultiJson::LoadError with data on invalid JSON' do
+      data = '{invalid}'
+      begin
+        MultiJson.load(data)
+      rescue MultiJson::LoadError => le
+        expect(le.data).to eq data
+      end
+    end
+
+    it 'catches MultiJson::DecodeError for legacy support' do
       data = '{invalid}'
       begin
         MultiJson.load(data)
@@ -92,7 +124,7 @@ shared_examples_for "an adapter" do |adapter|
 
     it 'stringifys symbol keys when encoding' do
       dumped_json = MultiJson.dump(:a => 1, :b => {:c => 2})
-      expect(MultiJson.load(dumped_json)).to eq({"a" => 1, "b" => {"c" => 2}})
+      expect(MultiJson.load(dumped_json)).to eq({'a' => 1, 'b' => {'c' => 2}})
     end
 
     it 'properly loads valid JSON in StringIOs' do
@@ -119,9 +151,12 @@ shared_examples_for "an adapter" do |adapter|
       end
     end
 
-    it 'allow to load JSON values' do
+    it 'allows to load JSON values' do
       expect(MultiJson.load('42')).to eq 42
     end
 
+    it 'allows to load JSON with UTF-8 characters' do
+      expect(MultiJson.load('{"color":"żółć"}')).to eq({'color' => 'żółć'})
+    end
   end
 end

data/spec/helper.rb

@@ -1,15 +1,7 @@
-def jruby?
-  defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-end
-
-def macruby?
-  defined?(RUBY_ENGINE) && RUBY_ENGINE == 'macruby'
-end
-
-unless ENV['CI'] || macruby?
+if !ENV['CI'] && defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby'
   require 'simplecov'
   SimpleCov.start do
-    add_filter 'spec'
+    add_filter 'vendor'
   end
 end
 
@@ -22,6 +14,14 @@ RSpec.configure do |config|
   end
 end
 
+def macruby?
+  defined?(RUBY_ENGINE) && RUBY_ENGINE == 'macruby'
+end
+
+def jruby?
+  defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+end
+
 class MockDecoder
   def self.load(string, options={})
     {'abc' => 'def'}
@@ -32,8 +32,14 @@ class MockDecoder
   end
 end
 
-class TimeWithZone
-  def to_json(options={})
-    "\"2005-02-01T15:15:10Z\""
+module MockModuleDecoder
+  extend self
+
+  def load(string, options={})
+    {'abc' => 'def'}
   end
-end
+
+  def dump(string)
+    '{"abc":"def"}'
+  end
+end