faraday 0.0.2 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/faraday.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{faraday}
-  s.version = "0.0.2"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["rick"]
-  s.date = %q{2009-12-19}
+  s.date = %q{2010-01-02}
   s.description = %q{HTTP/REST API client library with pluggable components}
   s.email = %q{technoweenie@gmail.com}
   s.extra_rdoc_files = [

data/lib/faraday.rb

@@ -1,21 +1,34 @@
 module Faraday
-  # Loads each autoloaded constant.  If thread safety is a concern, wrap
-  # this in a Mutex.
-  def self.load
-    constants.each do |const|
-      const_get(const) if autoload?(const)
+  module AutoloadHelper
+    def autoload_all(prefix, options)
+      options.each do |const_name, path|
+        autoload const_name, File.join(prefix, path)
+      end
+    end
+
+    # Loads each autoloaded constant.  If thread safety is a concern, wrap
+    # this in a Mutex.
+    def load
+      constants.each do |const|
+        const_get(const) if autoload?(const)
+      end
     end
   end
 
-  autoload :Connection,     'faraday/connection'
-  autoload :TestConnection, 'faraday/test_connection'
-  autoload :Response,       'faraday/response'
-  autoload :Error,          'faraday/error'
+  extend AutoloadHelper
+
+  autoload_all 'faraday', 
+    :Connection     => 'connection',
+    :TestConnection => 'test_connection',
+    :Response       => 'response',
+    :Error          => 'error'
 
   module Adapter
-    autoload :NetHttp,     'faraday/adapter/net_http'
-    autoload :Typhoeus,    'faraday/adapter/typhoeus'
-    autoload :MockRequest, 'faraday/adapter/mock_request'
+    extend AutoloadHelper
+    autoload_all 'faraday/adapter', 
+      :NetHttp     => 'net_http',
+      :Typhoeus    => 'typhoeus',
+      :MockRequest => 'mock_request'
 
     # Names of available adapters.  Should not actually load them.
     def self.adapters

data/lib/faraday/adapter/mock_request.rb

@@ -35,16 +35,19 @@ module Faraday
       class Stub < Struct.new(:path, :request_headers, :status, :response_headers, :body)
         def matches?(request_path, headers)
           return false if request_path != path
-          return true  if request_headers.empty?
           request_headers.each do |key, value|
-            return true if headers[key] == value
-          end 
-          false
+            return false if headers[key] != value
+          end
+          true
         end
       end
 
       def initialize &block
         super nil
+        configure(&block) if block
+      end
+
+      def configure
         yield stubs
       end
 

data/lib/faraday/adapter/net_http.rb

@@ -5,9 +5,9 @@ module Faraday
       extend Faraday::Connection::Options
 
       def _get(uri, request_headers)
-        http      = Net::HTTP.new(uri.host, uri.port)
+        http = Net::HTTP.new(uri.host, uri.port)
         response_class.new do |resp|
-          http_resp = http.get(uri.path, request_headers) do |chunk|
+          http_resp = http.get(path_for(uri), request_headers) do |chunk|
             resp.process(chunk)
           end
           http_resp.each_header do |key, value|

data/lib/faraday/connection.rb

@@ -12,18 +12,30 @@ module Faraday
 
     include Addressable
 
-    attr_accessor :host, :port, :scheme
+    attr_accessor :host, :port, :scheme, :params, :headers
     attr_reader   :path_prefix
 
-    def initialize(url = nil)
-      @response_class = nil
-      if url
-        uri              = URI.parse(url)
-        self.scheme      = uri.scheme
-        self.host        = uri.host
-        self.port        = uri.port
-        self.path_prefix = uri.path
+    # :url
+    # :params
+    # :headers
+    # :response
+    def initialize(url = nil, options = {})
+      if url.is_a?(Hash)
+        options = url
+        url     = options[:url]
       end
+      @response_class = options[:response]
+      @params         = options[:params]  || {}
+      @headers        = options[:headers] || {}
+      self.url_prefix = url if url
+    end
+
+    def url_prefix=(url)
+      uri              = URI.parse(url)
+      self.scheme      = uri.scheme
+      self.host        = uri.host
+      self.port        = uri.port
+      self.path_prefix = uri.path
     end
 
     # Override in a subclass, or include an adapter
@@ -31,8 +43,9 @@ module Faraday
     #   def _get(uri, headers)
     #   end
     #
-    def get(url, params = {}, headers = {})
-      _get(build_uri(url, params), headers)
+    def get(url, params = nil, headers = nil)
+      uri = build_uri(url, build_params(params))
+      _get(uri, build_headers(headers))
     end
 
     def response_class
@@ -49,16 +62,16 @@ module Faraday
     def in_parallel?
       !!@parallel_manager
     end
-    
+
     def in_parallel(options = {})
       @parallel_manager = true
       yield
       @parallel_manager = false
     end
-    
+
     def setup_parallel_manager(options = {})
     end
-    
+
     def run_parallel_requests
     end
 
@@ -70,7 +83,7 @@ module Faraday
       @path_prefix = value
     end
 
-    def build_uri(url, params = {})
+    def build_uri(url, params = nil)
       uri          = URI.parse(url)
       uri.scheme ||= @scheme
       uri.host   ||= @host
@@ -78,11 +91,35 @@ module Faraday
       if @path_prefix && uri.path !~ /^\//
         uri.path = "#{@path_prefix.size > 1 ? @path_prefix : nil}/#{uri.path}"
       end
-      query = params_to_query(params)
-      if !query.empty? then uri.query = query end
+      if params && !params.empty?
+        uri.query = params_to_query(params)
+      end
       uri
     end
 
+    def path_for(uri)
+      uri.path.tap do |s|
+        s << "?#{uri.query}"    if uri.query
+        s << "##{uri.fragment}" if uri.fragment
+      end
+    end
+
+    def build_params(existing)
+      build_hash :params, existing
+    end
+
+    def build_headers(existing)
+      build_hash(:headers, existing).tap do |headers|
+        headers.keys.each do |key|
+          headers[key] = headers.delete(key).to_s
+        end
+      end
+    end
+
+    def build_hash(method, existing)
+      existing ? send(method).merge(existing) : send(method)
+    end
+
     def params_to_query(params)
       params.inject([]) do |memo, (key, val)|
         memo << "#{escape_for_querystring(key)}=#{escape_for_querystring(val)}"
@@ -92,7 +129,7 @@ module Faraday
     # Some servers convert +'s in URL query params to spaces.
     # Go ahead and encode it.
     def escape_for_querystring(s)
-      URI.encode_component(s, Addressable::URI::CharacterClasses::QUERY).tap do |escaped|
+      URI.encode_component(s.to_s, Addressable::URI::CharacterClasses::QUERY).tap do |escaped|
         escaped.gsub! /\+/, "%2B"
       end
     end

data/lib/faraday/response.rb

@@ -7,7 +7,9 @@ module Faraday
       end
     end
 
-    autoload :YajlResponse, 'faraday/response/yajl_response'
+    extend AutoloadHelper
+    autoload_all 'faraday/response', 
+      :YajlResponse => 'yajl_response'
 
     def initialize(headers = nil, body = nil)
       super(headers || {}, body)

data/test/adapter_test.rb

@@ -11,6 +11,16 @@ class AdapterTest < Faraday::TestCase
         @connection.extend adapter
       end
 
+      it "passes params" do
+        @connection.params = {:a => 1}
+        assert_equal "params[:a] == 1", @connection.get('params').body
+      end
+
+      it "passes headers" do
+        @connection.headers = {"X-Test" => 1}
+        assert_equal "env[HTTP_X_TEST] == 1", @connection.get('headers').body
+      end
+
       it "retrieves the response body" do
         assert_equal 'hello world', @connection.get('hello_world').body
       end

data/test/connection_test.rb

@@ -31,6 +31,21 @@ class ConnectionTest < Faraday::TestCase
       conn = Faraday::Connection.new "http://sushi.com/fish"
       assert_equal '/fish', conn.path_prefix
     end
+
+    it "parses @path_prefix out of given url option" do
+      conn = Faraday::Connection.new :url => "http://sushi.com/fish"
+      assert_equal '/fish', conn.path_prefix
+    end
+
+    it "stores default params from options" do
+      conn = Faraday::Connection.new :params => {:a => 1}
+      assert_equal 1, conn.params[:a]
+    end
+
+    it "stores default headers from options" do
+      conn = Faraday::Connection.new :headers => {:a => 1}
+      assert_equal 1, conn.headers[:a]
+    end
   end
 
   describe "#build_uri" do

data/test/helper.rb

@@ -8,6 +8,12 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'faraday'
 
+begin
+  require 'ruby-debug'
+  Debugger.start
+rescue LoadError
+end
+
 module Faraday
   class TestCase < Test::Unit::TestCase
     LIVE_SERVER = 'http://localhost:4567'

data/test/live_server.rb

@@ -7,4 +7,12 @@ end
 
 get '/json' do
   "[1,2,3]"
+end
+
+get '/params' do
+  %(params[:a] == #{params[:a]})
+end
+
+get "/headers" do
+  %(env[HTTP_X_TEST] == #{env["HTTP_X_TEST"]})
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: faraday
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - rick
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-19 00:00:00 -08:00
+date: 2010-01-02 00:00:00 -08:00
 default_executable: 
 dependencies: []