excon 0.5.7 → 0.5.8

data/Gemfile

@@ -6,7 +6,7 @@ group :benchmark do
   gem 'em-http-request'
   gem 'httparty'
   gem 'rest-client'
-  gem 'tach', :path => '~/geemus/tach'
+  gem 'tach'
   gem 'typhoeus'
   gem 'sinatra'
   gem 'streamly_ffi'

data/changelog.txt

@@ -1,3 +1,10 @@
+0.5.8 03/24/11
+==============
+
+* fix regression where nil values in queries were ignored in 1.9. thanks mattsa
+* fix regression causing EOFError when making many connections in one thread
+* added tests to prevent both of the former from recurring
+
 0.5.7 03/21/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.5.7'
-  s.date              = '2011-03-21'
+  s.version           = '0.5.8'
+  s.date              = '2011-03-24'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -89,7 +89,9 @@ Gem::Specification.new do |s|
     lib/excon/errors.rb
     lib/excon/response.rb
     tests/basic_tests.rb
+    tests/query_string_tests.rb
     tests/rackups/basic.ru
+    tests/rackups/query_string.ru
     tests/rackups/thread_safety.ru
     tests/stub_tests.rb
     tests/test_helper.rb

data/lib/excon.rb

@@ -13,7 +13,7 @@ require 'excon/response'
 
 module Excon
   unless const_defined?(:VERSION)
-    VERSION = '0.5.7'
+    VERSION = '0.5.8'
   end
 
   unless const_defined?(:CHUNK_SIZE)

data/lib/excon/connection.rb

@@ -28,6 +28,7 @@ module Excon
       }.merge!(params)
 
       @socket_key = '' << @connection[:host] << ':' << @connection[:port].to_s
+      reset
     end
 
     # Sends the supplied request to the destination host.
@@ -72,8 +73,15 @@ module Excon
         when Hash
           request << '?'
           for key, values in params[:query]
-            for value in [*values]
-              request << key.to_s << '=' << CGI.escape(value.to_s) << '&'
+            case values
+            when nil
+              request << key.to_s << '&'
+            when Array
+              values.each do |value|
+                request << key.to_s << '=' << CGI.escape(value.to_s) << '&'
+              end
+            else
+              request << key.to_s << '=' << CGI.escape(values.to_s) << '&'
             end
           end
           request.chop! # remove trailing '&'

data/tests/query_string_tests.rb

@@ -0,0 +1,60 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
+
+with_rackup('query_string.ru') do
+  Shindo.tests('Excon query string variants') do
+    connection = Excon.new('http://127.0.0.1:9292')
+    
+    tests(":query => {:foo => 'bar'}") do
+
+      response = connection.request(:method => :get, :path => '/query', :query => {:foo => 'bar'})
+      query_string = response.body[7..-1] # query string sent
+      
+      tests("query string sent").returns('foo=bar') do
+        query_string
+      end
+      
+    end
+    
+    tests(":query => {:foo => nil}") do
+
+      response = connection.request(:method => :get, :path => '/query', :query => {:foo => nil})
+      query_string = response.body[7..-1] # query string sent
+      
+      tests("query string sent").returns('foo') do
+        query_string
+      end
+      
+    end
+    
+    tests(":query => {:foo => 'bar', :me => nil}") do
+
+      response = connection.request(:method => :get, :path => '/query', :query => {:foo => 'bar', :me => nil})
+      query_string = response.body[7..-1] # query string sent
+      
+      tests("query string sent includes 'foo=bar'").returns(true) do
+        query_string.split('&').include?('foo=bar')
+      end
+      
+      tests("query string sent includes 'me'").returns(true) do
+        query_string.split('&').include?('me')
+      end
+      
+    end
+    
+    tests(":query => {:foo => 'bar', :me => 'too'}") do
+
+      response = connection.request(:method => :get, :path => '/query', :query => {:foo => 'bar', :me => 'too'})
+      query_string = response.body[7..-1] # query string sent
+      
+      tests("query string sent includes 'foo=bar'").returns(true) do
+        query_string.split('&').include?('foo=bar')
+      end
+      
+      tests("query string sent includes 'me=too'").returns(true) do
+        query_string.split('&').include?('me=too')
+      end
+      
+    end
+    
+  end
+end

data/tests/rackups/query_string.ru

@@ -0,0 +1,9 @@
+require 'sinatra'
+
+class App < Sinatra::Base
+  get '/query' do
+    "query: " + request.query_string
+  end
+end
+
+run App

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: excon
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 5
-  - 7
-  version: 0.5.7
+  - 8
+  version: 0.5.8
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 -07:00
+date: 2011-03-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -111,7 +111,9 @@ files:
 - lib/excon/errors.rb
 - lib/excon/response.rb
 - tests/basic_tests.rb
+- tests/query_string_tests.rb
 - tests/rackups/basic.ru
+- tests/rackups/query_string.ru
 - tests/rackups/thread_safety.ru
 - tests/stub_tests.rb
 - tests/test_helper.rb