multi_json 1.0.0 → 1.0.1

data/.travis.yml

@@ -1,6 +1,8 @@
 rvm:
+  - 1.8.6
   - 1.8.7
+  - 1.9.1
   - 1.9.2
-  - ree
+  - jruby
   - rbx
-  - jruby
+  - ree

data/lib/multi_json.rb

@@ -14,8 +14,7 @@ module MultiJson
   REQUIREMENT_MAP = [
     ["yajl", :yajl],
     ["json", :json_gem],
-    ["json/pure", :json_pure],
-    ["ok_json", :ok_json]
+    ["json/pure", :json_pure]
   ]
 
   # The default engine based on what you currently
@@ -34,6 +33,8 @@ module MultiJson
         next
       end
     end
+
+    :ok_json
   end
 
   # Set the JSON parser utilizing a symbol, string, or class.
@@ -45,13 +46,13 @@ module MultiJson
   # * <tt>:yajl</tt>
   def engine=(new_engine)
     case new_engine
-      when String, Symbol
-        require "multi_json/engines/#{new_engine}"
-        @engine = MultiJson::Engines.const_get("#{new_engine.to_s.split('_').map{|s| s.capitalize}.join('')}")
-      when Class
-        @engine = new_engine
-      else
-        raise "Did not recognize your engine specification. Please specify either a symbol or a class."
+    when String, Symbol
+      require "multi_json/engines/#{new_engine}"
+      @engine = MultiJson::Engines.const_get("#{new_engine.to_s.split('_').map{|s| s.capitalize}.join('')}")
+    when Class
+      @engine = new_engine
+    else
+      raise "Did not recognize your engine specification. Please specify either a symbol or a class."
     end
   end
 

data/lib/multi_json/version.rb

@@ -1,3 +1,3 @@
 module MultiJson
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/multi_json.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.authors = ["Michael Bleigh"]
   s.email   = ["michael@intridea.com"]
   s.summary = %q{A gem to provide swappable JSON backends.}
-  s.description = %q{A gem to provide swappable JSON backends utilizing Yajl::Ruby, the JSON gem, ActiveSupport, or JSON pure.}
+  s.description = %q{A gem to provide swappable JSON backends utilizing Yajl::Ruby, the JSON gem, JSON pure, or a vendored version of okjson.}
   s.homepage = "http://github.com/intridea/multi_json"
 
   s.extra_rdoc_files = ["LICENSE", "README.rdoc"]

data/spec/multi_json_spec.rb

@@ -13,6 +13,20 @@ end
 
 describe "MultiJson" do
   context 'engines' do
+    it 'defaults to ok_json if no other json implementions are available' do
+      old_map = MultiJson::REQUIREMENT_MAP
+      begin
+        MultiJson::REQUIREMENT_MAP.each_with_index do |(library, engine), index|
+          MultiJson::REQUIREMENT_MAP[index] = ["foo/#{library}", engine]
+        end
+        MultiJson.default_engine.should == :ok_json
+      ensure
+        old_map.each_with_index do |(library, engine), index|
+          MultiJson::REQUIREMENT_MAP[index] = [library, engine]
+        end
+      end
+    end
+    
     it 'defaults to the best available gem' do
       # the yajl-ruby gem does not work on jruby, so the best engine is the JsonGem engine
       if jruby?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: multi_json
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -15,10 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 Z
+date: 2011-05-04 00:00:00 +02:00
+default_executable: 
 dependencies: []
 
-description: A gem to provide swappable JSON backends utilizing Yajl::Ruby, the JSON gem, ActiveSupport, or JSON pure.
+description: A gem to provide swappable JSON backends utilizing Yajl::Ruby, the JSON gem, JSON pure, or a vendored version of okjson.
 email: 
 - michael@intridea.com
 executables: []
@@ -48,6 +49,7 @@ files:
 - spec/multi_json_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: http://github.com/intridea/multi_json
 licenses: []
 
@@ -79,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A gem to provide swappable JSON backends.
@@ -87,4 +89,3 @@ test_files:
 - spec/multi_json_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: