multi_json 1.0.4 → 1.1.0

data/.rspec

@@ -1,3 +1,2 @@
 --color
---format=nested
---backtrace
+--order random

data/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gem 'json',      '~> 1.4', :require => nil
 gem 'yajl-ruby', '~> 1.0', :require => nil

data/README.md

@@ -1,35 +1,50 @@
-# MultiJSON
+# MultiJSON [![Build Status](https://secure.travis-ci.org/intridea/multi_json.png?branch=master)][travis] [![Dependency Status](https://gemnasium.com/intridea/multi_json.png?travis)][gemnasium]
+
+[travis]: http://travis-ci.org/intridea/multi_json
+[gemnasium]: https://gemnasium.com/intridea/multi_json
+
 Lots of Ruby libraries utilize JSON parsing in some form, and everyone has
 their favorite JSON library. In order to best support multiple JSON parsers and
-libraries, <tt>multi_json</tt> is a general-purpose swappable JSON backend
-library. You use it like so:
+libraries, `multi_json` is a general-purpose swappable JSON backend library.
+You use it like so:
 
     require 'multi_json'
 
     MultiJson.engine = :yajl
     MultiJson.decode('{ "abc":"def" }') # decoded using Yajl
 
+    MultiJson.decode('{ "abc":"def" }', :symbolize_keys => true) # for symbol keys: {:abc => "def"}
+
     MultiJson.engine = :json_gem
     MultiJson.engine = MultiJson::Engines::JsonGem # equivalent to previous line
     MultiJson.encode({ :abc => 'def' }) # encoded using the JSON gem
 
     MultiJson.encode({ :abc => 'def' }, :pretty => true) # encoded in a pretty form (ignored if engine is ok_json)
 
-The <tt>engine</tt> setter takes either a symbol or a class (to allow for
-custom JSON parsers) that responds to both <tt>.decode</tt> and
-<tt>.encode</tt> at the class level.
+The `engine` setter takes either a symbol or a class (to allow for custom JSON
+parsers) that responds to both `.decode` and `.encode` at the class level.
 
 MultiJSON tries to have intelligent defaulting. That is, if you have any of the
 supported engines already loaded, it will utilize them before attempting to
 load any. When loading, libraries are ordered by speed. First Yajl-Ruby, then
 the JSON gem, then JSON pure. If no JSON library is available, MultiJSON falls
-back to a bundled version of [OkJson](https://github.com/kr/okjson).
+back to a bundled version of [OkJson][].
+
+[okjson]: https://github.com/kr/okjson
+
+## Supported JSON Engines
+
+* [`:yajl`](https://github.com/brianmario/yajl-ruby) Yet another json library, C extension
+* [`:json_gem`](https://github.com/genki/json) Json gem as C extension
+* [`:json_pure`](https://github.com/genki/json) Pure ruby implementation of the json gem
+* [`:ok_json`][okjson] Pure ruby implementation, aiming for maximum compatibility
+* [`:nsjsonserialization`](https://developer.apple.com/library/ios/#documentation/Foundation/Reference/NSJSONSerialization_Class/Reference/Reference.html) Wrapper for Apple's NSJSONSerialization out of the Cocoa Framework (MacRuby only)
 
-## <a name="ci">Continuous Integration</a>
-[![Build Status](https://secure.travis-ci.org/intridea/multi_json.png)](http://travis-ci.org/intridea/multi_json)
+## <a name="contributing"></a>Contributing
+In the spirit of [free software][free-sw], **everyone** is encouraged to help
+improve this project.
 
-## <a name="contributing">Contributing</a>
-In the spirit of [free software](http://www.fsf.org/licensing/essays/free-sw.html), **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:
 
@@ -38,42 +53,53 @@ Here are some ways *you* can contribute:
 * 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 writing code (**no patch is too small**: fix typos, add comments, clean up
+  inconsistent whitespace)
 * by refactoring code
-* by closing [issues](https://github.com/intridea/multi_json/issues)
+* by closing [issues][]
 * by reviewing patches
 
-## <a name="issues">Submitting an Issue</a>
-We use the [GitHub issue
-tracker](https://github.com/intridea/multi_json/issues) to track bugs and
-features. Before submitting a bug report or feature request, check to make sure
-it hasn't already been submitted. You can indicate support for an existing
-issuse by voting it up. When submitting a bug report, please include a
-[Gist](https://gist.github.com/) 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.
-
-## <a name="pulls">Submitting a Pull Request</a>
+[issues]: https://github.com/intridea/multi_json/issues
+
+## <a name="issues"></a>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. You can indicate support for an existing issuse by
+voting it up. 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/
+
+## <a name="pulls"></a>Submitting a Pull Request
 1. Fork the project.
 2. Create a topic branch.
 3. Implement your feature or bug fix.
 4. Add specs for your feature or bug fix.
-5. Run <tt>bundle exec rake spec</tt>. If your changes are not 100% covered, go back to step 4.
+5. Run `bundle exec rake spec`. If your changes are not 100% covered, go back
+   to step 4.
 6. Commit and push your changes.
-7. Submit a pull request. Please do not include changes to the gemspec, version, or history file. (If you want to create your own version for some reason, please do so in a separate commit.)
+7. Submit a pull request. Please do not include changes to the gemspec,
+   version, or history file. (If you want to create your own version for some
+   reason, please do so in a separate commit.)
 
-## <a name="rubies">Supported Rubies</a>
-This library aims to support and is [tested
-against](http://travis-ci.org/intridea/multi_json) the following Ruby
+## <a name="versions"></a>Supported Ruby Versions
+This library aims to support and is [tested against][travis] the following Ruby
 implementations:
 
 * Ruby 1.8.7
-* Ruby 1.9.1
 * Ruby 1.9.2
-* [JRuby](http://www.jruby.org/)
-* [Rubinius](http://rubini.us/)
-* [Ruby Enterprise Edition](http://www.rubyenterpriseedition.com/)
+* Ruby 1.9.3
+* [JRuby][]
+* [Rubinius][]
+* [Ruby Enterprise Edition][ree]
+* [MacRuby][] (not tested on Travis CI)
+
+[jruby]: http://www.jruby.org/
+[rubinius]: http://rubini.us/
+[ree]: http://www.rubyenterpriseedition.com/
+[macruby]: http://www.macruby.org/
 
 If something doesn't work on one of these interpreters, it should be considered
 a bug.
@@ -89,6 +115,8 @@ implementation, you will be personally responsible for providing patches in a
 timely fashion. If critical issues for a particular implementation exist at the
 time of a major release, support for that Ruby version may be dropped.
 
-## <a name="copyright">Copyright</a>
+## <a name="copyright"></a>Copyright
 Copyright (c) 2010 Michael Bleigh, Josh Kalderimis, Erik Michaels-Ober, and Intridea, Inc.
-See [LICENSE](https://github.com/intridea/multi_json/blob/master/LICENSE.md) for details.
+See [LICENSE][] for details.
+
+[license]: https://github.com/intridea/multi_json/blob/master/LICENSE.md

data/lib/multi_json.rb

@@ -55,11 +55,14 @@ module MultiJson
   # * <tt>:json_pure</tt>
   # * <tt>:ok_json</tt>
   # * <tt>:yajl</tt>
+  # * <tt>:nsjsonserialization</tt> (MacRuby only)
   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 NilClass
+      @engine = nil
     when Class
       @engine = new_engine
     else

data/lib/multi_json/engines/nsjsonserialization.rb

@@ -0,0 +1,34 @@
+framework 'Foundation'
+require 'multi_json/engines/ok_json'
+
+module MultiJson
+  module Engines
+    class Nsjsonserialization < MultiJson::Engines::OkJson
+      ParseError = ::MultiJson::OkJson::Error
+      
+      def self.decode(string, options = {})
+        string = string.read if string.respond_to?(:read)
+        data = string.dataUsingEncoding(NSUTF8StringEncoding)
+        object = NSJSONSerialization.JSONObjectWithData(data, options: NSJSONReadingMutableContainers | NSJSONReadingMutableLeaves, error: nil)
+        if object
+          object = symbolize_keys(object) if options[:symbolize_keys]
+          object
+        else
+          super(string, options = {})
+        end
+      end
+
+      def self.encode(object, options = {})
+        pretty = options[:pretty] ? NSJSONWritingPrettyPrinted : 0
+        object = object.as_json if object.respond_to?(:as_json)
+        if NSJSONSerialization.isValidJSONObject(object)
+          data = NSJSONSerialization.dataWithJSONObject(object, options: pretty, error: nil)
+          NSMutableString.alloc.initWithData(data, encoding: NSUTF8StringEncoding)
+        else
+          super(object, options)
+        end
+      end
+      
+    end
+  end
+end

data/lib/multi_json/version.rb

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

data/spec/helper.rb

@@ -1,14 +1,12 @@
-['..', '../../lib'].each do |path|
-  $:.unshift dir if dir = File.expand_path(path, __FILE__) and not $:.include?(dir)
+def macruby?
+  defined?(RUBY_ENGINE) && RUBY_ENGINE == 'macruby'
 end
 
 require 'simplecov'
-SimpleCov.start
-
+SimpleCov.start unless macruby?
 require 'multi_json'
 require 'rspec'
 
-
 class MockDecoder
   def self.decode(string, options = {})
     {'abc' => 'def'}
@@ -25,11 +23,14 @@ class TimeWithZone
   end
 end
 
-
 def yajl_on_travis(engine)
   ENV['TRAVIS'] && engine == 'yajl' && jruby?
 end
 
+def nsjsonserialization_on_other_than_macruby(engine)
+  engine == 'nsjsonserialization' && !macruby?
+end
+
 def jruby?
   defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-end
+end

data/spec/multi_json_spec.rb

@@ -3,8 +3,11 @@ require 'stringio'
 
 describe "MultiJson" do
   context 'engines' do
+    before do
+      MultiJson.engine = nil
+    end
     context 'when no other json implementations are available' do
-      before(:each) do
+      before 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)
@@ -15,7 +18,7 @@ describe "MultiJson" do
         Object.send :remove_const, :JSON if @old_json
       end
 
-      after(:each) do
+      after do
         @old_map.each_with_index do |(library, engine), index|
           MultiJson::REQUIREMENT_MAP[index] = [library, engine]
         end
@@ -54,11 +57,15 @@ describe "MultiJson" do
     end
   end
 
-  %w(json_gem json_pure ok_json yajl).each do |engine|
+  %w(json_gem json_pure ok_json yajl nsjsonserialization).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
+    if nsjsonserialization_on_other_than_macruby(engine)
+      puts "NSJSONSerialization is exclusively available for MacRuby only."
+      next
+    end
 
     context engine do
       before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_json
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-28 00:00:00.000000000 Z
+date: 2012-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70345404971980 !ruby/object:Gem::Requirement
+  requirement: &70295944803660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70345404971980
+  version_requirements: *70295944803660
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70345404970940 !ruby/object:Gem::Requirement
+  requirement: &70295944803060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '3.9'
   type: :development
   prerelease: false
-  version_requirements: *70345404970940
+  version_requirements: *70295944803060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70345404968560 !ruby/object:Gem::Requirement
+  requirement: &70295944802460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70345404968560
+  version_requirements: *70295944802460
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70345404967560 !ruby/object:Gem::Requirement
+  requirement: &70295944801920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,7 +56,7 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70345404967560
+  version_requirements: *70295944801920
 description: A gem to provide swappable JSON backends utilizing Yajl::Ruby, the JSON
   gem, JSON pure, or a vendored version of okjson.
 email:
@@ -82,6 +82,7 @@ files:
 - 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/nsjsonserialization.rb
 - lib/multi_json/engines/ok_json.rb
 - lib/multi_json/engines/yajl.rb
 - lib/multi_json/vendor/ok_json.rb
@@ -108,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A gem to provide swappable JSON backends.