faraday 0.5.0 → 0.5.1

data/Gemfile

@@ -1,3 +1,12 @@
 source "http://rubygems.org"
 
+# Bundle gems for the local environment. Make sure to
+# put test-only gems in this group so their generators
+# and rake tasks are available in development mode:
+group :development, :test do
+  gem 'patron', '~> 0.4'
+  gem 'sinatra', '~> 1.0'
+  gem 'typhoeus', '~> 0.1'
+end
+
 gemspec

data/Gemfile.lock

@@ -1,28 +1,33 @@
 PATH
   remote: .
   specs:
-    faraday (0.4.6)
-      addressable (~> 2.1.1)
+    faraday (0.5.1)
+      addressable (~> 2.2.2)
       multipart-post (~> 1.0.1)
-      rack (~> 1.0.1)
+      rack (~> 1.2.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.1.2)
+    addressable (2.2.2)
     multipart-post (1.0.1)
-    rack (1.0.1)
+    patron (0.4.9)
+    rack (1.2.1)
     rake (0.8.7)
     sinatra (1.0)
       rack (>= 1.0)
+    typhoeus (0.1.31)
+      rack
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  addressable (~> 2.1.1)
+  addressable (~> 2.2.2)
   faraday!
   multipart-post (~> 1.0.1)
-  rack (~> 1.0.1)
-  rake (~> 0.8.7)
-  sinatra (~> 1.0.0)
+  patron (~> 0.4)
+  rack (~> 1.2.1)
+  rake (~> 0.8)
+  sinatra (~> 1.0)
+  typhoeus (~> 0.1)

data/README.md

@@ -22,7 +22,7 @@ This mess is gonna get raw, like sushi. So, haters to the left.
     resp1 = conn.get '/nigiri/sake.json'
     resp2 = conn.post do |req|
       req.url  "/nigiri.json", :page => 2
-      req[:content_type] = 'application/json'
+      req["Content-Type"] = 'application/json'
       req.body = {:name => 'Unagi'}
     end
 
@@ -32,7 +32,7 @@ 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 = Faraday::Test::Stubs.new do |stub|
+    stubs = Faraday::Adapter::Test::Stubs.new do |stub|
       stub.get('/tamago') { [200, {}, 'egg'] }
     end
 

data/Rakefile

@@ -71,6 +71,7 @@ end
 #
 #############################################################################
 
+desc "Create tag v#{version} and build and push #{gem_file} to Rubygems"
 task :release => :build do
   unless `git branch` =~ /^\* master$/
     puts "You must be on the master branch to release!"
@@ -80,15 +81,17 @@ task :release => :build do
   sh "git tag v#{version}"
   sh "git push origin master"
   sh "git push origin v#{version}"
-  sh "gem push pkg/#{name}-#{version}.gem"
+  sh "gem push pkg/#{gem_file}"
 end
 
+desc "Build #{gem_file} into the pkg directory"
 task :build => :gemspec do
   sh "mkdir -p pkg"
   sh "gem build #{gemspec_file}"
   sh "mv #{gem_file} pkg"
 end
 
+desc "Generate #{gemspec_file}"
 task :gemspec => :validate do
   # read spec file and split out manifest section
   spec = File.read(gemspec_file)
@@ -117,6 +120,7 @@ task :gemspec => :validate do
   puts "Updated #{gemspec_file}"
 end
 
+desc "Validate #{gemspec_file}"
 task :validate do
   libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
   unless libfiles.empty?
@@ -127,4 +131,4 @@ task :validate do
     puts "A `VERSION` file at root level violates Gem best practices."
     exit!
   end
-end
+end

data/faraday.gemspec

@@ -6,15 +6,14 @@
 ## http://docs.rubygems.org/read/chapter/20
 Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.rubygems_version = '1.3.5'
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
 
   ## Leave these as is they will be modified for you by the rake gemspec task.
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'faraday'
-  s.version           = '0.5.0'
-  s.date              = '2010-10-08'
+  s.version           = '0.5.1'
+  s.date              = '2010-10-15'
   s.rubyforge_project = 'faraday'
 
   ## Make sure your summary is short. The description may be as long
@@ -33,11 +32,10 @@ Gem::Specification.new do |s|
   ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
   s.require_paths = %w[lib]
 
-  s.add_development_dependency('rake', ['~> 0.8.7'])
-  s.add_development_dependency('sinatra', ['~> 1.0.0'])
-  s.add_runtime_dependency('addressable', ['~> 2.1.1'])
-  s.add_runtime_dependency('multipart-post', ['~> 1.0.1'])
-  s.add_runtime_dependency('rack', ['~> 1.2.1'])
+  s.add_development_dependency('rake', '~> 0.8')
+  s.add_runtime_dependency('addressable', '~> 2.2.2')
+  s.add_runtime_dependency('multipart-post', '~> 1.0.1')
+  s.add_runtime_dependency('rack', '~> 1.2.1')
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE
@@ -87,4 +85,4 @@ Gem::Specification.new do |s|
   ## Test files will be grabbed from the file list. Make sure the path glob
   ## matches what you actually use.
   s.test_files = s.files.select { |path| path =~ /^test\/.*_test\.rb/ }
-end
+end

data/lib/faraday.rb

@@ -1,5 +1,5 @@
 module Faraday
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 
   class << self
     attr_accessor :default_adapter

data/lib/faraday/adapter/test.rb

@@ -105,14 +105,16 @@ module Faraday
       end
 
       def call(env)
-        if stub = stubs.match(env[:method], Faraday::Utils.normalize_path(env[:url]), env[:body])
+        normalized_path = Faraday::Utils.normalize_path(env[:url])
+
+        if stub = stubs.match(env[:method], normalized_path, env[:body])
           status, headers, body = stub.block.call(env)
           env.update \
             :status           => status,
             :response_headers => headers,
             :body             => body
         else
-          raise "no stubbed request for #{env[:method]} #{request_uri(env[:url])} #{env[:body]}"
+          raise "no stubbed request for #{env[:method]} #{normalized_path} #{env[:body]}"
         end
         @app.call(env)
       end

data/lib/faraday/adapter/typhoeus.rb

@@ -56,9 +56,10 @@ module Faraday
       def parse_response_headers(header_string)
         return {} unless header_string && !header_string.empty?
         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
-          map! { |(k, v)| [k.downcase, v]   }.flatten!]
+          tap    { |a|      a.shift           }. # drop the HTTP status line
+          map    { |h|      h.split(/:\s+/,2) }. # split key and value
+          reject { |(k, v)| k.nil?            }. # Ignore blank lines
+          map    { |(k, v)| [k.downcase, v]   }.flatten]
       end
 
       # TODO: build in support for multipart streaming if typhoeus supports it.

data/test/adapters/live_test.rb

@@ -19,7 +19,7 @@ if Faraday::TestCase::LIVE_SERVER
         end
 
         define_method "test_#{adapter}_GET_retrieves_the_response_headers" do
-          assert_equal 'text/html', create_connection(adapter).get('hello_world').headers['content-type']
+          assert_match /text\/html/, create_connection(adapter).get('hello_world').headers['content-type']
         end
 
         define_method "test_#{adapter}_POST_send_url_encoded_params" do
@@ -39,7 +39,7 @@ if Faraday::TestCase::LIVE_SERVER
         end
 
         define_method "test_#{adapter}_POST_retrieves_the_response_headers" do
-          assert_equal 'text/html', create_connection(adapter).post('echo_name').headers['content-type']
+          assert_match /text\/html/, create_connection(adapter).post('echo_name').headers['content-type']
         end
 
         define_method "test_#{adapter}_POST_sends_files" do
@@ -70,7 +70,7 @@ if Faraday::TestCase::LIVE_SERVER
           end
 
           define_method "test_#{adapter}_PUT_retrieves_the_response_headers" do
-            assert_equal 'text/html', create_connection(adapter).put('echo_name').headers['content-type']
+            assert_match /text\/html/, create_connection(adapter).put('echo_name').headers['content-type']
           end
         end
 
@@ -78,7 +78,7 @@ if Faraday::TestCase::LIVE_SERVER
           resp = create_connection(adapter).head do |req|
             req.url 'hello', 'name' => 'zack'
           end
-          assert_equal 'text/html', resp.headers['content-type']
+          assert_match /text\/html/, resp.headers['content-type']
         end
 
         define_method "test_#{adapter}_HEAD_retrieves_no_response_body" do
@@ -86,11 +86,11 @@ if Faraday::TestCase::LIVE_SERVER
         end
 
         define_method "test_#{adapter}_HEAD_retrieves_the_response_headers" do
-          assert_equal 'text/html', create_connection(adapter).head('hello_world').headers['content-type']
+          assert_match /text\/html/, create_connection(adapter).head('hello_world').headers['content-type']
         end
 
         define_method "test_#{adapter}_DELETE_retrieves_the_response_headers" do
-          assert_equal 'text/html', create_connection(adapter).delete('delete_with_json').headers['content-type']
+          assert_match /text\/html/, create_connection(adapter).delete('delete_with_json').headers['content-type']
         end
 
         define_method "test_#{adapter}_DELETE_retrieves_the_body" do
@@ -147,4 +147,4 @@ if Faraday::TestCase::LIVE_SERVER
       end
     end
   end
-end
+end

data/test/adapters/test_middleware_test.rb

@@ -33,5 +33,11 @@ module Adapters
       assert_equal 'hello', @conn.get("/hello").body
       assert_equal 'world', @conn.get("/hello").body
     end
+
+    def test_raises_an_error_if_no_stub_is_found_for_request
+      assert_raise RuntimeError do
+        @conn.get('/invalid'){ [200, {}, []] }
+      end
+    end
   end
 end

data/test/adapters/typhoeus_test.rb

@@ -21,6 +21,11 @@ if Faraday::Adapter::Typhoeus.loaded?
         headers = @adapter.parse_response_headers("HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nLocation: http://sushi.com/\r\n\r\n")
         assert_equal 'http://sushi.com/', headers['location']
       end
+
+      def test_parse_response_headers_parses_blank_lines
+        headers = @adapter.parse_response_headers("HTTP/1.1 200 OK\r\n\r\nContent-Type: text/html\r\n\r\n")
+        assert_equal 'text/html', headers['content-type']
+      end
     end
   end
 end

data/test/helper.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
-gem 'rack',        '>= 1.0.1'
-gem 'addressable', '>= 2.1.1'
+gem 'rack',        '>= 1.2.1'
+gem 'addressable', '>= 2.2.2'
 
 require 'test/unit'
 if ENV['LEFTRIGHT']

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: faraday
 version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Rick Olson
@@ -14,79 +15,72 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 -07:00
+date: 2010-10-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 0
         - 8
-        - 7
-        version: 0.8.7
+        version: "0.8"
   type: :development
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sinatra
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: addressable
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
-        - 1
-        - 1
-        version: 2.1.1
+        - 2
+        - 2
+        version: 2.2.2
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: multipart-post
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 0
         - 1
         version: 1.0.1
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
         - 2
         - 1
         version: 1.2.1
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 description: HTTP/REST API client library.
 email: technoweenie@gmail.com
 executables: []
@@ -143,23 +137,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: faraday
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2
 summary: HTTP/REST API client library.