excon 0.9.6 → 0.10.0

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'jruby-openssl', :platform => :jruby
+gem 'jruby-openssl', '< 0.7.4', :platform => :jruby
 
 group :benchmark do
   gem 'em-http-request'

data/Rakefile

@@ -48,14 +48,6 @@ Shindo::Rake.new
 
 task :default => :tests
 
-desc "Generate RCov test coverage and open in your browser"
-task :coverage do
-  require 'rcov'
-  sh "rm -fr coverage"
-  sh "rcov tests/test_*.rb"
-  sh "open coverage/index.html"
-end
-
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'

data/changelog.txt

@@ -1,3 +1,11 @@
+0.10.0 03/01/12
+===============
+
+* avoid setting/passing Content-Length headers for GET requests with no body
+* remove rcov from tasks/bundle in development
+* automatically parse and use basic auth when passed as part of a uri
+* fix for erroneous recursion in Excon.defaults=
+
 0.9.6 02/22/12
 ==============
 

data/excon.gemspec

@@ -13,8 +13,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              = 'excon'
-  s.version           = '0.9.6'
-  s.date              = '2012-02-22'
+  s.version           = '0.10.0'
+  s.date              = '2012-03-01'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -104,6 +104,7 @@ Gem::Specification.new do |s|
     tests/proxy_tests.rb
     tests/query_string_tests.rb
     tests/rackups/basic.ru
+    tests/rackups/basic_auth.ru
     tests/rackups/proxy.ru
     tests/rackups/query_string.ru
     tests/rackups/request_methods.ru

data/lib/excon.rb

@@ -35,7 +35,7 @@ module Excon
     # Change defaults for Excon connections
     # @return [Hash] defaults for Excon connections
     def defaults=(new_defaults)
-      self.defaults = new_defaults
+      @defaults = new_defaults
     end
 
     # Status of mocking

data/lib/excon/connection.rb

@@ -48,6 +48,12 @@ module Excon
         @connection[:headers]['Proxy-Connection'] ||= 'Keep-Alive'
       end
 
+      # Use Basic Auth if url contains a login
+      if uri.user || uri.password
+        auth = ["#{uri.user}:#{uri.password}"].pack('m').delete("\r\n")
+        @connection[:headers]['Authorization'] ||= "Basic #{auth}"
+      end
+
       @socket_key = '' << @connection[:host] << ':' << @connection[:port]
       reset
     end
@@ -170,17 +176,21 @@ module Excon
 
           # calculate content length and set to handle non-ascii
           unless params[:headers].has_key?('Content-Length')
-            params[:headers]['Content-Length'] = case params[:body]
-            when File
-              params[:body].binmode
-              File.size(params[:body])
-            when String
-              if FORCE_ENC
-                params[:body].force_encoding('BINARY')
+            # The HTTP spec isn't clear on it, but specifically, GET requests don't usually send bodies;
+            # if they don't, sending Content-Length:0 can cause issues.
+            unless (params[:method].to_s.casecmp('GET') == 0 && params[:body].nil?)
+              params[:headers]['Content-Length'] = case params[:body]
+              when File
+                params[:body].binmode
+                File.size(params[:body])
+              when String
+                if FORCE_ENC
+                  params[:body].force_encoding('BINARY')
+                end
+                params[:body].length
+              else
+                0
               end
-              params[:body].length
-            else
-              0
             end
           end
 
@@ -198,7 +208,7 @@ module Excon
           socket.write(request)
 
           # write out the body
-          if params[:headers]['Content-Length'] != 0
+          unless params[:body].nil? || params[:body].empty?
             if params[:body].is_a?(String)
               socket.write(params[:body])
             else

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
   unless const_defined?(:VERSION)
-    VERSION = '0.9.6'
+    VERSION = '0.10.0'
   end
 
   unless const_defined?(:CHUNK_SIZE)

data/lib/excon/response.rb

@@ -42,7 +42,7 @@ module Excon
           if transfer_encoding_chunked
             # 2 == "/r/n".length
             while (chunk_size = socket.readline.chop!.to_i(16)) > 0
-              yield(socket.read(chunk_size + 2).chop!, nil, content_length)
+              yield(socket.read(chunk_size + 2).chop!, nil, nil)
             end
             socket.read(2)
           elsif remaining = content_length

data/tests/basic_tests.rb

@@ -4,8 +4,31 @@ with_rackup('basic.ru') do
   end
 end
 
+with_rackup('basic_auth.ru') do
+  Shindo.tests('Excon basics (Basic Auth Pass)') do
+    basic_tests('http://test_user:test_password@127.0.0.1:9292')
+  end
+
+  Shindo.tests('Excon basics (Basic Auth Fail)') do
+    cases = [
+      ['correct user, no password', 'http://test_user@127.0.0.1:9292'],
+      ['correct user, wrong password', 'http://test_user:fake_password@127.0.0.1:9292'],
+      ['wrong user, correct password', 'http://fake_user:test_password@127.0.0.1:9292'],
+    ]
+    cases.each do |desc,url|
+      connection = Excon.new(url)
+      response = connection.request(:method => :get, :path => '/content-length/100')
+
+      tests("response.status for #{desc}").returns(401) do
+        response.status
+      end
+
+    end
+  end
+end
+
 with_rackup('ssl.ru') do
   Shindo.tests('Excon basics (ssl)') do
     basic_tests('https://127.0.0.1:9443')
   end
-end
+end

data/tests/rackups/basic_auth.ru

@@ -0,0 +1,23 @@
+require 'sinatra'
+
+class App < Sinatra::Base
+  before do
+    auth ||= Rack::Auth::Basic::Request.new(request.env)
+    user, pass = auth.provided? && auth.basic? && auth.credentials
+    unless [user, pass] == ["test_user", "test_password"]
+      response['WWW-Authenticate'] = %(Basic realm="Restricted Area")
+      throw(:halt, [401, "Not authorized\n"])
+    end
+  end
+
+  get('/content-length/:value') do |value|
+    headers("Custom" => "Foo: bar")
+    'x' * value.to_i
+  end
+
+  post('/body-sink') do
+    request.body.read.size.to_s
+  end
+end
+
+run App

data/tests/request_method_tests.rb

@@ -12,6 +12,10 @@ Shindo.tests('Excon request methods') do
         Excon.post('http://localhost:9292').body
       end
 
+      tests('Excon.delete').returns('DELETE') do
+        Excon.delete('http://localhost:9292').body
+      end
+
     end
 
     tests 'with a connection object' do
@@ -26,6 +30,10 @@ Shindo.tests('Excon request methods') do
         connection.post.body
       end
 
+      tests('connection.delete').returns('DELETE') do
+        connection.delete.body
+      end
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-22 00:00:00.000000000Z
+date: 2012-03-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &9166800 !ruby/object:Gem::Requirement
+  requirement: &70310527674080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 3.1.3
   type: :development
   prerelease: false
-  version_requirements: *9166800
+  version_requirements: *70310527674080
 - !ruby/object:Gem::Dependency
   name: delorean
-  requirement: &9166610 !ruby/object:Gem::Requirement
+  requirement: &70310527672680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9166610
+  version_requirements: *70310527672680
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &9166380 !ruby/object:Gem::Requirement
+  requirement: &70310527671680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9166380
+  version_requirements: *70310527671680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &9166170 !ruby/object:Gem::Requirement
+  requirement: &70310527670180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9166170
+  version_requirements: *70310527670180
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &9165960 !ruby/object:Gem::Requirement
+  requirement: &70310527668720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9165960
+  version_requirements: *70310527668720
 - !ruby/object:Gem::Dependency
   name: shindo
-  requirement: &9165750 !ruby/object:Gem::Requirement
+  requirement: &70310527667260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9165750
+  version_requirements: *70310527667260
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &9165510 !ruby/object:Gem::Requirement
+  requirement: &70310527665960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +89,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9165510
+  version_requirements: *70310527665960
 description: EXtended http(s) CONnections
 email: geemus@gmail.com
 executables: []
@@ -135,6 +135,7 @@ files:
 - tests/proxy_tests.rb
 - tests/query_string_tests.rb
 - tests/rackups/basic.ru
+- tests/rackups/basic_auth.ru
 - tests/rackups/proxy.ru
 - tests/rackups/query_string.ru
 - tests/rackups/request_methods.ru
@@ -161,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -511600863
+      hash: 3014596879037877365
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -170,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: excon
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 2
 summary: speed, persistence, http(s)