api_client 0.3.1 → 0.3.2

data/lib/api_client/connection/json.rb

@@ -0,0 +1,16 @@
+require 'faraday'
+
+# Exactly like Basic, but uses JSON encoding for request body
+# if applicable
+module ApiClient
+  module Connection
+    class Json < Basic
+      def finalize_handler
+        @handler.use     Middlewares::Request::Logger, ApiClient.logger if ApiClient.logger
+        @handler.use     Middlewares::Request::Json
+        @handler.use     Faraday::Request::UrlEncoded
+        @handler.adapter Faraday.default_adapter
+      end
+    end
+  end
+end

data/lib/api_client/connection/middlewares/request/json.rb

@@ -0,0 +1,37 @@
+require "faraday"
+require "yajl"
+
+class ApiClient::Connection::Middlewares::Request::Json < Faraday::Middleware
+  CONTENT_TYPE = "Content-Type".freeze
+
+  class << self
+    attr_accessor :mime_type
+  end
+  self.mime_type = "application/json".freeze
+
+  def call(env)
+    match_content_type(env) do |data|
+      params = Faraday::Utils::ParamsHash[data]
+      env[:body] = Yajl::Encoder.encode(params)
+    end
+    @app.call env
+  end
+
+  def match_content_type(env)
+    if process_request?(env)
+      env[:request_headers][CONTENT_TYPE] ||= self.class.mime_type
+      yield env[:body] unless env[:body].respond_to?(:to_str)
+    end
+  end
+
+  def process_request?(env)
+    type = request_type(env)
+    env[:body] and (type.empty? or type == self.class.mime_type)
+  end
+
+  def request_type(env)
+    type = env[:request_headers][CONTENT_TYPE].to_s
+    type = type.split(";", 2).first if type.index(";")
+    type
+  end
+end

data/lib/api_client/version.rb

@@ -1,3 +1,3 @@
 module ApiClient
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/api_client.rb

@@ -4,10 +4,10 @@ module ApiClient
     attr_accessor :logger
   end
 
-  autoload :Base,          "api_client/base"
-  autoload :Errors,        "api_client/errors"
-  autoload :Scope,         "api_client/scope"
-  autoload :Utils,         "api_client/utils"
+  autoload :Base,           "api_client/base"
+  autoload :Errors,         "api_client/errors"
+  autoload :Scope,          "api_client/scope"
+  autoload :Utils,          "api_client/utils"
 
   module Mixins
     autoload :ConnectionHooks, "api_client/mixins/connection_hooks"
@@ -34,11 +34,13 @@ module ApiClient
       module Request
         autoload :OAuth,  "api_client/connection/middlewares/request/oauth"
         autoload :Logger, "api_client/connection/middlewares/request/logger"
+        autoload :Json,   "api_client/connection/middlewares/request/json"
       end
     end
 
     autoload :Abstract, "api_client/connection/abstract"
     autoload :Basic,    "api_client/connection/basic"
+    autoload :Json,     "api_client/connection/json"
     autoload :Oauth,    "api_client/connection/oauth"
   end
 

data/spec/api_client/connection/request/json_spec.rb

@@ -0,0 +1,30 @@
+require "spec_helper"
+
+describe ApiClient::Connection::Middlewares::Request::Json do
+  let(:app) { mock }
+  let(:body) { {:some => :data} }
+  let(:env) do
+    {
+      :url => "http://api.twitter.com",
+      :request_headers => {},
+      :method => "post",
+      :body => body
+    }
+  end
+
+  subject { ApiClient::Connection::Middlewares::Request::Json.new(app) }
+
+  it "sets content type to json" do
+    app.should_receive(:call).
+      with(hash_including(:request_headers => {"Content-Type" => "application/json"}))
+
+    subject.call(env)
+  end
+
+  it "JSON encodes body" do
+    app.should_receive(:call).
+      with(hash_including(:body => Yajl::Encoder.encode(body)))
+
+    subject.call(env)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_client
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-06 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -83,6 +83,8 @@ files:
 - lib/api_client/base.rb
 - lib/api_client/connection/abstract.rb
 - lib/api_client/connection/basic.rb
+- lib/api_client/connection/json.rb
+- lib/api_client/connection/middlewares/request/json.rb
 - lib/api_client/connection/middlewares/request/logger.rb
 - lib/api_client/connection/middlewares/request/oauth.rb
 - lib/api_client/connection/oauth.rb
@@ -108,6 +110,7 @@ files:
 - spec/api_client/connection/abstract_spec.rb
 - spec/api_client/connection/basic_spec.rb
 - spec/api_client/connection/oauth_spec.rb
+- spec/api_client/connection/request/json_spec.rb
 - spec/api_client/connection/request/logger_spec.rb
 - spec/api_client/connection/request/oauth_spec.rb
 - spec/api_client/resource/base_spec.rb
@@ -152,6 +155,7 @@ test_files:
 - spec/api_client/connection/abstract_spec.rb
 - spec/api_client/connection/basic_spec.rb
 - spec/api_client/connection/oauth_spec.rb
+- spec/api_client/connection/request/json_spec.rb
 - spec/api_client/connection/request/logger_spec.rb
 - spec/api_client/connection/request/oauth_spec.rb
 - spec/api_client/resource/base_spec.rb