multi_json 1.9.3 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c2a387cf1082722ed68ed290ba53909de8fa882
-  data.tar.gz: d06db47576a3cb2801b12af6d15fbd227facc800
+  metadata.gz: e9e80b3da1939ae507958fa22e0212cb5156d8de
+  data.tar.gz: 62cf542ccfea9291b606484c4b3821b04f0f4553
 SHA512:
-  metadata.gz: dab04d4d5f9f3bcda964d379a9d9fee49cd09b2a72cf5ecf67d3f1be339f12e4a54c8fae1269b07437d4be0b87f93c8ef3719bd74b2096fb75a9db69d3ecd6a5
-  data.tar.gz: 723e745ecc160b1ae47ea0e35b79d0833b8c65549b787c8f3e2b2e9ae26055239a2d0cac18b1b3a637cdf5b7778d99ed0ee91f116e55156e1c304146b7558110
+  metadata.gz: 5be5ee5ddcf2c0227718423a55424ac679b5a031b4972106f247d5ee4c02761bac842f89cb69935f9aa493ef1a617a218894353b7ef11e8e5feb30b01977af4e
+  data.tar.gz: 38562e8b713275e6eb7dd49217f92007a906801d32e52acb8c85c880367a547e2a15a499aa7967d806e103f3b0f3d445f07451aa7de1e87406ba7b33baa427b0

data/.travis.yml

@@ -1,11 +1,10 @@
 bundler_args: --without development
 language: ruby
 rvm:
-  - 1.8.7
+  - 1.8.7-p374
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1.0
   - 2.1.1
   - jruby-18mode
   - jruby-19mode
@@ -14,6 +13,7 @@ rvm:
   - ruby-head
 matrix:
   allow_failures:
+    - rvm: rbx-2
     - rvm: jruby-head
     - rvm: ruby-head
   fast_finish: true

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+1.10.0
+------
+* [Performance tweaks](https://github.com/intridea/multi_json/commit/58724acfed31866d079eaafb1cd824e341ade287)
+
 1.9.3
 -----
 * [Convert indent option to Fixnum before passing to Oj](https://github.com/intridea/multi_json/commit/826fc5535b863b74fc9f981dfdda3e26f1ee4e5b)

data/Gemfile

@@ -14,7 +14,6 @@ end
 
 group :test do
   gem 'rspec', '>= 2.14'
-  gem 'simplecov', :require => false
 end
 
 platforms :jruby do
@@ -23,7 +22,7 @@ platforms :jruby do
 end
 
 platforms :mingw, :mswin, :ruby do
-  gem 'oj', '~> 2.8', :require => nil
+  gem 'oj', '~> 2.9', :require => nil
   gem 'yajl-ruby', '~> 1.0', :require => nil
 end
 

data/README.md

@@ -1,6 +1,6 @@
 # MultiJSON
 
-[![Gem Version](http://img.shields.io/gem/v/multi_json.svg)][gem]
+[![Gem Version](https://travis-ci.org/intridea/multi_json.svg)][gem]
 [![Build Status](http://img.shields.io/travis/intridea/multi_json.svg)][travis]
 [![Dependency Status](http://img.shields.io/gemnasium/intridea/multi_json.svg)][gemnasium]
 [![Code Climate](http://img.shields.io/codeclimate/github/intridea/multi_json.svg)][codeclimate]
@@ -72,7 +72,6 @@ implementations:
 * Ruby 1.9.2
 * Ruby 1.9.3
 * Ruby 2.0.0
-* Ruby 2.1.0
 * Ruby 2.1.1
 * [JRuby][]
 * [Rubinius][]

data/lib/multi_json.rb

@@ -7,21 +7,6 @@ module MultiJson
   include Options
   extend self
 
-  class << self
-    def cached_options
-      @cached_options ||= {}
-    end
-
-    def reset_cached_options!
-      @cached_options = {}
-    end
-  end
-
-  # Since `default_options` is deprecated, the
-  # reader is aliased to `dump_options` and the
-  # writer sets both `dump_options` and `load_options`
-  alias default_options dump_options
-
   def default_options=(value)
     Kernel.warn "MultiJson.default_options setter is deprecated\n" +
       "Use MultiJson.load_options and MultiJson.dump_options instead"
@@ -29,6 +14,19 @@ module MultiJson
     self.load_options = self.dump_options = value
   end
 
+  def default_options
+    Kernel.warn "MultiJson.default_options is deprecated\n" +
+      "Use MultiJson.load_options or MultiJson.dump_options instead"
+
+    self.load_options
+  end
+
+  %w[cached_options reset_cached_options!].each do |method_name|
+    define_method method_name do |*|
+      Kernel.warn "MultiJson.#{method_name} method is deprecated and no longer used."
+    end
+  end
+
   ALIASES = { 'jrjackson' => 'jr_jackson' }
 
   REQUIREMENT_MAP = [

data/lib/multi_json/adapter.rb

@@ -17,31 +17,11 @@ module MultiJson
 
       def load(string, options={})
         raise self::ParseError if blank?(string)
-        instance.load(string, collect_load_options(options).clone)
+        instance.load(string, load_options(options).merge(MultiJson.load_options(options)).merge!(options))
       end
 
       def dump(object, options={})
-        instance.dump(object, collect_dump_options(options).clone)
-      end
-
-    protected
-
-      def collect_load_options(options)
-        cache('load', options){ collect_options(:load_options, options).merge(options) }
-      end
-
-      def collect_dump_options(options)
-        cache('dump', options){ collect_options(:dump_options, options).merge(options) }
-      end
-
-      def collect_options(method, *args)
-        global, local = *[MultiJson, self].map{ |r| r.send(method, *args) }
-        local.merge(global)
-      end
-
-      def cache(method, options)
-        cache_key = [self, options].map(&:hash).join + method
-        MultiJson.cached_options[cache_key] ||= yield
+        instance.dump(object, dump_options(options).merge(MultiJson.dump_options(options)).merge!(options))
       end
 
     private

data/lib/multi_json/options.rb

@@ -2,21 +2,19 @@ module MultiJson
   module Options
 
     def load_options=(options)
-      MultiJson.reset_cached_options!
       @load_options = options
     end
 
     def dump_options=(options)
-      MultiJson.reset_cached_options!
       @dump_options = options
     end
 
     def load_options(*args)
-      get_options :load_options, *args
+      defined?(@load_options) && get_options(@load_options, *args) || default_load_options
     end
 
     def dump_options(*args)
-      get_options :dump_options, *args
+      defined?(@dump_options) && get_options(@dump_options, *args) || default_dump_options
     end
 
     def default_load_options
@@ -29,19 +27,11 @@ module MultiJson
 
     private
 
-    def get_options(ivar, *args)
-      defaults = send("default_#{ivar}")
-
-      return defaults unless instance_variable_defined?("@#{ivar}")
-
-      value = instance_variable_get("@#{ivar}")
-
-      if value.respond_to?(:call) and value.arity
-        value.arity == 0 ? value[] : value[*args]
-      elsif Hash === value or value.respond_to?(:to_hash)
-        value.to_hash
-      else
-        defaults
+    def get_options(options, *args)
+      if options.respond_to?(:call) and options.arity
+        options.arity == 0 ? options[] : options[*args]
+      elsif Hash === options or options.respond_to?(:to_hash)
+        options.to_hash
       end
     end
   end

data/lib/multi_json/version.rb

@@ -1,9 +1,9 @@
 module MultiJson
   class Version
-    MAJOR = 1 unless defined? MultiJson::Version::MAJOR
-    MINOR = 9 unless defined? MultiJson::Version::MINOR
-    PATCH = 3 unless defined? MultiJson::Version::PATCH
-    PRE = nil unless defined? MultiJson::Version::PRE
+    MAJOR =  1 unless defined? MultiJson::Version::MAJOR
+    MINOR = 10 unless defined? MultiJson::Version::MINOR
+    PATCH =  0 unless defined? MultiJson::Version::PATCH
+    PRE =  nil unless defined? MultiJson::Version::PRE
 
     class << self
 

data/spec/spec_helper.rb

@@ -1,15 +1,3 @@
-require 'simplecov'
-# require 'coveralls'
-
-# SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-#   SimpleCov::Formatter::HTMLFormatter,
-#   Coveralls::SimpleCov::Formatter
-# ]
-# SimpleCov.start do
-#   add_filter 'spec'
-#   add_filter 'vendor'
-# end
-
 require 'multi_json'
 require 'rspec'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_json
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.10.0
 platform: ruby
 authors:
 - Michael Bleigh
@@ -33,20 +33,20 @@ cert_chain:
   7BTxdlSpJZDcAK29Ni3NRCRu6Air4wfDln0Ilzeuut6cJ4/j2/RlvsccVSRaEfOa
   wM7GTK5SEdU3qelyBdc4+RRs6uU=
   -----END CERTIFICATE-----
-date: 2014-04-27 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 description: A common interface to multiple JSON libraries, including Oj, Yajl, the
@@ -60,10 +60,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .rspec
-- .travis.yml
-- .yardopts
+- ".document"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -111,12 +111,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []