faraday 0.2.4 → 0.3.0

data/README.rdoc

@@ -30,7 +30,7 @@ This mess is gonna get raw, like sushi. So, haters to the left.
 
   # It's possible to define stubbed request outside a test adapter block.
   stubs = Faraday::Test::Stubs.new do |stub|
-    stub.get('/tamago') { [200, {}, 'egg' }
+    stub.get('/tamago') { [200, {}, 'egg'] }
   end
 
   # You can pass stubbed request to the test adapter or define them in a block

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0

data/faraday.gemspec

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

data/lib/faraday/builder.rb

@@ -1,31 +1,40 @@
 module Faraday
   # Possibly going to extend this a bit.
   #
-  # Faraday::Connection.new(:url => 'http://sushi.com') do
-  #   request  :yajl     # Faraday::Request::Yajl
-  #   adapter  :logger   # Faraday::Adapter::Logger
-  #   response :yajl     # Faraday::Response::Yajl
+  # Faraday::Connection.new(:url => 'http://sushi.com') do |b|
+  #   b.request  :yajl     # Faraday::Request::Yajl
+  #   b.adapter  :logger   # Faraday::Adapter::Logger
+  #   b.response :yajl     # Faraday::Response::Yajl
   # end
   class Builder
     attr_accessor :handlers
 
-    def self.create_with_inner_app(&block)
-      inner = lambda do |env| 
-        if !env[:parallel_manager]
-          env[:response].finish(env)
-        else
-          env[:response]
-        end
+    def self.create(&block)
+      Builder.new(&block)
+    end
+
+    def self.inner_app
+      lambda do |env| 
+        env[:parallel_manager] ? env[:response] : env[:response].finish(env)
       end
-      Builder.new(&block).tap { |builder| builder.run(inner) }
     end
 
-    def initialize
-      @handlers = []
-      yield self
+    def initialize(handlers = [], &block)
+      @handlers = handlers
+      build(&block) if block_given?
+    end
+
+    def build(&block)
+      block.call(self)
+      run(self.class.inner_app)
+    end
+
+    def [](index)
+      # @handlers are stored in reverse order
+      @handlers[-(index+1)]
     end
 
-    def run app
+    def run(app)
       @handlers.unshift app
     end
 
@@ -34,8 +43,8 @@ module Faraday
       @handlers[1..-1].inject(inner_app) { |app, middleware| middleware.call(app) }
     end
 
-    def use klass, *args, &block
-      @handlers.unshift(lambda { |app| klass.new(app, *args, &block) })
+    def use(klass, *args, &block)
+      run(lambda { |app| klass.new(app, *args, &block) })
     end
 
     def request(key, *args, &block)
@@ -53,5 +62,13 @@ module Faraday
     def use_symbol(mod, key, *args, &block)
       use mod.lookup_module(key), *args, &block
     end
+
+    def ==(other)
+      other.is_a?(self.class) && @handlers == other.handlers
+    end
+
+    def dup
+      self.class.new @handlers.dup
+    end
   end
 end

data/lib/faraday/connection.rb

@@ -33,10 +33,16 @@ module Faraday
       merge_params  @params,  options[:params]  if options[:params]
       merge_headers @headers, options[:headers] if options[:headers]
       if block
-        @builder = Builder.create_with_inner_app(&block)
+        @builder = Builder.create(&block)
+      else
+        @builder = options[:builder] || Builder.new
       end
     end
 
+    def build(&block)
+      @builder.build(&block)
+    end
+
     def get(url = nil, headers = nil, &block)
       run_request :get, url, nil, headers, &block
     end
@@ -141,6 +147,10 @@ module Faraday
       uri
     end
 
+    def dup
+      self.class.new(build_url(''), :headers => headers.dup, :params => params.dup, :builder => builder.dup)
+    end
+
     def replace_query(uri, params)
       url_params = @params.dup
       if uri.query && !uri.query.empty?

data/test/connection_app_test.rb

@@ -35,11 +35,26 @@ class TestConnectionApps < Faraday::TestCase
   end
 
   def test_builder_adds_middleware_to_builder_stack
-    assert_kind_of TestMiddleWare, @conn.builder.handlers[2].call(nil)
-    assert_kind_of TestAdapter,    @conn.builder.handlers[1].call(nil)
+    assert_kind_of TestMiddleWare, @conn.builder[0].call(nil)
+    assert_kind_of TestAdapter,    @conn.builder[1].call(nil)
   end
 
   def test_to_app_returns_rack_object
     assert @conn.to_app.respond_to?(:call)
   end
+
+  def test_builder_is_passed_to_new_faraday_connection
+    new_conn = Faraday::Connection.new :builder => @conn.builder
+    assert_equal @conn.builder, new_conn.builder
+  end
+
+  def test_builder_is_built_on_new_faraday_connection
+    new_conn = Faraday::Connection.new
+    new_conn.build do |b|
+      b.run @conn.builder[0]
+      b.run @conn.builder[1]
+    end
+    assert_kind_of TestMiddleWare, new_conn.builder[0].call(nil)
+    assert_kind_of TestAdapter,    new_conn.builder[1].call(nil)
+  end
 end

data/test/connection_test.rb

@@ -158,4 +158,19 @@ class TestConnection < Faraday::TestCase
     end
     assert_equal "a%5Bb%5D=1%20%2B%202", conn.build_query('a[b]' => '1 + 2')
   end
+
+  def test_dups_connection_object
+    conn = Faraday::Connection.new 'http://sushi.com/foo' do |b|
+      b.adapter :net_http
+    end
+    conn.headers['content-type'] = 'text/plain'
+    conn.params['a'] = '1'
+
+    duped = conn.dup
+    assert_equal conn.build_url(''), duped.build_url('')
+    [:headers, :params, :builder].each do |attr|
+      assert_equal     conn.send(attr),           duped.send(attr)
+      assert_not_equal conn.send(attr).object_id, duped.send(attr).object_id
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: faraday
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors: 
 - rick
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 -08:00
+date: 2010-04-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency