multi_json 1.7.4 → 1.7.5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+1.7.5
+-----
+* [Fix warning '*' interpreted as argument prefix](https://github.com/intridea/multi_json/commit/b698962c7f64430222a1f06430669706a47aff89)
+* [Remove stdlib warning](https://github.com/intridea/multi_json/commit/d06eec6b7996ac8b4ff0e2229efd835379b0c30f)
+
 1.7.4
 -----
 * [Cache options for better performance](https://github.com/intridea/multi_json/commit/8a26ee93140c4bed36194ed9fb887a1b6919257b)
@@ -12,8 +17,8 @@
 
 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)
+* [Rename Jrjackson adapter to JrJackson](https://github.com/intridea/multi_json/commit/b36dc915fc0e6548cbad06b5db6f520e040c9c8b)
+* [Implement 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
@@ -138,7 +143,7 @@
 
 0.0.3
 -----
-* [Improved defaulting and documentation](https://github.com/sferik/twitter/commit/3a0e41b9e4b0909201045fa47704b78c9d949b73)
+* [Improve defaulting and documentation](https://github.com/sferik/twitter/commit/3a0e41b9e4b0909201045fa47704b78c9d949b73)
 
 0.0.2
 -----

data/lib/multi_json.rb

@@ -31,7 +31,7 @@ module MultiJson
   %w(load_options= dump_options=).each do |method|
     define_method method do |*args|
       use current_adapter
-      super *args
+      super(*args)
     end
   end
 

data/lib/multi_json/adapters/json_common.rb

@@ -5,16 +5,6 @@ module MultiJson
     class JsonCommon < Adapter
       defaults :load, :create_additions => false, :quirks_mode => true
 
-      GEM_VERSION = '1.7.7'
-
-      def 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)
 

data/lib/multi_json/adapters/json_gem.rb

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

data/lib/multi_json/adapters/json_pure.rb

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

data/lib/multi_json/version.rb

@@ -1,3 +1,18 @@
 module MultiJson
-  VERSION = '1.7.4' unless defined?(MultiJson::VERSION)
+  class Version
+    MAJOR = 1 unless defined? MultiJson::Version::MAJOR
+    MINOR = 7 unless defined? MultiJson::Version::MINOR
+    PATCH = 5 unless defined? MultiJson::Version::PATCH
+    PRE = nil unless defined? MultiJson::Version::PRE
+
+    class << self
+
+      # @return [String]
+      def to_s
+        [MAJOR, MINOR, PATCH, PRE].compact.join('.')
+      end
+
+    end
+
+  end
 end

data/multi_json.gemspec

@@ -7,7 +7,7 @@ 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.description   = %q{A common interface to multiple JSON libraries, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, NSJSONSerialization, gson.rb, JrJackson, 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'
@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   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.summary       = %q{A common interface to multiple JSON libraries.}
   spec.test_files    = Dir['spec/**/*']
-  spec.version       = MultiJson::VERSION
+  spec.version       = MultiJson::Version
 end

data/spec/helper.rb

@@ -5,7 +5,9 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
 ]
-SimpleCov.start
+SimpleCov.start do
+  add_filter 'vendor'
+end
 
 require 'multi_json'
 require 'rspec'

data/spec/multi_json_spec.rb

@@ -62,25 +62,6 @@ 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 warn 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.4
+  version: 1.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -39,7 +39,7 @@ cert_chain:
   U0xxV3ZRUnNCbHlwSGZoczZKSnVMbHlaUEdoVTNSL3YKU2YzbFZLcEJDV2dS
   cEdUdnk0NVhWcEIrNTl5MzNQSm1FdVExUFRFT1l2UXlhbzlVS01BQWFBTi83
   cVdRdGpsMApobHc9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2013-05-26 00:00:00.000000000 Z
+date: 2013-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,8 +57,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-description: 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.
+description: A common interface to multiple JSON libraries, including Oj, Yajl, the
+  JSON gem (with C-extensions), the pure-Ruby JSON gem, NSJSONSerialization, gson.rb,
+  JrJackson, and OkJson.
 email:
 - michael@intridea.com
 - josh.kalderimis@gmail.com
@@ -122,7 +123,7 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: A gem to provide swappable JSON backends.
+summary: A common interface to multiple JSON libraries.
 test_files:
 - spec/adapter_shared_example.rb
 - spec/has_options.rb