rufus-json 1.0.0 → 1.0.1

data/CHANGELOG.txt

@@ -2,6 +2,12 @@
 = rufus-json CHANGELOG.txt
 
 
+== rufus-json - 1.0.1    released 2011/06/01
+
+- require 'rufus-json/automatic' ('one require' rufus-json)
+- Rufus::Json.load_backend(*order)
+
+
 == rufus-json - 1.0.0    released 2011/05/25
 
 - reaching 1.0.0 finally

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2009-2010, John Mettraux, jmettraux@gmail.com
+Copyright (c) 2009-2011, John Mettraux, jmettraux@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.rdoc

@@ -13,9 +13,11 @@ One interface for various JSON Ruby backends.
   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}'
 
 
@@ -45,6 +47,20 @@ There is a dup method, it may be useful in an all JSON system (flattening stuff
   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/

data/lib/rufus/json/automatic.rb

@@ -0,0 +1,3 @@
+
+require 'rufus-json/automatic'
+

data/lib/rufus/json.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2009-2010, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2009-2011, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,7 @@
 module Rufus
 module Json
 
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 
   # The JSON / JSON pure decoder
   #
@@ -69,6 +69,33 @@ module Json
     lambda { raise 'no JSON backend found' }
   ]
 
+  # In the given order, attempts to load a json lib and sets it as the
+  # backend of rufus-json.
+  #
+  # Returns the name of lib found if sucessful.
+  #
+  # Returns nil if no lib could be set.
+  #
+  # The default order / list of backends is yajl, active_support, json,
+  # json/pure. When specifying a custom order/list, unspecified backends
+  # won't be tried for.
+  #
+  def self.load_backend(*order)
+
+    order = %w[ yajl active_support json json/pure ] if order.empty?
+
+    order.each do |lib|
+      begin
+        require(lib)
+        Rufus::Json.backend = lib
+        return lib
+      rescue LoadError => le
+      end
+    end
+
+    nil
+  end
+
   # [Re-]Attempts to detect a JSON backend
   #
   def self.detect_backend
@@ -110,9 +137,12 @@ module Json
   #
   def self.backend=(b)
 
-    if b.is_a?(Symbol)
-      b = { :yajl => YAJL, :json => JSON, :active => ACTIVE, :none => NONE }[b]
-    end
+    b = {
+      'yajl' => YAJL, 'yajl-ruby' => YAJL,
+      'json' => JSON, 'json-pure' => JSON,
+      'active' => ACTIVE, 'active-support' => ACTIVE,
+      'none' => NONE
+    }[b.to_s.gsub(/[_\/]/, '-')] if b.is_a?(String) or b.is_a?(Symbol)
 
     @backend = b
   end

data/lib/rufus-json/automatic.rb

@@ -0,0 +1,28 @@
+#--
+# Copyright (c) 2009-2011, John Mettraux, jmettraux@gmail.com
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# Made in Japan.
+#++
+
+
+require 'rufus-json'
+Rufus::Json.load_backend
+

data/test/backend_test.rb

@@ -45,5 +45,37 @@ class BackendTest < Test::Unit::TestCase
 
     assert_equal :json, Rufus::Json.backend
   end
+
+  def test_set_backend_twist
+
+    require 'json/pure'
+
+    Rufus::Json.backend = 'json_pure'
+
+    assert_equal :json, Rufus::Json.backend
+  end
+
+  def test_load_backend
+
+    r = Rufus::Json.load_backend
+
+    assert_equal 'yajl', r
+    assert_equal :yajl, Rufus::Json.backend
+  end
+
+  def test_load_backend_with_different_order
+
+    r = Rufus::Json.load_backend('json', 'yajl')
+
+    assert_equal 'json', r
+    assert_equal :json, Rufus::Json.backend
+  end
+
+  def test_load_backend_with_missing_backend
+
+    r = Rufus::Json.load_backend('nada', 'nemo')
+
+    assert_nil r
+  end
 end
 

data/test/test.rb

@@ -9,16 +9,26 @@ require 'rubygems'
 
 R = `which ruby`.strip
 P = File.dirname(__FILE__)
+$result = ''
+
+def do_test(command)
 
-%w[ json active_support yajl json/pure ].each do |lib|
   puts
   puts '-' * 80
-  puts "#{R} #{P}/do_test.rb #{lib}"
-  puts `#{R} #{P}/do_test.rb #{lib}`
+  puts command
+  puts `#{command}`
+
+  $result << ($?.exitstatus == 0 ? 'o' : 'X')
 end
 
+%w[ json active_support yajl json/pure ].each do |lib|
+  do_test "#{R} #{P}/do_test.rb #{lib}"
+end
+
+do_test "#{R} #{P}/backend_test.rb"
+
+puts
+puts
+puts $result
 puts
-puts '-' * 80
-puts "#{R} #{P}/backend_test.rb"
-puts `#{R} #{P}/backend_test.rb`
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-json
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - John Mettraux
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 +09:00
+date: 2011-06-01 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,7 +100,9 @@ extra_rdoc_files: []
 
 files: 
 - Rakefile
+- lib/rufus/json/automatic.rb
 - lib/rufus/json.rb
+- lib/rufus-json/automatic.rb
 - lib/rufus-json.rb
 - test/backend_test.rb
 - test/do_test.rb