excon 0.37.0 → 0.38.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTA1OTcwN2U0ZDZkNWFiYWI0ZGY3NzkzZjgwNDg0MDJlOTI0OGM2Ng==
+    N2Q1NWY3Zjk1ZmMzZTc5ZTFjODAzZGMyZmUwMTljYTkyYTFjNjAxMw==
   data.tar.gz: !binary |-
-    MDhkY2IzMmQyNmU1NTQ1MzA4NTRlZDljMDNlYzkxMzI2YjRhMjNjOQ==
+    NjFkNTZhNTlmMGFkN2MwNjJjNDEzZjM2MGYyYjg3OTNhNTM5NjM5Yw==
 SHA512:
   metadata.gz: !binary |-
-    NTMxZjAyMDViNmI2N2MzY2VhYjQyMDg1OTU1ZmZmN2U2NTk5Y2NjNDQ5ZDMw
-    MWNlMWRlNzYyNWM3ZGE5MjkyZDhjYjk2NTI5YjU1NTIxMWM3MTk0Yjc4M2M0
-    MjQxMmU1NzM3ZGQxZGM1NGFlMjYzMWIxZjI5NzRmNThlODJmNTU=
+    NjE0NGE3NzdiMDA4YTg0NWIyNDMxNGMyMDBiY2I4MDkzZjRjYWU4NzE1Nzhl
+    Yjk5N2YyYjRlYzdlMDBlM2VhYTU1MTQ4OTU5Zjc2YTc4OWY1OWMwMTNjODdm
+    ZDkxZWVhODdiYmVkNzgzMGU2MGY1NjNmMjBhOTQ2MThmNWQzNGY=
   data.tar.gz: !binary |-
-    ZDQxMWEyZjljYzk1ZTljOTdiMTc4Njk5NzEzNGQxYWFhODU1MDgzZWI3Nzkw
-    OWQzOTgwODZkMzliYmVhOGY5YTdiNGZhYTExOTI5MmRmOTA4MmIyNDJjOTRl
-    ZmRlNmYzNDhiZmJkNzk5ZjJiM2JlODQ2ZWFiM2RhZjc3MDhiOWY=
+    NWQ5OTYyMzhlNzMwZWRlMGY1ODUxMWFkZjU0MWQ1MmRiMjUyMGNjMDA1ZjIw
+    ZjI2YTlhNzZiN2Y1ODg4MGFjMTNjNDljMmU5NzFiNmFhNzMyMjk1YTQxMzg0
+    YjdhYWNlZmUwYjI4MTc1ZTU2NDAwNThlMjljODVjMTc1ZjIyNTg=

data/CONTRIBUTING.md

@@ -14,7 +14,7 @@ New contributors are always welcome, when it doubt please ask questions. We stri
 
 ### Non-Coding
 
-* Work for {twitter}[http://twitter.com]? I'd love to reclaim the unused {@excon}[http://twitter.com/excon] account!
+* Work for [twitter](http://twitter.com)? I'd love to reclaim the unused [@excon](http://twitter.com/excon) account!
 * Offer feedback on open [issues](https://github.com/excon/excon/issues).
 * Write and help edit [documentation](https://github.com/excon/excon.github.com).
 * Translate [documentation](https://github.com/excon/excon.github.com) in to other languages.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    excon (0.37.0)
+    excon (0.38.0)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -4,7 +4,7 @@ Usable, fast, simple Ruby HTTP 1.1
 
 Excon was designed to be simple, fast and performant. It works great as a general HTTP(s) client and is particularly well suited to usage in API clients.
 
-[![Build Status](https://secure.travis-ci.org/geemus/excon.png)](http://travis-ci.org/geemus/excon)
+[![Build Status](https://secure.travis-ci.org/excon/excon.png)](http://travis-ci.org/excon/excon)
 [![Dependency Status](https://gemnasium.com/geemus/excon.png)](https://gemnasium.com/geemus/excon)
 [![Gem Version](https://fury-badge.herokuapp.com/rb/excon.png)](http://badge.fury.io/rb/excon)
 [![Gittip](http://img.shields.io/gittip/geemus.png)](https://www.gittip.com/geemus/)
@@ -339,7 +339,7 @@ The #instrument method will be called for each HTTP request, response, retry, an
 
 For debugging purposes you can also use Excon::StandardInstrumentor to output all events to stderr. This can also be specified by setting the `EXCON_DEBUG` ENV var.
 
-See [the documentation for ActiveSupport::Notifications](http://api.rubyonrails.org/classes/ActiveSupport/Notifications.html) for more detail on using the subscription interface.  See excon's instrumentation_test.rb for more examples of instrumenting excon.
+See [the documentation for ActiveSupport::Notifications](http://api.rubyonrails.org/classes/ActiveSupport/Notifications.html) for more detail on using the subscription interface.  See excon's [instrumentation_test.rb](https://github.com/excon/excon/blob/master/tests/middlewares/instrumentation_tests.rb) for more examples of instrumenting excon.
 
 ## HTTPS/SSL Issues
 
@@ -363,12 +363,12 @@ Either of these should allow you to work around the socket error and continue wi
 
 * [General Documentation](http://excon.io).
 * Ask specific questions on [Stack Overflow](http://stackoverflow.com/questions/tagged/excon).
-* Report bugs and discuss potential features in [Github issues](https://github.com/geemus/excon/issues).
+* Report bugs and discuss potential features in [Github issues](https://github.com/excon/excon/issues).
 
 ## Contributing
 
-Please refer to [CONTRIBUTING.md](https://github.com/geemus/excon/blob/master/CONTRIBUTING.md).
+Please refer to [CONTRIBUTING.md](https://github.com/excon/excon/blob/master/CONTRIBUTING.md).
 
 ## License
 
-Please refer to [LICENSE.md](https://github.com/geemus/excon/blob/master/LICENSE.md).
+Please refer to [LICENSE.md](https://github.com/excon/excon/blob/master/LICENSE.md).

data/changelog.txt

@@ -1,3 +1,11 @@
+0.38.0 07/09/2014
+=================
+
+avoid reading non-file bodies (mock related fix)
+fixes to readme links
+fix excon_debug to set debug_response
+ensure both \r and \n are read when parsing headers
+
 0.37.0 06/09/2014
 =================
 

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.37.0'
-  s.date              = '2014-06-09'
+  s.version           = '0.38.0'
+  s.date              = '2014-07-09'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   ## a custom homepage, consider using your GitHub URL or the like.
   s.authors  = ["dpiddy (Dan Peterson)", "geemus (Wesley Beary)", "nextmat (Matt Sanders)"]
   s.email    = 'geemus@gmail.com'
-  s.homepage = 'https://github.com/geemus/excon'
+  s.homepage = 'https://github.com/excon/excon'
   s.license  = 'MIT'
 
   ## This gets added to the $LOAD_PATH so that 'lib/NAME.rb' can be required as

data/lib/excon/connection.rb

@@ -85,7 +85,7 @@ module Excon
         @data[:instrumentor] = Excon::StandardInstrumentor
 
         if ENV.has_key?('EXCON_DEBUG')
-          @data[:debug_request] = @data[:debug_reponse] = true
+          @data[:debug_request] = @data[:debug_response] = true
         end
       end
 

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
 
-  VERSION = '0.37.0'
+  VERSION = '0.38.0'
 
   CR_NL = "\r\n"
 

data/lib/excon/errors.rb

@@ -3,6 +3,7 @@ module Excon
 
     class Error < StandardError; end
     class StubNotFound < StandardError; end
+    class InvalidStub < StandardError; end
 
     class SocketError < Error
       attr_reader :socket_error

data/lib/excon/middlewares/mock.rb

@@ -4,7 +4,7 @@ module Excon
       def request_call(datum)
         if datum[:mock]
           # convert File/Tempfile body to string before matching:
-          unless datum[:body].nil? || datum[:body].is_a?(String)
+          if datum[:body].respond_to?(:read)
            if datum[:body].respond_to?(:binmode)
              datum[:body].binmode
            end
@@ -12,6 +12,8 @@ module Excon
              datum[:body].rewind
            end
            datum[:body] = datum[:body].read
+          elsif !datum[:body].nil? && !datum[:body].is_a?(String)
+            raise Excon::Errors::InvalidStub.new("Request body should be a string or an IO object. #{datum[:body].class} provided")
           end
 
           if stub = Excon.stub_for(datum)

data/lib/excon/response.rb

@@ -83,7 +83,10 @@ module Excon
                 chunk_size -= chunk.bytesize
                 response_block.call(chunk, nil, nil)
               end
-              socket.read(2) # 2 == "\r\n".length
+              new_line_size = 2 # 2 == "\r\n".length
+              while new_line_size > 0
+                new_line_size -= socket.read(new_line_size).length
+              end
             end
           else
             while (chunk_size = socket.readline.chomp!.to_i(16)) > 0
@@ -92,7 +95,10 @@ module Excon
                 chunk_size -= chunk.bytesize
                 datum[:response][:body] << chunk
               end
-              socket.read(2) # 2 == "\r\n".length
+              new_line_size = 2 # 2 == "\r\n".length
+              while new_line_size > 0
+                new_line_size -= socket.read(new_line_size).length
+              end
             end
           end
           parse_headers(socket, datum) # merge trailers into headers

data/tests/middlewares/mock_tests.rb

@@ -132,6 +132,12 @@ Shindo.tests('Excon stubs') do
 
   end
 
+  tests("invalid stub response").raises(Excon::Errors::InvalidStub) do
+    Excon.stub({:body => 42, :method => :get}, {:status => 200})
+    connection = Excon.new('http://127.0.0.1:9292', :mock => true)
+    connection.request(:body => 42, :method => :get, :path => '/').status
+  end
+
   tests("mismatched stub").raises(Excon::Errors::StubNotFound) do
     Excon.stub({:method => :post}, {:body => 'body'})
     Excon.get('http://127.0.0.1:9292/', :mock => true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.38.0
 platform: ruby
 authors:
 - dpiddy (Dan Peterson)
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -224,7 +224,7 @@ files:
 - tests/thread_safety_tests.rb
 - tests/timeout_tests.rb
 - tests/utils_tests.rb
-homepage: https://github.com/geemus/excon
+homepage: https://github.com/excon/excon
 licenses:
 - MIT
 metadata: {}