multi_json 1.0.2 → 1.0.3

data/.document

@@ -1,5 +1,5 @@
-README.rdoc
-lib/**/*.rb
+LICENSE.md
+README.md
 bin/*
 features/**/*.feature
-LICENSE
+lib/**/*.rb

data/.rspec

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

data/Gemfile

@@ -1,11 +1,7 @@
-source "http://rubygems.org"
-
-gemspec
-
-gem 'rake',  '~> 0.8'
-gem 'rspec', '~> 2.5'
-gem 'rcov',  '~> 0.9', :platforms => [:mri, :jruby]
+source 'http://rubygems.org'
 
 gem 'json',      '~> 1.4', :require => nil
 gem 'json_pure', '~> 1.4', :require => nil
-gem 'yajl-ruby', '~> 0.7', :require => nil, :platforms => :ruby
+gem 'yajl-ruby', '~> 0.7', :require => nil
+
+gemspec

data/{LICENSE → LICENSE.md}

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Michael Bleigh and Intridea, Inc.
+Copyright (c) 2010 Michael Bleigh, Josh Kalderimis, Erik Michaels-Ober, and Intridea, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -0,0 +1,70 @@
+MultiJSON
+=========
+
+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:
+
+    require 'multi_json'
+
+    MultiJson.engine = :yajl
+    MultiJson.decode('{"abc":"def"}') # decoded using Yajl
+
+    MultiJson.engine = :json_gem
+    MultiJson.engine = MultiJson::Engines::JsonGem # equivalent to previous line
+    MultiJson.encode({:abc => 'def'}) # encoded using the JSON gem
+
+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.
+
+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).
+
+Continuous Integration
+----------------------
+[![Build Status](http://travis-ci.org/intridea/multi_json.png)](http://travis-ci.org/intridea/multi_json)
+
+Contributing
+------------
+In the spirit of [free software](http://www.fsf.org/licensing/essays/free-sw.html), **everyone** is encouraged to help improve this project.
+
+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](https://github.com/intridea/multi_json/issues)
+* by reviewing patches
+
+Submitting an Issue
+-------------------
+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.
+
+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.
+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.)
+
+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.

data/Rakefile

@@ -1,9 +1,9 @@
-require 'rubygems'
+#!/usr/bin/env rake
 begin
   require 'bundler'
   Bundler::GemHelper.install_tasks
 rescue LoadError => e
-  puts "although not required, it's recommended that you use bundler during development"
+  warn "[WARNING]: It is recommended that you use bundler during development: gem install bundler"
 end
 
 require 'rspec/core/rake_task'
@@ -11,27 +11,13 @@ desc "Run all examples"
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+task :test => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "multi_json #{MultiJson::VERSION}"
-  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('README.md')
+  rdoc.rdoc_files.include('LICENSE.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-task :cleanup_rcov_files do
-  rm_rf 'coverage.data'
-end
-
-begin
-  namespace :spec do
-    desc "Run all examples using rcov"
-    RSpec::Core::RakeTask.new :rcov => :cleanup_rcov_files do |t|
-      t.rcov = true
-      t.rcov_opts =  %[-Ilib -Ispec --exclude "gems/*,features"]
-      t.rcov_opts << %[--text-report --sort coverage --no-html --aggregate coverage.data]
-    end
-  end
-rescue LoadError
-end

data/lib/multi_json/engines/ok_json.rb

@@ -16,20 +16,31 @@ module MultiJson
       end
 
       def self.symbolize_keys(object) #:nodoc:
-        return object unless object.is_a?(Hash)
-        object.inject({}) do |result, (key, value)|
-          new_key   = key.is_a?(String) ? key.to_sym : key
-          new_value = value.is_a?(Hash) ? symbolize_keys(value) : value
-          result.merge! new_key => new_value
+        modify_keys(object) do |key|
+          key.is_a?(String) ? key.to_sym : key
         end
       end
 
       def self.stringify_keys(object) #:nodoc:
-        return object unless object.is_a?(Hash)
-        object.inject({}) do |result, (key, value)|
-          new_key   = key.is_a?(Symbol) ? key.to_s : key
-          new_value = value.is_a?(Hash) ? stringify_keys(value) : value
-          result.merge! new_key => new_value
+        modify_keys(object) do |key|
+          key.is_a?(Symbol) ? key.to_s : key
+        end
+      end
+
+      def self.modify_keys(object, &modifier) #:nodoc:
+        case object
+        when Array
+          object.map do |value|
+            modify_keys(value, &modifier)
+          end
+        when Hash
+          object.inject({}) do |result, (key, value)|
+            new_key   = modifier.call(key)
+            new_value = modify_keys(value, &modifier)
+            result.merge! new_key => new_value
+          end
+        else
+          object
         end
       end
     end

data/lib/multi_json/version.rb

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

data/multi_json.gemspec

@@ -1,25 +1,23 @@
 # -*- encoding: utf-8 -*-
 require File.expand_path("../lib/multi_json/version", __FILE__)
 
-Gem::Specification.new do |s|
-  s.name = "multi_json"
-  s.version = MultiJson::VERSION
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
-
-  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, JSON pure, or a vendored version of okjson.}
-  s.homepage = "http://github.com/intridea/multi_json"
-
-  s.extra_rdoc_files = ["LICENSE", "README.rdoc"]
-  s.rdoc_options     = ["--charset=UTF-8"]
-
-  s.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
-  s.files       = `git ls-files`.split("\n")
-  s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
-
-  s.require_paths = ["lib"]
+Gem::Specification.new do |gem|
+  gem.add_development_dependency 'rake', '~> 0.9'
+  gem.add_development_dependency 'rdoc', '3.5.1'
+  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.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.version = MultiJson::VERSION
 end
-

data/spec/helper.rb

@@ -0,0 +1,11 @@
+begin
+  require 'bundler'
+  Bundler.setup
+rescue LoadError
+  warn "[WARNING]: It is recommended that you use bundler during development: gem install bundler"
+end
+
+require 'simplecov'
+SimpleCov.start
+require 'rspec'
+require 'multi_json'

data/spec/multi_json_spec.rb

@@ -1,9 +1,9 @@
-require 'spec_helper'
+require 'helper'
 require 'stringio'
-          
+
 class MockDecoder
   def self.decode(string, options = {})
-    { 'abc' => 'def' }
+    {'abc' => 'def'}
   end
 
   def self.encode(string)
@@ -26,16 +26,10 @@ describe "MultiJson" do
         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?
-        require 'json'
-        MultiJson.engine.name.should == 'MultiJson::Engines::JsonGem'
-      else
-        require 'yajl'
-        MultiJson.engine.name.should == 'MultiJson::Engines::Yajl'
-      end
+      require 'yajl'
+      MultiJson.engine.name.should == 'MultiJson::Engines::Yajl'
     end
 
     it 'is settable via a symbol' do
@@ -70,8 +64,23 @@ describe "MultiJson" do
         end
 
         it 'encodes symbol keys as strings' do
-          encoded_json = MultiJson.encode({ :foo => { :bar => 'baz' } })
-          MultiJson.decode(encoded_json).should == { 'foo' => { 'bar' => 'baz' } }
+          [
+            [
+              { :foo => { :bar => 'baz' } },
+              { 'foo' => { 'bar' => 'baz' } }
+            ],
+            [
+              [ { :foo => { :bar => 'baz' } } ],
+              [ { 'foo' => { 'bar' => 'baz' } } ],
+            ],
+            [
+              { :foo => [ { :bar => 'baz' } ] },
+              { 'foo' => [ { 'bar' => 'baz' } ] },
+            ]
+          ].each do |example, expected|
+            encoded_json = MultiJson.encode(example)
+            MultiJson.decode(encoded_json).should == expected
+          end
         end
 
         it 'encodes rootless JSON' do
@@ -95,14 +104,29 @@ describe "MultiJson" 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 'allows for symbolization of keys' do
-          MultiJson.decode('{"abc":{"def":"hgi"}}', :symbolize_keys => true).should == { :abc => { :def => 'hgi' } }
+          [
+            [
+              '{"abc":{"def":"hgi"}}',
+              { :abc => { :def => 'hgi' } }
+            ],
+            [
+              '[{"abc":{"def":"hgi"}}]',
+              [ { :abc => { :def => 'hgi' } } ]
+            ],
+            [
+              '{"abc":[{"def":"hgi"}]}',
+              { :abc => [ { :def => 'hgi' } ] }
+            ],
+          ].each do |example, expected|
+            MultiJson.decode(example, :symbolize_keys => true).should == expected
+          end
         end
       end
     end

metadata

@@ -2,36 +2,83 @@
 name: multi_json
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Michael Bleigh
+- Josh Kalderimis
+- Erik Michaels-Ober
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 +02:00
-default_executable: 
-dependencies: []
-
+date: 2011-05-23 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !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 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 3.5.1
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !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 
+    none: false
+    requirements: 
+    - - ~>
+      - !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: 
 - michael@intridea.com
+- josh.kalderimis@gmail.com
+- sferik@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+- LICENSE.md
+- README.md
 files: 
 - .document
+- .gemtest
 - .gitignore
 - .rspec
 - .travis.yml
 - Gemfile
-- LICENSE
-- README.rdoc
+- LICENSE.md
+- README.md
 - Rakefile
 - lib/multi_json.rb
 - lib/multi_json/engines/json_gem.rb
@@ -41,10 +88,8 @@ files:
 - lib/multi_json/vendor/ok_json.rb
 - lib/multi_json/version.rb
 - multi_json.gemspec
+- spec/helper.rb
 - spec/multi_json_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/intridea/multi_json
 licenses: []
 
@@ -68,11 +113,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.3
 signing_key: 
 specification_version: 3
 summary: A gem to provide swappable JSON backends.
 test_files: 
+- spec/helper.rb
 - spec/multi_json_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb

data/README.rdoc

@@ -1,30 +0,0 @@
-= MultiJSON
-
-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:
-
-    require 'multi_json'
-
-    MultiJson.engine = :yajl
-    MultiJson.decode('{"abc":"def"}') # decoded using Yajl
-
-    MultiJson.engine = :json_gem
-    MultiJson.engine = MultiJson::Engines::JsonGem # equivalent to previous line
-    MultiJson.encode({:abc => 'def'}) # encoded using the JSON gem
-
-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.
-
-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 <a href="https://github.com/kr/okjson">OkJson</a>.
-
-== Note on Patches/Pull Requests
-
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-== Copyright
-
-Copyright (c) 2010 Michael Bleigh and Intridea, Inc. See LICENSE for details.

data/spec/spec.opts

@@ -1,2 +0,0 @@
---color
---format=nested

data/spec/spec_helper.rb

@@ -1,15 +0,0 @@
-begin
-  require 'bundler'
-rescue LoadError
-  puts "although not required, it's recommended that you use bundler during development"
-end
-
-require 'rspec'
-require 'rspec/autorun'
-
-$VERBOSE = true
-require 'multi_json'
-
-def jruby?
-  defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
-end