rufus-json 0.2.1 → 0.2.2

data/CHANGELOG.txt

@@ -2,6 +2,11 @@
 = rufus-json CHANGELOG.txt
 
 
+== rufus-json - 0.2.2    released 2010/05/26
+
+- Unified Rufus::Json::ParserError (Torsten Schoenebaum)
+
+
 == rufus-json - 0.2.1    released 2010/05/03
 
 - ActiveSupport::JSON.encode(o) instead of o.to_json

data/Rakefile

@@ -31,7 +31,7 @@ One interface to various JSON ruby libs (yajl, json, json_pure, json-jruby, acti
   }
   gem.email = 'jmettraux@gmail.com'
   gem.homepage = 'http://github.com/jmettraux/rufus-json/'
-  gem.authors = [ 'John Mettraux' ]
+  gem.authors = [ 'John Mettraux', 'Torsten Schoenebaum' ]
   gem.rubyforge_project = 'rufus'
 
   gem.test_file = 'test/test.rb'
@@ -41,7 +41,9 @@ One interface to various JSON ruby libs (yajl, json, json_pure, json-jruby, acti
   gem.add_development_dependency 'activesupport'
   #gem.add_development_dependency 'json_pure'
   #gem.add_development_dependency 'json-jruby'
-  gem.add_development_dependency 'yard', '>= 0'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'yard'
+  gem.add_development_dependency 'jeweler'
 
   # gemspec spec : http://www.rubygems.org/read/chapter/20
 end

data/lib/rufus/json.rb

@@ -26,20 +26,22 @@
 module Rufus
 module Json
 
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 
   # The JSON / JSON pure decoder
   #
   JSON = [
     lambda { |o| o.to_json },
-    lambda { |s| ::JSON.parse(s, :max_nesting => nil) }
+    lambda { |s| ::JSON.parse(s, :max_nesting => nil) },
+    lambda { ::JSON::ParserError }
   ]
 
   # The Rails ActiveSupport::JSON decoder
   #
   ACTIVE_SUPPORT = [
     lambda { |o| ActiveSupport::JSON.encode(o) },
-    lambda { |s| ActiveSupport::JSON.decode(s) }
+    lambda { |s| ActiveSupport::JSON.decode(s) },
+    lambda { ::ActiveSupport::JSON::ParseError }
   ]
   ACTIVE = ACTIVE_SUPPORT
 
@@ -47,12 +49,17 @@ module Json
   #
   YAJL = [
     lambda { |o| Yajl::Encoder.encode(o) },
-    lambda { |s| Yajl::Parser.parse(s) }
+    lambda { |s| Yajl::Parser.parse(s) },
+    lambda { ::Yajl::ParseError }
   ]
 
   # The "raise an exception because there's no backend" backend
   #
-  NONE = [ lambda { |s| raise 'no JSON backend found' } ] * 2
+  NONE = [ 
+    lambda { |s| raise 'no JSON backend found' },
+    lambda { |s| raise 'no JSON backend found' },
+    lambda { raise 'no JSON backend found' }
+  ]
 
   # [Re-]Attempts to detect a JSON backend
   #
@@ -110,7 +117,13 @@ module Json
   #
   def self.decode (s)
 
-    @backend[1].call(s)
+    begin
+
+      @backend[1].call(s)
+
+    rescue @backend[2].call => e
+      raise ParserError, e.message
+    end
   end
 
   # Duplicates an object by turning it into JSON and back.
@@ -121,6 +134,10 @@ module Json
 
     (@backend == NONE) ? Marshal.load(Marshal.dump(o)) : decode(encode(o))
   end
+
+  # Wraps parser errors during decode
+  #
+  class ParserError < StandardError; end
 end
 end
 

data/rufus-json.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-json}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["John Mettraux"]
-  s.date = %q{2010-05-03}
+  s.authors = ["John Mettraux", "Torsten Schoenebaum"]
+  s.date = %q{2010-05-26}
   s.description = %q{
 One interface to various JSON ruby libs (yajl, json, json_pure, json-jruby, active_support). Has a preference for yajl.
   }
@@ -48,18 +48,24 @@ One interface to various JSON ruby libs (yajl, json, json_pure, json-jruby, acti
       s.add_development_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<yajl-ruby>, [">= 0"])
       s.add_development_dependency(%q<activesupport>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<yajl-ruby>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<yajl-ruby>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
 

data/test/test.rb

@@ -66,6 +66,11 @@ class JsonTest < Test::Unit::TestCase
     do_test_deep_nesting('json', Rufus::Json::JSON)
   end
 
+  def test_parser_error_json
+
+    do_test_parser_error('json', Rufus::Json::JSON)
+  end
+
   def test_decode_yajl
 
     do_test_decode('yajl', Rufus::Json::YAJL)
@@ -86,6 +91,11 @@ class JsonTest < Test::Unit::TestCase
     do_test_deep_nesting('yajl', Rufus::Json::YAJL)
   end
 
+  def test_parser_error_yajl
+
+    do_test_parser_error('yajl', Rufus::Json::YAJL)
+  end
+
   def test_decode_as
 
     do_test_decode('active_support', Rufus::Json::ACTIVE)
@@ -162,5 +172,17 @@ class JsonTest < Test::Unit::TestCase
     assert_equal(s, Rufus::Json.encode(h))
     assert_equal(h, Rufus::Json.decode(s))
   end
+
+  def do_test_parser_error (lib, cons)
+
+    require lib
+    Rufus::Json.backend = cons
+
+    s = '{foo:cx1234}'
+
+    assert_raise Rufus::Json::ParserError do
+      Rufus::Json.decode(s)
+    end
+  end
 end
 

metadata

@@ -5,16 +5,17 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - John Mettraux
+- Torsten Schoenebaum
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 +09:00
+date: 2010-05-26 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,7 +55,7 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: rake
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
@@ -65,6 +66,30 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: "\n\
   One interface to various JSON ruby libs (yajl, json, json_pure, json-jruby, active_support). Has a preference for yajl.\n  "
 email: jmettraux@gmail.com