sinatra-diskcache 1.0.0 → 1.0.1

data/lib/sinatra/diskcache.rb

@@ -45,7 +45,7 @@ module Sinatra
             def cache_get filename
                 filepath = path_to filename
 
-                if not ( File.size? filepath ) and settings.diskcache_empty_cleanup
+                if File.exist? filepath and File.size?( filepath ) == 0 and settings.diskcache_empty_cleanup
                     cache_log "#{filename} is empty, wiping"
                     File.delete filepath
                     nil
@@ -53,15 +53,18 @@ module Sinatra
                     if ( File.ctime( filepath ) + settings.diskcache_expiry_period > Time.now ) or not settings.diskcache_expiry_enabled
                         begin
                             cache_log "found unexpirable file #{filepath}"
-                            return File.new filepath, 'r'
+                            return File.open filepath, 'r'
                         rescue IOError => e
                             cache_log "can't open #{filename}, skipping"
+                            nil
                         end
                     else
                         cache_log "#{filename} expired, wiping"
                         File.delete filepath
                         nil
                     end
+                else
+                    nil
                 end
             end
         end

data/lib/sinatra/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module DiskCache
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-diskcache
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-05 00:00:00.000000000 Z
+date: 2012-12-26 00:00:00.000000000 Z
 dependencies: []
 description: Allows to cache heavy-load query results on the disk
 email: