multi_json 1.0.0.rc → 1.0.0.rc2

data/Gemfile

@@ -2,6 +2,10 @@ source "http://rubygems.org"
 
 gemspec
 
+gem 'rake',  '~> 0.8'
+gem 'rspec', '~> 2.5'
+gem 'rcov',  '~> 0.9', :platforms => [:mri, :jruby]
+
 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, :platforms => :ruby

data/lib/multi_json.rb

@@ -2,6 +2,8 @@ module MultiJson
   class DecodeError < StandardError; end
   module_function
 
+  @engine = nil
+
   # Get the current engine class.
   def engine
     return @engine if @engine

data/lib/multi_json/version.rb

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

data/multi_json.gemspec

@@ -21,18 +21,5 @@ Gem::Specification.new do |s|
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
 
   s.require_paths = ["lib"]
-
-  s.add_development_dependency("rake", "~> 0.8")
-  s.add_development_dependency("rspec", "~> 2.0")
-  s.add_development_dependency("json", "~> 1.4")
-  s.add_development_dependency("json_pure", "~> 1.4")
-
-  unless ENV['RUBY_VERSION'].match(/^rbx-/)
-    s.add_development_dependency("rcov", "~> 0.9")
-  end
-
-  unless ENV['RUBY_VERSION'].match(/^jruby-/)
-    s.add_development_dependency("yajl-ruby", "~> 0.7")
-  end
 end
 

data/spec/multi_json_spec.rb

@@ -14,7 +14,7 @@ describe "MultiJson" do
   context 'engines' do
     it 'should default to the best available gem' do
       # the yajl-ruby gem does not work on jruby, so the best engine is the JsonGem engine
-      if ENV['RUBY_VERSION'].match(/^jruby-/)
+      if jruby?
         require 'json'
         MultiJson.engine.name.should == 'MultiJson::Engines::JsonGem'
       else
@@ -53,6 +53,11 @@ describe "MultiJson" do
             MultiJson.decode(MultiJson.encode(example)).should == example
           end
         end
+
+        it 'should encode 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

data/spec/spec_helper.rb

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

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: multi_json
 version: !ruby/object:Gem::Version 
-  hash: 7712010
+  hash: 15424049
   prerelease: 6
   segments: 
   - 1
   - 0
   - 0
   - rc
-  version: 1.0.0.rc
+  - 2
+  version: 1.0.0.rc2
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -16,98 +17,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-14 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 
-        hash: 27
-        segments: 
-        - 0
-        - 8
-        version: "0.8"
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: json_pure
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        version: "0.7"
-  type: :development
-  version_requirements: *id006
+date: 2011-04-18 00:00:00 Z
+dependencies: []
+
 description: A gem to provide swappable JSON backends utilizing Yajl::Ruby, the JSON gem, ActiveSupport, or JSON pure.
 email: 
 - michael@intridea.com