resourceful 0.5.0 → 0.5.1

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/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/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.1"
   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.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Sadauskas"]
-  s.date = %q{2009-07-13}
+  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"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resourceful
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Paul Sadauskas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-13 00:00:00 -06:00
+date: 2009-07-15 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,52 +99,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: true
 homepage: http://github.com/paul/resourceful
 licenses: []