rufus-jig 0.1.7 → 0.1.8

data/CHANGELOG.txt

@@ -2,7 +2,12 @@
 = rufus-jig CHANGELOG.txt
 
 
-== rufus-jig - 0.1.7    not yet released
+== rufus-jig - 0.1.8    released 2009/12/25
+
+- using rufus-json
+
+
+== rufus-jig - 0.1.7    released 2009/12/23
 
 - implemented :force_json => true for services returning JSON in plain/text
 - :accept => :json as a shorcut for :accept -> 'application/json'

data/Rakefile

@@ -41,6 +41,8 @@ Jeweler::Tasks.new do |gem|
 
   #gem.add_dependency 'yajl-ruby'
   #gem.add_dependency 'json'
+  gem.add_dependency 'rufus-lru'
+  gem.add_dependency 'rufus-json'
   gem.add_development_dependency 'yard', '>= 0'
 
   # gemspec spec : http://www.rubygems.org/read/chapter/20

data/lib/rufus/jig/http.rb

@@ -248,7 +248,7 @@ module Rufus::Jig
 
       return data if data.nil? || data.is_a?(String)
 
-      return Rufus::Jig::Json.encode(data) \
+      return Rufus::Json.encode(data) \
         if (opts['Content-Type'] || '').match(/^application\/json/)
 
       data.to_s
@@ -269,7 +269,7 @@ module Rufus::Jig
       ct = response.headers['Content-Type']
 
       if opts[:force_json] || (ct && ct.match(/^application\/json/))
-        Rufus::Jig::Json.decode(b)
+        Rufus::Json.decode(b)
       else
         b
       end

data/lib/rufus/jig/version.rb

@@ -1,7 +1,7 @@
 
 module Rufus
 module Jig
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end
 end
 

data/lib/rufus/jig.rb

@@ -26,10 +26,11 @@
 module Rufus
 module Jig
 
+  require 'rufus/json'
+
   require 'rufus/jig/version'
 
   require 'rufus/jig/http'
-  require 'rufus/jig/json'
 
   autoload :Couch, 'rufus/jig/couch'
   autoload :CouchError, 'rufus/jig/couch'

data/rufus-jig.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-jig}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mettraux", "Kenneth Kalmer"]
-  s.date = %q{2009-12-24}
+  s.date = %q{2009-12-25}
   s.description = %q{
     Json Internet Get.
 
@@ -34,7 +34,6 @@ Gem::Specification.new do |s|
      "lib/rufus/jig.rb",
      "lib/rufus/jig/couch.rb",
      "lib/rufus/jig/http.rb",
-     "lib/rufus/jig/json.rb",
      "lib/rufus/jig/path.rb",
      "lib/rufus/jig/version.rb",
      "rufus-jig.gemspec",
@@ -67,11 +66,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rufus-lru>, [">= 0"])
+      s.add_runtime_dependency(%q<rufus-json>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
     else
+      s.add_dependency(%q<rufus-lru>, [">= 0"])
+      s.add_dependency(%q<rufus-json>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
     end
   else
+    s.add_dependency(%q<rufus-lru>, [">= 0"])
+    s.add_dependency(%q<rufus-json>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-jig
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - John Mettraux
@@ -10,9 +10,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-24 00:00:00 +09:00
+date: 2009-12-25 00:00:00 +09:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rufus-lru
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rufus-json
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: yard
   type: :development
@@ -44,7 +64,6 @@ files:
 - lib/rufus/jig.rb
 - lib/rufus/jig/couch.rb
 - lib/rufus/jig/http.rb
-- lib/rufus/jig/json.rb
 - lib/rufus/jig/path.rb
 - lib/rufus/jig/version.rb
 - rufus-jig.gemspec

data/lib/rufus/jig/json.rb

@@ -1,93 +0,0 @@
-#--
-# Copyright (c) 2009-2009, 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.
-#++
-
-
-module Rufus::Jig
-
-  #
-  # Dealing with multiple JSON libs. Favours yajl-ruby.
-  #
-  # Lifted from http://github.com/jmettraux/ruote
-  #
-  module Json
-
-    # The JSON / JSON pure decoder
-    #
-    JSON = [
-      lambda { |o| o.to_json },
-      lambda { |s| ::JSON.parse(s) }
-    ]
-
-    # The Rails ActiveSupport::JSON decoder
-    #
-    ACTIVE_SUPPORT = [
-      lambda { |o| o.to_json },
-      lambda { |s| ActiveSupport::JSON.decode(s) }
-    ]
-
-    # http://github.com/brianmario/yajl-ruby/
-    #
-    YAJL = [
-      lambda { |o| Yajl::Encoder.encode(o) },
-      lambda { |s| Yajl::Parser.parse(s) }
-    ]
-
-    # The "raise an exception because there's no backend" backend
-    #
-    NONE = [ lambda { |s| raise 'no JSON backend found' } ] * 2
-
-    @backend = if defined?(::Yajl)
-      YAJL
-    elsif defined?(::JSON)
-      JSON
-    elsif defined?(ActiveSupport::JSON)
-      ACTIVE_SUPPORT
-    else
-      NONE
-    end
-
-    # Forces a decoder JSON/ACTIVE_SUPPORT or any lambda pair that knows
-    # how to deal with JSON.
-    #
-    def self.backend= (b)
-
-      @backend = b
-    end
-
-    # Encodes the given object to JSON.
-    #
-    def self.encode (o)
-
-      @backend[0].call(o)
-    end
-
-    # Decodes the given JSON string.
-    #
-    def self.decode (s)
-
-      @backend[1].call(s)
-    end
-  end
-end
-