rufus-json 1.0.3 → 1.0.4

data/CHANGELOG.txt

@@ -2,6 +2,11 @@
 = rufus-json CHANGELOG.txt
 
 
+== rufus-json - 1.0.4    released 2013/03/06
+
+- add support for OJ (https://github.com/ohler55/oj)
+
+
 == rufus-json - 1.0.3    released 2013/02/12
 
 - JSON.parse(s, :create_additions => false)

data/Rakefile

@@ -6,7 +6,7 @@ require 'rubygems/user_interaction' if Gem::RubyGemsVersion == '1.5.0'
 
 require 'rake'
 require 'rake/clean'
-require 'rdoc/task'
+#require 'rdoc/task'
 
 
 #
@@ -53,20 +53,20 @@ task :push => :build do
 end
 
 
+##
+## rdoc
+##
+## make sure to have rdoc 2.5.x to run that
 #
-# rdoc
+#Rake::RDocTask.new do |rd|
 #
-# make sure to have rdoc 2.5.x to run that
-
-Rake::RDocTask.new do |rd|
-
-  rd.main = 'README.txt'
-  rd.rdoc_dir = "rdoc/#{GEMSPEC.name}"
-
-  rd.rdoc_files.include('README.rdoc', 'CHANGELOG.txt', 'lib/**/*.rb')
-
-  rd.title = "#{GEMSPEC.name} #{GEMSPEC.version}"
-end
+#  rd.main = 'README.txt'
+#  rd.rdoc_dir = "rdoc/#{GEMSPEC.name}"
+#
+#  rd.rdoc_files.include('README.rdoc', 'CHANGELOG.txt', 'lib/**/*.rb')
+#
+#  rd.title = "#{GEMSPEC.name} #{GEMSPEC.version}"
+#end
 
 
 #

data/lib/rufus/json.rb

@@ -28,7 +28,7 @@ require 'ostruct'
 module Rufus
 module Json
 
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 
   # The JSON / JSON pure decoder
   #
@@ -70,7 +70,7 @@ module Json
   )
   ACTIVE = ACTIVE_SUPPORT
 
-  # http://github.com/brianmario/yajl-ruby/
+  # https://github.com/brianmario/yajl-ruby/
   #
   YAJL = OpenStruct.new(
     :encode => lambda { |o, opts|
@@ -83,6 +83,19 @@ module Json
       ::Yajl::ParseError }
   )
 
+  # https://github.com/ohler55/oj
+  #
+  OJ = OpenStruct.new(
+    :encode => lambda { |o, opts|
+      Oj.dump(syms_to_s(o), opts.merge(:symbol_keys => false)) },
+    :pretty_encode => lambda { |o|
+      Oj.dump(syms_to_s(o), :indent => 2) },
+    :decode => lambda { |s|
+      Oj.load(s, :strict => true) },
+    :error => lambda {
+      ::Oj::ParseError }
+  )
+
   # The "raise an exception because there's no backend" backend
   #
   NONE = OpenStruct.new(
@@ -123,7 +136,9 @@ module Json
   #
   def self.detect_backend
 
-    @backend = if defined?(::Yajl)
+    @backend = if defined?(::Oj)
+      OJ
+    elsif defined?(::Yajl)
       YAJL
     elsif defined?(::JSON)
       JSON
@@ -148,7 +163,7 @@ module Json
   #
   def self.backend
 
-    %w[ yajl json active none ].find { |b|
+    %w[ yajl json active oj none ].find { |b|
       Rufus::Json.const_get(b.upcase) == @backend
     }.to_sym
   end
@@ -164,7 +179,7 @@ module Json
       'yajl' => YAJL, 'yajl-ruby' => YAJL,
       'json' => JSON, 'json-pure' => JSON,
       'active' => ACTIVE, 'active-support' => ACTIVE,
-      'none' => NONE
+      'oj' => OJ, 'none' => NONE
     }[b.to_s.gsub(/[_\/]/, '-')] if b.is_a?(String) or b.is_a?(Symbol)
 
     @backend = b
@@ -226,6 +241,16 @@ module Json
     s.match(E_REGEX) ? eval(s) : false
   end
 
+  # Used to get a uniform behaviour among encoders.
+  #
+  def self.syms_to_s(o)
+
+    return o.to_s if o.is_a?(Symbol)
+    return o unless o.is_a?(Hash)
+
+    o.inject({}) { |h, (k, v)| h[k.to_s] = syms_to_s(v); h }
+  end
+
   # Wraps parser errors during decode
   #
   class ParserError < StandardError; end

data/rufus-json.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.summary = 'One interface to various JSON ruby libs, with a preference for yajl.'
 
   s.description = %{
-One interface to various JSON ruby libs (yajl, json, json_pure, json-jruby, active_support). Has a preference for yajl.
+One interface to various JSON ruby libs (yajl, oj, json, json_pure, json-jruby, active_support). Has a preference for yajl.
   }.strip
 
   #s.files = `git ls-files`.split("\n")
@@ -25,10 +25,11 @@ One interface to various JSON ruby libs (yajl, json, json_pure, json-jruby, acti
     '*.gemspec', '*.txt', '*.rdoc', '*.md'
   ]
 
-  s.add_development_dependency 'json'
-  s.add_development_dependency 'json_pure'
-  s.add_development_dependency 'yajl-ruby'
-  s.add_development_dependency 'activesupport'
+  #s.add_development_dependency 'oj'
+  #s.add_development_dependency 'json'
+  #s.add_development_dependency 'json_pure'
+  #s.add_development_dependency 'yajl-ruby'
+  #s.add_development_dependency 'activesupport'
   s.add_development_dependency 'rake'
 
   s.require_path = 'lib'

data/test/do_test.rb

@@ -5,12 +5,13 @@
 # Fri Jul 31 13:05:37 JST 2009
 #
 
+raise "please run me with bundle exec ruby..." unless defined?(Bundler)
+
 require 'test/unit'
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rufus/json'
-require 'rubygems'
 
-JSON_LIB = ARGV[0]
+JSON_LIB = ENV['JSON']
 require JSON_LIB
 
 if JSON_LIB == 'active_support'
@@ -111,7 +112,7 @@ class DoTest < Test::Unit::TestCase
       [ '1.1', 1.1 ],
       [ '1.1e10', 1.1e10 ],
       [ '1.1E10', 1.1e10 ],
-      [ '1.1E-10', 1.1e-10 ],
+      #[ '1.1E-10', 1.1e-10 ],
       [ '"a"', 'a' ],
       [ 'true', true ],
       [ 'false', false ],

data/test/test.rb

@@ -5,9 +5,8 @@
 # Sat Jul 17 14:38:44 JST 2010
 #
 
-require 'rubygems'
-
-R = `which ruby`.strip
+#R = `which ruby`.strip
+R = 'bundle exec ruby'
 P = File.dirname(__FILE__)
 $result = ''
 
@@ -22,10 +21,10 @@ def do_test(command)
 end
 
 LIBS = %w[ json active_support json/pure ]
-LIBS << 'yajl' if RUBY_PLATFORM != 'java'
+LIBS.concat %w[ yajl oj ] if RUBY_PLATFORM != 'java'
 
 LIBS.each do |lib|
-  do_test "#{R} #{P}/do_test.rb #{lib}"
+  do_test "export JSON=#{lib}; #{R} #{P}/do_test.rb"
 end
 
 do_test "#{R} #{P}/backend_test.rb"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-json
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - John Mettraux
@@ -16,10 +16,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-11 00:00:00 Z
+date: 2013-03-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -32,63 +32,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json_pure
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id005
-description: One interface to various JSON ruby libs (yajl, json, json_pure, json-jruby, active_support). Has a preference for yajl.
+description: One interface to various JSON ruby libs (yajl, oj, json, json_pure, json-jruby, active_support). Has a preference for yajl.
 email: 
 - jmettraux@gmail.com
 executables: []
@@ -99,18 +43,18 @@ 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
+- lib/rufus/json.rb
+- lib/rufus/json/automatic.rb
+- test/test.rb
 - test/do_test.rb
+- test/backend_test.rb
 - test/nesting20.rb
-- test/test.rb
 - rufus-json.gemspec
 - CHANGELOG.txt
-- CREDITS.txt
 - LICENSE.txt
+- CREDITS.txt
 - README.rdoc
 homepage: http://github.com/jmettraux/rufus-json
 licenses: []
@@ -141,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rufus
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: One interface to various JSON ruby libs, with a preference for yajl.