paul-resourceful 0.5.0 → 0.5.3

data/Manifest

@@ -1,30 +1,29 @@
-Manifest
-spec/spec.opts
-spec/simple_sinatra_server_spec.rb
-spec/simple_sinatra_server.rb
-spec/acceptance/header_spec.rb
-spec/acceptance/caching_spec.rb
-spec/acceptance/resource_spec.rb
-spec/acceptance/redirecting_spec.rb
-spec/acceptance/authorization_spec.rb
-spec/acceptance_shared_specs.rb
-spec/spec_helper.rb
-spec/old_acceptance_specs.rb
-README.markdown
-resourceful.gemspec
-lib/resourceful/cache_manager.rb
-lib/resourceful/exceptions.rb
+lib/resourceful.rb
 lib/resourceful/net_http_adapter.rb
 lib/resourceful/stubbed_resource_proxy.rb
 lib/resourceful/header.rb
-lib/resourceful/authentication_manager.rb
-lib/resourceful/request.rb
-lib/resourceful/resource.rb
+lib/resourceful/memcache_cache_manager.rb
 lib/resourceful/response.rb
 lib/resourceful/util.rb
-lib/resourceful/http_accessor.rb
 lib/resourceful/options_interpreter.rb
-lib/resourceful/memcache_cache_manager.rb
-lib/resourceful.rb
-Rakefile
+lib/resourceful/cache_manager.rb
+lib/resourceful/request.rb
+lib/resourceful/resource.rb
+lib/resourceful/exceptions.rb
+lib/resourceful/http_accessor.rb
+lib/resourceful/authentication_manager.rb
+README.markdown
 MIT-LICENSE
+Rakefile
+Manifest
+spec/simple_sinatra_server_spec.rb
+spec/old_acceptance_specs.rb
+spec/acceptance_shared_specs.rb
+spec/spec_helper.rb
+spec/simple_sinatra_server.rb
+spec/acceptance/authorization_spec.rb
+spec/acceptance/header_spec.rb
+spec/acceptance/resource_spec.rb
+spec/acceptance/caching_spec.rb
+spec/acceptance/redirecting_spec.rb
+spec/spec.opts

data/Rakefile

@@ -12,8 +12,8 @@ begin
     p.email           = "psadauskas@gmail.com"
 
     p.ignore_pattern  = ["pkg/*", "tmp/*"]
-    p.dependencies    = ['addressable', 'httpauth', 'rspec', 'facets', 'andand']
-    p.development_dependencies = ['thin', 'yard', 'sinatra']
+    p.dependencies    = ['addressable', 'httpauth']
+    p.development_dependencies = ['thin', 'yard', 'sinatra', 'rspec']
   end
 rescue LoadError => e
   puts "install 'echoe' gem to be able to build the gem"

data/lib/resourceful/authentication_manager.rb

@@ -1,4 +1,4 @@
-require 'rubygems'
+#require 'rubygems'
 require 'httpauth'
 require 'addressable/uri'
 

data/lib/resourceful/cache_manager.rb

@@ -1,6 +1,4 @@
 require 'resourceful/header'
-require 'andand'
-require 'facets/kernel/returning'
 require 'digest/md5'
 
 module Resourceful
@@ -72,9 +70,9 @@ module Resourceful
     end
 
     def lookup(request)
-      returning(@collection[request.uri.to_s][request]) do |response|
-        response.authoritative = false if response
-      end
+      response = @collection[request.uri.to_s][request]
+      response.authoritative = false if response
+      response
     end
 
     def store(request, response)
@@ -104,9 +102,9 @@ module Resourceful
     end
 
     def lookup(request)
-      returning(cache_entries_for(request)[request]) do |response|
-        response.authoritative = false if response
-      end
+      response = cache_entries_for(request)[request]
+      response.authoritative = false if response
+      response
     end
 
     def store(request, response)
@@ -161,7 +159,8 @@ module Resourceful
     # @return [Resourceful::Response] 
     #   The cached response for the specified request if one is available.
     def [](request)
-      find { |an_entry| an_entry.valid_for?(request) }.andand.response 
+      entry = find { |entry| entry.valid_for?(request) }
+      entry.response if entry
     end
     
     # Saves an entry into the collection. Replaces any existing ones that could 

data/lib/resourceful/memcache_cache_manager.rb

@@ -1,7 +1,6 @@
 require "resourceful/cache_manager"
 
 require 'memcache'
-require 'facets/kernel/returning'
 
 module Resourceful
   class MemcacheCacheManager < AbstractCacheManager
@@ -45,9 +44,10 @@ module Resourceful
     def store(request, response)
       return unless response.cachable?
 
-      @memcache[request.to_mc_key] = returning(cache_entries_for(request)) do |entries|
-        entries[request] = response
-      end
+      entries = cache_entries_for(request)
+      entries[request] = response
+
+      @memcache[request.to_mc_key] = entries
     end
 
     # Invalidates a all cached entries for a uri. 

data/lib/resourceful/request.rb

@@ -86,7 +86,7 @@ module Resourceful
       @cached_response ||= begin
         @already_checked_cache = true
         resp = accessor.cache_manager.lookup(self)
-        logger.info("    Retrieved from cache")
+        logger.info("    Retrieved from cache") if resp
         resp
       end
     end
@@ -162,7 +162,6 @@ module Resourceful
     # Perform the request, with no magic handling of anything.
     def perform!
       @request_time = Time.now
-      logger.debug("DEBUG: Request Header: #{@header.inspect}")
 
       http_resp = NetHttpAdapter.make_request(@method, @resource.uri, @body, @header)
       @response = Resourceful::Response.new(uri, *http_resp)

data/lib/resourceful/response.rb

@@ -1,7 +1,5 @@
 require 'net/http'
 require 'time'
-require 'rubygems'
-require 'facets/kernel/ergo'
 require 'zlib'
 
 module Resourceful
@@ -86,7 +84,8 @@ module Resourceful
     end
 
     def body
-      case header['Content-Encoding'].ergo.first
+      encoding = header['Content-Encoding'] && header['Content-Encoding'].first
+      case encoding
       when nil
         # body is identity encoded; just return it
         @body
@@ -97,7 +96,7 @@ module Resourceful
         header.delete('Content-Encoding')
         @body
       else
-        raise UnsupportedContentCoding, "Resourceful does not support #{header['Content-Encoding'].ergo.first} content coding" 
+        raise UnsupportedContentCoding, "Resourceful does not support #{encoding} content coding" 
       end
     end
 

data/lib/resourceful.rb

@@ -12,7 +12,7 @@ require 'resourceful/http_accessor'
 
 # Resourceful is a library that provides a high level HTTP interface.
 module Resourceful
-  VERSION = "0.5.0"
+  VERSION = "0.5.3"
   RESOURCEFUL_USER_AGENT_TOKEN = "Resourceful/#{VERSION}(Ruby/#{RUBY_VERSION})"
 
 end

data/resourceful.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{resourceful}
-  s.version = "0.5.0"
+  s.version = "0.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Sadauskas"]
-  s.date = %q{2009-05-18}
+  s.date = %q{2009-07-15}
   s.description = %q{An HTTP library for Ruby that takes advantage of everything HTTP has to offer.}
   s.email = %q{psadauskas@gmail.com}
-  s.extra_rdoc_files = ["README.markdown", "lib/resourceful/cache_manager.rb", "lib/resourceful/exceptions.rb", "lib/resourceful/net_http_adapter.rb", "lib/resourceful/stubbed_resource_proxy.rb", "lib/resourceful/header.rb", "lib/resourceful/authentication_manager.rb", "lib/resourceful/request.rb", "lib/resourceful/resource.rb", "lib/resourceful/response.rb", "lib/resourceful/util.rb", "lib/resourceful/http_accessor.rb", "lib/resourceful/options_interpreter.rb", "lib/resourceful/memcache_cache_manager.rb", "lib/resourceful.rb"]
-  s.files = ["Manifest", "spec/spec.opts", "spec/simple_sinatra_server_spec.rb", "spec/simple_sinatra_server.rb", "spec/acceptance/header_spec.rb", "spec/acceptance/caching_spec.rb", "spec/acceptance/resource_spec.rb", "spec/acceptance/redirecting_spec.rb", "spec/acceptance/authorization_spec.rb", "spec/acceptance_shared_specs.rb", "spec/spec_helper.rb", "spec/old_acceptance_specs.rb", "README.markdown", "resourceful.gemspec", "lib/resourceful/cache_manager.rb", "lib/resourceful/exceptions.rb", "lib/resourceful/net_http_adapter.rb", "lib/resourceful/stubbed_resource_proxy.rb", "lib/resourceful/header.rb", "lib/resourceful/authentication_manager.rb", "lib/resourceful/request.rb", "lib/resourceful/resource.rb", "lib/resourceful/response.rb", "lib/resourceful/util.rb", "lib/resourceful/http_accessor.rb", "lib/resourceful/options_interpreter.rb", "lib/resourceful/memcache_cache_manager.rb", "lib/resourceful.rb", "Rakefile", "MIT-LICENSE"]
+  s.extra_rdoc_files = ["lib/resourceful.rb", "lib/resourceful/net_http_adapter.rb", "lib/resourceful/stubbed_resource_proxy.rb", "lib/resourceful/header.rb", "lib/resourceful/memcache_cache_manager.rb", "lib/resourceful/response.rb", "lib/resourceful/util.rb", "lib/resourceful/options_interpreter.rb", "lib/resourceful/cache_manager.rb", "lib/resourceful/request.rb", "lib/resourceful/resource.rb", "lib/resourceful/exceptions.rb", "lib/resourceful/http_accessor.rb", "lib/resourceful/authentication_manager.rb", "README.markdown"]
+  s.files = ["lib/resourceful.rb", "lib/resourceful/net_http_adapter.rb", "lib/resourceful/stubbed_resource_proxy.rb", "lib/resourceful/header.rb", "lib/resourceful/memcache_cache_manager.rb", "lib/resourceful/response.rb", "lib/resourceful/util.rb", "lib/resourceful/options_interpreter.rb", "lib/resourceful/cache_manager.rb", "lib/resourceful/request.rb", "lib/resourceful/resource.rb", "lib/resourceful/exceptions.rb", "lib/resourceful/http_accessor.rb", "lib/resourceful/authentication_manager.rb", "README.markdown", "MIT-LICENSE", "Rakefile", "Manifest", "spec/simple_sinatra_server_spec.rb", "spec/old_acceptance_specs.rb", "spec/acceptance_shared_specs.rb", "spec/spec_helper.rb", "spec/simple_sinatra_server.rb", "spec/acceptance/authorization_spec.rb", "spec/acceptance/header_spec.rb", "spec/acceptance/resource_spec.rb", "spec/acceptance/caching_spec.rb", "spec/acceptance/redirecting_spec.rb", "spec/spec.opts", "resourceful.gemspec"]
   s.homepage = %q{http://github.com/paul/resourceful}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Resourceful", "--main", "README.markdown"]
   s.require_paths = ["lib"]
@@ -25,30 +25,24 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<addressable>, [">= 0"])
       s.add_runtime_dependency(%q<httpauth>, [">= 0"])
-      s.add_runtime_dependency(%q<rspec>, [">= 0"])
-      s.add_runtime_dependency(%q<facets>, [">= 0"])
-      s.add_runtime_dependency(%q<andand>, [">= 0"])
       s.add_development_dependency(%q<thin>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<sinatra>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
     else
       s.add_dependency(%q<addressable>, [">= 0"])
       s.add_dependency(%q<httpauth>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<facets>, [">= 0"])
-      s.add_dependency(%q<andand>, [">= 0"])
       s.add_dependency(%q<thin>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<sinatra>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
     s.add_dependency(%q<addressable>, [">= 0"])
     s.add_dependency(%q<httpauth>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<facets>, [">= 0"])
-    s.add_dependency(%q<andand>, [">= 0"])
     s.add_dependency(%q<thin>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<sinatra>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
   end
 end

data/spec/acceptance/caching_spec.rb

@@ -1,6 +1,7 @@
 
 require File.dirname(__FILE__) + '/../spec_helper'
 require 'resourceful'
+require 'addressable/template'
 
 describe Resourceful do
 
@@ -29,8 +30,8 @@ describe Resourceful do
     end
 
     def uri_for_code(code, params = {})
-      uri = Addressable::URI.expand_template("http://localhost:3000/code/{code}",
-                                             "code" => code.to_s)
+      template = Addressable::Template.new("http://localhost:3000/code/{code}")
+      uri = template.expand("code" => code.to_s)
 
       uri_plus_params(uri, params)
     end

data/spec/simple_sinatra_server.rb

@@ -13,7 +13,8 @@ end
 
 def set_request_header_in_body!
   response['Content-Type'] ||= "application/yaml"
-  request.env.to_yaml
+  headers = request.env.reject { |k,v| !v.is_a?(String) }
+  headers.to_yaml
 end
 
 get '/' do

data/spec/simple_sinatra_server_spec.rb

@@ -63,7 +63,7 @@ end
 describe "/code/nnn" do
   it 'should respond with the code provided in the url' do
     # Just try a handful
-    [100, 200, 201, 301, 302, 304, 403, 404, 500].each do |code|
+    [200, 201, 301, 302, 304, 403, 404, 500].each do |code|
       get "/code/#{code}"
       @response.status.should == code
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: paul-resourceful
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.3
 platform: ruby
 authors: 
 - Paul Sadauskas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-18 00:00:00 -07:00
+date: 2009-07-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,28 +33,8 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: facets
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: andand
-  type: :runtime
+  name: thin
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -63,7 +43,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: thin
+  name: yard
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -73,7 +53,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: sinatra
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -83,7 +63,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: rspec
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -99,52 +79,52 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.markdown
-- lib/resourceful/cache_manager.rb
-- lib/resourceful/exceptions.rb
+- lib/resourceful.rb
 - lib/resourceful/net_http_adapter.rb
 - lib/resourceful/stubbed_resource_proxy.rb
 - lib/resourceful/header.rb
-- lib/resourceful/authentication_manager.rb
-- lib/resourceful/request.rb
-- lib/resourceful/resource.rb
+- lib/resourceful/memcache_cache_manager.rb
 - lib/resourceful/response.rb
 - lib/resourceful/util.rb
-- lib/resourceful/http_accessor.rb
 - lib/resourceful/options_interpreter.rb
-- lib/resourceful/memcache_cache_manager.rb
-- lib/resourceful.rb
-files: 
-- Manifest
-- spec/spec.opts
-- spec/simple_sinatra_server_spec.rb
-- spec/simple_sinatra_server.rb
-- spec/acceptance/header_spec.rb
-- spec/acceptance/caching_spec.rb
-- spec/acceptance/resource_spec.rb
-- spec/acceptance/redirecting_spec.rb
-- spec/acceptance/authorization_spec.rb
-- spec/acceptance_shared_specs.rb
-- spec/spec_helper.rb
-- spec/old_acceptance_specs.rb
-- README.markdown
-- resourceful.gemspec
 - lib/resourceful/cache_manager.rb
+- lib/resourceful/request.rb
+- lib/resourceful/resource.rb
 - lib/resourceful/exceptions.rb
+- lib/resourceful/http_accessor.rb
+- lib/resourceful/authentication_manager.rb
+- README.markdown
+files: 
+- lib/resourceful.rb
 - lib/resourceful/net_http_adapter.rb
 - lib/resourceful/stubbed_resource_proxy.rb
 - lib/resourceful/header.rb
-- lib/resourceful/authentication_manager.rb
-- lib/resourceful/request.rb
-- lib/resourceful/resource.rb
+- lib/resourceful/memcache_cache_manager.rb
 - lib/resourceful/response.rb
 - lib/resourceful/util.rb
-- lib/resourceful/http_accessor.rb
 - lib/resourceful/options_interpreter.rb
-- lib/resourceful/memcache_cache_manager.rb
-- lib/resourceful.rb
-- Rakefile
+- lib/resourceful/cache_manager.rb
+- lib/resourceful/request.rb
+- lib/resourceful/resource.rb
+- lib/resourceful/exceptions.rb
+- lib/resourceful/http_accessor.rb
+- lib/resourceful/authentication_manager.rb
+- README.markdown
 - MIT-LICENSE
+- Rakefile
+- Manifest
+- spec/simple_sinatra_server_spec.rb
+- spec/old_acceptance_specs.rb
+- spec/acceptance_shared_specs.rb
+- spec/spec_helper.rb
+- spec/simple_sinatra_server.rb
+- spec/acceptance/authorization_spec.rb
+- spec/acceptance/header_spec.rb
+- spec/acceptance/resource_spec.rb
+- spec/acceptance/caching_spec.rb
+- spec/acceptance/redirecting_spec.rb
+- spec/spec.opts
+- resourceful.gemspec
 has_rdoc: false
 homepage: http://github.com/paul/resourceful
 post_install_message: