multi_json 0.0.4 → 0.0.5

data/.gitignore

@@ -15,8 +15,16 @@ tmtags
 
 ## PROJECT::GENERAL
 coverage
+doc
 rdoc
-pkg
+log
+
+## BUNDLER
+*.gem
 .bundle
+pkg
+
+## RCOV
+coverage.data
 
 ## PROJECT::SPECIFIC

data/.rspec

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

data/Gemfile

@@ -1,8 +1,10 @@
 source "http://rubygems.org"
 
-gem 'rspec'
+group :development, :test do
+  gem 'activesupport', '~> 3.0', :require => nil
+  gem 'json', '~> 1.4', :require => nil
+  gem 'json_pure', '~> 1.4', :require => nil
+  gem 'yajl-ruby', '~> 0.7', :require => nil
+end
 
-gem 'json', :require => nil
-gem 'json_pure', :require => nil
-gem 'yajl-ruby', :require => nil
-gem 'activesupport', :require => nil
+gemspec

data/Gemfile.lock

@@ -0,0 +1,38 @@
+PATH
+  remote: .
+  specs:
+    multi_json (0.0.5)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.1)
+    diff-lcs (1.1.2)
+    json (1.4.6)
+    json_pure (1.4.6)
+    rake (0.8.7)
+    rcov (0.9.9)
+    rspec (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
+      rspec-mocks (= 2.0.0)
+    rspec-core (2.0.0)
+    rspec-expectations (2.0.0)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
+    yajl-ruby (0.7.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 3.0)
+  json (~> 1.4)
+  json_pure (~> 1.4)
+  multi_json!
+  rake (~> 0.8)
+  rcov (~> 0.9)
+  rspec (~> 2.0)
+  yajl-ruby (~> 0.7)

data/Rakefile

@@ -1,49 +1,32 @@
 require 'rubygems'
-require 'rake'
+require 'bundler'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "multi_json"
-    gem.summary = %Q{A gem to provide swappable JSON backends.}
-    gem.description = %Q{A gem to provide swappable JSON backends utilizing Yajl::Ruby, the JSON gem, ActiveSupport, or JSON pure.}
-    gem.email = "michael@intridea.com"
-    gem.homepage = "http://github.com/intridea/multi_json"
-    gem.authors = ["Michael Bleigh"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
+Bundler::GemHelper.install_tasks
 
-  task :spec => :check_dependencies
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+require 'rspec/core/rake_task'
+desc "Run all examples"
+RSpec::Core::RakeTask.new(:spec) do |t|
 end
 
-begin
-  require 'spec/rake/spectask'
-  Spec::Rake::SpecTask.new(:spec) do |spec|
-    spec.libs << 'lib' << 'spec'
-    spec.spec_files = FileList['spec/**/*_spec.rb']
-  end
+task :cleanup_rcov_files do
+  rm_rf 'coverage.data'
+end
 
-  Spec::Rake::SpecTask.new(:rcov) do |spec|
-    spec.libs << 'lib' << 'spec'
-    spec.pattern = 'spec/**/*_spec.rb'
-    spec.rcov = true
+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
-
-  task :default => :spec
-rescue LoadError
-  puts "RSpec (or a dependency) not available. Install it with: gem install rspec"
 end
 
+task :default => :spec
+
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "multi_json #{version}"
+  rdoc.title = "multi_json #{MultiJson::VERSION}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/lib/multi_json.rb

@@ -1,6 +1,7 @@
 module MultiJson
+  class DecodeError < StandardError; end
   module_function
-  
+
   # Get the current engine class.
   def engine
     return @engine if @engine
@@ -14,7 +15,7 @@ module MultiJson
     ["active_support", :active_support],
     ["json/pure", :json_pure]
   ]
-  
+
   # The default engine based on what you currently
   # have loaded and installed. First checks to see
   # if any engines are already loaded, then checks
@@ -33,7 +34,7 @@ module MultiJson
       end
     end
   end
-  
+
   # Set the JSON parser utilizing a symbol, string, or class.
   # Supported by default are:
   #
@@ -52,18 +53,22 @@ module MultiJson
         raise "Did not recognize your engine specification. Please specify either a symbol or a class."
     end
   end
-  
+
   # Decode a JSON string into Ruby.
   #
   # <b>Options</b>
   #
   # <tt>:symbolize_keys</tt> :: If true, will use symbols instead of strings for the keys.
   def decode(string, options = {})
-    engine.decode(string, options)
+    begin
+      engine.decode(string, options)
+    rescue StandardError => exception
+      raise DecodeError, exception.inspect
+    end
   end
-  
+
   # Encodes a Ruby object as JSON.
   def encode(object)
     engine.encode(object)
   end
-end
+end

data/lib/multi_json/engines/active_support.rb

@@ -3,16 +3,16 @@ require 'active_support' unless defined?(::ActiveSupport::JSON)
 module MultiJson
   module Engines
     # Use ActiveSupport to encode/decode JSON.
-    class ActiveSupport 
+    class ActiveSupport
       def self.decode(string, options = {}) #:nodoc:
         hash = ::ActiveSupport::JSON.decode(string)
         options[:symbolize_keys] ? symbolize_keys(hash) : hash
       end
-      
+
       def self.encode(object) #:nodoc:
         ::ActiveSupport::JSON.encode(object)
       end
-      
+
       def self.symbolize_keys(hash) #:nodoc:
         hash.inject({}){|result, (key, value)|
           new_key = case key
@@ -29,4 +29,4 @@ module MultiJson
       end
     end
   end
-end
+end

data/lib/multi_json/engines/json_gem.rb

@@ -9,10 +9,10 @@ module MultiJson
         opts[:symbolize_names] = options[:symbolize_keys]
         ::JSON.parse(string, opts)
       end
-      
+
       def self.encode(object) #:nodoc:
         object.to_json
       end
     end
   end
-end
+end

data/lib/multi_json/engines/json_pure.rb

@@ -9,10 +9,10 @@ module MultiJson
         opts[:symbolize_names] = options[:symbolize_keys]
         ::JSON.parse(string, opts)
       end
-      
+
       def self.encode(object) #:nodoc:
         object.to_json
       end
     end
   end
-end
+end

data/lib/multi_json/engines/yajl.rb

@@ -7,10 +7,10 @@ module MultiJson
       def self.decode(string, options = {}) #:nodoc:
         ::Yajl::Parser.new(:symbolize_keys => options[:symbolize_keys]).parse(string)
       end
-      
+
       def self.encode(object) #:nodoc:
         ::Yajl::Encoder.new.encode(object)
       end
     end
   end
-end
+end

data/lib/multi_json/version.rb

@@ -0,0 +1,3 @@
+module MultiJson
+  VERSION = "0.0.5"
+end

data/multi_json.gemspec

@@ -1,60 +1,27 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+require File.expand_path("../lib/multi_json/version", __FILE__)
 
 Gem::Specification.new do |s|
-  s.name = %q{multi_json}
-  s.version = "0.0.4"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  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.date = %q{2010-06-19}
   s.description = %q{A gem to provide swappable JSON backends utilizing Yajl::Ruby, the JSON gem, ActiveSupport, or JSON pure.}
-  s.email = %q{michael@intridea.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "Gemfile",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/multi_json.rb",
-     "lib/multi_json/engines/active_support.rb",
-     "lib/multi_json/engines/json_gem.rb",
-     "lib/multi_json/engines/json_pure.rb",
-     "lib/multi_json/engines/yajl.rb",
-     "multi_json.gemspec",
-     "spec/multi_json_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/intridea/multi_json}
+  s.summary = %q{A gem to provide swappable JSON backends.}
+  s.email = ["michael@intridea.com"]
+  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"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{A gem to provide swappable JSON backends.}
-  s.test_files = [
-    "spec/multi_json_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-    else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-  end
+  s.add_development_dependency("rake", "~> 0.8")
+  s.add_development_dependency("rcov", "~> 0.9")
+  s.add_development_dependency("rspec", "~> 2.0")
+  s.add_development_dependency("activesupport", "~> 3.0")
+  s.add_development_dependency("json", "~> 1.4")
+  s.add_development_dependency("json_pure", "~> 1.4")
+  s.add_development_dependency("yajl-ruby", "~> 0.7")
 end
 

data/spec/multi_json_spec.rb

@@ -4,7 +4,7 @@ class MockDecoder
   def self.decode(string, options = {})
     {'abc' => 'def'}
   end
-  
+
   def self.encode(string)
     '{"abc":"def"}'
   end
@@ -21,13 +21,13 @@ describe "MultiJson" do
       MultiJson.engine = :yajl
       MultiJson.engine.name.should == 'MultiJson::Engines::Yajl'
     end
-    
+
     it 'should be settable via a class' do
       MultiJson.engine = MockDecoder
       MultiJson.engine.name.should == 'MockDecoder'
     end
   end
-  
+
   %w(active_support json_gem json_pure yajl).each do |engine|
     context engine do
       before do
@@ -37,7 +37,7 @@ describe "MultiJson" do
           pending "Engine #{engine} couldn't be loaded (not installed?)"
         end
       end
-      
+
       describe '.encode' do
         it 'should write decodable JSON' do
           [
@@ -48,12 +48,18 @@ describe "MultiJson" do
           end
         end
       end
-      
+
       describe '.decode' do
-        it 'should properly decode some json' do
+        it 'should properly decode valid JSON' do
           MultiJson.decode('{"abc":"def"}').should == {'abc' => 'def'}
         end
-        
+
+        it 'should raise MultiJson::DecodeError on invalid JSON' do
+          lambda do
+            MultiJson.decode('{"abc"}')
+          end.should raise_error(MultiJson::DecodeError)
+        end
+
         it 'should allow for symbolization of keys' do
           MultiJson.decode('{"abc":{"def":"hgi"}}', :symbolize_keys => true).should == {:abc => {:def => 'hgi'}}
         end

data/spec/spec_helper.rb

@@ -1,16 +1,11 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'multi_json'
-require 'spec'
-require 'spec/autorun'
-require 'rubygems'
+require 'rspec'
+require 'rspec/autorun'
 begin
   require 'bundler'
   Bundler.setup
 rescue LoadError
   $stderr.puts "Bundler (or a dependency) not available."
 end
-
-Spec::Runner.configure do |config|
-  
-end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: multi_json
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -14,25 +15,117 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-19 00:00:00 -04:00
+date: 2010-11-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
+        - 0
+        - 8
+        version: "0.8"
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
+  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 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        version: "1.4"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: json_pure
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        version: "1.4"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: yajl-ruby
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 7
+        version: "0.7"
+  type: :development
+  version_requirements: *id007
 description: A gem to provide swappable JSON backends utilizing Yajl::Ruby, the JSON gem, ActiveSupport, or JSON pure.
-email: michael@intridea.com
+email: 
+- michael@intridea.com
 executables: []
 
 extensions: []
@@ -43,16 +136,18 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- .rspec
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - lib/multi_json.rb
 - lib/multi_json/engines/active_support.rb
 - lib/multi_json/engines/json_gem.rb
 - lib/multi_json/engines/json_pure.rb
 - lib/multi_json/engines/yajl.rb
+- lib/multi_json/version.rb
 - multi_json.gemspec
 - spec/multi_json_spec.rb
 - spec/spec.opts
@@ -67,26 +162,33 @@ rdoc_options:
 require_paths: 
 - lib
 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 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A gem to provide swappable JSON backends.
 test_files: 
 - spec/multi_json_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb

data/VERSION

@@ -1 +0,0 @@
-0.0.4