rufus-json 1.0.5 → 1.0.6

data/CHANGELOG.txt

@@ -2,6 +2,11 @@
 = rufus-json CHANGELOG.txt
 
 
+== rufus-json - 1.0.5    released 2013/09/05
+
+- add support for JrJackson on JRuby (contribution by Nando Sola)
+
+
 == rufus-json - 1.0.5    released 2013/08/03
 
 - ensure .dup stringifies keys when backend == NONE

data/CREDITS.txt

@@ -1,5 +1,10 @@
 
 == authors
 
-John Mettraux - http://github.com/jmettraux
+John Mettraux - https://github.com/jmettraux
+Torsten Schoenebaum - https://github.com/tosch
+
+== contributors
+
+Nando Sola - https://github.com/nandosola - support for JrJackson
 

data/README.md

@@ -0,0 +1,93 @@
+
+# rufus-json
+
+One interface for various JSON Ruby backends.
+
+```ruby
+require 'rubygems'
+
+# load your favourite JSON backend
+require 'yajl'
+#require 'json'
+#require 'active_support'
+
+require 'rufus-json' # gem install rufus-json
+
+p Rufus::Json.decode('{"a":2,"b":true}')
+p Rufus::Json.load('{"a":2,"b":true}')
+  # => { 'a' => 2, 'b' => true }
+
+p Rufus::Json.encode({ 'a' => 2, 'b' => true })
+p Rufus::Json.dump({ 'a' => 2, 'b' => true })
+  # => '{"a":2,"b":true}'
+```
+
+If multiple libs are present, it will favour yajl-ruby and json, and then active_support. It's OK to force a backend.
+
+```
+Rufus::Json.backend = :yajl
+#Rufus::Json.backend = :json
+#Rufus::Json.backend = :active
+```
+
+To know if there is currently a backend set :
+
+```ruby
+Rufus::Json.has_backend?
+```
+
+It's OK to load a lib and force detection :
+
+```ruby
+require 'json'
+Rufus::Json.detect_backend
+
+p Rufus::Json.backend
+  # => :json
+```
+
+
+There is a dup method, it may be useful in an all JSON system (flattening stuff that will anyway get flattened later).
+
+```ruby
+o = Rufus::Json.dup(o)
+```
+
+
+### require 'rufus-json/automatic'
+
+```ruby
+require 'rufus-json/automatic'
+```
+
+will require 'rufus-json' and load the first JSON lib available (in the order yajl, oj, jrjackson, active_support, json, json/pure.
+
+It is equivalent to
+
+```ruby
+  require 'rufus-json'
+  Rufus::Json.load_backend
+```
+
+(the .load_backend method accepts a list/order of backends to try).
+
+
+## issue tracker
+
+http://github.com/jmettraux/rufus-json/issues
+
+
+## irc
+
+irc.freenode.net #ruote
+
+
+## authors
+
+see [CREDITS.txt](CREDITS.txt)
+
+
+## license
+
+MIT, see [LICENSE.txt](LICENSE.txt)
+

data/lib/rufus/json.rb

@@ -26,7 +26,7 @@
 module Rufus
 module Json
 
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 
   # The JSON / JSON pure decoder
   #
@@ -94,6 +94,19 @@ module Json
       ::Oj::ParseError }
   }
 
+  # https://github.com/guyboertje/jrjackson
+  #
+  JRJACKSON = {
+      :encode => lambda { |o, opts|
+        fix_raw_value(::JrJackson::Json.dump(syms_to_s(o))) },
+      :pretty_encode => lambda { |o|
+        fix_raw_value(::JrJackson::Json.dump(syms_to_s(o))) },
+      :decode => lambda { |s|
+        ::JrJackson::Json.load(s) },
+      :error => lambda {
+        ::JrJackson::ParseError }
+  }
+
   # The "raise an exception because there's no backend" backend
   #
   NONE = {
@@ -116,7 +129,8 @@ module Json
   #
   def self.load_backend(*order)
 
-    order = %w[ yajl active_support json json/pure ] if order.empty?
+    order =
+      %w[ yajl oj jrjackson active_support json json/pure ] if order.empty?
 
     order.each do |lib|
       begin
@@ -134,17 +148,20 @@ module Json
   #
   def self.detect_backend
 
-    @backend = if defined?(::Oj)
-      OJ
-    elsif defined?(::Yajl)
-      YAJL
-    elsif defined?(::JSON)
-      JSON
-    elsif defined?(ActiveSupport::JSON)
-      ACTIVE_SUPPORT
-    else
-      NONE
-    end
+    @backend =
+      if defined?(::JrJackson)
+        JRJACKSON
+      elsif defined?(::Oj)
+        OJ
+      elsif defined?(::Yajl)
+        YAJL
+      elsif defined?(::JSON)
+        JSON
+      elsif defined?(ActiveSupport::JSON)
+        ACTIVE_SUPPORT
+      else
+        NONE
+      end
   end
 
   detect_backend
@@ -161,7 +178,7 @@ module Json
   #
   def self.backend
 
-    %w[ yajl json active oj none ].find { |b|
+    %w[ yajl json active oj jrjackson none ].find { |b|
       Rufus::Json.const_get(b.upcase) == @backend
     }.to_sym
   end
@@ -173,12 +190,13 @@ module Json
   #
   def self.backend=(b)
 
-    b = {
-      'yajl' => YAJL, 'yajl-ruby' => YAJL,
-      'json' => JSON, 'json-pure' => JSON,
-      'active' => ACTIVE, 'active-support' => ACTIVE,
-      'oj' => OJ, 'none' => NONE
-    }[b.to_s.gsub(/[_\/]/, '-')] if b.is_a?(String) or b.is_a?(Symbol)
+    b =
+      {
+        'yajl' => YAJL, 'yajl-ruby' => YAJL,
+        'json' => JSON, 'json-pure' => JSON,
+        'active' => ACTIVE, 'active-support' => ACTIVE,
+        'oj' => OJ, 'jrjackson' => JRJACKSON, 'none' => NONE
+      }[b.to_s.gsub(/[_\/]/, '-')] if b.is_a?(String) or b.is_a?(Symbol)
 
     @backend = b
   end
@@ -253,6 +271,21 @@ module Json
     o.inject({}) { |h, (k, v)| h[k.to_s] = syms_to_s(v); h }
   end
 
+  # Used to handle parsers that do not support raw value encoding
+  # (i.e. JrJackson)
+  #
+  def self.fix_raw_value(o)
+
+    case o
+      when FalseClass, TrueClass, Fixnum, Float
+        o.to_s
+      when NilClass
+        'null'
+      else
+        o
+    end
+  end
+
   # Wraps parser errors during decode
   #
   class ParserError < StandardError; end

data/rufus-json.gemspec

@@ -12,10 +12,11 @@ Gem::Specification.new do |s|
   s.email = [ 'jmettraux@gmail.com' ]
   s.homepage = 'http://github.com/jmettraux/rufus-json'
   s.rubyforge_project = 'rufus'
+  s.license = 'MIT'
   s.summary = 'One interface to various JSON ruby libs, with a preference for yajl.'
 
   s.description = %{
-One interface to various JSON ruby libs (yajl, oj, json, json_pure, json-jruby, active_support). Has a preference for yajl.
+One interface to various JSON ruby libs (yajl, oj, jrjackson, json, json_pure, json-jruby, active_support). Has a preference for yajl.
   }.strip
 
   #s.files = `git ls-files`.split("\n")
@@ -25,6 +26,7 @@ One interface to various JSON ruby libs (yajl, oj, json, json_pure, json-jruby,
     '*.gemspec', '*.txt', '*.rdoc', '*.md'
   ]
 
+  #s.add_development_dependency 'jrjackson'
   #s.add_development_dependency 'oj'
   #s.add_development_dependency 'json'
   #s.add_development_dependency 'json_pure'

data/test/backend_test.rb

@@ -59,8 +59,13 @@ class BackendTest < Test::Unit::TestCase
 
     r = Rufus::Json.load_backend
 
-    assert_equal 'yajl', r
-    assert_equal :yajl, Rufus::Json.backend
+    if RUBY_PLATFORM == 'ruby'
+      assert_equal 'yajl', r
+      assert_equal :yajl, Rufus::Json.backend
+    elsif RUBY_PLATFORM == 'jruby'
+      assert_equal 'active_support', r
+      assert_equal :active, Rufus::Json.backend
+    end
   end
 
   def test_load_backend_with_different_order

data/test/do_test.rb

@@ -128,7 +128,7 @@ class DoTest < Test::Unit::TestCase
     s = Rufus::Json.pretty_encode(
       { 'a' => 'b', 'e' => [ 1, 2, 3 ], 'c' => { 'd' => true } })
 
-    assert(s.index("\n")) if JSON_LIB != 'active_support'
+    assert(s.index("\n")) if JSON_LIB != 'active_support' && JSON_LIB != 'jrjackson'  #no pretty encoding supported
   end
 end
 

data/test/test.rb

@@ -25,6 +25,7 @@ end
 
 LIBS = %w[ json active_support json/pure ]
 LIBS.concat %w[ yajl oj ] if RUBY_PLATFORM != 'java'
+LIBS.concat %w[ jrjackson ] if RUBY_PLATFORM == 'java'
 
 LIBS.each do |lib|
   do_test "export JSON=#{lib}; #{R} #{P}/do_test.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rufus-json
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-03 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -28,8 +28,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: One interface to various JSON ruby libs (yajl, oj, json, json_pure, json-jruby,
-  active_support). Has a preference for yajl.
+description: One interface to various JSON ruby libs (yajl, oj, jrjackson, json, json_pure,
+  json-jruby, active_support). Has a preference for yajl.
 email:
 - jmettraux@gmail.com
 executables: []
@@ -50,9 +50,10 @@ files:
 - CHANGELOG.txt
 - LICENSE.txt
 - CREDITS.txt
-- README.rdoc
+- README.md
 homepage: http://github.com/jmettraux/rufus-json
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:

data/README.rdoc

@@ -1,100 +0,0 @@
-
-= rufus-json
-
-One interface for various JSON Ruby backends.
-
-  require 'rubygems'
-
-  # load your favourite JSON backend
-  require 'yajl'
-  #require 'json'
-  #require 'active_support'
-
-  require 'rufus-json' # gem install rufus-json
-
-  p Rufus::Json.decode('{"a":2,"b":true}')
-  p Rufus::Json.load('{"a":2,"b":true}')
-    # => { 'a' => 2, 'b' => true }
-
-  p Rufus::Json.encode({ 'a' => 2, 'b' => true })
-  p Rufus::Json.dump({ 'a' => 2, 'b' => true })
-    # => '{"a":2,"b":true}'
-
-
-If multiple libs are present, it will favour yajl-ruby and json, and then active_support. It's OK to force a backend.
-
-  Rufus::Json.backend = :yajl
-  #Rufus::Json.backend = :json
-  #Rufus::Json.backend = :active
-
-
-To know if there is currently a backend set :
-
-  Rufus::Json.has_backend?
-
-
-It's OK to load a lib and force detection :
-
-  require 'json'
-  Rufus::Json.detect_backend
-
-  p Rufus::Json.backend
-    # => :json
-
-
-There is a dup method, it may be useful in an all JSON system (flattening stuff that will anyway get flattened later).
-
-  o = Rufus::Json.dup(o)
-
-
-=== require 'rufus-json/automatic'
-
-  require 'rufus-json/automatic'
-
-will require 'rufus-json' and load the first JSON lib available (in the order yajl, active_support, json, json/pure.
-
-It is equivalent to
-
-  require 'rufus-json'
-  Rufus::Json.load_backend
-
-(the .load_backend method accepts a list/order of backends to try).
-
-
-== rdoc
-
-http://rufus.rubyforge.org/rufus-json/
-
-
-== mailing list
-
-On the rufus-ruby list :
-
-http://groups.google.com/group/rufus-ruby
-
-
-== issue tracker
-
-http://github.com/jmettraux/rufus-json/issues
-
-
-== irc
-
-  irc.freenode.net #ruote
-
-
-== the rest of Rufus
-
-http://rufus.rubyforge.org
-
-
-== authors
-
-* John Mettraux, http://jmettraux.wordpress.com/
-* Torsten Schoenebaum, https://github.com/tosch
-
-
-== license
-
-MIT
-