faraday 0.2.0 → 0.2.1

data/README.rdoc

@@ -6,17 +6,17 @@ This mess is gonna get raw, like sushi. So, haters to the left.
 
 == Usage
 
-  conn = Alice::Connection.new(:url => 'http://sushi.com') do |builder|
-    builder.use Alice::Request::Yajl     # convert body to json with Yajl lib
-    builder.use Alice::Adapter::Logger   # log the request somewhere?
-    builder.use Alice::Adapter::Typhoeus # make http request with typhoeus
-    builder.use Alice::Response::Yajl    # # parse body with yajl
+  conn = Faraday::Connection.new(:url => 'http://sushi.com') do |builder|
+    builder.use Faraday::Request::Yajl     # convert body to json with Yajl lib
+    builder.use Faraday::Adapter::Logger   # log the request somewhere?
+    builder.use Faraday::Adapter::Typhoeus # make http request with typhoeus
+    builder.use Faraday::Response::Yajl    # # parse body with yajl
 
     # or use shortcuts
-    builder.request  :yajl     # Alice::Request::Yajl
-    builder.adapter  :logger   # Alice::Adapter::Logger
-    builder.adapter  :typhoeus # Alice::Adapter::Typhoeus
-    builder.response :yajl     # Alice::Response::Yajl
+    builder.request  :yajl     # Faraday::Request::Yajl
+    builder.adapter  :logger   # Faraday::Adapter::Logger
+    builder.adapter  :typhoeus # Faraday::Adapter::Typhoeus
+    builder.response :yajl     # Faraday::Response::Yajl
   end
 
   resp1 = conn.get '/nigiri/sake.json'
@@ -29,21 +29,21 @@ This mess is gonna get raw, like sushi. So, haters to the left.
 == Testing
 
   # It's possible to define stubbed request outside a test adapter block.
-  stubs = Alice::Test::Stubs.new do |stub|
-    stub.get('/tamago') { [200, 'egg', {} }
+  stubs = Faraday::Test::Stubs.new do |stub|
+    stub.get('/tamago') { [200, {}, 'egg' }
   end
 
   # You can pass stubbed request to the test adapter or define them in a block
   # or a combination of the two.
-  test = Alice::Connection.new do |builder|
+  test = Faraday::Connection.new do |builder|
     builder.adapter :test, stubs do |stub|
-      stub.get('/ebi') {[ 200, 'shrimp', {} ]}
+      stub.get('/ebi') {[ 200, {}, 'shrimp' ]}
     end
   end
 
   # It's also possible to stub additional requests after the connection has
   # been initialized. This is useful for testing.
-  stubs.get('/uni') {[ 200, 'urchin', {} ]}
+  stubs.get('/uni') {[ 200, {}, 'urchin' ]}
 
   resp = test.get '/tamago'
   resp.body # => 'egg'
@@ -53,6 +53,12 @@ This mess is gonna get raw, like sushi. So, haters to the left.
   resp.body # => 'urchin'
   resp = test.get '/else' #=> raises "no such stub" error
 
+  # If you like, you can treat your stubs as mocks by verifying that all of the
+  # stubbed calls were made. NOTE that this feature is still fairly
+  # experimental: It will not verify the order or count of any stub, only that
+  # it was called once during the course of the test.
+  stubs.verify_stubbed_calls
+
 == TODO
 
 * Add curb/em-http support

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/faraday.gemspec

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

data/lib/faraday/adapter/test.rb

@@ -56,12 +56,29 @@ module Faraday
         def new_stub(request_method, path, body=nil, &block)
           (@stack[request_method] ||= []) << Stub.new(path, body, block)
         end
+
+        # Raises an error if any of the stubbed calls have not been made.
+        def verify_stubbed_calls
+          failed_stubs = []
+          @stack.each do |method, stubs|
+            unless stubs.size == 0
+              failed_stubs.concat(stubs.map {|stub|
+                "Expected #{method} #{stub}."
+              })
+            end
+          end
+          raise failed_stubs.join(" ") unless failed_stubs.size == 0
+        end
       end
 
       class Stub < Struct.new(:path, :body, :block)
         def matches?(request_path, request_body)
           request_path == path && request_body == body
         end
+
+        def to_s
+          "#{path} #{body}"
+        end
       end
 
       def initialize app, stubs=nil, &block

metadata

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