resourceful 0.2.1 → 0.3.0

data/spec/resourceful/request_spec.rb

@@ -50,7 +50,7 @@ describe Resourceful::Request do
       @net_http_adapter_response = mock('net_http_adapter_response')
       Resourceful::NetHttpAdapter.stub!(:make_request).and_return(@net_http_adapter_response)
 
-      @response = mock('response', :code => 200, :authoritative= => true, :was_unsuccessful? => false)
+      @response = mock('response', :code => 200, :authoritative= => true, :was_unsuccessful? => false, :request_time= => nil)
       Resourceful::Response.stub!(:new).and_return(@response)
     end
 
@@ -70,6 +70,13 @@ describe Resourceful::Request do
       @request.request_time.should == now
     end
 
+    it 'should set the response\'s request time' do
+      now = Time.now
+      Time.stub!(:now).and_return(now)
+
+      @response.should_receive(:request_time=).with(now)
+      @request.response
+    end
   end
 
   describe '#should_be_redirected?' do
@@ -77,7 +84,7 @@ describe Resourceful::Request do
       @net_http_adapter_response = mock('net_http_adapter_response')
       Resourceful::NetHttpAdapter.stub!(:make_request).and_return(@net_http_adapter_response)
 
-      @response = mock('response', :code => 200, :authoritative= => true, :was_unsuccessful? => false)
+      @response = mock('response', :code => 200, :authoritative= => true, :was_unsuccessful? => false, :request_time= => nil)
       Resourceful::Response.stub!(:new).and_return(@response)
     end
 

data/spec/resourceful/resource_spec.rb

@@ -37,6 +37,15 @@ describe Resourceful::Resource do
     it 'should take a uri' do
       @resource.uri.should == @uri
     end
+
+    it 'should take some default_options' do
+      r = Resourceful::Resource.new(@accessor, @uri, :foo => :bar)
+      r.default_options.should == {:foo => :bar}
+    end
+
+    it 'should default to an empty hash for options' do
+      @resource.default_options.should == {}
+    end
   end
 
   describe '#effective_uri' do
@@ -67,6 +76,22 @@ describe Resourceful::Resource do
       @resource.do_read_request(:some_method, :foo => :bar)
     end
 
+    describe 'default options' do
+      before do
+        @resource.default_options = {:foo => :bar}
+      end
+
+      it 'should merge the header with the default options' do
+        Resourceful::Request.should_receive(:new).with(anything, anything, anything, :foo => :bar).and_return(@request)
+        make_request
+      end
+
+      it 'should override any default header with the request header' do
+        Resourceful::Request.should_receive(:new).with(anything, anything, anything, :foo => :baz).and_return(@request)
+        @resource.do_read_request(:some_method, :foo => :baz)
+      end
+    end
+
     describe 'non-success responses' do
       before do
         @uri      = 'http://www.example.com/code/404'
@@ -164,7 +189,7 @@ describe Resourceful::Resource do
         end
         
         it 'should make a new resource from the new location' do
-          new_resource = mock('resource', :do_read_request => @response)
+          new_resource = mock('resource', :do_read_request => @response, :uri => @uri)
           Resourceful::Resource.should_receive(:new).with(@accessor, @redirected_uri).and_return(new_resource)
           make_request
         end
@@ -244,7 +269,7 @@ describe Resourceful::Resource do
   describe '#do_write_request' do
 
     def make_request
-      @resource.do_write_request(:some_method, "data", {})
+      @resource.do_write_request(:some_method, "data")
     end
 
     it 'should make a new request object from the method' do
@@ -252,33 +277,49 @@ describe Resourceful::Resource do
       @resource.do_write_request(:some_method, "data")
     end
 
+    describe 'default options' do
+      before do
+        @resource.default_options = {:foo => :bar}
+      end
+
+      it 'should merge the header with the default options' do
+        Resourceful::Request.should_receive(:new).with(anything, anything, anything, :foo => :bar).and_return(@request)
+        make_request
+      end
+
+      it 'should override any default header with the request header' do
+        Resourceful::Request.should_receive(:new).with(anything, anything, anything, :foo => :baz).and_return(@request)
+        @resource.do_write_request(:some_method, "data", :foo => :baz)
+      end
+    end
+
     describe 'non-success responses' do
       before do
         @uri      = 'http://www.example.com/code/404'
         @resource = Resourceful::Resource.new(@accessor, @uri)
 
         @redirected_uri = 'http://www.example.com/get'
-        @redirect_response = mock('redirect_response',
-                                  :header                 => {'Location' => [@redirected_uri]},
-                                  :is_redirect?           => false,
-                                  :is_success?            => false,
-                                  :is_not_authorized?     => false,
-                                  :code                   => 404)
+        @response = mock('response',
+                         :header                 => {'Location' => [@redirected_uri]},
+                         :is_redirect?           => false,
+                         :is_success?            => false,
+                         :is_not_authorized?     => false,
+                         :code                   => 404)
         
-        @request.stub!(:response).and_return(@redirect_response, @response)
+        @request.stub!(:response).and_return(@response)
         @request.stub!(:method).and_return(:post)
         @request.stub!(:uri).and_return('http://www.example.com/code/404')
       end
 
       it 'should raise UnsuccessfulHttpRequestError' do
         lambda {
-          @resource.do_write_request(:post, "data", anything)
+          @resource.do_write_request(:post, "data")
         }.should raise_error(Resourceful::UnsuccessfulHttpRequestError)
       end 
 
       it 'should give a reasonable error message' do
         lambda {
-          @resource.do_write_request(:post, "data", anything)
+          @resource.do_write_request(:post, "data")
         }.should raise_error("post request to <http://www.example.com/code/404> failed with code 404")
       end
     end 

data/spec/simple_http_server_shared_spec.rb

@@ -123,9 +123,8 @@ end unless defined? AuthorizationResponder
 
 describe 'simple http server', :shared => true do
   before(:all) do
-    #setup a thin http server we can connect to
-    require 'thin'
     require 'rack'
+    require 'thin'
 
     app = Rack::Builder.new do |env|
       use Rack::ShowExceptions
@@ -147,8 +146,8 @@ describe 'simple http server', :shared => true do
     #spawn the server in a separate thread
     @httpd = Thread.new do
       Thin::Logging.silent = true
-      #Thin::Logging.debug = true
-      Thin::Server.start(app) 
+      # Thin::Logging.debug = true
+      Thin::Server.start(app)
     end
     #give the server a chance to initialize
     sleep 0.05

data/spec/simple_http_server_shared_spec_spec.rb

@@ -56,6 +56,15 @@ describe 'http server' do
     resp[1]['Foo'].should == ['bar']
   end
 
+  it 'should allow the Date header to be overridden' do
+    uri = URI.escape("http://localhost:3000/header?{Date: \"Thu, 21 Aug 2008 20:00:00 GMT\"}")
+    resp = Resourceful::NetHttpAdapter.make_request(:get, uri)
+
+    resp[1].should have_key('Date')
+    resp[1]['Date'].should == ['Thu, 21 Aug 2008 20:00:00 GMT']
+  end
+
+
   it 'should parse escaped uris properly' do
     uri = URI.escape("http://localhost:3000/header?{Expire: \"#{Time.now.httpdate}\"}")
 

data/spec/spec_helper.rb

@@ -4,8 +4,7 @@ require 'spec'
 require 'pp'
 require 'facets'
 
-#$LOAD_PATH << Pathname(__FILE__).dirname + "../lib"
-$LOAD_PATH << File.dirname(__FILE__) + "../lib"
+$LOAD_PATH << Pathname(__FILE__).dirname + "../lib"
 require 'resourceful/util'
 require 'resourceful'
 require 'resourceful/http_accessor'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: resourceful
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
-- Paul Sadauskas & Peter Williams
+- Paul Sadauskas
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-07-31 00:00:00 -06:00
+date: 2008-12-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,26 +52,79 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: Resourceful provides a convenient Ruby API for making HTTP requests.
+- !ruby/object:Gem::Dependency 
+  name: andand
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: thin
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: yard
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: An HTTP library for Ruby that takes advantage of everything HTTP has to offer.
 email: psadauskas@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
-files: 
-- MIT-LICENSE
+extra_rdoc_files: 
+- lib/resourceful.rb
+- lib/resourceful/authentication_manager.rb
+- lib/resourceful/util.rb
+- lib/resourceful/resource.rb
+- lib/resourceful/memcache_cache_manager.rb
+- lib/resourceful/net_http_adapter.rb
+- lib/resourceful/http_accessor.rb
+- lib/resourceful/stubbed_resource_proxy.rb
+- lib/resourceful/header.rb
+- lib/resourceful/cache_manager.rb
+- lib/resourceful/options_interpreter.rb
+- lib/resourceful/response.rb
+- lib/resourceful/request.rb
 - README.markdown
-- Rakefile
+files: 
+- lib/resourceful.rb
+- lib/resourceful/authentication_manager.rb
+- lib/resourceful/util.rb
+- lib/resourceful/resource.rb
+- lib/resourceful/memcache_cache_manager.rb
+- lib/resourceful/net_http_adapter.rb
+- lib/resourceful/http_accessor.rb
+- lib/resourceful/stubbed_resource_proxy.rb
+- lib/resourceful/header.rb
+- lib/resourceful/cache_manager.rb
+- lib/resourceful/options_interpreter.rb
+- lib/resourceful/response.rb
+- lib/resourceful/request.rb
 - spec/acceptance_shared_specs.rb
 - spec/spec.opts
 - spec/acceptance_spec.rb
 - spec/simple_http_server_shared_spec_spec.rb
 - spec/spec_helper.rb
-- spec/resourceful
 - spec/resourceful/header_spec.rb
 - spec/resourceful/authentication_manager_spec.rb
+- spec/resourceful/memcache_cache_manager_spec.rb
 - spec/resourceful/response_spec.rb
 - spec/resourceful/options_interpreter_spec.rb
 - spec/resourceful/http_accessor_spec.rb
@@ -81,45 +134,41 @@ files:
 - spec/resourceful/cache_manager_spec.rb
 - spec/resourceful/net_http_adapter_spec.rb
 - spec/simple_http_server_shared_spec.rb
-- lib/resourceful.rb
-- lib/resourceful
-- lib/resourceful/authentication_manager.rb
-- lib/resourceful/util.rb
-- lib/resourceful/resource.rb
-- lib/resourceful/net_http_adapter.rb
-- lib/resourceful/version.rb
-- lib/resourceful/http_accessor.rb
-- lib/resourceful/stubbed_resource_proxy.rb
-- lib/resourceful/header.rb
-- lib/resourceful/cache_manager.rb
-- lib/resourceful/options_interpreter.rb
-- lib/resourceful/response.rb
-- lib/resourceful/request.rb
-has_rdoc: false
-homepage: https://github.com/paul/resourceful/tree/master
+- Manifest
+- Rakefile
+- README.markdown
+- MIT-LICENSE
+- resourceful.gemspec
+has_rdoc: true
+homepage: http://github.com/paul/resourceful
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --line-numbers
+- --inline-source
+- --title
+- Resourceful
+- --main
+- README.markdown
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.8.6
+      version: "0"
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: "1.2"
   version: 
 requirements: []
 
 rubyforge_project: resourceful
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: Resourceful provides a convenient Ruby API for making HTTP requests.
+summary: An HTTP library for Ruby that takes advantage of everything HTTP has to offer.
 test_files: []
 

data/lib/resourceful/version.rb

@@ -1 +0,0 @@
-RESOURCEFUL_VERSION = '0.2'