benschwarz-openuri_memcached 0.1.2 → 0.1.3

data/lib/openuri_memcached.rb

@@ -11,8 +11,16 @@ require 'memcached'
 module Kernel
   private 
   alias openuri_original_open open
-  def open(uri, *rest, &block)
-    OpenURI::open(uri, *rest, &block)
+  def open(name, *rest, &block)
+    if name.respond_to?(:open)
+      name.open(*rest, &block)
+    elsif name.respond_to?(:to_str) &&
+          %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} =~ name &&
+          (uri = URI.parse(name)).respond_to?(:open)
+      OpenURI::open(name, *rest, &block)
+    else
+      open_uri_original_open(name, *rest, &block)
+    end
   end
   module_function :open, :openuri_original_open
 end
@@ -29,10 +37,21 @@ module OpenURI
     end
     
     unless response
-      response = openuri_original_open(uri, *rest, &block).read
+      response = openuri_original_open(uri, *rest).read
       Cache::set(uri.to_s, response) if Cache.enabled?
     end
-    StringIO.new(response)
+
+    response = StringIO.new(response)
+
+    if block_given?
+      begin
+        yield response
+      ensure
+        response.close
+      end
+    else
+      response
+    end
   end
   
   class Cache

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benschwarz-openuri_memcached
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Ben Schwarz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-27 00:00:00 -07:00
+date: 2009-01-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency