multi_json 1.0.0.rc2 → 1.0.0.rc3

data/lib/multi_json.rb

@@ -15,7 +15,7 @@ module MultiJson
     ["yajl", :yajl],
     ["json", :json_gem],
     ["json/pure", :json_pure],
-    ["okjson", :okjson]
+    ["ok_json", :ok_json]
   ]
 
   # The default engine based on what you currently
@@ -41,7 +41,7 @@ module MultiJson
   #
   # * <tt>:json_gem</tt>
   # * <tt>:json_pure</tt>
-  # * <tt>:okjson</tt>
+  # * <tt>:ok_json</tt>
   # * <tt>:yajl</tt>
   def engine=(new_engine)
     case new_engine
@@ -61,11 +61,9 @@ module MultiJson
   #
   # <tt>:symbolize_keys</tt> :: If true, will use symbols instead of strings for the keys.
   def decode(string, options = {})
-    begin
-      engine.decode(string, options)
-    rescue StandardError => exception
-      raise DecodeError, exception.inspect
-    end
+    engine.decode(string, options)
+  rescue engine::ParseError => exception
+    raise DecodeError, exception.message, exception.backtrace
   end
 
   # Encodes a Ruby object as JSON.

data/lib/multi_json/engines/json_gem.rb

@@ -4,9 +4,12 @@ module MultiJson
   module Engines
     # Use the JSON gem to encode/decode.
     class JsonGem
+      ParseError = ::JSON::ParserError
+
       def self.decode(string, options = {}) #:nodoc:
         opts = {}
         opts[:symbolize_names] = options[:symbolize_keys]
+        string = string.read if string.respond_to?(:read)
         ::JSON.parse(string, opts)
       end
 

data/lib/multi_json/engines/json_pure.rb

@@ -4,9 +4,12 @@ module MultiJson
   module Engines
     # Use JSON pure to encode/decode.
     class JsonPure
+      ParseError = ::JSON::ParserError
+
       def self.decode(string, options = {}) #:nodoc:
         opts = {}
         opts[:symbolize_names] = options[:symbolize_keys]
+        string = string.read if string.respond_to?(:read)
         ::JSON.parse(string, opts)
       end
 

data/lib/multi_json/engines/{okjson.rb → ok_json.rb}

@@ -1,15 +1,18 @@
-require "multi_json/vendor/okjson" unless defined?(::OkJson)
+require "multi_json/vendor/ok_json" unless defined?(::OkJson)
 
 module MultiJson
   module Engines
-    class Okjson
+    class OkJson
+      ParseError = ::OkJson::Error
+
       def self.decode(string, options = {}) #:nodoc:
-        result = OkJson.decode(string)
+        string = string.read if string.respond_to?(:read)
+        result = ::OkJson.decode(string)
         options[:symbolize_keys] ? symbolize_keys(result) : result
       end
 
       def self.encode(object) #:nodoc:
-        OkJson.encode(stringify_keys(object))
+        ::OkJson.encode(stringify_keys(object))
       end
 
       def self.symbolize_keys(object) #:nodoc:

data/lib/multi_json/engines/yajl.rb

@@ -4,6 +4,8 @@ module MultiJson
   module Engines
     # Use the Yajl-Ruby library to encode/decode.
     class Yajl
+      ParseError = ::Yajl::ParseError
+
       def self.decode(string, options = {}) #:nodoc:
         ::Yajl::Parser.new(:symbolize_keys => options[:symbolize_keys]).parse(string)
       end

data/lib/multi_json/version.rb

@@ -1,3 +1,3 @@
 module MultiJson
-  VERSION = "1.0.0.rc2"
+  VERSION = "1.0.0.rc3"
 end

data/spec/multi_json_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
-
+require 'stringio'
+          
 class MockDecoder
   def self.decode(string, options = {})
     { 'abc' => 'def' }
@@ -12,7 +13,7 @@ end
 
 describe "MultiJson" do
   context 'engines' do
-    it 'should default to the best available gem' do
+    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?
         require 'json'
@@ -23,18 +24,18 @@ describe "MultiJson" do
       end
     end
 
-    it 'should be settable via a symbol' do
+    it 'is settable via a symbol' do
       MultiJson.engine = :json_gem
       MultiJson.engine.name.should == 'MultiJson::Engines::JsonGem'
     end
 
-    it 'should be settable via a class' do
+    it 'is settable via a class' do
       MultiJson.engine = MockDecoder
       MultiJson.engine.name.should == 'MockDecoder'
     end
   end
 
-  %w(json_gem json_pure okjson yajl).each do |engine|
+  %w(json_gem json_pure ok_json yajl).each do |engine|
     context engine do
       before do
         begin
@@ -45,7 +46,7 @@ describe "MultiJson" do
       end
 
       describe '.encode' do
-        it 'should write decodable JSON' do
+        it 'writes decodable JSON' do
           [
             { 'abc' => 'def' },
             [1, 2, 3, "4"]
@@ -54,29 +55,34 @@ describe "MultiJson" do
           end
         end
 
-        it 'should encode symbol keys as strings' do
+        it 'encodes symbol keys as strings' do
           encoded_json = MultiJson.encode({ :foo => { :bar => 'baz' } })
           MultiJson.decode(encoded_json).should == { 'foo' => { 'bar' => 'baz' } }
         end
       end
 
       describe '.decode' do
-        it 'should properly decode valid JSON' do
+        it 'properly decodes valid JSON' do
           MultiJson.decode('{"abc":"def"}').should == { 'abc' => 'def' }
         end
 
-        it 'should raise MultiJson::DecodeError on invalid JSON' do
+        it 'raises MultiJson::DecodeError on invalid JSON' do
           lambda do
             MultiJson.decode('{"abc"}')
           end.should raise_error(MultiJson::DecodeError)
         end
 
-        it 'should stringify symbol keys when encoding' do
+        it 'stringifys symbol keys when encoding' do
           encoded_json = MultiJson.encode(:a => 1, :b => {:c => 2})
           MultiJson.decode(encoded_json).should == { "a" => 1, "b" => { "c" => 2 } }
         end
+        
+        it "properly decodes valid JSON in StringIOs" do
+          json = StringIO.new('{"abc":"def"}')
+          MultiJson.decode(json).should == { 'abc' => 'def' }
+        end
 
-        it 'should allow for symbolization of keys' do
+        it 'allows for symbolization of keys' do
           MultiJson.decode('{"abc":{"def":"hgi"}}', :symbolize_keys => true).should == { :abc => { :def => 'hgi' } }
         end
       end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: multi_json
 version: !ruby/object:Gem::Version 
-  hash: 15424049
+  hash: 15424051
   prerelease: 6
   segments: 
   - 1
   - 0
   - 0
   - rc
-  - 2
-  version: 1.0.0.rc2
+  - 3
+  version: 1.0.0.rc3
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 Z
+date: 2011-04-19 00:00:00 Z
 dependencies: []
 
 description: A gem to provide swappable JSON backends utilizing Yajl::Ruby, the JSON gem, ActiveSupport, or JSON pure.
@@ -42,9 +42,9 @@ files:
 - lib/multi_json.rb
 - lib/multi_json/engines/json_gem.rb
 - lib/multi_json/engines/json_pure.rb
-- lib/multi_json/engines/okjson.rb
+- lib/multi_json/engines/ok_json.rb
 - lib/multi_json/engines/yajl.rb
-- lib/multi_json/vendor/okjson.rb
+- lib/multi_json/vendor/ok_json.rb
 - lib/multi_json/version.rb
 - multi_json.gemspec
 - spec/multi_json_spec.rb