excon 0.9.1 → 0.9.2

data/changelog.txt

@@ -1,3 +1,9 @@
+0.9.2 12/16/11
+==============
+
+* update mocks to allow for regex based matching
+* fixes for write_nonblock+OpenSSL weirdness
+
 0.9.1 12/15/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.9.1'
-  s.date              = '2011-12-15'
+  s.version           = '0.9.2'
+  s.date              = '2011-12-16'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long

data/lib/excon/connection.rb

@@ -139,87 +139,87 @@ module Excon
 
     def request_kernel(params, &block)
       begin
-        if params[:mock]
-          return invoke_stub(params, &block)
-        end
-
-        socket.params = params
-        # start with "METHOD /path"
-        request = params[:method].to_s.upcase << ' '
-        if @proxy
-          request << params[:scheme] << '://' << params[:host] << ':' << params[:port]
-        end
-        request << params[:path]
+        response = if params[:mock]
+          invoke_stub(params, &block)
+        else
+          socket.params = params
+          # start with "METHOD /path"
+          request = params[:method].to_s.upcase << ' '
+          if @proxy
+            request << params[:scheme] << '://' << params[:host] << ':' << params[:port]
+          end
+          request << params[:path]
 
-        # add query to path, if there is one
-        case params[:query]
-        when String
-          request << '?' << params[:query]
-        when Hash
-          request << '?'
-          for key, values in params[:query]
-            if values.nil?
-              request << key.to_s << '&'
-            else
-              for value in [*values]
-                request << key.to_s << '=' << CGI.escape(value.to_s) << '&'
+          # add query to path, if there is one
+          case params[:query]
+          when String
+            request << '?' << params[:query]
+          when Hash
+            request << '?'
+            for key, values in params[:query]
+              if values.nil?
+                request << key.to_s << '&'
+              else
+                for value in [*values]
+                  request << key.to_s << '=' << CGI.escape(value.to_s) << '&'
+                end
               end
             end
+            request.chop! # remove trailing '&'
           end
-          request.chop! # remove trailing '&'
-        end
 
-        # finish first line with "HTTP/1.1\r\n"
-        request << HTTP_1_1
+          # finish first line with "HTTP/1.1\r\n"
+          request << HTTP_1_1
 
-        # 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')
+          # 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')
+              end
+              params[:body].length
+            else
+              0
             end
-            params[:body].length
-          else
-            0
           end
-        end
 
-        # add headers to request
-        for key, values in params[:headers]
-          for value in [*values]
-            request << key.to_s << ': ' << value.to_s << CR_NL
+          # add headers to request
+          for key, values in params[:headers]
+            for value in [*values]
+              request << key.to_s << ': ' << value.to_s << CR_NL
+            end
           end
-        end
 
-        # add additional "\r\n" to indicate end of headers
-        request << CR_NL
+          # add additional "\r\n" to indicate end of headers
+          request << CR_NL
 
-        # write out the request, sans body
-        socket.write(request)
+          # write out the request, sans body
+          socket.write(request)
 
-        # write out the body
-        if params[:body]
-          if params[:body].is_a?(String)
-            socket.write(params[:body])
-          else
-            while chunk = params[:body].read(CHUNK_SIZE)
-              socket.write(chunk)
+          # write out the body
+          if params[:body]
+            if params[:body].is_a?(String)
+              socket.write(params[:body])
+            else
+              while chunk = params[:body].read(CHUNK_SIZE)
+                socket.write(chunk)
+              end
             end
           end
-        end
 
-        # read the response
-        response = Excon::Response.parse(socket, params, &block)
+          # read the response
+          response = Excon::Response.parse(socket, params, &block)
 
-        if response.headers['Connection'] == 'close'
-          reset
-        end
+          if response.headers['Connection'] == 'close'
+            reset
+          end
 
-        response
+          response
+        end
       rescue Excon::Errors::StubNotFound => stub_not_found
         raise(stub_not_found)
       rescue => socket_error
@@ -237,9 +237,23 @@ module Excon
 
     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]})
+        headers_match = !stub.has_key?(:headers) || stub[:headers].keys.all? do |key|
+          case value = stub[:headers][key]
+          when Regexp
+            value =~ params[:headers][key]
+          else
+            value =~ params[:headers][key]
+          end
+        end
+        non_headers_match = (stub.keys - [:headers]).all? do |key|
+          case value = stub[key]
+          when Regexp
+            value =~ params[key]
+          else
+            value == params[key]
+          end
+        end
+        if headers_match && non_headers_match
           response_attributes = case response
           when Proc
             response.call(params)

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
   unless const_defined?(:VERSION)
-    VERSION = '0.9.1'
+    VERSION = '0.9.2'
   end
 
   unless const_defined?(:CHUNK_SIZE)
@@ -31,6 +31,10 @@ module Excon
     HTTPS = 'https'
   end
 
+  unless const_defined?(:NO_ENTITY)
+    NO_ENTITY = [204, 205, 304].freeze
+  end
+
   unless ::IO.const_defined?(:WaitReadable)
     class ::IO
       module WaitReadable; end

data/lib/excon/response.rb

@@ -1,6 +1,5 @@
 module Excon
   class Response
-    NO_ENTITY = [204, 205, 304].freeze
 
     attr_accessor :body, :headers, :status
 

data/lib/excon/socket.rb

@@ -102,7 +102,11 @@ module Excon
     end
 
     def write(data)
-      while true
+      # We normally return from the return in the else block below, but
+      # we guard that data is still something in case we get weird
+      # values and String#[] returns nil. (This behavior has been observed
+      # in the wild, so this is a simple defensive mechanism)
+      while data
         begin
           # I wish that this API accepted a start position, then we wouldn't
           # have to slice data when there is a short write.
@@ -127,7 +131,13 @@ module Excon
           end
         else
           # Fast, common case.
-          return if written == data.size
+          # The >= seems weird, why would it have written MORE than we
+          # requested. But we're getting some weird behavior when @socket
+          # is an OpenSSL socket, where it seems like it's saying it wrote
+          # more (perhaps due to SSL packet overhead?).
+          #
+          # Pretty weird, but this is a simple defensive mechanism.
+          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

data/tests/stub_tests.rb

@@ -44,6 +44,34 @@ Shindo.tests('Excon stubs') do
 
   end
 
+  tests("stub({:path => %r{/tests/(\S+)}}, {:body => $1, :status => 200})") do
+
+    Excon.stub({:path => %r{/tests/(\S+)}}) do |params|
+      {
+        :body => /tests\/(\S+)/.match(params[:path]).captures.first,
+        :status => 200
+      }
+    end
+
+    connection = Excon.new('http://127.0.0.1:9292', :mock => true)
+    response = connection.request(:method => :get, :path => '/tests/test')
+
+    tests('response.body').returns('test') do
+      response.body
+    end
+
+    tests('response.headers').returns({}) do
+      response.headers
+    end
+
+    tests('response.status').returns(200) do
+      response.status
+    end
+
+    Excon.stubs.clear
+
+  end
+
   tests("stub({:body => 'body', :method => :get}) {|params| {:body => params[:body], :headers => params[:headers], :status => 200}}") do
 
     Excon.stub({:body => 'body', :method => :get}) {|params| {:body => params[:body], :headers => params[:headers], :status => 200}}
@@ -97,6 +125,19 @@ Shindo.tests('Excon stubs') do
 
   Excon.stubs.clear
 
+  tests("stub({}, {:status => 404}") do
+
+    connection = Excon.new('http://127.0.0.1:9292', :mock => true)
+    Excon.stub({}, {:status => 404})
+
+    tests("request(:expects => 200, :method => :get, :path => '/')").raises(Excon::Errors::NotFound) do
+      connection.request(:expects => 200, :method => :get, :path => '/')
+    end
+
+    Excon.stubs.clear
+
+  end
+
   tests('mock = false') do
     with_rackup('basic.ru') do
       basic_tests

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 1
+  - 2
   segments_generated: true
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - dpiddy (Dan Peterson)
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-15 00:00:00 -06:00
+date: 2011-12-16 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency