excon 0.7.12 → 0.8.0

data/README.rdoc

@@ -71,13 +71,11 @@ You can specify a proxy URL that Excon will use with both HTTP and HTTPS connect
   connection = Excon.new('http://geemus.com', :proxy => 'http://my.proxy:3128')
   connection.request(:method => 'GET')
 
-The proxy URL must be fully specified, including scheme (e.g. "http://") and port.
+The proxy URL must be fully specified, including scheme (e.g. "http://") and port. 
 
-Excon will also use the environment variables "http_proxy" and "https_proxy" if they are present.
+Proxy support must be set when establishing a connection object and cannot be overridden in individual requests. Because of this it is unavailable in one-off requests (Excon.get, etc.)
 
-If "https_proxy" is not set, the value of "http_proxy" will be used for both HTTP and HTTPS connections.
-
-NOTE: Environment variables will take precedence over a :proxy option that has been specified in code.
+NOTE: Excon will use the environment variables "http_proxy" and "https_proxy" if they are present. If these variables are set they will take precedence over a :proxy option specified in code. If "https_proxy" is not set, the value of "http_proxy" will be used for both HTTP and HTTPS connections.
 
 == Stubs
 

data/changelog.txt

@@ -1,3 +1,44 @@
+0.8.0 12/12/11
+==============
+
+* move mock handler to its own method
+* better handling around openssl errors
+* simplify writing by removing buffer
+
+0.7.12 12/04/11
+===============
+
+* revert: explicitly close files after writing
+
+0.7.11 12/24/11
+==============
+
+* rebuild gem broken gemspec with 1.8.x
+
+0.7.10 12/04/11
+===============
+
+* explicitly close files after writing
+
+0.7.9 11/30/11
+==============
+
+* add ability to modify retry limit
+* use addrinfo to avoid localhost and other IPv6 issues
+* update gemspec authors to add Dan Peterson and Matt Sanders
+
+0.7.8 11/24/11
+==============
+
+* rebuild gem broken gemspec with 1.8.x
+
+0.7.7 11/24/11
+==============
+
+* setup for travis ci automated testing
+* fix EOFError
+* use Socket.getaddrinfo to fix IPv6 issues
+
 0.7.6 10/04/11
 ==============
 

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.7.12'
-  s.date              = '2011-12-04'
+  s.version           = '0.8.0'
+  s.date              = '2011-12-12'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long

data/lib/excon/connection.rb

@@ -82,31 +82,8 @@ module Excon
         unless params[:mock]
           socket.params = params
         else
-          for stub, response in Excon.stubs
-            # all specified non-headers params match and no headers were specified or all specified headers match
-            if (stub.keys - [:headers]).all? {|key| stub[key] == params[key] } &&
-              (!stub.has_key?(:headers) || stub[:headers].keys.all? {|key| stub[:headers][key] == params[:headers][key]})
-              response_attributes = case response
-              when Proc
-                response.call(params)
-              else
-                response
-              end
-              if block_given? && response_attributes.has_key?(:body)
-                body = response_attributes.delete(:body)
-                content_length = remaining = body.bytesize
-                i = 0
-                while i < body.length
-                  yield(body[i, CHUNK_SIZE], [remaining - CHUNK_SIZE, 0].max, content_length)
-                  remaining -= CHUNK_SIZE
-                  i += CHUNK_SIZE
-                end
-              end
-              return Excon::Response.new(response_attributes)
-            end
-          end
-          # if we reach here no stubs matched
-          raise(Excon::Errors::StubNotFound.new('no stubs matched ' << params.inspect))
+          mocked_response = invoke_stub(params, &block)
+          return mocked_response unless mocked_response.nil?
         end
 
         # start with "METHOD /path"
@@ -215,6 +192,34 @@ module Excon
         raise(request_error)
       end
     end
+    
+    def invoke_stub(params)
+      for stub, response in Excon.stubs
+        # all specified non-headers params match and no headers were specified or all specified headers match
+        if (stub.keys - [:headers]).all? {|key| stub[key] == params[key] } &&
+          (!stub.has_key?(:headers) || stub[:headers].keys.all? {|key| stub[:headers][key] == params[:headers][key]})
+          response_attributes = case response
+          when Proc
+            response.call(params)
+          else
+            response
+          end
+          if block_given? && response_attributes.has_key?(:body)
+            body = response_attributes.delete(:body)
+            content_length = remaining = body.bytesize
+            i = 0
+            while i < body.length
+              yield(body[i, CHUNK_SIZE], [remaining - CHUNK_SIZE, 0].max, content_length)
+              remaining -= CHUNK_SIZE
+              i += CHUNK_SIZE
+            end
+          end
+          return Excon::Response.new(response_attributes)
+        end
+      end
+      # if we reach here no stubs matched
+      raise(Excon::Errors::StubNotFound.new('no stubs matched ' << params.inspect))
+    end
 
     def reset
       (old_socket = sockets.delete(@socket_key)) && old_socket.close

data/lib/excon/constants.rb

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

data/lib/excon/socket.rb

@@ -10,7 +10,7 @@ module Excon
 
     def initialize(params = {}, proxy = nil)
       @params, @proxy = params, proxy
-      @read_buffer, @write_buffer = '', ''
+      @read_buffer = ''
       @eof = false
 
       connect
@@ -102,12 +102,11 @@ module Excon
     end
 
     def write(data)
-      @write_buffer << data
-      until @write_buffer.empty?
+      while true
         begin
-          max_length = [@write_buffer.length, Excon::CHUNK_SIZE].min
-          written = @socket.write_nonblock(@write_buffer.slice(0, max_length))
-          @write_buffer.slice!(0, written)
+          # I wish that this API accepted a start position, then we wouldn't
+          # have to slice data when there is a short write.
+          written = @socket.write_nonblock(data)
         rescue OpenSSL::SSL::SSLError => error
           if error.message == 'write would block'
             if IO.select(nil, [@socket], nil, @params[:write_timeout])
@@ -116,12 +115,25 @@ module Excon
               raise(Excon::Errors::Timeout.new("write timeout reached"))
             end
           end
+
+          # If there is an unknown OpenSSL error, don't just swallow
+          # it, raise it out.
+          raise Excon::Errors::SocketError.new(error)
         rescue Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitWritable
           if IO.select(nil, [@socket], nil, @params[:write_timeout])
             retry
           else
             raise(Excon::Errors::Timeout.new("write timeout reached"))
           end
+        else
+          # Fast, common case.
+          return if written == data.size
+
+          # This takes advantage of the fact that most ruby implementations
+          # have Copy-On-Write strings. Thusly why requesting a subrange
+          # of data, we actually don't copy data because the new string
+          # simply references a subrange of the original.
+          data = data[written, data.size]
         end
       end
     end

metadata

@@ -1,88 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: excon
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 7
-  - 12
-  segments_generated: true
-  version: 0.7.12
+version: !ruby/object:Gem::Version
+  version: 0.8.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - dpiddy (Dan Peterson)
 - geemus (Wesley Beary)
 - nextmat (Matt Sanders)
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-04 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id001
+date: 2011-12-12 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: open4
-  prerelease: false
+  requirement: &5046310 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id002
-  name: rake
   prerelease: false
+  version_requirements: *5046310
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &5046020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 0
-        segments_generated: true
-        version: 0.2.0
-  requirement: *id003
-  name: shindo
   prerelease: false
+  version_requirements: *5046020
+- !ruby/object:Gem::Dependency
+  name: shindo
+  requirement: &5045670 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.2.0
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id004
-  name: sinatra
   prerelease: false
+  version_requirements: *5045670
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &5045400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: *5045400
 description: EXtended http(s) CONnections
 email: geemus@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - Gemfile
 - README.rdoc
 - Rakefile
@@ -130,37 +111,29 @@ files:
 - tests/stub_tests.rb
 - tests/test_helper.rb
 - tests/thread_safety_tests.rb
-has_rdoc: true
 homepage: https://github.com/geemus/excon
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      segments_generated: true
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      segments_generated: true
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: excon
-rubygems_version: 1.3.6
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 2
 summary: speed, persistence, http(s)
 test_files: []
-