padrino-cache 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0f9b6295baf4a34d62feb4b56eb4d29a164eee4
-  data.tar.gz: 7f7bec0848f097f87953dca324d9e044be02860a
+  metadata.gz: 2b7050f5d6d2ab9a219ac49f53070953c9b36fce
+  data.tar.gz: 1d9a1dd4afb6129cc79d587cdcff69a08492a062
 SHA512:
-  metadata.gz: add4db22861cbadbd691e234f56d143fddd10420eaf8b8c53d2c506967bb47860082bb8b9166e0805506a0ee666431febca78666c3742b3e0e2736917f62ac16
-  data.tar.gz: e1fe58db16647084e285adf8a5d2013114ada60be75268289c2a49876853d726e4e650b9da6911629ba927f1a42285622c31bd8858918e1d94cf2103caee0cae
+  metadata.gz: 83da0914d495a370167a331d774818e0bee19f705cc6bf20dae375d50c8e04693dccedff3e85dfba18384a2b837f09597ac7746d1723b5bee156fcba784ead30
+  data.tar.gz: e8e1f995cd4256f0c29e319f77f3497b367fbbcc74fd2652be35544f9d566171719d68e40820bea5089d3f8b9db65dfd8d5168ce21ab91a10958938d192edce2

data/README.rdoc

@@ -257,7 +257,7 @@ You can set a global caching option or a per app caching options.
 
   Padrino.cache = Padrino::Cache.new(:LRUHash) # Keeps cached values in memory
   Padrino.cache = Padrino::Cache.new(:Memcached) # Uses default server at localhost
-  Padrino.cache = Padrino::Cache.new(:Memcached, '127.0.0.1:11211', :exception_retry_limit => 1)
+  Padrino.cache = Padrino::Cache.new(:Memcached, :server => '127.0.0.1:11211', :exception_retry_limit => 1)
   Padrino.cache = Padrino::Cache.new(:Memcached, :backend => memcached_or_dalli_instance)
   Padrino.cache = Padrino::Cache.new(:Redis) # Uses default server at localhost
   Padrino.cache = Padrino::Cache.new(:Redis, :host => '127.0.0.1', :port => 6379, :db => 0)

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

@@ -0,0 +1,23 @@
+module Padrino
+  module Cache
+    module Helpers
+      module ObjectCache
+        def cache_object(key, opts = {})
+          if settings.caching?
+            began_at = Time.now
+            if value = settings.cache[key.to_s]
+              logger.debug "GET Object", began_at, key.to_s if defined?(logger)
+            else
+              value = yield
+              settings.cache.store(key.to_s, value, opts)
+              logger.debug "SET Object", began_at, key.to_s if defined?(logger)
+            end
+            value
+          else
+            yield
+          end
+        end
+      end
+    end
+  end
+end

data/lib/padrino-cache.rb

@@ -31,7 +31,7 @@ module Padrino
     #   Padrino.cache = Padrino::Cache.new(:File, :dir => Padrino.root('tmp', app_name.to_s, 'cache')) # default choice
     #   Padrino.cache = Padrino::Cache.new(:LRUHash) # Keeps cached values in memory
     #   Padrino.cache = Padrino::Cache.new(:Memcached) # Uses default server at localhost
-    #   Padrino.cache = Padrino::Cache.new(:Memcached, '127.0.0.1:11211', :exception_retry_limit => 1)
+    #   Padrino.cache = Padrino::Cache.new(:Memcached, :server => '127.0.0.1:11211', :exception_retry_limit => 1)
     #   Padrino.cache = Padrino::Cache.new(:Memcached, :backend => memcached_or_dalli_instance)
     #   Padrino.cache = Padrino::Cache.new(:Redis) # Uses default server at localhost
     #   Padrino.cache = Padrino::Cache.new(:Redis, :host => '127.0.0.1', :port => 6379, :db => 0)
@@ -93,6 +93,7 @@ module Padrino
       #   MyApp.cache.clear
       #
       def registered(app)
+        app.helpers Padrino::Cache::Helpers::ObjectCache
         app.helpers Padrino::Cache::Helpers::CacheStore
         app.helpers Padrino::Cache::Helpers::Fragment
         app.helpers Padrino::Cache::Helpers::Page

data/test/test_padrino_cache.rb

@@ -1,16 +1,12 @@
 require File.expand_path('../helper', __FILE__)
 
 describe "PadrinoCache" do
-
-  before do
-  end
-
   after do
     tmp = File.expand_path("../tmp", __FILE__)
     %x[rm -rf #{tmp}]
   end
 
-  should 'cache a fragment' do
+  it 'should cache a fragment' do
     called = false
     mock_app do
       register Padrino::Cache
@@ -23,10 +19,10 @@ describe "PadrinoCache" do
     get "/foo"
     assert_equal 200, status
     assert_equal 'test fragment', body
-    assert_not_equal called, false
+    refute_equal called, false
   end
 
-  should 'cache a page' do
+  it 'should cache a page' do
     called = false
     mock_app do
       register Padrino::Cache
@@ -39,10 +35,10 @@ describe "PadrinoCache" do
     get "/foo"
     assert_equal 200, status
     assert_equal 'test page', body
-    assert_not_equal false, called
+    refute_equal false, called
   end
 
-  should 'delete from the cache' do
+  it 'should delete from the cache' do
     called = false
     mock_app do
       register Padrino::Cache
@@ -57,10 +53,10 @@ describe "PadrinoCache" do
     get "/foo"
     assert_equal 200, status
     assert_equal 'test page again', body
-    assert_not_equal false, called
+    refute_equal false, called
   end
 
-  should 'accept custom cache keys' do
+  it 'should accept custom cache keys' do
     called = false
     mock_app do
       register Padrino::Cache
@@ -102,7 +98,7 @@ describe "PadrinoCache" do
     assert_equal 'bar', body
   end
 
-  should 'delete based on urls' do
+  it 'should delete based on urls' do
     called = false
     mock_app do
       register Padrino::Cache
@@ -119,7 +115,7 @@ describe "PadrinoCache" do
     assert_equal 'test page again', body
   end
 
-  should 'accept allow controller-wide caching' do
+  it 'should accept allow controller-wide caching' do
     called = false
     mock_app do
       controller :cache => true do
@@ -136,7 +132,7 @@ describe "PadrinoCache" do
     assert_equal 'test', body
   end
 
-  should 'allow cache disabling on a per route basis' do
+  it 'should allow cache disabling on a per route basis' do
     called = false
     mock_app do
       register Padrino::Cache
@@ -153,7 +149,7 @@ describe "PadrinoCache" do
     assert_equal 'test again', body
   end
 
-  should 'allow expiring for pages' do
+  it 'should allow expiring for pages' do
     called = false
     mock_app do
       register Padrino::Cache
@@ -171,13 +167,12 @@ describe "PadrinoCache" do
     get "/foo"
     assert_equal 200, status
     assert_equal 'test', body
-    sleep 2
-    get "/foo"
+    Time.stub(:now, Time.now + 3) { get "/foo" }
     assert_equal 200, status
     assert_equal 'test again', body
   end
 
-  should 'allow expiring for fragments' do
+  it 'should allow expiring for fragments' do
     called = false
     mock_app do
       register Padrino::Cache
@@ -197,13 +192,12 @@ describe "PadrinoCache" do
     get "/foo"
     assert_equal 200, status
     assert_equal 'test', body
-    sleep 3
-    get "/foo"
+    Time.stub(:now, Time.now + 3) { get "/foo" }
     assert_equal 200, status
     assert_equal 'test again', body
   end
 
-  should 'allow disabling of the cache' do
+  it 'should allow disabling of the cache' do
     called = false
     mock_app do
       register Padrino::Cache
@@ -219,7 +213,7 @@ describe "PadrinoCache" do
     assert_equal 500, status
   end
 
-  should 'not cache integer statuses' do
+  it 'should not cache integer statuses' do
     mock_app do
       register Padrino::Cache
       enable :caching
@@ -244,7 +238,7 @@ describe "PadrinoCache" do
     assert_equal 503, status
   end
 
-  should 'cache should not hit with unique params' do
+  it 'should cache should not hit with unique params' do
     call_count = 0
     mock_app do
       register Padrino::Cache
@@ -271,7 +265,7 @@ describe "PadrinoCache" do
     assert_equal 2, call_count
   end
 
-  should 'resolve block cache keys' do
+  it 'should resolve block cache keys' do
     call_count = 0
     mock_app do
       register Padrino::Cache
@@ -293,7 +287,7 @@ describe "PadrinoCache" do
     assert_equal 3, call_count
   end
 
-  should 'raise an error if providing both a cache_key and block' do
+  it 'should raise an error if providing both a cache_key and block' do
     mock_app do
       register Padrino::Cache
       enable :caching
@@ -306,7 +300,7 @@ describe "PadrinoCache" do
     assert_raises(RuntimeError) { get '/foo' }
   end
 
-  should 'cache content_type' do
+  it 'should cache content_type' do
     called = false
     mock_app do
       register Padrino::Cache
@@ -331,4 +325,25 @@ describe "PadrinoCache" do
     assert_equal '{"foo":"bar"}', body
     assert_match /json/, last_response.content_type
   end
+
+  it 'should cache an object' do
+    counter = 0
+    mock_app do
+      register Padrino::Cache
+      enable :caching
+      get '/' do
+        result = ''
+        2.times do
+          result = cache_object 'object1' do
+            counter += 1
+            { :foo => 'bar' }
+          end
+        end
+        result[:foo].to_s
+      end
+    end
+    get '/'
+    assert_equal 'bar', body
+    assert_equal 1, counter
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-cache
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-04-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.0
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: moneta
   requirement: !ruby/object:Gem::Requirement
@@ -69,6 +69,7 @@ files:
 - README.rdoc
 - Rakefile
 - lib/padrino-cache.rb
+- lib/padrino-cache/helpers/cache_object.rb
 - lib/padrino-cache/helpers/cache_store.rb
 - lib/padrino-cache/helpers/fragment.rb
 - lib/padrino-cache/helpers/page.rb