faraday 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/faraday.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{faraday}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["rick"]
-  s.date = %q{2010-01-02}
+  s.date = %q{2010-01-05}
   s.description = %q{HTTP/REST API client library with pluggable components}
   s.email = %q{technoweenie@gmail.com}
   s.extra_rdoc_files = [
@@ -30,6 +30,9 @@ Gem::Specification.new do |s|
      "lib/faraday/adapter/typhoeus.rb",
      "lib/faraday/connection.rb",
      "lib/faraday/error.rb",
+     "lib/faraday/loadable.rb",
+     "lib/faraday/request/post_request.rb",
+     "lib/faraday/request/yajl_request.rb",
      "lib/faraday/response.rb",
      "lib/faraday/response/yajl_response.rb",
      "lib/faraday/test_connection.rb",

data/lib/faraday.rb

@@ -21,7 +21,15 @@ module Faraday
     :Connection     => 'connection',
     :TestConnection => 'test_connection',
     :Response       => 'response',
-    :Error          => 'error'
+    :Error          => 'error',
+    :Loadable       => 'loadable'
+
+  module Request
+    extend AutoloadHelper
+    autoload_all 'faraday/request',
+      :YajlRequest => 'yajl_request',
+      :PostRequest => 'post_request'
+  end
 
   module Adapter
     extend AutoloadHelper

data/lib/faraday/adapter/mock_request.rb

@@ -17,27 +17,42 @@ module Faraday
           @stack.empty?
         end
 
-        def match(request_method, path, request_headers)
+        def match(request_method, path, data, request_headers)
           return false if !@stack.key?(request_method)
-          @stack[request_method].detect { |stub| stub.matches?(path, request_headers) }
+          stub = @stack[request_method].detect { |stub| stub.matches?(path, data, request_headers) }
+          @stack[request_method].delete(stub) if stub
         end
 
         def get(path, request_headers = {}, &block)
-          (@stack[:get] ||= []) << new_stub(path, request_headers, block)
+          (@stack[:get] ||= []) << new_stub(path, {}, request_headers, block)
         end
 
-        def new_stub(path, request_headers, block)
+        def delete(path, request_headers = {}, &block)
+          (@stack[:delete] ||= []) << new_stub(path, {}, request_headers, block)
+        end
+
+        def post(path, data, request_headers = {}, &block)
+          (@stack[:post] ||= []) << new_stub(path, data, request_headers, block)
+        end
+
+        def put(path, data, request_headers = {}, &block)
+          (@stack[:put] ||= []) << new_stub(path, data, request_headers, block)
+        end
+
+        def new_stub(path, data, request_headers, block)
           status, response_headers, body = block.call
-          Stub.new(path, request_headers, status, response_headers, body)
+          Stub.new(path, request_headers, status, response_headers, body, data)
         end
       end
 
-      class Stub < Struct.new(:path, :request_headers, :status, :response_headers, :body)
-        def matches?(request_path, headers)
+      class Stub < Struct.new(:path, :request_headers, :status, :response_headers, :body, :data)
+        def matches?(request_path, params, headers)
           return false if request_path != path
+          return false if params != data
+          return true  if request_headers.empty?
           request_headers.each do |key, value|
             return false if headers[key] != value
-          end
+          end 
           true
         end
       end
@@ -57,7 +72,41 @@ module Faraday
 
       def _get(uri, headers)
         raise ConnectionFailed, "no stubbed requests" if stubs.empty?
-        if stub = @stubs.match(:get, uri.path, headers)
+        if stub = @stubs.match(:get, uri.path, {}, headers)
+          response_class.new do |resp|
+            resp.headers = stub.response_headers
+            resp.process stub.body
+          end
+        else
+          nil
+        end
+      end
+
+      def _delete(uri, headers)
+        raise ConnectionFailed, "no stubbed requests" if stubs.empty?
+        if stub = @stubs.match(:delete, uri.path, {}, headers)
+          response_class.new do |resp|
+            resp.headers = stub.response_headers
+            resp.process stub.body
+          end
+        else
+          nil
+        end
+      end
+      def _post(uri, data, headers)
+        raise ConnectionFailed, "no stubbed requests" if stubs.empty?
+        if stub = @stubs.match(:post, uri.path, data, headers)
+          response_class.new do |resp|
+            resp.headers = stub.response_headers
+            resp.process stub.body
+          end
+        else
+          nil
+        end
+      end
+      def _put(uri, data, headers)
+        raise ConnectionFailed, "no stubbed requests" if stubs.empty?
+        if stub = @stubs.match(:put, uri.path, data, headers)
           response_class.new do |resp|
             resp.headers = stub.response_headers
             resp.process stub.body

data/lib/faraday/adapter/net_http.rb

@@ -1,15 +1,16 @@
 require 'net/http'
+require 'cgi'
 module Faraday
   module Adapter
     module NetHttp
       extend Faraday::Connection::Options
 
-      def _get(uri, request_headers)
+      def _perform(method, uri, data, request_headers)
         http = Net::HTTP.new(uri.host, uri.port)
         response_class.new do |resp|
-          http_resp = http.get(path_for(uri), request_headers) do |chunk|
-            resp.process(chunk)
-          end
+          http_resp = http.send_request(method, path_for(uri), data, request_headers)
+          raise Faraday::Error::ResourceNotFound if http_resp.code == '404'
+          resp.process http_resp.body
           http_resp.each_header do |key, value|
             resp.headers[key] = value
           end
@@ -17,6 +18,25 @@ module Faraday
       rescue Errno::ECONNREFUSED
         raise Faraday::Error::ConnectionFailed, "connection refused"
       end
+
+      def _put(uri, data, request_headers)
+        request = request_class.new(data, request_headers)
+        _perform('PUT', uri, request.body, request.headers)
+      end
+
+      def _post(uri, data, request_headers)
+        request = request_class.new(data, request_headers)
+        _perform('POST', uri, request.body, request.headers)
+      end
+
+      def _get(uri, request_headers)
+        _perform('GET', uri, uri.query, request_headers)
+      end
+
+      def _delete(uri, request_headers)
+        _perform('DELETE', uri, uri.query, request_headers)
+      end
+
     end
   end
 end

data/lib/faraday/adapter/typhoeus.rb

@@ -25,12 +25,32 @@ module Faraday
           @parallel_manager = nil
         end
         
+        def _post(uri, data, request_headers)
+          request = request_class.new(data, request_headers)
+          _perform(:post, uri, :headers => request.headers, :body => request.body)
+        end
+
         def _get(uri, request_headers)
+          _perform(:get, uri, :headers => request_headers)
+        end
+
+        def _put(uri, data, request_headers)
+          request = request_class.new(data, request_headers)
+          _perform(:put, uri, :headers => request.headers, :body => request.body)
+        end
+
+        def _delete(uri, request_headers)
+          _perform(:delete, uri, :headers => request_headers)
+        end
+
+        def _perform method, uri, params
           response_class.new do |resp|
             is_async = in_parallel?
             setup_parallel_manager
-            req      = ::Typhoeus::Request.new(uri.to_s, :headers => request_headers, :method => :get)
+            params[:method] = method
+            req      = ::Typhoeus::Request.new(uri.to_s, params)
             req.on_complete do |response|
+              raise Faraday::Error::ResourceNotFound if response.code == 404
               resp.process!(response.body)
               resp.headers = parse_response_headers(response.headers)
             end
@@ -42,6 +62,7 @@ module Faraday
         end
 
         def parse_response_headers(header_string)
+          return {} unless header_string # XXX
           Hash[*header_string.split(/\r\n/).
             tap  { |a|      a.shift           }. # drop the HTTP status line
             map! { |h|      h.split(/:\s+/,2) }. # split key and value

data/lib/faraday/connection.rb

@@ -38,6 +38,34 @@ module Faraday
       self.path_prefix = uri.path
     end
 
+
+    # Override in a subclass, or include an adapter
+    #
+    #   def _post(uri, post_params, headers)
+    #   end
+    #
+    def post(uri, params = {}, headers = {})
+      _post build_uri(uri), build_params(params), build_headers(headers)
+    end
+
+    # Override in a subclass, or include an adapter
+    #
+    #   def _put(uri, post_params, headers)
+    #   end
+    #
+    def put(uri, params = {}, headers = {})
+      _put build_uri(uri), build_params(params), build_headers(headers)
+    end
+
+    # Override in a subclass, or include an adapter
+    #
+    #   def _delete(uri, headers)
+    #   end
+    #
+    def delete(uri, params = {}, headers = {})
+      _delete build_uri(uri, build_params(params)), build_headers(headers)
+    end
+
     # Override in a subclass, or include an adapter
     #
     #   def _get(uri, headers)
@@ -48,6 +76,10 @@ module Faraday
       _get(uri, build_headers(headers))
     end
 
+    def request_class
+      @request_class || Request::PostRequest
+    end
+
     def response_class
       @response_class || Response
     end
@@ -59,6 +91,13 @@ module Faraday
       @response_class = v
     end
 
+    def request_class=(v)
+      if v.respond_to?(:loaded?) && !v.loaded?
+        raise ArgumentError, "The request class: #{v.inspect} does not appear to be loaded."
+      end
+      @request_class = v
+    end
+
     def in_parallel?
       !!@parallel_manager
     end

data/lib/faraday/error.rb

@@ -1,5 +1,6 @@
 module Faraday
   module Error
     class ConnectionFailed < StandardError; end
+    class ResourceNotFound < StandardError; end
   end
 end

data/lib/faraday/loadable.rb

@@ -0,0 +1,13 @@
+module Faraday
+  module Loadable
+    def self.extended mod
+      class << mod
+        attr_accessor :load_error
+      end
+    end
+
+    def self.loaded?
+      load_error.nil?
+    end
+  end
+end

data/lib/faraday/request/post_request.rb

@@ -0,0 +1,30 @@
+module Faraday
+  module Request
+    class PostRequest
+      extend Loadable
+
+      def initialize params, headers={}
+        @params = params
+        @headers = headers
+      end
+
+      def headers
+        @headers.merge('Content-Type' => 'application/x-www-form-urlencoded')
+      end
+
+      def body
+        create_post_params @params
+      end
+    
+     private
+      def create_post_params(params, base = "")
+        [].tap do |toreturn|
+          params.each_key do |key|
+            keystring = base == '' ? key : "#{base}[#{key}]"
+            toreturn << (params[key].kind_of?(Hash) ? create_post_params(params[key], keystring) : "#{keystring}=#{CGI.escape(params[key].to_s)}")
+          end
+        end.join('&')
+      end
+    end
+  end
+end

data/lib/faraday/request/yajl_request.rb

@@ -0,0 +1,27 @@
+module Faraday
+  module Request
+    class YajlRequest
+      extend Loadable
+
+      begin
+        require 'yajl'
+
+        def initialize params, headers={}
+          @params = params
+          @headers = headers
+        end
+
+        def headers
+          @headers.merge('Content-Type' => 'application/json')
+        end
+
+        # TODO streaming
+        def body
+          Yajl::Encoder.encode @params
+        end
+      rescue LoadError => e
+        self.load_error = e
+      end
+    end
+  end
+end

data/lib/faraday/response.rb

@@ -1,11 +1,6 @@
 module Faraday
   class Response < Struct.new(:headers, :body)
-    class << self
-      attr_accessor :load_error
-      def loaded?
-        !load_error
-      end
-    end
+    extend Loadable
 
     extend AutoloadHelper
     autoload_all 'faraday/response', 
@@ -40,4 +35,4 @@ module Faraday
       self.body = body.join if body.respond_to?(:join)
     end
   end
-end
+end

data/test/adapter_test.rb

@@ -6,11 +6,23 @@ class AdapterTest < Faraday::TestCase
   end
 
   Faraday::Adapter.loaded_adapters.each do |adapter|
-    describe "#get with #{adapter} adapter" do
+    describe "with #{adapter} adapter" do
       before do
         @connection.extend adapter
       end
 
+      describe "#delete" do
+        it "retrieves the response body with YajlResponse" do
+          @connection.response_class = Faraday::Response::YajlResponse
+          assert_equal({'deleted' => true},
+            @connection.delete('delete_with_json').body)
+        end
+        
+        it "send url-encoded params" do
+          assert_equal('foobar', @connection.delete('delete_with_params', 'deleted' => 'foobar').body)
+        end
+      end
+
       it "passes params" do
         @connection.params = {:a => 1}
         assert_equal "params[:a] == 1", @connection.get('params').body
@@ -25,13 +37,50 @@ class AdapterTest < Faraday::TestCase
         assert_equal 'hello world', @connection.get('hello_world').body
       end
 
-      it "retrieves the response body with YajlResponse" do
-        @connection.response_class = Faraday::Response::YajlResponse
-        assert_equal [1,2,3], @connection.get('json').body
+      describe "#put" do
+        it "sends params" do
+          assert_equal 'hello zack', @connection.put('hello', 'name' => 'zack').body
+        end
+
+        it "retrieves the response body with YajlResponse" do
+          @connection.response_class = Faraday::Response::YajlResponse
+          assert_equal({'name' => 'zack'},
+            @connection.put('echo_name', 'name' => 'zack').body)
+        end
       end
 
-      it "retrieves the response headers" do
-        assert_equal 'text/html', @connection.get('hello_world').headers['content-type']
+      describe "#post" do
+        it "sends params" do
+          assert_equal 'hello zack', @connection.post('hello', 'name' => 'zack').body
+        end
+
+        it "retrieves the response body with YajlResponse" do
+          @connection.response_class = Faraday::Response::YajlResponse
+          assert_equal({'name' => 'zack'},
+            @connection.post('echo_name', 'name' => 'zack').body)
+        end
+      end
+
+      describe "#get" do
+        it "raises on 404" do
+          assert_raise(Faraday::Error::ResourceNotFound) { @connection.get('/nothing') }
+        end
+        it "retrieves the response body" do
+          assert_equal 'hello world', @connection.get('hello_world').body
+        end
+
+        it "send url-encoded params" do
+          assert_equal('hello zack', @connection.get('hello', 'name' => 'zack').body)
+        end
+
+        it "retrieves the response body with YajlResponse" do
+          @connection.response_class = Faraday::Response::YajlResponse
+          assert_equal [1,2,3], @connection.get('json').body
+        end
+
+        it "retrieves the response headers" do
+          assert_equal 'text/html', @connection.get('hello_world').headers['content-type']
+        end
       end
     end
 

data/test/helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'context'
+require 'ruby-debug'
 if ENV['LEFTRIGHT']
   require 'leftright'
 end

data/test/live_server.rb

@@ -9,10 +9,39 @@ get '/json' do
   "[1,2,3]"
 end
 
+post '/hello' do
+  "hello #{params[:name]}"
+end
+
+get '/hello' do
+  "hello #{params[:name]}"
+end
+
+put '/hello' do
+  "hello #{params[:name]}"
+end
+
+post '/echo_name' do
+  %/{"name":#{params[:name].inspect}}/
+end
+
+put '/echo_name' do
+  %/{"name":#{params[:name].inspect}}/
+end
+
+delete '/delete_with_json' do
+  %/{"deleted":true}/
+end
+
+delete '/delete_with_params' do
+  params[:deleted]
+end
+
 get '/params' do
   %(params[:a] == #{params[:a]})
 end
 
 get "/headers" do
   %(env[HTTP_X_TEST] == #{env["HTTP_X_TEST"]})
-end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: faraday
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - rick
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-02 00:00:00 -08:00
+date: 2010-01-05 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +36,9 @@ files:
 - lib/faraday/adapter/typhoeus.rb
 - lib/faraday/connection.rb
 - lib/faraday/error.rb
+- lib/faraday/loadable.rb
+- lib/faraday/request/post_request.rb
+- lib/faraday/request/yajl_request.rb
 - lib/faraday/response.rb
 - lib/faraday/response/yajl_response.rb
 - lib/faraday/test_connection.rb