rufus-json 0.2.3 → 0.2.4

data/CHANGELOG.txt

@@ -2,6 +2,12 @@
 = rufus-json CHANGELOG.txt
 
 
+== rufus-json - 0.2.4    released 2010/07/17
+
+- Rufus::Json.pretty_encode(o) (except for active_support)
+- Rufus::Json.encode(o, opts={}) options are accessible
+
+
 == rufus-json - 0.2.3    released 2010/06/29
 
 - made sure we're able to parse any JSON string

data/lib/rufus/json.rb

@@ -26,12 +26,15 @@
 module Rufus
 module Json
 
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 
   # The JSON / JSON pure decoder
   #
   JSON = [
-    lambda { |o| o.to_json },
+    lambda { |o, opts|
+      opts[:max_nesting] = false unless opts.has_key?(:max_nesting)
+      ::JSON.generate(o, opts)
+    },
     lambda { |s| ::JSON.parse("[#{s}]", :max_nesting => nil).first },
     lambda { ::JSON::ParserError }
   ]
@@ -39,7 +42,7 @@ module Json
   # The Rails ActiveSupport::JSON decoder
   #
   ACTIVE_SUPPORT = [
-    lambda { |o| ActiveSupport::JSON.encode(o) },
+    lambda { |o, opts| ActiveSupport::JSON.encode(o, opts) },
     lambda { |s| decode_e(s) || ActiveSupport::JSON.decode(s) },
     #lambda { ::ActiveSupport::JSON::ParseError }
     lambda { RuntimeError }
@@ -49,7 +52,7 @@ module Json
   # http://github.com/brianmario/yajl-ruby/
   #
   YAJL = [
-    lambda { |o| Yajl::Encoder.encode(o) },
+    lambda { |o, opts| Yajl::Encoder.encode(o, opts) },
     lambda { |s| Yajl::Parser.parse(s) },
     lambda { ::Yajl::ParseError }
   ]
@@ -57,7 +60,7 @@ module Json
   # The "raise an exception because there's no backend" backend
   #
   NONE = [
-    lambda { |s| raise 'no JSON backend found' },
+    lambda { |o, opts| raise 'no JSON backend found' },
     lambda { |s| raise 'no JSON backend found' },
     lambda { raise 'no JSON backend found' }
   ]
@@ -103,28 +106,42 @@ module Json
   #
   def self.backend= (b)
 
-    b = { :yajl => YAJL, :json => JSON, :active => ACTIVE, :none => NONE }[b] \
-      if b.is_a?(Symbol)
+    if b.is_a?(Symbol)
+      b = { :yajl => YAJL, :json => JSON, :active => ACTIVE, :none => NONE }[b]
+    end
 
     @backend = b
   end
 
-  def self.encode (o)
+  # Encodes the given object to a JSON string.
+  #
+  def self.encode (o, opts={})
 
-    @backend[0].call(o)
+    @backend[0].call(o, opts)
+  end
+
+  # Pretty encoding
+  #
+  def self.pretty_encode (o)
+
+    case @backend
+      when JSON
+        encode(o, :indent => '  ', :object_nl => "\n", :array_nl => "\n", :space => ' ')
+      when YAJL
+        encode(o, :pretty => true, :indent => '  ')
+      else
+        encode(o)
+    end
   end
 
   # Decodes the given JSON string.
   #
   def self.decode (s)
 
-    begin
+    @backend[1].call(s)
 
-      @backend[1].call(s)
-
-    rescue @backend[2].call => e
-      raise ParserError, e.message
-    end
+  rescue @backend[2].call => e
+    raise ParserError.new(e.message)
   end
 
   # Duplicates an object by turning it into JSON and back.

data/rufus-json.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-json}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   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-06-29}
+  s.date = %q{2010-07-17}
   s.description = %q{
 One interface to various JSON ruby libs (yajl, json, json_pure, json-jruby, active_support). Has a preference for yajl.
   }
@@ -27,6 +27,8 @@ One interface to various JSON ruby libs (yajl, json, json_pure, json-jruby, acti
      "lib/rufus-json.rb",
      "lib/rufus/json.rb",
      "rufus-json.gemspec",
+     "test/backend_test.rb",
+     "test/do_test.rb",
      "test/nesting20.rb",
      "test/test.rb"
   ]

data/test/backend_test.rb

@@ -0,0 +1,49 @@
+
+#
+# testing rufus-json
+#
+# Fri Jul 31 13:05:37 JST 2009
+#
+
+require 'test/unit'
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rufus/json'
+require 'rubygems'
+
+
+class BackendTest < Test::Unit::TestCase
+
+  def setup
+    Rufus::Json.backend = Rufus::Json::NONE
+  end
+  #def teardown
+  #end
+
+  def test_no_backend
+
+    assert_raise RuntimeError do
+      Rufus::Json.decode('nada')
+    end
+  end
+
+  def test_get_backend
+
+    assert_equal :none, Rufus::Json.backend
+
+    require 'json'
+
+    Rufus::Json.detect_backend
+
+    assert_not_equal :none, Rufus::Json.backend
+  end
+
+  def test_set_backend
+
+    require 'json'
+
+    Rufus::Json.backend = :json
+
+    assert_equal :json, Rufus::Json.backend
+  end
+end
+

data/test/do_test.rb

@@ -0,0 +1,110 @@
+
+#
+# testing rufus-json
+#
+# Fri Jul 31 13:05:37 JST 2009
+#
+
+require 'test/unit'
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rufus/json'
+require 'rubygems'
+
+JSON_LIB = ARGV[0]
+require JSON_LIB
+
+if JSON_LIB == 'active_support'
+  Rufus::Json.backend = :active
+else
+  Rufus::Json.detect_backend
+end
+
+puts
+puts '  ' + Rufus::Json.backend.to_s.upcase
+puts
+
+
+class DoTest < Test::Unit::TestCase
+
+  #def setup
+  #end
+
+  def test_backend
+
+    target = JSON_LIB.to_sym
+    target = :active if target == :active_support
+
+    assert_equal target, Rufus::Json.backend
+  end
+
+  def test_decode
+
+    assert_equal [ 1, 2, 3 ], Rufus::Json.decode("[ 1, 2, 3 ]")
+  end
+
+  def test_encode
+
+    assert_equal "[1,2,3]", Rufus::Json.encode([ 1, 2, 3 ])
+  end
+
+  def test_dup
+
+    d0 = { 'id' => 'nada' }
+    d1 = { :id => :nada }
+
+    assert_equal({ 'id' => 'nada' }, Rufus::Json.dup(d0))
+    assert_equal({ 'id' => 'nada' }, Rufus::Json.dup(d1))
+  end
+
+  def test_deep_nesting
+
+    s = "{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{}}}}}}}}}}}}}}}}}}}}}}"
+
+    h = {}
+    p = h
+    (1..21).each do |i|
+      p['a'] = {}
+      p = p['a']
+    end
+
+    assert_equal(s, Rufus::Json.encode(h))
+    assert_equal(h, Rufus::Json.decode(s))
+  end
+
+  def test_parser_error
+
+    return if Rufus::Json.backend == :active
+
+    s = '{foo:cx1234}'
+
+    assert_raise Rufus::Json::ParserError do
+      p Rufus::Json.decode(s)
+    end
+  end
+
+  def test_json_atoms
+
+    [
+      [ '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
+
+  def test_pretty_encode
+
+    s = Rufus::Json.pretty_encode(
+      { 'a' => 'b', 'e' => [ 1, 2, 3 ], 'c' => { 'd' => true } })
+
+    assert(s.index("\n")) if JSON_LIB != 'active_support'
+  end
+end
+

data/test/test.rb

@@ -2,222 +2,23 @@
 #
 # testing rufus-json
 #
-# Fri Jul 31 13:05:37 JST 2009
+# Sat Jul 17 14:38:44 JST 2010
 #
 
-require 'test/unit'
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rufus/json'
 require 'rubygems'
 
+R = `which ruby`.strip
+P = File.dirname(__FILE__)
 
-class JsonTest < Test::Unit::TestCase
-
-  def setup
-    Rufus::Json.backend = Rufus::Json::NONE
-  end
-  #def teardown
-  #end
-
-  def test_no_backend
-
-    assert_raise RuntimeError do
-      Rufus::Json.decode('nada')
-    end
-  end
-
-  def test_get_backend
-
-    assert_equal :none, Rufus::Json.backend
-
-    require 'json'
-
-    Rufus::Json.detect_backend
-
-    assert_not_equal :none, Rufus::Json.backend
-  end
-
-  def test_set_backend
-
-    require 'json'
-
-    Rufus::Json.backend = :json
-
-    assert_equal :json, Rufus::Json.backend
-  end
-
-  def test_decode_json
-
-    do_test_decode('json', Rufus::Json::JSON)
-  end
-
-  def test_encode_json
-
-    do_test_encode('json', Rufus::Json::JSON)
-  end
-
-  def test_dup_json
-
-    do_test_dup('json', Rufus::Json::JSON)
-  end
-
-  def test_deep_nesting_json
-
-    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_json_atoms_json
-
-    do_test_json_atoms('json', Rufus::Json::JSON)
-  end
-
-  def test_decode_yajl
-
-    do_test_decode('yajl', Rufus::Json::YAJL)
-  end
-
-  def test_encode_yajl
-
-    do_test_encode('yajl', Rufus::Json::YAJL)
-  end
-
-  def test_dup_yajl
-
-    do_test_dup('yajl', Rufus::Json::YAJL)
-  end
-
-  def test_deep_nesting_yajl
-
-    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_json_atoms_yajl
-
-    do_test_json_atoms('yajl', Rufus::Json::YAJL)
-  end
-
-  def test_decode_as
-
-    do_test_decode('active_support', Rufus::Json::ACTIVE)
-  end
-
-  def test_encode_as
-
-    do_test_encode('active_support', Rufus::Json::ACTIVE)
-  end
-
-  def test_dup_as
-
-    do_test_dup('active_support', Rufus::Json::ACTIVE)
-  end
-
-  def test_deep_nesting_as
-
-    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)
-
-    require lib
-
-    assert_raise RuntimeError do
-      Rufus::Json.decode('nada')
-    end
-
-    Rufus::Json.backend = cons
-    assert_equal [ 1, 2, 3 ], Rufus::Json.decode("[ 1, 2, 3 ]")
-  end
-
-  def do_test_encode (lib, cons)
-
-    require lib
-
-    assert_raise RuntimeError do
-      Rufus::Json.encode('nada')
-    end
-
-    Rufus::Json.backend = cons
-    assert_equal "[1,2,3]", Rufus::Json.encode([ 1, 2, 3 ])
-  end
-
-  def do_test_dup (lib, cons)
-
-    require lib
-
-    d0 = { 'id' => 'nada' }
-    d1 = { :id => :nada }
-
-    Rufus::Json.backend = cons
-
-    assert_equal({ 'id' => 'nada' }, Rufus::Json.dup(d0))
-    assert_equal({ 'id' => 'nada' }, Rufus::Json.dup(d1))
-  end
-
-  def do_test_deep_nesting (lib, cons)
-
-    require lib
-    Rufus::Json.backend = cons
-
-    s = "{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{}}}}}}}}}}}}}}}}}}}}}}"
-
-    h = {}
-    p = h
-    (1..21).each do |i|
-      p['a'] = {}
-      p = p['a']
-    end
-
-    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
-
-  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
+%w[ json active_support yajl ].each do |lib|
+  puts
+  puts '-' * 80
+  puts "#{R} #{P}/do_test.rb #{lib}"
+  puts `#{R} #{P}/do_test.rb #{lib}`
 end
 
+puts
+puts '-' * 80
+puts "#{R} #{P}/backend_test.rb"
+puts `#{R} #{P}/backend_test.rb`
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - John Mettraux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 +09:00
+date: 2010-07-17 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,6 +109,8 @@ files:
 - lib/rufus-json.rb
 - lib/rufus/json.rb
 - rufus-json.gemspec
+- test/backend_test.rb
+- test/do_test.rb
 - test/nesting20.rb
 - test/test.rb
 has_rdoc: true