padrino-cache 0.12.4 → 0.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ac0df7b073b59210a93e186e5b1db6f3538ea14
-  data.tar.gz: 364ef351e0ffc8a5290d14f2ae5164135d349f26
+  metadata.gz: 4577c95f9efa61aba692677d3d8e5c0e337f39de
+  data.tar.gz: b0d649693289a1221867df1f28ac2efa39a88239
 SHA512:
-  metadata.gz: 01b773adf36bfd56da7e3d1dc40335e01670501b5db24d5505a772336f89676104c0de75a62d345b6fd269def2d67d2d1eedd08951a568b53a6cf33cf6f46cc5
-  data.tar.gz: 28fc7e4ea62c7697cc195027b9f7dcf02f0a53cc696d6cd3cf19a9fc766b1896c947a15e30d757b15ba611c1bf0677d704e1de5518b9bc000acbe8341205eacb
+  metadata.gz: 7db82e2e36d002c87ee1a6ea8f3835e1fa63b7a98dc32de57562e0a07f57e1d4f5831e39566ac8a751d3c74a797f01475013c1c9cb293a718af188e6f7f78c7b
+  data.tar.gz: c704a5c3adf1f89e75cd6e72a719fb126c98ed7fe84e9d0dfdbd69489a701535c2258b39d09d26f7e816411247d60a3db5b7708329c686a49442195f7ce2d6ed

data/lib/padrino-cache.rb

@@ -98,9 +98,11 @@ 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.new(:File,
-                                           :dir => Padrino.root('tmp', defined?(app.app_name) ? app.app_name.to_s : '', 'cache'))
-        app.disable :caching
+        unless app.respond_to?(:cache)
+          cache_dir = Padrino.root('tmp', defined?(app.app_name) ? app.app_name.to_s : '', 'cache')
+          app.set :cache, Padrino::Cache.new(:File, :dir => cache_dir)
+        end
+        app.disable :caching unless app.respond_to?(:caching)
         included(app)
       end
 

data/test/test_padrino_cache.rb

@@ -457,4 +457,22 @@ describe "PadrinoCache" do
     assert_equal 4, called_times_a
     assert_equal 2, called_times_b
   end
+
+  it "preserve the app's `caching` setting if set before registering the module" do
+    mock_app do
+      enable :caching
+      register Padrino::Cache
+    end
+
+    assert @app.caching
+  end
+
+  it "preserve the app's `cache` setting if set before registering the module" do
+    mock_app do
+      set :cache, Padrino::Cache.new(:Memory)
+      register Padrino::Cache
+    end
+
+    assert @app.cache.adapter.adapter.is_a?(Moneta::Adapters::Memory)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-cache
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.12.5
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-19 00:00:00.000000000 Z
+date: 2015-03-04 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.12.4
+        version: 0.12.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.4
+        version: 0.12.5
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.4
+        version: 0.12.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.4
+        version: 0.12.5
 - !ruby/object:Gem::Dependency
   name: moneta
   requirement: !ruby/object:Gem::Requirement