rest-client-components 1.1.1 → 1.2.0

data/Rakefile

@@ -9,7 +9,7 @@ begin
     s.homepage = "http://github.com/crohr/rest-client-components"
     s.description = "RestClient on steroids ! Easily add one or more Rack middleware around RestClient to add functionalities such as transparent caching (Rack::Cache), transparent logging, etc."
     s.authors = ["Cyril Rohr"]
-    s.add_dependency "rest-client", ">= 1.5.0"
+    s.add_dependency "rest-client", ">= 1.6.0", "< 1.7.0"
     s.add_dependency "rack", ">= 1.0.1"
     s.add_development_dependency "webmock"
   end

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

data/lib/restclient/components.rb

@@ -90,7 +90,11 @@ module RestClient
       uri = URI.parse(@url)
       # minimal rack spec
       env = { 
-        "restclient.hash" => {:request => self, :error => nil, :block => block},
+        "restclient.hash" => {
+          :request => self, 
+          :error => nil, 
+          :block => block
+        },
         "REQUEST_METHOD" => @method.to_s.upcase,
         "SCRIPT_NAME" => "",
         "PATH_INFO" => uri.path || "/",
@@ -108,7 +112,12 @@ module RestClient
       @processed_headers.each do |key, value|
         env.merge!("HTTP_"+key.to_s.gsub("-", "_").upcase => value)
       end
-      env.delete('HTTP_CONTENT_TYPE'); env.delete('HTTP_CONTENT_LENGTH')
+      if content_type = env.delete('HTTP_CONTENT_TYPE')
+        env['CONTENT_TYPE'] = content_type
+      end
+      if content_length = env.delete('HTTP_CONTENT_LENGTH')
+        env['CONTENT_LENGTH'] = content_length
+      end
       stack = RestClient::RACK_APP
       RestClient.components.each do |(component, args)|
         if (args || []).empty?
@@ -169,10 +178,12 @@ module RestClient
     begin
       # get the original request, replace headers with those of env, and execute it
       request = env['restclient.hash'][:request]
-      additional_headers = (env.keys.select{|k| k=~/^HTTP_/}).inject({}){|accu, k|
-        accu[k.gsub("HTTP_", "")] = env[k]
+      env_headers = (env.keys.select{|k| k=~/^HTTP_/}).inject({}){|accu, k|
+        accu[k.gsub("HTTP_", "").split("_").map{|s| s.downcase.capitalize}.join("-")] = env[k]
         accu
       }
+      env_headers['Content-Type'] = env['CONTENT_TYPE'] if env['CONTENT_TYPE']
+      env_headers['Content-Length'] = env['CONTENT_LENGTH'] if env['CONTENT_LENGTH']
       # hack, should probably avoid to call #read on rack.input..
       payload = if (env['rack.input'].size > 0)
         env['rack.input'].rewind
@@ -181,12 +192,14 @@ module RestClient
         nil
       end
       request.instance_variable_set "@payload", payload
-      headers = request.make_headers(additional_headers)
-      headers.delete('Content-Type')
-      headers['Content-type'] = env['CONTENT_TYPE'] if env['CONTENT_TYPE']
+      headers = request.make_headers(env_headers)
       request.processed_headers.update(headers)
       response = request.original_execute
-    rescue RestClient::ExceptionWithResponse => e  
+    rescue RestClient::ExceptionWithResponse => e    
+      # re-raise the error if the response is nil (RestClient does not
+      # differentiate between a RestClient::RequestTimeout due to a 408 
+      # status code, and a RestClient::RequestTimeout due to a Timeout::Error)
+      raise e if e.response.nil?
       env['restclient.hash'][:error] = e
       response = e.response
     end

data/rest-client-components.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rest-client-components}
-  s.version = "1.1.1"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril Rohr"]
-  s.date = %q{2010-04-24}
+  s.date = %q{2010-07-22}
   s.description = %q{RestClient on steroids ! Easily add one or more Rack middleware around RestClient to add functionalities such as transparent caching (Rack::Cache), transparent logging, etc.}
   s.email = %q{cyril.rohr@gmail.com}
   s.extra_rdoc_files = [
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/crohr/rest-client-components}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{RestClient on steroids ! Easily add one or more Rack middleware around RestClient to add functionalities such as transparent caching (Rack::Cache), transparent logging, etc.}
   s.test_files = [
     "spec/components_spec.rb",
@@ -46,17 +46,17 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rest-client>, [">= 1.5.0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rest-client>, [">= 1.6.0", "< 1.7.0"])
       s.add_runtime_dependency(%q<rack>, [">= 1.0.1"])
       s.add_development_dependency(%q<webmock>, [">= 0"])
     else
-      s.add_dependency(%q<rest-client>, [">= 1.5.0"])
+      s.add_dependency(%q<rest-client>, [">= 1.6.0", "< 1.7.0"])
       s.add_dependency(%q<rack>, [">= 1.0.1"])
       s.add_dependency(%q<webmock>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rest-client>, [">= 1.5.0"])
+    s.add_dependency(%q<rest-client>, [">= 1.6.0", "< 1.7.0"])
     s.add_dependency(%q<rack>, [">= 1.0.1"])
     s.add_dependency(%q<webmock>, [">= 0"])
   end

data/spec/components_spec.rb

@@ -60,6 +60,10 @@ describe "Components for RestClient" do
       stub_request(:get, "http://server.ltd/resource").to_raise(EOFError)
       lambda{ RestClient.get "http://server.ltd/resource" }.should raise_error(RestClient::ServerBrokeConnection)
     end
+    it "should raise timeout Exception errors" do
+      stub_request(:get, "http://server.ltd/resource").to_raise(Timeout::Error)
+      lambda{ RestClient.get "http://server.ltd/resource" }.should raise_error(RestClient::RequestTimeout)
+    end
     it "should correctly pass the payload in rack.input" do
       class RackAppThatProcessesPayload
         def initialize(app); @app = app; end
@@ -71,10 +75,15 @@ describe "Components for RestClient" do
         end
       end
       RestClient.enable RackAppThatProcessesPayload
-      stub_request(:post, "http://server.ltd/resource").with(:body => "<b>rest-client-components</b> is cool", :headers => {'Content-Type'=>'text/plain', 'Accept-Encoding'=>'gzip, deflate', 'Content-Length'=>'37', 'Accept'=>'*/*; q=0.5, application/xml'}).to_return(:status => 201, :body => "ok", :headers => {'Content-Length' => 2, 'Content-Type' => "text/plain"})
+      stub_request(:post, "http://server.ltd/resource").with(:body => "<b>rest-client-components</b> is cool", :headers => {'Content-Type'=>'text/html', 'Accept-Encoding'=>'gzip, deflate', 'Content-Length'=>'37', 'Accept'=>'*/*; q=0.5, application/xml'}).to_return(:status => 201, :body => "ok", :headers => {'Content-Length' => 2, 'Content-Type' => "text/plain"})
       RestClient.post "http://server.ltd/resource", 'rest-client is cool', :content_type => "text/plain"
     end
     
+    it "should correctly pass content-length and content-type headers" do
+      stub_request(:post, "http://server.ltd/resource").with(:body => "some stupid message", :headers => {'Content-Type'=>'text/plain', 'Accept-Encoding'=>'gzip, deflate', 'Content-Length'=>'19', 'Accept'=>'*/*; q=0.5, application/xml'}).to_return(:status => 201, :body => "ok", :headers => {'Content-Length' => 2, 'Content-Type' => "text/plain"})
+      RestClient.post "http://server.ltd/resource", 'some stupid message', :content_type => "text/plain", :content_length => 19
+    end
+    
     describe "and another component" do
       before do
         class AnotherRackMiddleware
@@ -124,10 +133,8 @@ describe "Components for RestClient" do
           response.headers[:age].should == "0"
           response.body.should == "body"
         end
-        sleep 1
         RestClient.get "http://server.ltd/resource" do |response|
           response.headers[:x_rack_cache].should == 'stale, valid, store'
-          response.headers[:age].should == "1"
           response.body.should == "body"
         end
       end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rest-client-components
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  hash: 2840920021394413258
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Cyril Rohr
@@ -9,39 +15,63 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-24 00:00:00 +02:00
+date: 2010-07-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.0
-    version: 
+        hash: 2657083326512599250
+        segments: 
+        - 1
+        - 6
+        - 0
+        version: 1.6.0
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 158014003617880386
+        segments: 
+        - 1
+        - 7
+        - 0
+        version: 1.7.0
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3196562863265611407
+        segments: 
+        - 1
+        - 0
+        - 1
         version: 1.0.1
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: webmock
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: -1411813972297755852
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 description: RestClient on steroids ! Easily add one or more Rack middleware around RestClient to add functionalities such as transparent caching (Rack::Cache), transparent logging, etc.
 email: cyril.rohr@gmail.com
 executables: []
@@ -73,21 +103,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -1411813972297755852
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -1411813972297755852
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: RestClient on steroids ! Easily add one or more Rack middleware around RestClient to add functionalities such as transparent caching (Rack::Cache), transparent logging, etc.