multi_json 1.3.2 → 1.3.3

data/.travis.yml

@@ -1,9 +1,10 @@
 language: ruby
 rvm:
+  - rbx-18mode
+  - rbx-19mode
+  - jruby-18mode
+  - jruby-19mode
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - jruby-18mode
-  - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
+  - ruby-head

data/lib/multi_json.rb

@@ -19,12 +19,6 @@ module MultiJson
     ["json/pure", :json_pure]
   ]
 
-  # TODO: Remove for 2.0 release (but no sooner)
-  def default_engine
-    deprecate("MultiJson.default_engine is deprecated and will be removed in the next major version. Use MultiJson.default_adapter instead.")
-    self.default_adapter
-  end
-
   # The default adapter based on what you currently
   # have loaded and installed. First checks to see
   # if any adapters are already loaded, then checks
@@ -46,12 +40,8 @@ module MultiJson
     Kernel.warn "[WARNING] MultiJson is using the default adapter (ok_json). We recommend loading a different JSON library to improve performance."
     :ok_json
   end
-
-  # TODO: Remove for 2.0 release (but no sooner)
-  def engine
-    deprecate("MultiJson.engine is deprecated and will be removed in the next major version. Use MultiJson.adapter instead.")
-    self.adapter
-  end
+  # :nodoc:
+  alias :default_engine :default_adapter
 
   # Get the current adapter class.
   def adapter
@@ -59,12 +49,8 @@ module MultiJson
     self.use self.default_adapter
     @adapter
   end
-
-  # TODO: Remove for 2.0 release (but no sooner)
-  def engine=(new_engine)
-    deprecate("MultiJson.engine= is deprecated and will be removed in the next major version. Use MultiJson.use instead.")
-    self.use(new_engine)
-  end
+  # :nodoc:
+  alias :engine :adapter
 
   # Set the JSON parser utilizing a symbol, string, or class.
   # Supported by default are:
@@ -79,6 +65,8 @@ module MultiJson
     @adapter = load_adapter(new_adapter)
   end
   alias :adapter= :use
+  # :nodoc:
+  alias :engine= :use
 
   def load_adapter(new_adapter)
     case new_adapter
@@ -94,12 +82,6 @@ module MultiJson
     end
   end
 
-  # TODO: Remove for 2.0 release (but no sooner)
-  def decode(string, options={})
-    deprecate("MultiJson.decode is deprecated and will be removed in the next major version. Use MultiJson.load instead.")
-    self.load(string, options)
-  end
-
   # Decode a JSON string into Ruby.
   #
   # <b>Options</b>
@@ -112,6 +94,8 @@ module MultiJson
   rescue adapter::ParseError => exception
     raise DecodeError.new(exception.message, exception.backtrace, string)
   end
+  # :nodoc:
+  alias :decode :load
 
   def current_adapter(options)
     if new_adapter = (options || {}).delete(:adapter)
@@ -121,25 +105,12 @@ module MultiJson
     end
   end
 
-  # TODO: Remove for 2.0 release (but no sooner)
-  def encode(object, options={})
-    deprecate("MultiJson.encode is deprecated and will be removed in the next major version. Use MultiJson.dump instead.")
-    self.dump(object, options)
-  end
-
   # Encodes a Ruby object as JSON.
   def dump(object, options={})
     adapter = current_adapter(options)
     adapter.dump(object, options)
   end
+  # :nodoc:
+  alias :encode :dump
 
-  # Sends of a deprecation warning
-  def deprecate(raw_message)
-    @messages ||= {}
-    message = "#{Kernel.caller[1]}: [DEPRECATION] #{raw_message}"
-    unless @messages[message]
-      @messages[message] = true
-      Kernel.warn message
-    end
-  end
 end

data/lib/multi_json/version.rb

@@ -1,3 +1,3 @@
 module MultiJson
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end

data/multi_json.gemspec

@@ -13,26 +13,6 @@ Gem::Specification.new do |gem|
   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.name = 'multi_json'
-  gem.post_install_message =<<eos
-********************************************************************************
-
-  MultiJson.encode is deprecated and will be removed in the next major version.
-  Use MultiJson.dump instead.
-
-  MultiJson.decode is deprecated and will be removed in the next major version.
-  Use MultiJson.load instead.
-
-  MultiJson.engine is deprecated and will be removed in the next major version.
-  Use MultiJson.adapter instead.
-
-  MultiJson.engine= is deprecated and will be removed in the next major
-  version. Use MultiJson.use instead.
-
-  MultiJson.default_engine is deprecated and will be removed in the next major
-  version. Use MultiJson.default_adapter instead.
-
-********************************************************************************
-eos
   gem.rdoc_options = ["--charset=UTF-8"]
   gem.require_paths = ['lib']
   gem.required_rubygems_version = Gem::Requirement.new(">= 1.3.6")

data/spec/helper.rb

@@ -8,7 +8,9 @@ end
 
 unless ENV['CI'] || macruby?
   require 'simplecov'
-  SimpleCov.start
+  SimpleCov.start do
+    add_filter 'spec'
+  end
 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.3.2
+  version: 1.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2012-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -112,15 +112,7 @@ files:
 - lib/multi_json.rb
 homepage: http://github.com/intridea/multi_json
 licenses: []
-post_install_message: ! "********************************************************************************\n\n
-  \ MultiJson.encode is deprecated and will be removed in the next major version.\n
-  \ Use MultiJson.dump instead.\n\n  MultiJson.decode is deprecated and will be removed
-  in the next major version.\n  Use MultiJson.load instead.\n\n  MultiJson.engine
-  is deprecated and will be removed in the next major version.\n  Use MultiJson.adapter
-  instead.\n\n  MultiJson.engine= is deprecated and will be removed in the next major\n
-  \ version. Use MultiJson.use instead.\n\n  MultiJson.default_engine is deprecated
-  and will be removed in the next major\n  version. Use MultiJson.default_adapter
-  instead.\n\n********************************************************************************\n"
+post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
@@ -139,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A gem to provide swappable JSON backends.