padrino-cache 0.10.5 → 0.10.6.a

data/lib/padrino-cache/helpers/page.rb

@@ -93,18 +93,28 @@ module Padrino
                 began_at = Time.now
                 value = settings.cache.get(@route.cache_key || env['PATH_INFO'])
                 logger.debug "GET Cache", began_at, @route.cache_key || env['PATH_INFO'] if defined?(logger) && value
-                halt 200, value if value
+
+                if value
+                  content_type(value[:content_type]) if value[:content_type]
+                  halt 200, value[:response_buffer] if value[:response_buffer]
+                end
               end
             end
 
             route.after_filters do
               if settings.caching?
                 began_at = Time.now
+
+                content = {
+                  :response_buffer => @_response_buffer,
+                  :content_type    => @_content_type
+                }
+
                 if @_last_expires_in
-                  settings.cache.set(@route.cache_key || env['PATH_INFO'], @_response_buffer, :expires_in => @_last_expires_in)
+                  settings.cache.set(@route.cache_key || env['PATH_INFO'], content, :expires_in => @_last_expires_in)
                   @_last_expires_in = nil
                 else
-                  settings.cache.set(@route.cache_key || env['PATH_INFO'], @_response_buffer)
+                  settings.cache.set(@route.cache_key || env['PATH_INFO'], content)
                 end
                 logger.debug "SET Cache", began_at, @route.cache_key || env['PATH_INFO'] if defined?(logger)
               end

data/lib/padrino-cache/store/file.rb

@@ -35,16 +35,17 @@ module Padrino
         def get(key)
           init
           if ::File.exist?(path_for_key(key))
-            contents = ::File.read(path_for_key(key))
+            read_method = ::File.respond_to?(:binread) ? :binread : :read
+            contents    = ::File.send(read_method, path_for_key(key))
             expires_in, body = contents.split("\n", 2)
             expires_in = expires_in.to_i
             if expires_in == -1 or Time.new.to_i < expires_in
               Marshal.load(body) if body
-            else
+            else # expire the key
               delete(key)
               nil
             end
-          else
+          else # key can't be found
             nil
           end
         end

data/lib/padrino-cache.rb

@@ -91,7 +91,7 @@ module Padrino
         app.helpers Padrino::Cache::Helpers::CacheStore
         app.helpers Padrino::Cache::Helpers::Fragment
         app.helpers Padrino::Cache::Helpers::Page
-        app.set :cache, Padrino::Cache::Store::File.new(Padrino.root('tmp', app.app_name.to_s ,'cache'))
+        app.set :cache, Padrino::Cache::Store::File.new(Padrino.root('tmp', defined?(app.app_name) ? app.app_name.to_s : '', 'cache'))
         app.disable :caching
       end
       alias :included :registered

data/test/test_padrino_cache.rb

@@ -87,14 +87,14 @@ describe "PadrinoCache" do
     get "/foo"
     assert_equal 200, status
     assert_equal 'foo', body
-    assert_equal 'foo', @app.cache.get(:foo)
+    assert_equal 'foo', @app.cache.get(:foo)[:response_buffer]
     get "/foo"
     assert_equal 'foo', body
 
     get "/bar"
     assert_equal 200, status
     assert_equal 'bar', body
-    assert_equal 'bar', @app.cache.get(:bar)
+    assert_equal 'bar', @app.cache.get(:bar)[:response_buffer]
     get "/bar"
     assert_equal 'bar', body
   end

metadata

@@ -1,8 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-cache
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.10.5
+  hash: 98
+  prerelease: 7
+  segments: 
+  - 0
+  - 10
+  - 6
+  - a
+  version: 0.10.6.a
 platform: ruby
 authors: 
 - Padrino Team
@@ -13,8 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-12 00:00:00 -07:00
-default_executable: 
+date: 2012-01-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: padrino-core
@@ -24,7 +29,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.10.5
+        hash: 98
+        segments: 
+        - 0
+        - 10
+        - 6
+        - a
+        version: 0.10.6.a
   type: :runtime
   version_requirements: *id001
 description: Caching support for memcached, page and fragment
@@ -56,7 +67,6 @@ files:
 - test/helper.rb
 - test/test_padrino_cache.rb
 - test/test_stores.rb
-has_rdoc: true
 homepage: http://www.padrinorb.com
 licenses: []
 
@@ -70,17 +80,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: 1.3.6
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: padrino-cache
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Page and fragment caching for Padrino
@@ -88,3 +106,4 @@ test_files:
 - test/helper.rb
 - test/test_padrino_cache.rb
 - test/test_stores.rb
+has_rdoc: