multi_json 1.0.3 → 1.0.4

data/lib/multi_json/version.rb

@@ -1,3 +1,3 @@
 module MultiJson
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/multi_json.gemspec

@@ -1,23 +1,22 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 require File.expand_path("../lib/multi_json/version", __FILE__)
 
 Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake', '~> 0.9'
-  gem.add_development_dependency 'rdoc', '3.5.1'
+  gem.add_development_dependency 'rdoc', '~> 3.9'
   gem.add_development_dependency 'rspec', '~> 2.6'
   gem.add_development_dependency 'simplecov', '~> 0.4'
   gem.authors = ["Michael Bleigh", "Josh Kalderimis", "Erik Michaels-Ober"]
   gem.description = %q{A gem to provide swappable JSON backends utilizing Yajl::Ruby, the JSON gem, JSON pure, or a vendored version of okjson.}
   gem.email = ['michael@intridea.com', 'josh.kalderimis@gmail.com', 'sferik@gmail.com']
-  gem.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
   gem.extra_rdoc_files = ['LICENSE.md', 'README.md']
-  gem.files = `git ls-files`.split("\n")
+  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.rdoc_options = ["--charset=UTF-8"]
   gem.require_paths = ['lib']
   gem.required_rubygems_version = Gem::Requirement.new(">= 1.3.6")
   gem.summary = %q{A gem to provide swappable JSON backends.}
-  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.test_files = Dir['spec/**/*']
   gem.version = MultiJson::VERSION
 end

data/spec/helper.rb

@@ -1,11 +1,35 @@
-begin
-  require 'bundler'
-  Bundler.setup
-rescue LoadError
-  warn "[WARNING]: It is recommended that you use bundler during development: gem install bundler"
+['..', '../../lib'].each do |path|
+  $:.unshift dir if dir = File.expand_path(path, __FILE__) and not $:.include?(dir)
 end
 
 require 'simplecov'
 SimpleCov.start
-require 'rspec'
+
 require 'multi_json'
+require 'rspec'
+
+
+class MockDecoder
+  def self.decode(string, options = {})
+    {'abc' => 'def'}
+  end
+
+  def self.encode(string)
+    '{"abc":"def"}'
+  end
+end
+
+class TimeWithZone
+  def to_json(options = {})
+    "\"2005-02-01T15:15:10Z\""
+  end
+end
+
+
+def yajl_on_travis(engine)
+  ENV['TRAVIS'] && engine == 'yajl' && jruby?
+end
+
+def jruby?
+  defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+end

data/spec/multi_json_spec.rb

@@ -1,35 +1,46 @@
 require 'helper'
 require 'stringio'
 
-class MockDecoder
-  def self.decode(string, options = {})
-    {'abc' => 'def'}
-  end
-
-  def self.encode(string)
-    '{"abc":"def"}'
-  end
-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
+    context 'when no other json implementations are available' do
+      before(:each) do
+        @old_map = MultiJson::REQUIREMENT_MAP
+        @old_yajl = Object.const_get :Yajl if Object.const_defined?(:Yajl)
+        @old_json = Object.const_get :JSON if Object.const_defined?(:JSON)
         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|
+        Object.send :remove_const, :Yajl if @old_yajl
+        Object.send :remove_const, :JSON if @old_json
+      end
+
+      after(:each) do
+        @old_map.each_with_index do |(library, engine), index|
           MultiJson::REQUIREMENT_MAP[index] = [library, engine]
         end
+        Object.const_set :Yajl, @old_yajl if @old_yajl
+        Object.const_set :JSON, @old_json if @old_json
+      end
+
+      it 'defaults to ok_json if no other json implementions are available' do
+        MultiJson.default_engine.should == :ok_json
+      end
+
+      it 'prints a warning' do
+        Kernel.should_receive(:warn).with(/warning/i)
+        MultiJson.default_engine
       end
     end
 
     it 'defaults to the best available gem' do
-      require 'yajl'
-      MultiJson.engine.name.should == 'MultiJson::Engines::Yajl'
+      unless jruby?
+        require 'yajl'
+        MultiJson.engine.name.should == 'MultiJson::Engines::Yajl'
+      else
+        require 'json'
+        MultiJson.engine.name.should == 'MultiJson::Engines::JsonGem'
+      end
     end
 
     it 'is settable via a symbol' do
@@ -44,6 +55,11 @@ describe "MultiJson" do
   end
 
   %w(json_gem json_pure ok_json yajl).each do |engine|
+    if yajl_on_travis(engine)
+      puts "Yajl with JRuby is not tested on Travis as C-exts are turned off due to there experimental nature"
+      next
+    end
+
     context engine do
       before do
         begin
@@ -87,6 +103,25 @@ describe "MultiJson" do
           MultiJson.encode("random rootless string").should == "\"random rootless string\""
           MultiJson.encode(123).should == "123"
         end
+
+        it 'passes options to the engine' do
+          MultiJson.engine.should_receive(:encode).with('foo', {:bar => :baz})
+          MultiJson.encode('foo', :bar => :baz)
+        end
+
+        if engine == 'json_gem' || engine == 'json_pure'
+          describe 'with :pretty option set to true' do
+            it 'passes default pretty options' do
+              object = 'foo'
+              object.should_receive(:to_json).with(JSON::PRETTY_STATE_PROTOTYPE.to_h)
+              MultiJson.encode(object,:pretty => true)
+            end
+          end
+        end
+
+        it "encodes custom objects which implement as_json" do
+          MultiJson.encode(TimeWithZone.new).should == "\"2005-02-01T15:15:10Z\""
+        end
       end
 
       describe '.decode' do
@@ -100,6 +135,15 @@ describe "MultiJson" do
           end.should raise_error(MultiJson::DecodeError)
         end
 
+        it 'raises MultiJson::DecodeError with data on invalid JSON' do
+          data = '{invalid}'
+          begin
+            MultiJson.decode(data)
+          rescue MultiJson::DecodeError => de
+            de.data.should == data
+          end
+        end
+
         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 } }

metadata

@@ -1,122 +1,118 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: multi_json
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.0.4
   prerelease: 
-  version: 1.0.3
 platform: ruby
-authors: 
+authors:
 - Michael Bleigh
 - Josh Kalderimis
 - Erik Michaels-Ober
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-23 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70345404971980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        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: *70345404971980
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70345404970940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 3.5.1
+    requirements:
+    - - ~>
+      - !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: *70345404970940
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70345404968560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        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: *70345404968560
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &70345404967560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.4"
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :development
-  version_requirements: *id004
-description: A gem to provide swappable JSON backends utilizing Yajl::Ruby, the JSON gem, JSON pure, or a vendored version of okjson.
-email: 
+  prerelease: false
+  version_requirements: *70345404967560
+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
 - josh.kalderimis@gmail.com
 - sferik@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.md
 - README.md
-files: 
-- .document
-- .gemtest
-- .gitignore
-- .rspec
-- .travis.yml
-- Gemfile
+files:
 - LICENSE.md
 - README.md
 - Rakefile
-- lib/multi_json.rb
+- multi_json.gemspec
+- Gemfile
+- .document
+- .rspec
+- .travis.yml
+- spec/helper.rb
+- spec/multi_json_spec.rb
+- lib/multi_json/engines/json_common.rb
 - lib/multi_json/engines/json_gem.rb
 - lib/multi_json/engines/json_pure.rb
 - lib/multi_json/engines/ok_json.rb
 - lib/multi_json/engines/yajl.rb
 - lib/multi_json/vendor/ok_json.rb
 - lib/multi_json/version.rb
-- multi_json.gemspec
-- spec/helper.rb
-- spec/multi_json_spec.rb
+- 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 
-      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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.3
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A gem to provide swappable JSON backends.
-test_files: 
+test_files:
 - spec/helper.rb
 - spec/multi_json_spec.rb
+has_rdoc: 

data/.gitignore

@@ -1,34 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-doc
-rdoc
-log
-
-## BUNDLER
-*.gem
-.bundle
-pkg
-Gemfile.lock
-
-## RCOV
-coverage.data
-
-## RUBINIUS
-*.rbc
-
-## PROJECT::SPECIFIC