rufus-json 1.0.1 → 1.0.2

data/CHANGELOG.txt

@@ -2,6 +2,9 @@
 = rufus-json CHANGELOG.txt
 
 
+== rufus-json - 1.0.2    not yet released
+
+
 == rufus-json - 1.0.1    released 2011/06/01
 
 - require 'rufus-json/automatic' ('one require' rufus-json)

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2009-2011, John Mettraux, jmettraux@gmail.com
+Copyright (c) 2009-2012, 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

@@ -91,6 +91,7 @@ http://rufus.rubyforge.org
 == authors
 
 * John Mettraux, http://jmettraux.wordpress.com/
+* Torsten Schoenebaum, https://github.com/tosch
 
 
 == license

data/Rakefile

@@ -6,7 +6,7 @@ require 'rubygems/user_interaction' if Gem::RubyGemsVersion == '1.5.0'
 
 require 'rake'
 require 'rake/clean'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 
 #

data/lib/rufus/json.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2009-2011, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2009-2012, 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
@@ -22,16 +22,18 @@
 # Made in Japan.
 #++
 
+require 'ostruct'
+
 
 module Rufus
 module Json
 
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 
   # The JSON / JSON pure decoder
   #
-  JSON = [
-    lambda { |o, opts|
+  JSON = OpenStruct.new(
+    :encode => lambda { |o, opts|
       opts[:max_nesting] = false unless opts.has_key?(:max_nesting)
       if o.is_a?(Hash) or o.is_a?(Array)
         ::JSON.generate(o, opts)
@@ -39,35 +41,52 @@ module Json
         ::JSON.generate([ o ], opts).strip[1..-2]
       end
     },
-    lambda { |s| ::JSON.parse("[#{s}]", :max_nesting => nil).first },
-    lambda { ::JSON::ParserError }
-  ]
+    :pretty_encode => lambda { |o|
+      encode(
+        o,
+        :indent => '  ', :object_nl => "\n", :array_nl => "\n", :space => ' ')
+    },
+    :decode => lambda { |s|
+      ::JSON.parse("[#{s}]", :max_nesting => nil).first },
+    :error => lambda {
+      ::JSON::ParserError }
+  )
 
   # The Rails ActiveSupport::JSON decoder
   #
-  ACTIVE_SUPPORT = [
-    lambda { |o, opts| ActiveSupport::JSON.encode(o, opts) },
-    lambda { |s| decode_e(s) || ActiveSupport::JSON.decode(s) },
-    #lambda { ::ActiveSupport::JSON::ParseError }
-    lambda { RuntimeError }
-  ]
+  ACTIVE_SUPPORT = OpenStruct.new(
+    :encode => lambda { |o, opts|
+      ActiveSupport::JSON.encode(o, opts) },
+    :pretty_encode => lambda { |o|
+      ActiveSupport::JSON.encode(o) },
+    :decode => lambda { |s|
+      decode_e(s) || ActiveSupport::JSON.decode(s) },
+    :error => lambda {
+      RuntimeError }
+  )
   ACTIVE = ACTIVE_SUPPORT
 
   # http://github.com/brianmario/yajl-ruby/
   #
-  YAJL = [
-    lambda { |o, opts| Yajl::Encoder.encode(o, opts) },
-    lambda { |s| Yajl::Parser.parse(s) },
-    lambda { ::Yajl::ParseError }
-  ]
+  YAJL = OpenStruct.new(
+    :encode => lambda { |o, opts|
+      Yajl::Encoder.encode(o, opts) },
+    :pretty_encode => lambda { |o|
+      Yajl::Encoder.encode(o, :pretty => true, :indent => '  ') },
+    :decode => lambda { |s|
+      Yajl::Parser.parse(s) },
+    :error => lambda {
+      ::Yajl::ParseError }
+  )
 
   # The "raise an exception because there's no backend" backend
   #
-  NONE = [
-    lambda { |o, opts| raise 'no JSON backend found' },
-    lambda { |s| raise 'no JSON backend found' },
-    lambda { raise 'no JSON backend found' }
-  ]
+  NONE = OpenStruct.new(
+    :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.
@@ -151,21 +170,14 @@ module Json
   #
   def self.encode(o, opts={})
 
-    @backend[0].call(o, opts)
+    @backend.encode[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
+    @backend.pretty_encode[o]
   end
 
   # An alias for .encode
@@ -179,9 +191,9 @@ module Json
   #
   def self.decode(s)
 
-    @backend[1].call(s)
+    @backend.decode[s]
 
-  rescue @backend[2].call => e
+  rescue @backend.error[] => e
     raise ParserError.new(e.message)
   end
 

data/lib/rufus-json/automatic.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2009-2011, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2009-2012, 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/rufus-json.gemspec

@@ -1,19 +1,18 @@
-# encoding: utf-8
-
-require File.join(File.dirname(__FILE__), 'lib/rufus/json')
-  # bundler wants absolute path
-
 
 Gem::Specification.new do |s|
 
   s.name = 'rufus-json'
-  s.version = Rufus::Json::VERSION
+
+  s.version = File.read(
+    File.expand_path('../lib/rufus/json.rb', __FILE__)
+  ).match(/ VERSION *= *['"]([^'"]+)/)[1]
+
   s.platform = Gem::Platform::RUBY
   s.authors = [ 'John Mettraux', 'Torsten Schoenebaum' ]
   s.email = [ 'jmettraux@gmail.com' ]
   s.homepage = 'http://github.com/jmettraux/rufus-json'
   s.rubyforge_project = 'rufus'
-  s.summary = 'One interface to various JSON ruby libs (yajl, json, json_pure, json-jruby, active_support). Has a preference for yajl.'
+  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.

data/test/test.rb

@@ -21,7 +21,10 @@ def do_test(command)
   $result << ($?.exitstatus == 0 ? 'o' : 'X')
 end
 
-%w[ json active_support yajl json/pure ].each do |lib|
+LIBS = %w[ json active_support json/pure ]
+LIBS << 'yajl' if RUBY_PLATFORM != 'java'
+
+LIBS.each do |lib|
   do_test "#{R} #{P}/do_test.rb #{lib}"
 end
 
@@ -29,6 +32,8 @@ do_test "#{R} #{P}/backend_test.rb"
 
 puts
 puts
+puts '-' * 80
 puts $result
+puts '-' * 80
 puts
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-json
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - John Mettraux
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-01 00:00:00 +09:00
-default_executable: 
+date: 2012-05-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -113,7 +112,6 @@ files:
 - CREDITS.txt
 - LICENSE.txt
 - README.rdoc
-has_rdoc: true
 homepage: http://github.com/jmettraux/rufus-json
 licenses: []
 
@@ -143,9 +141,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rufus
-rubygems_version: 1.5.0
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: One interface to various JSON ruby libs (yajl, json, json_pure, json-jruby, active_support). Has a preference for yajl.
+summary: One interface to various JSON ruby libs, with a preference for yajl.
 test_files: []