excon 0.21.0 → 0.22.0

data/Gemfile.lock

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

data/README.md

@@ -48,8 +48,15 @@ Both one-off and persistent connections support many other options. Here are a f
     connection = Excon.new('http://geemus.com/')
     connection.get(:query => {:foo => 'bar'})
 
-    # POST body
-    Excon.post('http://geemus.com', :body => 'language=ruby&class=fog')
+    # POST body encoded with application/x-www-form-urlencoded
+    Excon.post('http://geemus.com',
+      :body => 'language=ruby&class=fog',
+      :headers => { "Content-Type" => "application/x-www-form-urlencoded" })
+
+    # same again, but using URI to build the body of parameters
+    Excon.post('http://geemus.com',
+      :body => URI.encode_www_form(:language => 'ruby', :class => 'fog'),
+      :headers => { "Content-Type" => "application/x-www-form-urlencoded" })
 
     # request accepts either symbols or strings
     connection.request(:method => :get)
@@ -61,9 +68,12 @@ Both one-off and persistent connections support many other options. Here are a f
     # this request can be repeated safely, retry up to 6 times
     connection.request(:idempotent => true, :retry_limit => 6)
 
-    # opt out of nonblocking operations for performance and/or as a workaround
+    # opt-out of nonblocking operations for performance and/or as a workaround
     connection.request(:nonblock => false)
 
+    # opt-in to omitting port from http:80 and https:443
+    connection.request(:omit_default_port => true)
+
     # set longer connect_timeout (default is 60 seconds)
     connection.request(:connect_timeout => 360)
 

data/changelog.txt

@@ -1,3 +1,11 @@
+0.22.0 05/17/2013
+=================
+
+remove request/response info from default error messages to avoid credential leaks
+add option to omit default ports (http:80 and https:443)
+add examples for form encoding
+updates to facilitate streaming responses from middleware responses
+
 0.21.0 05/04/2013
 =================
 

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.21.0'
-  s.date              = '2013-05-04'
+  s.version           = '0.22.0'
+  s.date              = '2013-05-17'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long

data/lib/excon.rb

@@ -29,6 +29,7 @@ module Excon
         ],
         :mock               => false,
         :nonblock           => DEFAULT_NONBLOCK,
+        :omit_default_port  => false,
         :read_timeout       => 60,
         :retry_limit        => DEFAULT_RETRY_LIMIT,
         :ssl_ca_file        => DEFAULT_CA_FILE,

data/lib/excon/connection.rb

@@ -106,7 +106,7 @@ module Excon
           # start with "METHOD /path"
           request = datum[:method].to_s.upcase << ' '
           if @data[:proxy]
-            request << datum[:scheme] << '://' << @data[:host] << ':' << @data[:port].to_s
+            request << datum[:scheme] << '://' << @data[:host] << port_string(@data)
           end
           request << datum[:path]
 
@@ -197,6 +197,13 @@ module Excon
     end
 
     def response_call(datum)
+      if datum.has_key?(:response_block) && !datum[:response][:body].empty?
+        content_length = remaining = datum[:response][:body].bytesize
+        while remaining > 0
+          datum[:response_block].call(datum[:response][:body].slice!(0, [datum[:chunk_size], remaining].min), [remaining - datum[:chunk_size], 0].max, content_length)
+          remaining -= datum[:chunk_size]
+        end
+      end
       datum
     end
 
@@ -215,7 +222,8 @@ module Excon
       datum = @data.merge(params)
       invalid_keys_warning(params, VALID_CONNECTION_KEYS)
       datum[:headers] = @data[:headers].merge(datum[:headers] || {})
-      datum[:headers]['Host']   ||= '' << datum[:host] << ':' << datum[:port].to_s
+
+      datum[:headers]['Host']   ||= '' << datum[:host] << port_string(datum)
       datum[:retries_remaining] ||= datum[:retry_limit]
 
       # if path is empty or doesn't start with '/', insert one
@@ -385,5 +393,12 @@ module Excon
       end
     end
 
+    def port_string(datum)
+      if datum[:omit_default_port] && (datum[:scheme].casecmp('http') == 0 && datum[:port].to_i == 80) || (datum[:scheme].casecmp('https') == 0 && datum[:port].to_i == 443)
+        ''
+      else
+        ':' << datum[:port].to_s
+      end
+    end
   end
 end

data/lib/excon/constants.rb

@@ -50,6 +50,7 @@ module Excon
     :middlewares,
     :mock,
     :nonblock,
+    :omit_default_port,
     :password,
     :path,
     :pipeline,
@@ -71,7 +72,7 @@ module Excon
     :write_timeout
   ]
 
-  VERSION = '0.21.0'
+  VERSION = '0.22.0'
 
   unless ::IO.const_defined?(:WaitReadable)
     class ::IO

data/lib/excon/errors.rb

@@ -121,15 +121,7 @@ module Excon
       }
 
       error, message = @errors[response[:status]] || [Excon::Errors::HTTPStatusError, 'Unknown']
-
-      # scrub authorization
-      request = request.dup
-      request.reject! {|key, value| [:connection, :stack].include?(key)}
-      if request.has_key?(:headers) && request[:headers].has_key?('Authorization')
-        request[:headers] = request[:headers].dup
-        request[:headers]['Authorization'] = REDACTED
-      end
-      error.new("Expected(#{request[:expects].inspect}) <=> Actual(#{response[:status]} #{message})\n  request => #{request.inspect}\n  response => #{response.inspect}", request, response)
+      error.new("Expected(#{request[:expects].inspect}) <=> Actual(#{response[:status]} #{message})", request, response)
     end
 
   end

data/lib/excon/middlewares/expects.rb

@@ -6,7 +6,7 @@ module Excon
           raise(
             Excon::Errors.status_error(
               datum.reject {|key,value| key == :response},
-              Excon::Response.new(datum[:response])              
+              Excon::Response.new(datum[:response])
             )
           )
         else

data/lib/excon/middlewares/mock.rb

@@ -33,19 +33,6 @@ module Excon
             if stub_datum.has_key?(:headers)
               datum[:response][:headers].merge!(stub_datum[:headers])
             end
-
-            if datum[:expects] && ![*datum[:expects]].include?(datum[:response][:status])
-              # don't pass stuff into a block if there was an error
-            elsif datum.has_key?(:response_block) && datum[:response].has_key?(:body)
-              body = datum[:response].delete(:body)
-              content_length = remaining = body.bytesize
-              i = 0
-              while i < body.length
-                datum[:response_block].call(body[i, datum[:chunk_size]], [remaining - datum[:chunk_size], 0].max, content_length)
-                remaining -= datum[:chunk_size]
-                i += datum[:chunk_size]
-              end
-            end
           else
             # if we reach here no stubs matched
             raise(Excon::Errors::StubNotFound.new('no stubs matched ' << datum.inspect))

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
+  prerelease: 
 platform: ruby
 authors:
 - dpiddy (Dan Peterson)
@@ -10,118 +11,134 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: delorean
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shindo
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: EXtended http(s) CONnections
@@ -203,25 +220,29 @@ files:
 - tests/timeout_tests.rb
 homepage: https://github.com/geemus/excon
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2062001769353405727
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: excon
-rubygems_version: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 2
 summary: speed, persistence, http(s)

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 79d850549c9cd7933c1c9a05634c3a742a68fd7c
-  data.tar.gz: c0e139c9271d440f1904e7e48a1e63001025bcae
-SHA512:
-  metadata.gz: ca660fbb1fd12593fc7b8e7dc0527c36689dac4774e0ba812b56f0ba2fa75b400642552418d9c53075b7e51d12dc1e51b1b7897b0331b965cfe87a04dfe48780
-  data.tar.gz: f8d723abcc8c5db7b54d5863259f37732ea64b3a68f5f5395c38d91f517ff5d28c5a661f81338845ae6f20c393bdd6ea9186fc516e30b570e4666230773d05ad