excon 0.6.5 → 0.6.6

data/README.rdoc

@@ -17,32 +17,37 @@ The simplest way to use excon is with one-off requests:
 
   response = Excon.get('http://geemus.com')
 
-Supported one off request methods are #connect, #delete, #get, #head, #options, #post, #put, and #trace. 
+Supported one-off request methods are #connect, #delete, #get, #head, #options, #post, #put, and #trace. 
 
 The returned response object has #body, #headers and #status attributes. 
 
 Alternately you can create a connection object which is reusable across multiple requests (more performant!).
 
   connection = Excon.new('http://geemus.com')
-  response_one = connection.request(:method => 'GET')
-  response_two = connection.request(:method => 'POST', :path => '/foo')
-  response_three = connection.request(:method => 'DELETE', :path => '/bar')
+  response_one = connection.get
+  response_two = connection.post(:path => '/foo')
+  response_three = connection.delete(:path => '/bar')
+  
+Sometimes it is more convenient to specify the request type as an argument:
+
+  response_four = connection.request(:method => :get, :path => '/more')
 
 Both one-off and persistent connections support many other options. Here are a few common examples:
 
   # Custom headers
   Excon.get('http://geemus.com', :headers => {'Authorization' => 'Basic 0123456789ABCDEF'})
-  connection.request(:method => 'GET', :headers => {'Authorization' => 'Basic 0123456789ABCDEF'})
+  connection.get(:headers => {'Authorization' => 'Basic 0123456789ABCDEF'})
   
   # Changing query strings
   connection = Excon.new('http://geemus.com/')
-  connection.request(:method => 'GET', :query => {:foo => 'bar'})
+  connection.get(:query => {:foo => 'bar'})
   
   # POST body
   Excon.post('http://geemus.com', :body => 'language=ruby&class=fog')
   
-  # Symbols can also be used for HTTP methods
+  # request accepts either symbols or strings
   connection.request(:method => :get)
+  connection.request(:method => 'GET')
 
 These options can be combined to make pretty much any request you might need.
 

data/Rakefile

@@ -13,7 +13,7 @@ def name
 end
 
 def version
-  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
+  line = File.read("lib/#{name}/constants.rb")[/^\s*VERSION\s*=\s*.*/]
   line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
 end
 

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.6.5'
-  s.date              = '2011-07-13'
+  s.version           = '0.6.6'
+  s.date              = '2011-09-06'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -87,6 +87,7 @@ Gem::Specification.new do |s|
     excon.gemspec
     lib/excon.rb
     lib/excon/connection.rb
+    lib/excon/constants.rb
     lib/excon/errors.rb
     lib/excon/response.rb
     tests/basic_tests.rb
@@ -97,8 +98,10 @@ Gem::Specification.new do |s|
     tests/rackups/basic.ru
     tests/rackups/proxy.ru
     tests/rackups/query_string.ru
+    tests/rackups/request_methods.ru
     tests/rackups/response_header.ru
     tests/rackups/thread_safety.ru
+    tests/request_method_tests.rb
     tests/stub_tests.rb
     tests/test_helper.rb
     tests/thread_safety_tests.rb

data/lib/excon.rb

@@ -7,19 +7,12 @@ require 'rbconfig'
 require 'socket'
 require 'uri'
 
+require 'excon/constants'
 require 'excon/connection'
 require 'excon/errors'
 require 'excon/response'
 
 module Excon
-  unless const_defined?(:VERSION)
-    VERSION = '0.6.5'
-  end
-
-  unless const_defined?(:CHUNK_SIZE)
-    CHUNK_SIZE = 1048576 # 1 megabyte
-  end
-
   class << self
     # @return [String] The filesystem path to the SSL Certificate Authority
     attr_accessor :ssl_ca_path
@@ -85,7 +78,7 @@ module Excon
     end
 
     # Generic non-persistent HTTP methods
-    %w{connect delete get head options post put trace}.each do |method|
+    HTTP_VERBS.each do |method|
       eval <<-DEF
         def #{method}(url, params = {}, &block)
           new(url).request(params.merge!(:method => :#{method}), &block)

data/lib/excon/connection.rb

@@ -212,6 +212,15 @@ module Excon
     def reset
       (old_socket = sockets.delete(@socket_key)) && old_socket.close
     end
+    
+    # Generate HTTP request verb methods
+    Excon::HTTP_VERBS.each do |method|
+      eval <<-DEF
+        def #{method}(params={}, &block)
+          request(params.merge!(:method => :#{method}), &block)
+        end
+      DEF
+    end
 
   private
     def connect

data/lib/excon/constants.rb

@@ -0,0 +1,13 @@
+module Excon
+  unless const_defined?(:VERSION)
+    VERSION = '0.6.6'
+  end
+
+  unless const_defined?(:CHUNK_SIZE)
+    CHUNK_SIZE = 1048576 # 1 megabyte
+  end
+  
+  unless const_defined?(:HTTP_VERBS)
+    HTTP_VERBS = %w{connect delete get head options post put trace}
+  end
+end

data/lib/excon/response.rb

@@ -29,8 +29,6 @@ module Excon
           content_length = value.to_i
         elsif (key.casecmp('Transfer-Encoding') == 0) && (value.casecmp('chunked') == 0)
           transfer_encoding_chunked = true
-        elsif (key.casecmp('Connection') == 0) && (value.casecmp('close') == 0)
-          connection_close = true
         end
       end
 
@@ -48,15 +46,16 @@ module Excon
               yield(socket.read(chunk_size + 2).chop!, nil, content_length)
             end
             socket.read(2)
-          elsif connection_close
-            remaining = socket.read
-            yield(remaining, remaining.length, content_length)
-          else
+          elsif remaining = content_length
             remaining = content_length
             while remaining > 0
               yield(socket.read([CHUNK_SIZE, remaining].min), [remaining - CHUNK_SIZE, 0].max, content_length)
               remaining -= CHUNK_SIZE
             end
+          else
+            while remaining = socket.read(CHUNK_SIZE)
+              yield(remaining, remaining.length, content_length)
+            end
           end
         else
           if transfer_encoding_chunked
@@ -64,27 +63,26 @@ module Excon
               response.body << socket.read(chunk_size + 2).chop! # 2 == "/r/n".length
             end
             socket.read(2) # 2 == "/r/n".length
-          elsif connection_close
-            response.body << socket.read
-          else
-            remaining = content_length
+          elsif remaining = content_length
             while remaining > 0
               response.body << socket.read([CHUNK_SIZE, remaining].min)
               remaining -= CHUNK_SIZE
             end
+          else
+            response.body << socket.read
           end
         end
       end
 
       response
     end
-    
+
     # Retrieve a specific header value. Header names are treated case-insensitively.
     #   @param [String] name Header name
     def get_header(name)
       headers.each do |key,value|
-        if key.casecmp(name) == 0 
-          return value 
+        if key.casecmp(name) == 0
+          return value
         end
       end
       nil

data/tests/rackups/request_methods.ru

@@ -0,0 +1,17 @@
+require 'sinatra'
+
+class App < Sinatra::Base
+  get '/' do
+    'GET'
+  end
+  
+  post '/' do
+    'POST'
+  end
+  
+  delete '/' do
+    'DELETE'
+  end
+end
+
+run App

data/tests/request_method_tests.rb

@@ -0,0 +1,33 @@
+Shindo.tests('Excon request methods') do
+
+  with_rackup('request_methods.ru') do
+
+    tests 'one-offs' do
+      
+      tests('Excon.get').returns('GET') do
+        Excon.get('http://127.0.0.1:9292').body
+      end
+      
+      tests('Excon.post').returns('POST') do
+        Excon.post('http://127.0.0.1:9292').body
+      end
+      
+    end
+    
+    tests 'with a connection object' do
+      
+      connection = Excon.new('http://127.0.0.1:9292')
+      
+      tests('connection.get').returns('GET') do
+        connection.get.body
+      end
+      
+      tests('connection.post').returns('POST') do
+        connection.post.body
+      end
+      
+    end
+
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: excon
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-13 00:00:00 Z
+date: 2011-09-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: open4
@@ -108,6 +108,7 @@ files:
 - excon.gemspec
 - lib/excon.rb
 - lib/excon/connection.rb
+- lib/excon/constants.rb
 - lib/excon/errors.rb
 - lib/excon/response.rb
 - tests/basic_tests.rb
@@ -118,8 +119,10 @@ files:
 - tests/rackups/basic.ru
 - tests/rackups/proxy.ru
 - tests/rackups/query_string.ru
+- tests/rackups/request_methods.ru
 - tests/rackups/response_header.ru
 - tests/rackups/thread_safety.ru
+- tests/request_method_tests.rb
 - tests/stub_tests.rb
 - tests/test_helper.rb
 - tests/thread_safety_tests.rb