rufus-json 0.2.4 → 0.2.5

data/CHANGELOG.txt

@@ -2,6 +2,12 @@
 = rufus-json CHANGELOG.txt
 
 
+== rufus-json - 0.2.5    released 2010/08/10
+
+- Rufus::Json.encode(o) now accepting string, numbers, boolean and null
+  for any JSON backend (especially json and json-pure)
+
+
 == rufus-json - 0.2.4    released 2010/07/17
 
 - Rufus::Json.pretty_encode(o) (except for active_support)

data/lib/rufus/json.rb

@@ -26,14 +26,18 @@
 module Rufus
 module Json
 
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 
   # The JSON / JSON pure decoder
   #
   JSON = [
     lambda { |o, opts|
       opts[:max_nesting] = false unless opts.has_key?(:max_nesting)
-      ::JSON.generate(o, opts)
+      if o.is_a?(Hash) or o.is_a?(Array)
+        ::JSON.generate(o, opts)
+      else
+        ::JSON.generate([ o ], opts).strip[1..-2]
+      end
     },
     lambda { |s| ::JSON.parse("[#{s}]", :max_nesting => nil).first },
     lambda { ::JSON::ParserError }

data/rufus-json.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-json}
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   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-07-17}
+  s.date = %q{2010-08-10}
   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/do_test.rb

@@ -20,7 +20,7 @@ else
 end
 
 puts
-puts '  ' + Rufus::Json.backend.to_s.upcase
+puts "  #{Rufus::Json.backend.to_s.upcase} (#{JSON_LIB})"
 puts
 
 
@@ -33,6 +33,7 @@ class DoTest < Test::Unit::TestCase
 
     target = JSON_LIB.to_sym
     target = :active if target == :active_support
+    target = :json if JSON_LIB == 'json/pure'
 
     assert_equal target, Rufus::Json.backend
   end
@@ -47,13 +48,24 @@ class DoTest < Test::Unit::TestCase
     assert_equal "[1,2,3]", Rufus::Json.encode([ 1, 2, 3 ])
   end
 
+  def test_encode_value # instead of object or array
+
+    assert_equal 'null', Rufus::Json.encode(nil)
+    assert_equal 'true', Rufus::Json.encode(true)
+    assert_equal 'false', Rufus::Json.encode(false)
+    assert_equal '1.0', Rufus::Json.encode(1.0)
+    assert_equal '"Capitaine Haddock"', Rufus::Json.encode('Capitaine Haddock')
+  end
+
   def test_dup
 
     d0 = { 'id' => 'nada' }
     d1 = { :id => :nada }
+    #d2 = { :id => { :tree => [ 'nada', {}, [] ] } }
 
     assert_equal({ 'id' => 'nada' }, Rufus::Json.dup(d0))
     assert_equal({ 'id' => 'nada' }, Rufus::Json.dup(d1))
+    #assert_equal({ 'id' => 'tree' }, Rufus::Json.dup(d2))
   end
 
   def test_deep_nesting

data/test/test.rb

@@ -10,7 +10,7 @@ require 'rubygems'
 R = `which ruby`.strip
 P = File.dirname(__FILE__)
 
-%w[ json active_support yajl ].each do |lib|
+%w[ json active_support yajl json/pure ].each do |lib|
   puts
   puts '-' * 80
   puts "#{R} #{P}/do_test.rb #{lib}"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - John Mettraux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-17 00:00:00 +09:00
+date: 2010-08-10 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency