faraday 0.5.3 → 0.5.4

data/Gemfile

@@ -6,10 +6,13 @@ source "http://rubygems.org"
 group :development, :test do
   gem 'patron', '~> 0.4'
   gem 'sinatra', '~> 1.1'
-  gem 'typhoeus', '~> 0.1'
+  gem 'typhoeus', '~> 0.2'
   gem 'eventmachine', '~> 0.12'
   gem 'em-http-request', '~> 0.2', :require => 'em-http'
-  gem 'em-synchrony', '~> 0.2', :require => ['em-synchrony', 'em-synchrony/em-http']
+  major, minor, patch = RUBY_VERSION.split('.')
+  if major.to_i >= 1 && minor.to_i >= 9
+    gem 'em-synchrony', '~> 0.2', :require => ['em-synchrony', 'em-synchrony/em-http']
+  end
 end
 
 gemspec

data/faraday.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   ## 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.3'
-  s.date              = '2010-11-09'
+  s.version           = '0.5.4'
+  s.date              = '2011-01-11'
   s.rubyforge_project = 'faraday'
 
   ## Make sure your summary is short. The description may be as long
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
 
   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('multipart-post', '~> 1.1.0')
   s.add_runtime_dependency('rack', ['>= 1.1.0', "< 2"])
 
   ## Leave this section as-is. It will be automatically generated from the
@@ -43,7 +43,6 @@ Gem::Specification.new do |s|
   # = MANIFEST =
   s.files = %w[
     Gemfile
-    Gemfile.lock
     LICENSE
     README.md
     Rakefile

data/lib/faraday.rb

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

data/lib/faraday/adapter.rb

@@ -10,7 +10,7 @@ module Faraday
       :ActionDispatch => 'action_dispatch',
       :NetHttp        => 'net_http',
       :Typhoeus       => 'typhoeus',
-      :EMSynchrony   => 'em_synchrony',
+      :EMSynchrony    => 'em_synchrony',
       :Patron         => 'patron',
       :Test           => 'test'
 
@@ -20,7 +20,7 @@ module Faraday
       :net_http        => :NetHttp,
       :typhoeus        => :Typhoeus,
       :patron          => :Patron,
-      :em_synchrnoy    => :EMSynchrony
+      :em_synchrony    => :EMSynchrony
 
     def call(env)
       process_body_for_request(env)

data/lib/faraday/connection.rb

@@ -81,7 +81,9 @@ module Faraday
     end
 
     def basic_auth(login, pass)
-      @headers['authorization'] = "Basic #{Base64.encode64("#{login}:#{pass}").strip}"
+      auth = Base64.encode64("#{login}:#{pass}")
+      auth.gsub!("\n", "")
+      @headers['authorization'] = "Basic #{auth}"
     end
 
     def token_auth(token, options = {})

data/lib/faraday/error.rb

@@ -6,7 +6,9 @@ module Faraday
       end
 
       def message
-        @inner_exception.message
+        @inner_exception.respond_to?(:message) ? 
+          @inner_exception.message             :
+          @inner_exception.to_s
       end
 
       def backtrace

data/test/connection_test.rb

@@ -58,6 +58,12 @@ class TestConnection < Faraday::TestCase
     assert_equal 'Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==', conn.headers['Authorization']
   end
 
+  def test_long_basic_auth_sets_authorization_header_without_new_lines
+    conn = Faraday::Connection.new
+    conn.basic_auth "A" * 255, ""
+    assert_equal "Basic #{'QUFB' * 85}Og==", conn.headers['Authorization']
+  end
+
   def test_auto_parses_basic_auth_from_url
     conn = Faraday::Connection.new :url => "http://aladdin:opensesame@sushi.com/fish"
     assert_equal 'Basic YWxhZGRpbjpvcGVuc2VzYW1l', conn.headers['Authorization']

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Rick Olson
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 -08:00
+date: 2011-01-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,9 +56,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 0
         - 1
-        version: 1.0.1
+        - 0
+        version: 1.1.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -91,7 +91,6 @@ extra_rdoc_files: []
 
 files: 
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,44 +0,0 @@
-PATH
-  remote: .
-  specs:
-    faraday (0.5.3)
-      addressable (~> 2.2.2)
-      multipart-post (~> 1.0.1)
-      rack (>= 1.1.0, < 2)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.2.2)
-    em-http-request (0.2.14)
-      addressable (>= 2.0.0)
-      eventmachine (>= 0.12.9)
-    em-synchrony (0.2.0)
-      eventmachine (>= 0.12.9)
-    eventmachine (0.12.10)
-    multipart-post (1.0.1)
-    patron (0.4.10)
-    rack (1.2.1)
-    rake (0.8.7)
-    sinatra (1.1.0)
-      rack (~> 1.1)
-      tilt (~> 1.1)
-    tilt (1.1)
-    typhoeus (0.1.31)
-      rack
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  addressable (~> 2.2.2)
-  em-http-request (~> 0.2)
-  em-synchrony (~> 0.2)
-  eventmachine (~> 0.12)
-  faraday!
-  multipart-post (~> 1.0.1)
-  patron (~> 0.4)
-  rack (>= 1.1.0, < 2)
-  rake (~> 0.8)
-  sinatra (~> 1.1)
-  typhoeus (~> 0.1)