sawyer 0.0.3 → 0.0.4

data/lib/sawyer.rb

@@ -1,5 +1,5 @@
 module Sawyer
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 
   class Error < StandardError; end
 end
@@ -10,5 +10,6 @@ require 'set'
   resource
   relation
   response
+  serializer
   agent
 ).each { |f| require File.expand_path("../sawyer/#{f}", __FILE__) }

data/lib/sawyer/agent.rb

@@ -3,15 +3,38 @@ require 'uri_template'
 
 module Sawyer
   class Agent
-    NO_BODY = Set.new [:get, :head]
+    NO_BODY = Set.new([:get, :head])
+
+    class << self
+      attr_writer :serializer
+    end
+
+    def self.serializer
+      @serializer ||= Serializer.any_json
+    end
+
+    def self.encode(data)
+      serializer.encode(data)
+    end
+
+    def self.decode(data)
+      serializer.decode(data)
+    end
 
     # Agents handle making the requests, and passing responses to
     # Sawyer::Response.
     #
     # endpoint - String URI of the API entry point.
-    def initialize(endpoint, conn = nil)
+    # options  - Hash of options.
+    #            :faraday    - Optional Faraday::Connection to use.
+    #            :serializer - Optional serializer Class.  Defaults to
+    #                          self.serializer_class.
+    #
+    # Yields the Faraday::Connection if a block is given.
+    def initialize(endpoint, options = nil)
       @endpoint = endpoint
-      @conn     = conn || Faraday.new(endpoint)
+      @conn = (options && options[:faraday]) || Faraday.new(endpoint)
+      @serializer = (options && options[:serializer]) || self.class.serializer
       yield @conn if block_given?
     end
 
@@ -80,7 +103,7 @@ module Sawyer
     #
     # Returns a String.
     def encode_body(data)
-      Yajl.dump data
+      @serializer.encode(data)
     end
 
     # Decodes a String response body to a resource.
@@ -89,7 +112,7 @@ module Sawyer
     #
     # Returns an Object resource (Hash by default).
     def decode_body(str)
-      Yajl.load str, :symbolize_keys => true
+      @serializer.decode(str)
     end
 
     def expand_url(url, options = nil)

data/lib/sawyer/response.rb

@@ -1,5 +1,3 @@
-require 'yajl'
-
 module Sawyer
   class Response
     attr_reader :agent,

data/lib/sawyer/serializer.rb

@@ -0,0 +1,106 @@
+require 'date'
+require 'time'
+
+module Sawyer
+  class Serializer
+    def self.any_json
+      yajl || multi_json || json
+    end
+
+    def self.yajl
+      require 'yajl'
+      new(Yajl)
+    rescue LoadError
+    end
+
+    def self.json
+      require 'json'
+      new(JSON)
+    rescue LoadError
+    end
+
+    def self.multi_json
+      require 'multi_json'
+      new(MultiJson)
+    rescue LoadError
+    end
+
+    def self.message_pack
+      require 'msgpack'
+      new(MessagePack, :pack, :unpack)
+    rescue LoadError
+    end
+
+    # Public: Wraps a serialization format for Sawyer.  Nested objects are
+    # prepared for serialization (such as changing Times to ISO 8601 Strings).
+    # Any serialization format that responds to #dump and #load will work.
+    def initialize(format, dump_method_name = nil, load_method_name = nil)
+      @format = format
+      @dump = @format.method(dump_method_name || :dump)
+      @load = @format.method(load_method_name || :load)
+    end
+
+    # Public: Encodes an Object (usually a Hash or Array of Hashes).
+    #
+    # data - Object to be encoded.
+    #
+    # Returns an encoded String.
+    def encode(data)
+      @dump.call(encode_object(data))
+    end
+
+    # Public: Decodes a String into an Object (usually a Hash or Array of
+    # Hashes).
+    #
+    # data - An encoded String.
+    #
+    # Returns a decoded Object.
+    def decode(data)
+      return nil if data.nil? || data.empty?
+      decode_object(@load.call(data))
+    end
+
+    def encode_object(data)
+      case data
+      when Hash then encode_hash(data)
+      when Array then data.map { |o| encode_object(data) }
+      else data
+      end
+    end
+
+    def encode_hash(hash)
+      hash.keys.each do |key|
+        case value = hash[key]
+        when Date then hash[key] = value.to_time.utc.xmlschema
+        when Time then hash[key] = value.utc.xmlschema
+        end
+      end
+      hash
+    end
+
+    def decode_object(data)
+      case data
+      when Hash then decode_hash(data)
+      when Array then data.map { |o| decode_object(data) }
+      else data
+      end
+    end
+
+    def decode_hash(hash)
+      hash.keys.each do |key|
+        hash[key.to_sym] = decode_hash_value(key, hash.delete(key))
+      end
+      hash
+    end
+
+    def decode_hash_value(key, value)
+      if key =~ /^_(at|on)$/
+        Time.parse(value)
+      elsif value.is_a?(Hash)
+        decode_hash(value)
+      else
+        value
+      end
+    end
+  end
+end

data/sawyer.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'sawyer'
-  s.version           = '0.0.3'
-  s.date              = '2012-09-26'
+  s.version           = '0.0.4'
+  s.date              = '2012-09-27'
   s.rubyforge_project = 'sawyer'
 
   ## Make sure your summary is short. The description may be as long
@@ -37,7 +37,6 @@ Gem::Specification.new do |s|
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('faraday',      ['~> 0.8.4'])
   s.add_dependency('uri_template', ['~> 0.5.0'])
-  s.add_dependency('yajl-ruby',    ['~> 1.1.0'])
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
@@ -62,6 +61,7 @@ Gem::Specification.new do |s|
     lib/sawyer/relation.rb
     lib/sawyer/resource.rb
     lib/sawyer/response.rb
+    lib/sawyer/serializer.rb
     sawyer.gemspec
     test/agent_test.rb
     test/helper.rb

data/test/agent_test.rb

@@ -14,7 +14,7 @@ module Sawyer
       @stubs.get '/a/' do |env|
         assert_equal 'foo.com', env[:url].host
 
-        [200, {}, Yajl.dump(
+        [200, {}, Sawyer::Agent.encode(
           :_links => {
             :users => {:href => '/users'}})]
       end
@@ -38,7 +38,7 @@ module Sawyer
       @stubs.get '/a/' do |env|
         assert_equal 'foo.com', env[:url].host
 
-        [200, {}, Yajl.dump(
+        [200, {}, Sawyer::Agent.encode(
           :_links => {
             :users => {:href => '/users'}})]
       end

data/test/response_test.rb

@@ -9,7 +9,7 @@ module Sawyer
         conn.builder.handlers.delete(Faraday::Adapter::NetHttp)
         conn.adapter :test, @stubs do |stub|
           stub.get '/' do
-            [200, {'Content-Type' => 'application/json'}, Yajl.dump(
+            [200, {'Content-Type' => 'application/json'}, Sawyer::Agent.encode(
               :a => 1,
               :_links => {
                 :self => {:href => '/a', :method => 'POST'}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sawyer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -43,22 +43,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
 description: Secret User Agent of HTTP built on Faraday
 email: technoweenie@gmail.com
 executables: []
@@ -79,6 +63,7 @@ files:
 - lib/sawyer/relation.rb
 - lib/sawyer/resource.rb
 - lib/sawyer/response.rb
+- lib/sawyer/serializer.rb
 - sawyer.gemspec
 - test/agent_test.rb
 - test/helper.rb
@@ -97,6 +82,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3466190819871303014
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: