@@ -182,19 +182,25 @@ module Rack::Cache end def self.resolve(uri) - server = "#{uri.host}:#{uri.port || '11211'}" - options = parse_query(uri.query) - options.keys.each do |key| - value = - case value = options.delete(key) - when 'true' ; true - when 'false' ; false - else value.to_sym - end - options[k.to_sym] = value + if uri.respond_to?(:scheme) + server = "#{uri.host}:#{uri.port || '11211'}" + options = parse_query(uri.query) + options.keys.each do |key| + value = + case value = options.delete(key) + when 'true' ; true + when 'false' ; false + else value.to_sym + end + options[k.to_sym] = value + end + options[:namespace] = uri.path.sub(/^\//, '') + new server, options + else + # if the object provided is not a URI, pass it straight through + # to the underlying implementation. + new uri end - options[:namespace] = uri.path.sub(/^\//, '') - new server, options end end lib/rack/cache/entitystore.rb @@ -42,9 +42,9 @@ module Rack::Cache # hack in support for passing a MemCache or Memcached object # as the storage URI. case - when defined?(::MemCache) && type.kind_of?(::MemCache) + when defined?(::MemCache) && uri.kind_of?(::MemCache) type.const_get(:MemCache).resolve(uri) - when defined?(::Memcached) && type.respond_to?(:stats) + when defined?(::Memcached) && uri.respond_to?(:stats) type.const_get(:MemCached).resolve(uri) else fail "Unknown storage provider: #{uri.to_s}" lib/rack/cache/storage.rb 05d23360c3e08ccb2bc5af5fae060c34cfceeeb2 Ryan Tomayko rtomayko@gmail.com http://github.com/rtomayko/rack-cache/commit/12b0de7eaa4801c97a57e6fb3c4bcf2d84056f64 12b0de7eaa4801c97a57e6fb3c4bcf2d84056f64 2009-06-06T02:04:44-07:00 2009-06-06T02:04:44-07:00 Fix passing memcache objects in entitystore option 4c27052373f4d84e265be409be3159c937c9f396 Ryan Tomayko rtomayko@gmail.com