multi_json 1.7.2 → 1.7.3

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+1.7.3
+-----
+* [Require json/ext to ensure extension version gets loaded for json_gem](https://github.com/intridea/multi_json/commit/942686f7e8597418c6f90ee69e1d45242fac07b1)
+* [Rename JrJackson](https://github.com/intridea/multi_json/commit/078de7ba8b6035343c3e96b4767549e9ec43369a)
+* [Prefer JrJackson to JSON gem if present](https://github.com/intridea/multi_json/commit/af8bd9799a66855f04b3aff1c488485950cec7bf)
+* [Print a warning if outdated gem versions are used](https://github.com/intridea/multi_json/commit/e7438e7ba2be0236cfa24c2bb9ad40ee821286d1)
+* [Loosen required_rubygems_version for compatibility with Ubuntu 10.04](https://github.com/intridea/multi_json/commit/59fad014e8fe41dbc6f09485ea0dc21fc42fd7a7)
+
 1.7.2
 -----
 * [Renamed Jrjackson adapter to JrJackson](https://github.com/intridea/multi_json/commit/b36dc915fc0e6548cbad06b5db6f520e040c9c8b)

data/Gemfile

@@ -3,10 +3,7 @@ source 'https://rubygems.org'
 gem 'rake', '>= 0.9'
 gem 'yard', '>= 0.8'
 
-platforms :mri do
-  gem 'json', '~> 1.4', :require => nil
-end
-
+gem 'json',      '~> 1.4', :require => nil
 gem 'json_pure', '~> 1.4', :require => nil
 
 platforms :ruby, :mswin, :mingw do
@@ -16,7 +13,7 @@ end
 
 platforms :jruby do
   gem 'gson', '>= 0.6', :require => nil
-  gem 'jrjackson', :require => nil
+  gem 'jrjackson', '~> 0.1.1', :require => nil
 end
 
 group :development do

data/lib/multi_json.rb

@@ -34,9 +34,9 @@ module MultiJson
   REQUIREMENT_MAP = [
     ['oj',           :oj],
     ['yajl',         :yajl],
-    ['json',         :json_gem],
+    ['json/ext',     :json_gem],
     ['gson',         :gson],
-    ['jrjackson_r',  :jr_jackson],
+    ['jrjackson',    :jr_jackson],
     ['json/pure',    :json_pure]
   ]
 
@@ -49,6 +49,7 @@ module MultiJson
     return :yajl if defined?(::Yajl)
     return :json_gem if defined?(::JSON)
     return :gson if defined?(::Gson)
+    return :jr_jackson if defined?(::JrJackson)
 
     REQUIREMENT_MAP.each do |(library, adapter)|
       begin
@@ -84,8 +85,11 @@ module MultiJson
   # * <tt>:yajl</tt>
   # * <tt>:nsjsonserialization</tt> (MacRuby only)
   # * <tt>:gson</tt> (JRuby only)
+  # * <tt>:jr_jackson</tt> (JRuby only)
   def use(new_adapter)
-    @adapter = load_adapter(new_adapter)
+    adapter = load_adapter(new_adapter)
+    adapter.activate! if adapter.respond_to?(:activate!)
+    @adapter = adapter
   end
   alias adapter= use
   alias engine= use

data/lib/multi_json/adapter.rb

@@ -40,4 +40,4 @@ module MultiJson
 
     end
   end
-end
+end

data/lib/multi_json/adapters/jr_jackson.rb

@@ -1,21 +1,18 @@
-require 'jrjackson_r' unless defined?(::JrJackson)
+require 'jrjackson' unless defined?(::JrJackson)
 require 'multi_json/adapter'
-require 'multi_json/convertible_hash_keys'
 
 module MultiJson
   module Adapters
+    # Use the jrjackson.rb library to dump/load.
     class JrJackson < Adapter
-      include ConvertibleHashKeys
-      ParseError = ::Java::OrgCodehausJackson::JsonParseException
+      ParseError = ::JrJackson::ParseError
 
-      def load(string, options={})
-        string = string.read if string.respond_to?(:read)
-        result = ::JrJackson::Json.parse(string)
-        options[:symbolize_keys] ? symbolize_keys(result) : result
+      def load(string, options={}) #:nodoc:
+        ::JrJackson::Json.load(string, options)
       end
 
-      def dump(object, options={})
-        ::JrJackson::Json.generate(stringify_keys(object))
+      def dump(object, options={}) #:nodoc:
+        ::JrJackson::Json.dump(object)
       end
     end
   end

data/lib/multi_json/adapters/json_common.rb

@@ -5,6 +5,16 @@ module MultiJson
     class JsonCommon < Adapter
       defaults :load, :create_additions => false, :quirks_mode => true
 
+      GEM_VERSION = '1.7.7'
+
+      def self.activate!
+        if JSON::VERSION < GEM_VERSION
+          Kernel.warn "You are using an old or stdlib version of #{gem_name} gem\n" +
+            "Please upgrade to the recent version by adding this to your Gemfile:\n\n" +
+            "  gem '#{gem_name}', '~> #{GEM_VERSION}'\n"
+        end
+      end
+
       def load(string, options={})
         string = string.read if string.respond_to?(:read)
 
@@ -22,4 +32,4 @@ module MultiJson
       end
     end
   end
-end
+end

data/lib/multi_json/adapters/json_gem.rb

@@ -6,6 +6,10 @@ module MultiJson
     # Use the JSON gem to dump/load.
     class JsonGem < JsonCommon
       ParseError = ::JSON::ParserError
+
+      def self.gem_name
+        'json'
+      end
     end
   end
 end

data/lib/multi_json/adapters/json_pure.rb

@@ -6,6 +6,10 @@ module MultiJson
     # Use JSON pure to dump/load.
     class JsonPure < JsonCommon
       ParseError = ::JSON::ParserError
+
+      def self.gem_name
+        'json_pure'
+      end
     end
   end
 end

data/lib/multi_json/options.rb

@@ -36,4 +36,4 @@ module MultiJson
       end
     end
   end
-end
+end

data/lib/multi_json/version.rb

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

data/multi_json.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.licenses      = ['MIT']
   spec.name          = 'multi_json'
   spec.require_paths = ['lib']
-  spec.required_rubygems_version = '>= 1.3.6'
+  spec.required_rubygems_version = '>= 1.3.5'
   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/**/*']

data/spec/adapter_shared_example.rb

@@ -13,7 +13,7 @@ shared_examples_for 'an adapter' do |adapter|
   it_behaves_like 'has options', lambda{ MultiJson.adapter }
 
   it 'does not modify argument hashes' do
-    options = { :symbolize_keys => true, :pretty => false, :adapter => :json_gem }
+    options = { :symbolize_keys => true, :pretty => false, :adapter => :json_pure }
     expect{MultiJson.load('{}', options)}.to_not change{options}
     expect{MultiJson.dump([42], options)}.to_not change{options}
   end
@@ -196,7 +196,8 @@ 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}})
+      loaded_json = MultiJson.load(dumped_json)
+      expect(loaded_json).to eq({'a' => 1, 'b' => {'c' => 2}})
     end
 
     it 'properly loads valid JSON in StringIOs' do

data/spec/has_options.rb

@@ -71,4 +71,4 @@ shared_examples_for 'has options' do |object|
       end
     end
   end
-end
+end

data/spec/helper.rb

@@ -29,4 +29,4 @@ end
 
 def jruby?
   defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-end
+end

data/spec/multi_json_spec.rb

@@ -15,6 +15,8 @@ describe 'MultiJson' do
         @old_oj = Object.const_get :Oj if Object.const_defined?(:Oj)
         @old_yajl = Object.const_get :Yajl if Object.const_defined?(:Yajl)
         @old_gson = Object.const_get :Gson if Object.const_defined?(:Gson)
+        @old_jrjackson = Object.const_get :JrJackson if Object.const_defined?(:JrJackson)
+
         MultiJson::REQUIREMENT_MAP.each_with_index do |(library, adapter), index|
           MultiJson::REQUIREMENT_MAP[index] = ["foo/#{library}", adapter]
         end
@@ -22,6 +24,7 @@ describe 'MultiJson' do
         Object.send :remove_const, :Oj if @old_oj
         Object.send :remove_const, :Yajl if @old_yajl
         Object.send :remove_const, :Gson if @old_gson
+        Object.send :remove_const, :JrJackson if @old_jrjackson
       end
 
       after do
@@ -32,6 +35,7 @@ describe 'MultiJson' do
         Object.const_set :Oj, @old_oj if @old_oj
         Object.const_set :Yajl, @old_yajl if @old_yajl
         Object.const_set :Gson, @old_gson if @old_gson
+        Object.const_set :JrJackson, @old_jrjackson if @old_jrjackson
       end
 
       it 'defaults to ok_json if no other json implementions are available' do
@@ -46,6 +50,25 @@ describe 'MultiJson' do
       end
     end
 
+    context 'with stdlib version' do
+      around do |example|
+        version = JSON::VERSION
+        silence_warnings{ JSON::VERSION = '1.5.5' }
+        example.call
+        silence_warnings{ JSON::VERSION = version }
+      end
+
+      it 'should warn about json' do
+        Kernel.should_receive(:warn).with(/'json', '~> 1.7.7'/)
+        MultiJson.use :json_gem
+      end
+
+      it 'should warb about json/pure' do
+        Kernel.should_receive(:warn).with(/'json_pure', '~> 1.7.7'/)
+        MultiJson.use :json_pure
+      end
+    end
+
     it 'defaults to the best available gem' do
       # Clear cache variable already set by previous tests
       MultiJson.send(:remove_instance_variable, :@adapter)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_json
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -39,7 +39,7 @@ cert_chain:
   U0xxV3ZRUnNCbHlwSGZoczZKSnVMbHlaUEdoVTNSL3YKU2YzbFZLcEJDV2dS
   cEdUdnk0NVhWcEIrNTl5MzNQSm1FdVExUFRFT1l2UXlhbzlVS01BQWFBTi83
   cVdRdGpsMApobHc9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,10 +116,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A gem to provide swappable JSON backends.