multi_json 0.0.3 → 0.0.4

data/Rakefile

@@ -14,25 +14,29 @@ begin
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
+
+  task :spec => :check_dependencies
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-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 :spec => :check_dependencies
+  Spec::Rake::SpecTask.new(:rcov) do |spec|
+    spec.libs << 'lib' << 'spec'
+    spec.pattern = 'spec/**/*_spec.rb'
+    spec.rcov = true
+  end
 
-task :default => :spec
+  task :default => :spec
+rescue LoadError
+  puts "RSpec (or a dependency) not available. Install it with: gem install rspec"
+end
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/multi_json.rb

@@ -7,6 +7,13 @@ module MultiJson
     self.engine = self.default_engine
     @engine
   end
+
+  REQUIREMENT_MAP = [
+    ["yajl", :yajl],
+    ["json", :json_gem],
+    ["active_support", :active_support],
+    ["json/pure", :json_pure]
+  ]
   
   # The default engine based on what you currently
   # have loaded and installed. First checks to see
@@ -16,11 +23,11 @@ module MultiJson
     return :yajl if defined?(::Yajl)
     return :json_gem if defined?(::JSON)
     return :active_support if defined?(::ActiveSupport::JSON)
-    
-    %w(yajl json active_support json/pure).each do |req|
+
+    REQUIREMENT_MAP.each do |(library, engine)|
       begin
-        require req
-        return req.sub('/','_').to_sym
+        require library
+        return engine
       rescue LoadError
         next
       end

data/multi_json.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{multi_json}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Bleigh"]
-  s.date = %q{2010-06-14}
+  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 = [
@@ -30,9 +30,9 @@ Gem::Specification.new do |s|
      "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",
-     "spec/x_to_json_spec.rb"
+     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/intridea/multi_json}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -40,8 +40,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{A gem to provide swappable JSON backends.}
   s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/x_to_json_spec.rb"
+    "spec/multi_json_spec.rb",
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/spec/{x_to_json_spec.rb → multi_json_spec.rb}

@@ -31,7 +31,11 @@ describe "MultiJson" do
   %w(active_support json_gem json_pure yajl).each do |engine|
     context engine do
       before do
-        MultiJson.engine = engine
+        begin
+          MultiJson.engine = engine
+        rescue LoadError
+          pending "Engine #{engine} couldn't be loaded (not installed?)"
+        end
       end
       
       describe '.encode' do

data/spec/spec_helper.rb

@@ -4,8 +4,12 @@ require 'multi_json'
 require 'spec'
 require 'spec/autorun'
 require 'rubygems'
-require 'bundler'
-Bundler.setup
+begin
+  require 'bundler'
+  Bundler.setup
+rescue LoadError
+  $stderr.puts "Bundler (or a dependency) not available."
+end
 
 Spec::Runner.configure do |config|
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-14 00:00:00 -04:00
+date: 2010-06-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,9 +54,9 @@ files:
 - 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
-- spec/x_to_json_spec.rb
 has_rdoc: true
 homepage: http://github.com/intridea/multi_json
 licenses: []
@@ -88,5 +88,5 @@ signing_key:
 specification_version: 3
 summary: A gem to provide swappable JSON backends.
 test_files: 
+- spec/multi_json_spec.rb
 - spec/spec_helper.rb
-- spec/x_to_json_spec.rb