rack-client 0.3.1.pre.c → 0.3.1.pre.d

data/lib/rack/client/adapter/base.rb

@@ -35,7 +35,6 @@ module Rack
         uri = URI.parse(url)
 
         path_info = uri.path.empty? ? '/' : uri.path
-        path_info += '?' + uri.query unless uri.query.nil? || uri.query.empty?
 
         env.update 'PATH_INFO'    => path_info
         env.update 'REQUEST_URI'  => uri.to_s

data/lib/rack/client/adapter/simple.rb

@@ -57,14 +57,14 @@ module Rack
         end
       end
 
+
       def request_tuple(url, headers = {}, body_or_params = nil, query_params = {}, &block)
-        headers, query_or_params = {}, headers if query_or_params.nil?
-        query_hash = Hash === query_or_params ? query_or_params : Utils.build_query(query_or_params)
+        query_hash = Hash === query_params ? query_params : Utils.build_query(query_params)
 
         uri = URI.parse(url)
 
         unless query_params.empty?
-          uri.query = Utils.build_nested_query(Utils.parse_nested_query(uri.query).merge(query_phrams))
+          uri.query = Utils.build_nested_query(Utils.parse_nested_query(uri.query).merge(query_params))
         end
 
         body = Hash === body_or_params ? Utils.build_nested_query(body_or_params) : body_or_params
@@ -74,8 +74,17 @@ module Rack
 
       def build_env(request_method, url, headers = {}, body = nil)
         uri = @base_uri.nil? ? URI.parse(url) : @base_uri + url
-        super(request_method, uri.to_s, headers, body)
+        {'HTTP_HOST' => http_host_for(uri)}.merge(super(request_method, uri.to_s, headers, body))
+      end
+
+      def http_host_for(uri)
+        unless uri.to_s.include?(":#{uri.port}")
+          [uri.host, uri.port].join(':')
+        else
+          uri.host
+        end
       end
+
     end
   end
 end

data/lib/rack/client/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Client
-    VERSION = "0.3.1.pre.c"
+    VERSION = "0.3.1.pre.d"
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rack-client
 version: !ruby/object:Gem::Version 
-  hash: 1923832054
+  hash: 1923832055
   prerelease: true
   segments: 
   - 0
   - 3
   - 1
   - pre
-  - c
-  version: 0.3.1.pre.c
+  - d
+  version: 0.3.1.pre.d
 platform: ruby
 authors: 
 - Tim Carey-Smith
@@ -17,10 +17,81 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-23 00:00:00 -07:00
+date: 2010-11-09 00:00:00 -08:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rack
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: excon
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: em-http-request
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: typhoeus
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: A client wrapper around a Rack app or HTTP
 email: tim@spork.in
 executables: []
@@ -134,56 +205,6 @@ files:
 - demo/config.ru
 - demo/demo.rb
 - demo/demo_spec.rb
-- spec/core/headers_spec.rb
-- spec/core/headers_spec.rbc
-- spec/core/response_spec.rb
-- spec/core/response_spec.rbc
-- spec/handler/em_http_spec.rb
-- spec/handler/em_http_spec.rbc
-- spec/handler/excon_spec.rb
-- spec/handler/excon_spec.rbc
-- spec/handler/net_http_spec.rb
-- spec/handler/net_http_spec.rbc
-- spec/handler/typhoeus_spec.rb
-- spec/handler/typhoeus_spec.rbc
-- spec/helpers/async_helper.rb
-- spec/helpers/async_helper.rbc
-- spec/helpers/em_http_helper.rb
-- spec/helpers/em_http_helper.rbc
-- spec/helpers/excon_helper.rb
-- spec/helpers/excon_helper.rbc
-- spec/helpers/handler_helper.rb
-- spec/helpers/handler_helper.rbc
-- spec/helpers/net_http_helper.rb
-- spec/helpers/net_http_helper.rbc
-- spec/helpers/sync_helper.rb
-- spec/helpers/sync_helper.rbc
-- spec/helpers/typhoeus_helper.rb
-- spec/helpers/typhoeus_helper.rbc
-- spec/middleware/cache_spec.rb
-- spec/middleware/cache_spec.rbc
-- spec/middleware/cookie_jar_spec.rb
-- spec/middleware/cookie_jar_spec.rbc
-- spec/middleware/etag_spec.rb
-- spec/middleware/etag_spec.rbc
-- spec/middleware/follow_redirects_spec.rb
-- spec/middleware/follow_redirects_spec.rbc
-- spec/middleware/lint_spec.rb
-- spec/middleware/lint_spec.rbc
-- spec/shared/handler_api.rb
-- spec/shared/handler_api.rbc
-- spec/shared/streamed_response_api.rb
-- spec/shared/streamed_response_api.rbc
-- spec/spec_apps/cache.ru
-- spec/spec_apps/cookie.ru
-- spec/spec_apps/delete.ru
-- spec/spec_apps/get.ru
-- spec/spec_apps/head.ru
-- spec/spec_apps/hello_world.ru
-- spec/spec_apps/redirect.ru
-- spec/spec_apps/stream.ru
-- spec/spec_config.ru
-- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/halorgium/rack-client
 licenses: []
@@ -215,59 +236,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 
-rubyforge_project: rack-client
+rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A client wrapper around a Rack app or HTTP
-test_files: 
-- spec/core/headers_spec.rb
-- spec/core/headers_spec.rbc
-- spec/core/response_spec.rb
-- spec/core/response_spec.rbc
-- spec/handler/em_http_spec.rb
-- spec/handler/em_http_spec.rbc
-- spec/handler/excon_spec.rb
-- spec/handler/excon_spec.rbc
-- spec/handler/net_http_spec.rb
-- spec/handler/net_http_spec.rbc
-- spec/handler/typhoeus_spec.rb
-- spec/handler/typhoeus_spec.rbc
-- spec/helpers/async_helper.rb
-- spec/helpers/async_helper.rbc
-- spec/helpers/em_http_helper.rb
-- spec/helpers/em_http_helper.rbc
-- spec/helpers/excon_helper.rb
-- spec/helpers/excon_helper.rbc
-- spec/helpers/handler_helper.rb
-- spec/helpers/handler_helper.rbc
-- spec/helpers/net_http_helper.rb
-- spec/helpers/net_http_helper.rbc
-- spec/helpers/sync_helper.rb
-- spec/helpers/sync_helper.rbc
-- spec/helpers/typhoeus_helper.rb
-- spec/helpers/typhoeus_helper.rbc
-- spec/middleware/cache_spec.rb
-- spec/middleware/cache_spec.rbc
-- spec/middleware/cookie_jar_spec.rb
-- spec/middleware/cookie_jar_spec.rbc
-- spec/middleware/etag_spec.rb
-- spec/middleware/etag_spec.rbc
-- spec/middleware/follow_redirects_spec.rb
-- spec/middleware/follow_redirects_spec.rbc
-- spec/middleware/lint_spec.rb
-- spec/middleware/lint_spec.rbc
-- spec/shared/handler_api.rb
-- spec/shared/handler_api.rbc
-- spec/shared/streamed_response_api.rb
-- spec/shared/streamed_response_api.rbc
-- spec/spec_apps/cache.ru
-- spec/spec_apps/cookie.ru
-- spec/spec_apps/delete.ru
-- spec/spec_apps/get.ru
-- spec/spec_apps/head.ru
-- spec/spec_apps/hello_world.ru
-- spec/spec_apps/redirect.ru
-- spec/spec_apps/stream.ru
-- spec/spec_config.ru
-- spec/spec_helper.rb
+test_files: []
+

data/spec/core/headers_spec.rb

@@ -1,47 +0,0 @@
-require 'spec_helper'
-
-describe Rack::Client::Headers do
-  context ".from" do
-    it 'rejects headers which do not do not start with HTTP_, excluding CONTENT_TYPE and CONTENT_LENGTH' do
-      headers = Rack::Client::Headers.from('rack.foo' => 'bar',
-                                           'HTTP_X_RACK_FOO' => 'bar',
-                                           'CONTENT_TYPE' => 'text/plain',
-                                           'CONTENT_LENGTH' => 100)
-      headers['rack.foo'].should be_nil
-      headers['HTTP_X_RACK_FOO'].should == 'bar'
-      headers['CONTENT_TYPE'].should == 'text/plain'
-      headers['CONTENT_LENGTH'].should == 100
-    end
-  end
-
-  context "#initialize" do
-    it 'merges in any arguments' do
-      Rack::Client::Headers.new('HTTP_X_RACK_FOO' => 'bar')['HTTP_X_RACK_FOO'] = 'bar'
-    end
-  end
-
-  context "#to_http" do
-    it 'removes the leading "HTTP_" from headers' do
-      headers = Rack::Client::Headers.new('HTTP_X_RACK_FOO' => 'bar').to_http
-      headers.keys.detect {|header| header =~ /^HTTP_/ }.should be_nil
-    end
-
-    it 'Titleizes the header name' do
-      headers = Rack::Client::Headers.new('HTTP_X_RACK_FOO' => 'bar').to_http
-      headers['X-Rack-Foo'].should == 'bar'
-    end
-  end
-
-  context "#to_env" do
-    it 'rackifies http header names, except CONTENT_TYPE and CONTENT_LENGTH' do
-      headers = Rack::Client::Headers.new('rack.foo' => 'bar',
-                                          'X-Rack-Foo' => 'bar',
-                                          'CONTENT_TYPE' => 'text/plain',
-                                          'CONTENT_LENGTH' => 100).to_env
-
-      headers['HTTP_X_RACK_FOO'].should == 'bar'
-      headers['CONTENT_TYPE'].should == 'text/plain'
-      headers['CONTENT_LENGTH'].should == 100
-    end
-  end
-end