multi_json 1.3.6 → 1.3.7

data/README.md

@@ -36,53 +36,6 @@ MultiJSON falls back to [OkJson][], a simple, vendorable JSON parser.
 * [NSJSONSerialization](https://developer.apple.com/library/ios/#documentation/Foundation/Reference/NSJSONSerialization_Class/Reference/Reference.html) Wrapper for Apple's NSJSONSerialization in the Cocoa Framework (MacRuby only)
 * [OkJson][okjson] A simple, vendorable JSON parser
 
-## Contributing
-In the spirit of [free software][free-sw], **everyone** is encouraged to help
-improve this project.
-
-[free-sw]: http://www.fsf.org/licensing/essays/free-sw.html
-
-Here are some ways *you* can contribute:
-
-* by using alpha, beta, and prerelease versions
-* by reporting bugs
-* by suggesting new features
-* by writing or editing documentation
-* by writing specifications
-* by writing code (**no patch is too small**: fix typos, add comments, clean up
-  inconsistent whitespace)
-* by refactoring code
-* by closing [issues][]
-* by reviewing patches
-
-[issues]: https://github.com/intridea/multi_json/issues
-
-## Submitting an Issue
-We use the [GitHub issue tracker][issues] to track bugs and features. Before
-submitting a bug report or feature request, check to make sure it hasn't
-already been submitted. When submitting a bug report, please include a [Gist][]
-that includes a stack trace and any details that may be necessary to reproduce
-the bug, including your gem version, Ruby version, and operating system.
-Ideally, a bug report should include a pull request with failing specs.
-
-[gist]: https://gist.github.com/
-
-## Submitting a Pull Request
-1. [Fork the repository.][fork]
-2. [Create a topic branch.][branch]
-3. Add specs for your unimplemented feature or bug fix.
-4. Run `bundle exec rake spec`. If your specs pass, return to step 3.
-5. Implement your feature or bug fix.
-6. Run `bundle exec rake spec`. If your specs fail, return to step 5.
-7. Run `open coverage/index.html`. If your changes are not completely covered
-   by your tests, return to step 3.
-8. Add, commit, and push your changes.
-9. [Submit a pull request.][pr]
-
-[fork]: http://help.github.com/fork-a-repo/
-[branch]: http://learn.github.com/p/branching.html
-[pr]: http://help.github.com/send-pull-requests/
-
 ## Supported Ruby Versions
 This library aims to support and is [tested against][travis] the following Ruby
 implementations:

data/lib/multi_json.rb

@@ -1,7 +1,7 @@
 module MultiJson
   class DecodeError < StandardError
     attr_reader :data
-    def initialize(message, backtrace, data)
+    def initialize(message="", backtrace=[], data="")
       super(message)
       self.set_backtrace(backtrace)
       @data = data
@@ -72,9 +72,11 @@ module MultiJson
       case new_adapter
       when String, Symbol
         require "multi_json/adapters/#{new_adapter}"
-        MultiJson::Adapters.const_get("#{new_adapter.to_s.split('_').map{|s| s.capitalize}.join('')}")
-      when NilClass
-        nil
+        MultiJson::Adapters.const_get(:"#{new_adapter.to_s.split('_').map{|s| s.capitalize}.join('')}")
+      when NilClass, FalseClass
+        default_adapter = self.default_adapter
+        require "multi_json/adapters/#{default_adapter}"
+        MultiJson::Adapters.const_get(:"#{default_adapter.to_s.split('_').map{|s| s.capitalize}.join('')}")
       when Class
         new_adapter
       else
@@ -90,9 +92,11 @@ module MultiJson
     # <tt>:adapter</tt> :: If set, the selected engine will be used just for the call.
     def load(string, options={})
       adapter = current_adapter(options)
-      adapter.load(string, options)
-    rescue adapter::ParseError => exception
-      raise DecodeError.new(exception.message, exception.backtrace, string)
+      begin
+        adapter.load(string, options)
+      rescue adapter::ParseError => exception
+        raise DecodeError.new(exception.message, exception.backtrace, string)
+      end
     end
     # :nodoc:
     alias :decode :load

data/lib/multi_json/adapters/oj.rb

@@ -4,17 +4,21 @@ module MultiJson
   module Adapters
     # Use the Oj library to dump/load.
     class Oj
-      ParseError = SyntaxError
+      ParseError = if defined?(::Oj::ParseError)
+        ::Oj::ParseError
+      else
+        SyntaxError
+      end
 
       ::Oj.default_options = {:mode => :compat}
 
       def self.load(string, options={}) #:nodoc:
-        options.merge!(:symbol_keys => options[:symbolize_keys] || options['symbolize_keys'])
+        options.merge!(:symbol_keys => options[:symbolize_keys])
         ::Oj.load(string, options)
       end
 
       def self.dump(object, options={}) #:nodoc:
-        options.merge!(:indent => 2) if options[:pretty] || options['pretty']
+        options.merge!(:indent => 2) if options[:pretty]
         ::Oj.dump(object, options)
       end
     end

data/lib/multi_json/version.rb

@@ -1,3 +1,3 @@
 module MultiJson
-  VERSION = "1.3.6" unless defined?(MultiJson::VERSION)
+  VERSION = "1.3.7" unless defined?(MultiJson::VERSION)
 end

data/lib/multi_json/version.rbc

@@ -0,0 +1,180 @@
+!RBIX
+9595534255132031488
+x
+M
+1
+n
+n
+x
+10
+__script__
+i
+28
+99
+7
+0
+65
+49
+1
+2
+13
+99
+12
+7
+2
+12
+7
+3
+12
+65
+12
+49
+4
+4
+15
+49
+2
+0
+15
+2
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+5
+x
+9
+MultiJson
+x
+11
+open_module
+x
+15
+__module_init__
+M
+1
+n
+n
+x
+9
+MultiJson
+i
+48
+5
+66
+26
+93
+0
+15
+29
+21
+0
+45
+0
+1
+7
+2
+3
+98
+3
+3
+30
+8
+27
+25
+92
+0
+27
+8
+32
+15
+7
+4
+8
+33
+1
+9
+38
+1
+8
+47
+65
+7
+2
+7
+5
+64
+49
+6
+2
+11
+I
+4
+I
+0
+I
+0
+I
+0
+n
+p
+7
+x
+9
+MultiJson
+n
+x
+7
+VERSION
+x
+22
+vm_const_defined_under
+s
+8
+constant
+s
+5
+1.3.6
+x
+9
+const_set
+p
+5
+I
+2
+I
+2
+I
+2f
+I
+0
+I
+30
+x
+69
+/Users/sferik/Projects/Ruby/gems/multi_json/lib/multi_json/version.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+0
+I
+1
+I
+1c
+x
+69
+/Users/sferik/Projects/Ruby/gems/multi_json/lib/multi_json/version.rb
+p
+0

data/spec/adapter_shared_example.rb

@@ -14,7 +14,7 @@ shared_examples_for "an adapter" do |adapter|
         {'abc' => 'def'},
         [1, 2, 3, "4"],
       ].each do |example|
-        MultiJson.load(MultiJson.dump(example)).should == example
+        expect(MultiJson.load(MultiJson.dump(example))).to eq example
       end
     end
 
@@ -34,13 +34,13 @@ shared_examples_for "an adapter" do |adapter|
         ]
       ].each do |example, expected|
         dumped_json = MultiJson.dump(example)
-        MultiJson.load(dumped_json).should == expected
+        expect(MultiJson.load(dumped_json)).to eq expected
       end
     end
 
     it 'dumps rootless JSON' do
-      MultiJson.dump("random rootless string").should == "\"random rootless string\""
-      MultiJson.dump(123).should == "123"
+      expect(MultiJson.dump("random rootless string")).to eq "\"random rootless string\""
+      expect(MultiJson.dump(123)).to eq "123"
     end
 
     it 'passes options to the adapter' do
@@ -59,19 +59,17 @@ shared_examples_for "an adapter" do |adapter|
     end
 
     it 'dumps custom objects which implement as_json' do
-      MultiJson.dump(TimeWithZone.new).should == "\"2005-02-01T15:15:10Z\""
+      expect(MultiJson.dump(TimeWithZone.new)).to eq "\"2005-02-01T15:15:10Z\""
     end
   end
 
   describe '.load' do
     it 'properly loads valid JSON' do
-      MultiJson.load('{"abc":"def"}').should == {'abc' => 'def'}
+      expect(MultiJson.load('{"abc":"def"}')).to eq({'abc' => 'def'})
     end
 
     it 'raises MultiJson::DecodeError on invalid JSON' do
-      lambda do
-        MultiJson.load('{"abc"}')
-      end.should raise_error(MultiJson::DecodeError)
+      expect{MultiJson.load('{"abc"}')}.to raise_error(MultiJson::DecodeError)
     end
 
     it 'raises MultiJson::DecodeError with data on invalid JSON' do
@@ -79,18 +77,18 @@ shared_examples_for "an adapter" do |adapter|
       begin
         MultiJson.load(data)
       rescue MultiJson::DecodeError => de
-        de.data.should == data
+        expect(de.data).to eq data
       end
     end
 
     it 'stringifys symbol keys when encoding' do
       dumped_json = MultiJson.dump(:a => 1, :b => {:c => 2})
-      MultiJson.load(dumped_json).should == {"a" => 1, "b" => {"c" => 2}}
+      expect(MultiJson.load(dumped_json)).to eq({"a" => 1, "b" => {"c" => 2}})
     end
 
     it 'properly loads valid JSON in StringIOs' do
       json = StringIO.new('{"abc":"def"}')
-      MultiJson.load(json).should == {'abc' => 'def'}
+      expect(MultiJson.load(json)).to eq({'abc' => 'def'})
     end
 
     it 'allows for symbolization of keys' do
@@ -108,7 +106,7 @@ shared_examples_for "an adapter" do |adapter|
           {:abc => [{:def => 'hgi'}]},
         ],
       ].each do |example, expected|
-        MultiJson.load(example, :symbolize_keys => true).should == expected
+        expect(MultiJson.load(example, :symbolize_keys => true)).to eq expected
       end
     end
   end

data/spec/helper.rb

@@ -12,9 +12,16 @@ unless ENV['CI'] || macruby?
     add_filter 'spec'
   end
 end
+
 require 'multi_json'
 require 'rspec'
 
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end
+
 class MockDecoder
   def self.load(string, options={})
     {'abc' => 'def'}

data/spec/multi_json_spec.rb

@@ -31,7 +31,7 @@ describe 'MultiJson' do
       end
 
       it 'defaults to ok_json if no other json implementions are available' do
-        MultiJson.default_adapter.should == :ok_json
+        expect(MultiJson.default_adapter).to eq :ok_json
       end
 
       it 'prints a warning' do
@@ -43,21 +43,21 @@ describe 'MultiJson' do
     it 'defaults to the best available gem' do
       unless jruby?
         require 'oj'
-        MultiJson.adapter.name.should == 'MultiJson::Adapters::Oj'
+        expect(MultiJson.adapter.name).to eq 'MultiJson::Adapters::Oj'
       else
         require 'json'
-        MultiJson.adapter.name.should == 'MultiJson::Adapters::JsonGem'
+        expect(MultiJson.adapter.name).to eq 'MultiJson::Adapters::JsonGem'
       end
     end
 
     it 'is settable via a symbol' do
       MultiJson.use :json_gem
-      MultiJson.adapter.name.should == 'MultiJson::Adapters::JsonGem'
+      expect(MultiJson.adapter.name).to eq 'MultiJson::Adapters::JsonGem'
     end
 
     it 'is settable via a class' do
       MultiJson.use MockDecoder
-      MultiJson.adapter.name.should == 'MockDecoder'
+      expect(MultiJson.adapter.name).to eq 'MockDecoder'
     end
 
     context "using one-shot parser" do
@@ -69,9 +69,9 @@ describe 'MultiJson' do
 
       it "should use the defined parser just for the call" do
         MultiJson.use :json_gem
-        MultiJson.dump('', :adapter => :json_pure).should eql('dump_something')
-        MultiJson.load('', :adapter => :json_pure).should eql('load_something')
-        MultiJson.adapter.to_s.should eql("MultiJson::Adapters::JsonGem")
+        expect(MultiJson.dump('', :adapter => :json_pure)).to eq 'dump_something'
+        expect(MultiJson.load('', :adapter => :json_pure)).to eq 'load_something'
+        expect(MultiJson.adapter.to_s).to eq "MultiJson::Adapters::JsonGem"
       end
     end
   end
@@ -81,7 +81,7 @@ describe 'MultiJson' do
     next if jruby? && (adapter == 'oj' || adapter == 'yajl')
 
     context adapter do
-      it_should_behave_like "an adapter", adapter
+      it_behaves_like "an adapter", adapter
     end
   end
 end

metadata

@@ -1,97 +1,94 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: multi_json
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 1.3.7
   prerelease: 
-  segments: 
-  - 1
-  - 3
-  - 6
-  version: 1.3.6
 platform: ruby
-authors: 
+authors:
 - Michael Bleigh
 - Josh Kalderimis
 - Erik Michaels-Ober
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 3
-        - 9
-        version: "3.9"
+      - !ruby/object:Gem::Version
+        version: '3.9'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 4
-        version: "0.4"
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :development
-  version_requirements: *id004
-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.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+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.
+email:
 - michael@intridea.com
 - josh.kalderimis@gmail.com
 - sferik@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.md
 - README.md
-files: 
+files:
 - LICENSE.md
 - README.md
 - Rakefile
@@ -112,43 +109,34 @@ files:
 - lib/multi_json/adapters/yajl.rb
 - lib/multi_json/vendor/okjson.rb
 - lib/multi_json/version.rb
+- lib/multi_json/version.rbc
 - lib/multi_json.rb
 homepage: http://github.com/intridea/multi_json
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A gem to provide swappable JSON backends.
-test_files: 
+test_files:
 - spec/adapter_shared_example.rb
 - spec/helper.rb
 - spec/multi_json_spec.rb