rack-client 0.3.0 → 0.3.1.pre.a

data/Rakefile

@@ -1,18 +1,13 @@
 require 'rubygems'
 require 'rake'
-require "rake/gempackagetask"
-require "rake/clean"
-require "spec/rake/spectask"
+require 'rake/gempackagetask'
+require 'rake/clean'
+require 'rspec/core/rake_task'
+
 
 $:.unshift File.join(File.dirname(__FILE__), 'lib')
 require 'rack/client/version'
 
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ['-c']
-end
-
-task :default  => :spec
 
 spec = Gem::Specification.new do |s|
   s.name              = "rack-client"
@@ -26,11 +21,7 @@ spec = Gem::Specification.new do |s|
   s.files             = %w[History.txt LICENSE README.textile Rakefile] + Dir["lib/**/*"] + Dir["demo/**/*"]
   s.test_files        = Dir["spec/**/*"]
 
-  require 'bundler'
-  bundle = Bundler::Definition.from_gemfile("Gemfile")
-  bundle.dependencies.
-    select { |d| d.groups.include?(:runtime) }.
-    each   { |d| s.add_dependency(d.name, d.version_requirements.to_s)  }
+  s.add_bundler_dependencies
 end
 
 Rake::GemPackageTask.new(spec) do |package|
@@ -42,3 +33,10 @@ task :install => [:clean, :package] do
   gem = Dir['pkg/*.gem'].first
   sh "sudo gem install --no-rdoc --no-ri --local #{gem}"
 end
+
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = %w[ -c -f documentation -r ./spec/spec_helper.rb ]
+  t.pattern = 'spec/**/*_spec.rb'
+end
+
+task :default  => :spec

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

@@ -11,16 +11,20 @@ module Rack
 
       %w[ options get head post put delete trace connect ].each do |method|
         eval <<-RUBY, binding, __FILE__, __LINE__ + 1
-          def #{method}(url, headers = {}, body = nil)
-            if block_given?
-              call(build_env('#{method.upcase}', url, headers, body)) {|tuple| yield *tuple }
-            else
-              return *call(build_env('#{method.upcase}', url, headers, body))
-            end
+          def #{method}(url, headers = {}, body = nil, &block)
+            request('#{method.upcase}', url, headers, body, &block)
           end
         RUBY
       end
 
+      def request(method, url, headers = {}, body = nil)
+        if block_given?
+          call(build_env(method.upcase, url, headers, body)) {|tuple| yield *tuple }
+        else
+          return *call(build_env(method.upcase, url, headers, body))
+        end
+      end
+
       def build_env(request_method, url,  headers = {}, body = nil)
         env = Headers.new(headers).to_env
 
@@ -33,20 +37,25 @@ module Rack
         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
-        env.update 'SERVER_NAME' => uri.host
-        env.update 'SERVER_PORT' => uri.port
-        env.update 'SCRIPT_NAME' => ''
+        env.update 'PATH_INFO'    => path_info
+        env.update 'REQUEST_URI'  => uri.to_s
+        env.update 'SERVER_NAME'  => uri.host
+        env.update 'SERVER_PORT'  => uri.port.to_s
+        env.update 'SCRIPT_NAME'  => ''
+        env.update 'QUERY_STRING' => uri.query.to_s
 
         input = case body
                 when nil        then StringIO.new
                 when String     then StringIO.new(body)
                 end
 
-        env.update 'rack.input'       => input
-        env.update 'rack.errors'      => StringIO.new
-        env.update 'rack.url_scheme'  => uri.scheme
+        env.update 'rack.input'         => input
+        env.update 'rack.errors'        => StringIO.new
+        env.update 'rack.url_scheme'    => uri.scheme
+        env.update 'rack.version'       => Rack::VERSION
+        env.update 'rack.multithread'   => true
+        env.update 'rack.multiprocess'  => true
+        env.update 'rack.run_once'      => false
 
         env.update 'HTTPS'  => env["rack.url_scheme"] == "https" ? "on" : "off"