excon 0.25.1 → 0.25.2

data/Gemfile.lock

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

data/changelog.txt

@@ -1,3 +1,12 @@
+0.25.2 07/18/2013
+=================
+
+add license to gemspec
+add "excon/#{version}" default user agent
+create/use response parser middleware
+fix proxy request info to use datum rather than @data
+
+
 0.25.1 07/01/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.25.1'
-  s.date              = '2013-07-02'
+  s.version           = '0.25.2'
+  s.date              = '2013-07-18'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   s.authors  = ["dpiddy (Dan Peterson)", "geemus (Wesley Beary)", "nextmat (Matt Sanders)"]
   s.email    = 'geemus@gmail.com'
   s.homepage = 'https://github.com/geemus/excon'
+  s.license  = 'MIT'
 
   ## This gets added to the $LOAD_PATH so that 'lib/NAME.rb' can be required as
   ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
@@ -101,6 +102,7 @@ Gem::Specification.new do |s|
     lib/excon/middlewares/idempotent.rb
     lib/excon/middlewares/instrumentor.rb
     lib/excon/middlewares/mock.rb
+    lib/excon/middlewares/response_parser.rb
     lib/excon/response.rb
     lib/excon/socket.rb
     lib/excon/ssl_socket.rb

data/lib/excon.rb

@@ -20,10 +20,13 @@ module Excon
         :connect_timeout    => 60,
         :debug_request      => false,
         :debug_response     => false,
-        :headers            => {},
+        :headers            => {
+          'User-Agent' => USER_AGENT
+        },
         :idempotent         => false,
         :instrumentor_name  => 'excon',
         :middlewares        => [
+          Excon::Middleware::ResponseParser,
           Excon::Middleware::Expects,
           Excon::Middleware::Idempotent,
           Excon::Middleware::Instrumentor,
@@ -58,6 +61,7 @@ require 'excon/middlewares/expects'
 require 'excon/middlewares/idempotent'
 require 'excon/middlewares/instrumentor'
 require 'excon/middlewares/mock'
+require 'excon/middlewares/response_parser'
 require 'excon/response'
 require 'excon/socket'
 require 'excon/ssl_socket'

data/lib/excon/connection.rb

@@ -105,8 +105,8 @@ module Excon
           socket.data = datum
           # start with "METHOD /path"
           request = datum[:method].to_s.upcase << ' '
-          if @data[:proxy]
-            request << datum[:scheme] << '://' << @data[:host] << port_string(@data)
+          if datum[:proxy]
+            request << datum[:scheme] << '://' << datum[:host] << port_string(datum)
           end
           request << datum[:path]
 
@@ -346,10 +346,6 @@ module Excon
     end
 
     def response(datum={})
-      unless datum.has_key?(:response)
-        datum = Excon::Response.parse(socket, datum)
-      end
-
       datum[:stack].response_call(datum)
     rescue => error
       case error

data/lib/excon/constants.rb

@@ -77,7 +77,8 @@ module Excon
     :write_timeout
   ]
 
-  VERSION = '0.25.1'
+  VERSION = '0.25.2'
+  USER_AGENT = 'excon/' << VERSION
 
   unless ::IO.const_defined?(:WaitReadable)
     class ::IO

data/lib/excon/middlewares/response_parser.rb

@@ -0,0 +1,12 @@
+module Excon
+  module Middleware
+    class ResponseParser < Excon::Middleware::Base
+      def response_call(datum)
+        unless datum.has_key?(:response)
+          datum = Excon::Response.parse(datum[:connection].send(:socket), datum)
+        end
+        @stack.response_call(datum)
+      end
+    end
+  end
+end

data/tests/middlewares/mock_tests.rb

@@ -85,7 +85,7 @@ Shindo.tests('Excon stubs') do
       response.body
     end
 
-    tests('response.headers').returns({'Host' => '127.0.0.1:9292'}) do
+    tests('response.headers').returns({'Host' => '127.0.0.1:9292', 'User-Agent' => "excon/#{Excon::VERSION}"}) do
       response.headers
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.25.1
+  version: 0.25.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -182,6 +182,7 @@ files:
 - lib/excon/middlewares/idempotent.rb
 - lib/excon/middlewares/instrumentor.rb
 - lib/excon/middlewares/mock.rb
+- lib/excon/middlewares/response_parser.rb
 - lib/excon/response.rb
 - lib/excon/socket.rb
 - lib/excon/ssl_socket.rb
@@ -221,7 +222,8 @@ files:
 - tests/thread_safety_tests.rb
 - tests/timeout_tests.rb
 homepage: https://github.com/geemus/excon
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
@@ -235,7 +237,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1836858691411277981
+      hash: 4254645777267103019
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: