rufus-json 1.0.4 → 1.0.5

data/CHANGELOG.txt

@@ -2,6 +2,11 @@
 = rufus-json CHANGELOG.txt
 
 
+== rufus-json - 1.0.5    released 2013/08/03
+
+- ensure .dup stringifies keys when backend == NONE
+
+
 == rufus-json - 1.0.4    released 2013/03/06
 
 - add support for OJ (https://github.com/ohler55/oj)

data/Rakefile

@@ -1,8 +1,5 @@
 
-$:.unshift('.') # 1.9.2
-
 require 'rubygems'
-require 'rubygems/user_interaction' if Gem::RubyGemsVersion == '1.5.0'
 
 require 'rake'
 require 'rake/clean'
@@ -69,17 +66,17 @@ end
 #end
 
 
+##
+## upload_rdoc
 #
-# upload_rdoc
-
-desc %{
-  upload the rdoc to rubyforge
-}
-task :upload_rdoc => [ :clean, :rdoc ] do
-
-  account = 'jmettraux@rubyforge.org'
-  webdir = '/var/www/gforge-projects/rufus'
-
-  sh "rsync -azv -e ssh rdoc/#{GEMSPEC.name} #{account}:#{webdir}/"
-end
+#desc %{
+#  upload the rdoc to rubyforge
+#}
+#task :upload_rdoc => [ :clean, :rdoc ] do
+#
+#  account = 'jmettraux@rubyforge.org'
+#  webdir = '/var/www/gforge-projects/rufus'
+#
+#  sh "rsync -azv -e ssh rdoc/#{GEMSPEC.name} #{account}:#{webdir}/"
+#end
 

data/lib/rufus/json.rb

@@ -22,17 +22,15 @@
 # Made in Japan.
 #++
 
-require 'ostruct'
-
 
 module Rufus
 module Json
 
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 
   # The JSON / JSON pure decoder
   #
-  JSON = OpenStruct.new(
+  JSON = {
     :encode => lambda { |o, opts|
       opts[:max_nesting] = false unless opts.has_key?(:max_nesting)
       if o.is_a?(Hash) or o.is_a?(Array)
@@ -54,11 +52,11 @@ module Json
       ).first },
     :error => lambda {
       ::JSON::ParserError }
-  )
+  }
 
   # The Rails ActiveSupport::JSON decoder
   #
-  ACTIVE_SUPPORT = OpenStruct.new(
+  ACTIVE_SUPPORT = {
     :encode => lambda { |o, opts|
       ActiveSupport::JSON.encode(o, opts) },
     :pretty_encode => lambda { |o|
@@ -67,12 +65,12 @@ module Json
       decode_e(s) || ActiveSupport::JSON.decode(s) },
     :error => lambda {
       RuntimeError }
-  )
+  }
   ACTIVE = ACTIVE_SUPPORT
 
   # https://github.com/brianmario/yajl-ruby/
   #
-  YAJL = OpenStruct.new(
+  YAJL = {
     :encode => lambda { |o, opts|
       Yajl::Encoder.encode(o, opts) },
     :pretty_encode => lambda { |o|
@@ -81,11 +79,11 @@ module Json
       Yajl::Parser.parse(s) },
     :error => lambda {
       ::Yajl::ParseError }
-  )
+  }
 
   # https://github.com/ohler55/oj
   #
-  OJ = OpenStruct.new(
+  OJ = {
     :encode => lambda { |o, opts|
       Oj.dump(syms_to_s(o), opts.merge(:symbol_keys => false)) },
     :pretty_encode => lambda { |o|
@@ -94,16 +92,16 @@ module Json
       Oj.load(s, :strict => true) },
     :error => lambda {
       ::Oj::ParseError }
-  )
+  }
 
   # The "raise an exception because there's no backend" backend
   #
-  NONE = OpenStruct.new(
+  NONE = {
     :encode => lambda { |o, opts| raise 'no JSON backend found' },
     :pretty_encode => lambda { |o| raise 'no JSON backend found' },
     :decode => lambda { |s| raise 'no JSON backend found' },
     :error => 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.
@@ -189,14 +187,14 @@ module Json
   #
   def self.encode(o, opts={})
 
-    @backend.encode[o, opts]
+    @backend[:encode][o, opts]
   end
 
   # Pretty encoding
   #
   def self.pretty_encode(o)
 
-    @backend.pretty_encode[o]
+    @backend[:pretty_encode][o]
   end
 
   # An alias for .encode
@@ -210,9 +208,9 @@ module Json
   #
   def self.decode(s)
 
-    @backend.decode[s]
+    @backend[:decode][s]
 
-  rescue @backend.error[] => e
+  rescue @backend[:error][] => e
     raise ParserError.new(e.message)
   end
 
@@ -229,7 +227,11 @@ module Json
   #
   def self.dup(o)
 
-    (@backend == NONE) ? Marshal.load(Marshal.dump(o)) : decode(encode(o))
+    if @backend == NONE
+      syms_to_s(Marshal.load(Marshal.dump(o)))
+    else
+      decode(encode(o))
+    end
   end
 
   E_REGEX = /^\d+(\.\d+)?[eE][+-]?\d+$/

data/test/do_test.rb

@@ -8,6 +8,7 @@
 raise "please run me with bundle exec ruby..." unless defined?(Bundler)
 
 require 'test/unit'
+
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rufus/json'
 

data/test/no_backend_test.rb

@@ -0,0 +1,34 @@
+
+#
+# testing rufus-json
+#
+# Sat Aug  3 09:37:48 JST 2013
+#
+# Ishinomaki
+#
+
+require 'test/unit'
+
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rufus-json'
+
+
+class NoBackendTest < Test::Unit::TestCase
+
+  def test_dup
+
+    Rufus::Json.backend = :none
+
+    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' => [ 'nada', {}, [] ] } }, Rufus::Json.dup(d2))
+  end
+end
+

data/test/test.rb

@@ -8,6 +8,9 @@
 #R = `which ruby`.strip
 R = 'bundle exec ruby'
 P = File.dirname(__FILE__)
+
+load "#{P}/no_backend_test.rb"
+
 $result = ''
 
 def do_test(command)

metadata

@@ -1,47 +1,41 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rufus-json
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 1.0.5
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 4
-  version: 1.0.4
 platform: ruby
-authors: 
+authors:
 - John Mettraux
 - Torsten Schoenebaum
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-description: One interface to various JSON ruby libs (yajl, oj, json, json_pure, json-jruby, active_support). Has a preference for yajl.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !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.
+email:
 - jmettraux@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Rakefile
 - lib/rufus-json/automatic.rb
 - lib/rufus-json.rb
@@ -50,6 +44,7 @@ files:
 - test/test.rb
 - test/do_test.rb
 - test/backend_test.rb
+- test/no_backend_test.rb
 - test/nesting20.rb
 - rufus-json.gemspec
 - CHANGELOG.txt
@@ -58,36 +53,26 @@ files:
 - README.rdoc
 homepage: http://github.com/jmettraux/rufus-json
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rufus
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: One interface to various JSON ruby libs, with a preference for yajl.
 test_files: []
-