padrino-cache 0.13.0.beta3 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6c70cf3724057ea09a38e40330a3e6d9fdb0a74
-  data.tar.gz: e23483154a290ba0a5ec048c1d77d4e3ed5978f6
+  metadata.gz: 92b6075e03da6a8e35fd8be6441693de04c7da00
+  data.tar.gz: f55e79f9c81a099fbcc328deb7062ab4bd628594
 SHA512:
-  metadata.gz: 21b4ad795f88207c9db9eccf3e105790225ef6aeb28e57a3bcb87176184ab77f7567c334f466ffa2342cb1aeb8f9cb2d65d87c49bdb82d86295c62af4aaf9c45
-  data.tar.gz: fa086048e28aea9ec85a3c8e28c9b666a7b89928bb30bdf87312198810b9a067bd44fab536d676e29cbe2e60b6ea74c62e33bffe349f56bf5b4d65ddc9f894f1
+  metadata.gz: b28478cdeef99a6f6588761b78fe1290c742c6acfc58c2aad49f168f01105b98490fbbb5ec4fee580e4c95d56af4656da43176a78dd704810884a2adbf4fff2b
+  data.tar.gz: b4aebbb30cb9f06e3675c61740ef168919946c744a0d5787fb9c0ef9a6c683f9d043220861df3001e117428fa4c3178588a185dfe528b89cd8517bd97ae3b23e

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

@@ -5,7 +5,8 @@ module Padrino
         def cache_object(key, opts = {})
           if settings.caching?
             began_at = Time.now
-            if value = settings.cache[key.to_s]
+            if settings.cache.key?(key.to_s)
+              value = settings.cache[key.to_s]
               logger.debug "GET Object", began_at, key.to_s if defined?(logger)
             else
               value = yield

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

@@ -51,9 +51,10 @@ module Padrino
         def cache(key, opts = {}, &block)
           if settings.caching?
             began_at = Time.now
-            if value = settings.cache[key.to_s]
+            if settings.cache.key?(key.to_s)
+              value = settings.cache[key.to_s]
               logger.debug "GET Fragment", began_at, key.to_s if defined?(logger)
-              concat_content(value.html_safe)
+              concat_content(value.to_s.html_safe)
             else
               value = capture_html(&block)
               settings.cache.store(key.to_s, value, opts)

data/test/test_padrino_cache.rb

@@ -479,4 +479,31 @@ describe "PadrinoCache" do
     end
     assert_kind_of Moneta::Adapters::Memory, adapter
   end
+
+  it "should check key existence" do
+    count1, count2 = 0, 0
+    mock_app do
+      register Padrino::Cache
+      enable :caching
+      get "/" do
+        cache(:foo) do
+          count1 += 1
+          nil
+        end
+        count1.inspect
+      end
+
+      get "/object" do
+        cache_object(:bar) do
+          count2 += 1
+          nil
+        end
+        count2.inspect
+      end
+    end
+    2.times { get "/" }
+    assert_equal "1", body
+    2.times { get "/object" }
+    assert_equal "1", body
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-cache
 version: !ruby/object:Gem::Version
-  version: 0.13.0.beta3
+  version: 0.13.0
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-02 00:00:00.000000000 Z
+date: 2015-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,28 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta3
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta3
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta3
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta3
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: moneta
   requirement: !ruby/object:Gem::Requirement
@@ -93,12 +93,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: 1.3.6
 requirements: []
 rubyforge_project: padrino-cache
-rubygems_version: 2.0.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Page and fragment caching for Padrino