rufus-json 0.2.2 → 0.2.3

data/CHANGELOG.txt

@@ -2,6 +2,12 @@
 = rufus-json CHANGELOG.txt
 
 
+== rufus-json - 0.2.3    released 2010/06/29
+
+- made sure we're able to parse any JSON string
+  ('json' couldn't parse "true", '"string"' or "12345" on their own)
+
+
 == rufus-json - 0.2.2    released 2010/05/26
 
 - Unified Rufus::Json::ParserError (Torsten Schoenebaum)

data/lib/rufus/json.rb

@@ -26,13 +26,13 @@
 module Rufus
 module Json
 
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 
   # 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).first },
     lambda { ::JSON::ParserError }
   ]
 
@@ -40,8 +40,9 @@ module Json
   #
   ACTIVE_SUPPORT = [
     lambda { |o| ActiveSupport::JSON.encode(o) },
-    lambda { |s| ActiveSupport::JSON.decode(s) },
-    lambda { ::ActiveSupport::JSON::ParseError }
+    lambda { |s| decode_e(s) || ActiveSupport::JSON.decode(s) },
+    #lambda { ::ActiveSupport::JSON::ParseError }
+    lambda { RuntimeError }
   ]
   ACTIVE = ACTIVE_SUPPORT
 
@@ -55,7 +56,7 @@ module Json
 
   # The "raise an exception because there's no backend" backend
   #
-  NONE = [ 
+  NONE = [
     lambda { |s| raise 'no JSON backend found' },
     lambda { |s| raise 'no JSON backend found' },
     lambda { raise 'no JSON backend found' }
@@ -135,6 +136,15 @@ module Json
     (@backend == NONE) ? Marshal.load(Marshal.dump(o)) : decode(encode(o))
   end
 
+  E_REGEX = /^\d+(\.\d+)?[eE][+-]?\d+$/
+
+  # Let's ActiveSupport do the E number notation.
+  #
+  def self.decode_e (s)
+
+    s.match(E_REGEX) ? eval(s) : false
+  end
+
   # Wraps parser errors during decode
   #
   class ParserError < StandardError; end

data/rufus-json.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-json}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mettraux", "Torsten Schoenebaum"]
-  s.date = %q{2010-05-26}
+  s.date = %q{2010-06-29}
   s.description = %q{
 One interface to various JSON ruby libs (yajl, json, json_pure, json-jruby, active_support). Has a preference for yajl.
   }

data/test/test.rb

@@ -71,6 +71,11 @@ class JsonTest < Test::Unit::TestCase
     do_test_parser_error('json', Rufus::Json::JSON)
   end
 
+  def test_json_atoms_json
+
+    do_test_json_atoms('json', Rufus::Json::JSON)
+  end
+
   def test_decode_yajl
 
     do_test_decode('yajl', Rufus::Json::YAJL)
@@ -96,6 +101,11 @@ class JsonTest < Test::Unit::TestCase
     do_test_parser_error('yajl', Rufus::Json::YAJL)
   end
 
+  def test_json_atoms_yajl
+
+    do_test_json_atoms('yajl', Rufus::Json::YAJL)
+  end
+
   def test_decode_as
 
     do_test_decode('active_support', Rufus::Json::ACTIVE)
@@ -116,6 +126,11 @@ class JsonTest < Test::Unit::TestCase
     do_test_deep_nesting('active_support', Rufus::Json::ACTIVE)
   end
 
+  def test_json_atoms_as
+
+    do_test_json_atoms('active_support', Rufus::Json::ACTIVE)
+  end
+
   protected
 
   def do_test_decode (lib, cons)
@@ -184,5 +199,25 @@ class JsonTest < Test::Unit::TestCase
       Rufus::Json.decode(s)
     end
   end
+
+  def do_test_json_atoms (lib, cons)
+
+    require lib
+    Rufus::Json.backend = cons
+
+    [
+      [ '1', 1 ],
+      [ '1.1', 1.1 ],
+      [ '1.1e10', 1.1e10 ],
+      [ '1.1E10', 1.1e10 ],
+      [ '1.1E-10', 1.1e-10 ],
+      [ '"a"', 'a' ],
+      [ 'true', true ],
+      [ 'false', false ],
+      [ 'null', nil ]
+    ].each do |s, v|
+      assert_equal v, Rufus::Json.decode(s)
+    end
+  end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - John Mettraux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 +09:00
+date: 2010-06-29 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency