padrino-cache 0.16.0.pre4 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44ab330efb4829abdce45c110fd1850546e2b49f89d7e1bfcf228055168cb98b
-  data.tar.gz: b1575c70425a4538c431aab116b8993b50fca09735fc3f9cbbe652444838a097
+  metadata.gz: 44e68b83c64abb2de33377f04f6e70de52b80ddcabe240f25659787e33a5521d
+  data.tar.gz: a5914bb48bc0d0a7bf010330405b4070c588756e1b7974c0eb63489b8b8ed228
 SHA512:
-  metadata.gz: 4d83c2fcb41c1621903266787d7f39643761a172f3b2bd5fc945bda2775e82b5e2a75a3972a6e89e50bb932b7f072f11df3f14351ba1feea4b8370eab957af87
-  data.tar.gz: 2696d10f110f037f73499a82d689c54c4225c3c029fba7664becf389d75647cd15c1223750abe6ae4e1cb1a4c782ebc8c7203375227f5916c4a57511648a5089
+  metadata.gz: c242ed3f212630753edfce0f21bd48873524194971763cf63a31b3de785397e40ed3fe5625318a049d64ec97a5c785927841a75ea768eda29c94519f255adc37
+  data.tar.gz: 62b5cd8edfac34eb057df321641179d2d752c8c37ecbb311d40f6ae4f836d90140e5022897690d54852479f0debd912e587c94fa78627ea95c30732e19109c53

data/README.rdoc

@@ -26,7 +26,7 @@ your needs, you can enable it very easily:
     register Padrino::Cache
     enable :caching
 
-    get '/foo', :cache => true do
+    get '/foo', cache: true do
       expires 30 # expire cached version at least every 30 seconds
       'Hello world'
     end
@@ -44,7 +44,7 @@ You can also cache on a controller-wide basis:
     end
 
     # Requests to routes within '/admin'
-    controller '/admin', :cache => true do
+    controller '/admin', cache: true do
       expires 60
 
       get '/foo' do
@@ -67,7 +67,7 @@ You can also provide a custom <tt>cache_key</tt> in any route:
     register Padrino::Cache
     enable :caching
 
-    get '/post/:id', :cache => true do
+    get '/post/:id', cache: true do
       @post = Post.find(params[:id])
       cache_key :my_name
     end
@@ -76,7 +76,7 @@ You can also provide a custom <tt>cache_key</tt> in any route:
 In this way you can manually expire cache with CachedApp.cache.delete(:my_name)
 for example from the Post model after an update.
 
-If you specify <tt>:cache => true</tt> but do not invoke <tt>expires</tt>,
+If you specify <tt>cache: true</tt> but do not invoke <tt>expires</tt>,
 the response will be cached indefinitely. Most of the time, you will want to
 specify the expiry of a cache entry by <tt>expires</tt>. Even a relatively
 low value--1 or 2 seconds--can greatly increase application efficiency, especially
@@ -107,7 +107,7 @@ The padrino-cache helpers are made available to your application thusly:
 
 As described above in the "Caching Quickstart" section, page caching is very
 easy to integrate into your application. To turn it on, simply provide the
-<tt>:cache => true</tt> option on either a controller or one of its routes.
+<tt>cache: true</tt> option on either a controller or one of its routes.
 By default, cached content is persisted with a "file store"--that is, in a
 subdirectory of your application root.
 
@@ -126,7 +126,7 @@ be executed; rather, its previous output will be sent to the client with a
     register Padrino::Cache  # includes helpers
     enable :caching          # turns on caching
 
-    controller '/blog', :cache => true do
+    controller '/blog', cache: true do
       expires 15
 
       get '/entries' do
@@ -163,11 +163,11 @@ to be cached. It can be used in within a route:
     enable :caching          # turns on caching
 
     controller '/tweets' do
-      get :feed, :map => '/:username' do
+      get :feed, map: '/:username' do
         username = params[:username]
 
-        @feed = cache( "feed_for_#{username}", :expires => 3 ) do
-          @tweets = Tweet.all( :username => username )
+        @feed = cache("feed_for_#{username}", expires: 3) do
+          @tweets = Tweet.all(username: username)
           render 'partials/feedcontent'
         end
 
@@ -190,11 +190,11 @@ Note that any other action will reference the same content if it uses the same k
     enable :caching          # turns on caching
 
     controller :tweets do
-      get :feed, :map => '/:username' do
+      get :feed, map: '/:username' do
         username = params[:username]
 
-        @feed = cache( "feed_for_#{username}", :expires => 3 ) do
-          @tweets = Tweet.all( :username => username )
+        @feed = cache("feed_for_#{username}", expires: 3) do
+          @tweets = Tweet.all(username: username)
           render 'partials/feedcontent'
         end
 
@@ -202,11 +202,11 @@ Note that any other action will reference the same content if it uses the same k
         render 'feeds/show'
       end
 
-      get :mobile_feed, :map => '/:username.iphone' do
+      get :mobile_feed, map: '/:username.iphone' do
         username = params[:username]
 
-        @feed = cache( "feed_for_#{username}", :expires => 3 ) do
-          @tweets = Tweet.all( :username => username )
+        @feed = cache("feed_for_#{username}", expires: 3) do
+          @tweets = Tweet.all(username: username)
           render 'partials/feedcontent'
         end
 
@@ -228,17 +228,17 @@ Finally, to DRY up things a bit, we might do:
     controller :tweets do
       # This works because all routes in this controller specify :username
       before do
-        @feed = cache( "feed_for_#{params[:username]}", :expires => 3 ) do
-          @tweets = Tweet.all( :username => params[:username] )
+        @feed = cache("feed_for_#{params[:username]}", expires: 3) do
+          @tweets = Tweet.all(username: params[:username])
           render 'partials/feedcontent'
         end
       end
 
-      get :feed, :map => '/:username' do
+      get :feed, map: '/:username' do
         render 'feeds/show'
       end
 
-      get :mobile_feed, :map => '/:username.iphone' do
+      get :mobile_feed, map: '/:username.iphone' do
         render 'feeds/show.iphone'
       end
     end
@@ -256,15 +256,15 @@ You can set a global caching option or a per app caching options.
 === Global Caching Options
 
   Padrino.cache = Padrino::Cache.new(:LRUHash) # default choice
-  Padrino.cache = Padrino::Cache.new(:File, :dir => Padrino.root('tmp', app_name.to_s, 'cache')) # Keeps cached values in file
+  Padrino.cache = Padrino::Cache.new(:File, dir: Padrino.root('tmp', app_name.to_s, 'cache')) # Keeps cached values in file
   Padrino.cache = Padrino::Cache.new(:Memcached) # Uses default server at localhost
-  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(: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)
-  Padrino.cache = Padrino::Cache.new(:Redis, :backend => redis_instance)
+  Padrino.cache = Padrino::Cache.new(:Redis, host: '127.0.0.1', port: 6379, db: 0)
+  Padrino.cache = Padrino::Cache.new(:Redis, backend: redis_instance)
   Padrino.cache = Padrino::Cache.new(:Mongo) # Uses default server at localhost
-  Padrino.cache = Padrino::Cache.new(:Mongo, :backend => mongo_client_instance)
+  Padrino.cache = Padrino::Cache.new(:Mongo, backend: mongo_client_instance)
 
 You can manage your cache from anywhere in your app:
 
@@ -281,7 +281,7 @@ have special requirements, for example if you want to configure the marshalling
   set :cache, Padrino::Cache.new(:LRUHash)
   set :cache, Padrino::Cache.new(:Memcached)
   set :cache, Padrino::Cache.new(:Redis)
-  set :cache, Padrino::Cache.new(:File, :dir => Padrino.root('tmp', app_name.to_s, 'cache')) # default choice
+  set :cache, Padrino::Cache.new(:File, dir: Padrino.root('tmp', app_name.to_s, 'cache')) # default choice
 
 You can manage your cache from anywhere in your app:
 
@@ -314,16 +314,16 @@ do our user a favor and instantly re-render the feed.
     COMPANY_FOUNDING = Time.utc( 2010, "April" )
 
     controller :tweets do
-      get :feed, :map => '/:username' do
+      get :feed, map: '/:username' do
         last_visit = session[:last_visit] || params[:since] || COMPANY_FOUNDING
 
         username = params[:username]
-        @tweets = Tweet.since( last_visit, :username => username ).limit( 100 )
+        @tweets = Tweet.since(last_visit, username: username).limit(100)
 
-        expire( "feed since #{last_visit}" ) if @tweets.any? { |t| t.deleted_since?( last_visit ) }
+        expire("feed since #{last_visit}") if @tweets.any? { |t| t.deleted_since?(last_visit) }
 
         session[:last_visit] = Time.now
-        @feed = cache( "feed since #{last_visit}", :expires => 60 ) do
+        @feed = cache("feed since #{last_visit}", expires: 60) do
           @tweets = @tweets.find_all { |t| !t.deleted? }
           render 'partials/feedcontent'
         end

data/Rakefile

@@ -1 +1 @@
-require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
+require_relative '../gem_rake_helper'

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

@@ -7,11 +7,11 @@ module Padrino
             began_at = Time.now
             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)
+              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)
+              logger.debug 'SET Object', began_at, key.to_s if defined?(logger)
             end
             value
           else

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

@@ -3,7 +3,7 @@ module Padrino
     module Helpers
       module CacheStore
         def expire(*key)
-          if key.size == 1 and (key.first.is_a?(String) or key.first.is_a?(Symbol))
+          if (key.size == 1) && (key.first.is_a?(String) || key.first.is_a?(Symbol))
             settings.cache.delete(key.first)
           else
             settings.cache.delete(self.class.url(*key))

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

@@ -33,11 +33,11 @@ module Padrino
         #     enable :caching          # turns on caching mechanism
         #
         #     controller '/tweets' do
-        #       get :feed, :map => '/:username' do
+        #       get :feed, map: '/:username' do
         #         username = params[:username]
         #
-        #         @feed = cache( "feed_for_#{username}", :expires => 3 ) do
-        #           @tweets = Tweet.all( :username => username )
+        #         @feed = cache("feed_for_#{username}", expires: 3) do
+        #           @tweets = Tweet.all(username: username)
         #           render 'partials/feedcontent'
         #         end
         #
@@ -53,12 +53,12 @@ module Padrino
             began_at = Time.now
             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)
+              logger.debug 'GET Fragment', began_at, key.to_s if defined?(logger)
               concat_content(value.to_s.html_safe)
             else
               value = capture_html(&block)
               settings.cache.store(key.to_s, value, opts)
-              logger.debug "SET Fragment", began_at, key.to_s if defined?(logger)
+              logger.debug 'SET Fragment', began_at, key.to_s if defined?(logger)
               concat_content(value)
             end
           else

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

@@ -6,7 +6,7 @@ module Padrino
     module Helpers
       ##
       # Page caching is easy to integrate into your application. To turn it on, simply provide the
-      # <tt>:cache => true</tt> option on either a controller or one of its routes.
+      # <tt>cache: true</tt> option on either a controller or one of its routes.
       # By default, cached content is persisted with a "file store" --that is, in a
       # subdirectory of your application root.
       #
@@ -15,7 +15,7 @@ module Padrino
       #   class CachedApp < Padrino::Application
       #     enable :caching          # turns on caching mechanism
       #
-      #     controller '/blog', :cache => true do
+      #     controller '/blog', cache: true do
       #       expires 15
       #
       #       get '/entries' do
@@ -50,7 +50,7 @@ module Padrino
         #   Time til expiration (seconds)
         #
         # @example
-        #   controller '/blog', :cache => true do
+        #   controller '/blog', cache: true do
         #     expires 15
         #
         #     get '/entries' do
@@ -72,7 +72,7 @@ module Padrino
         #   block to be evaluated to cache key
         #
         # @example
-        #   controller '/blog', :cache => true do
+        #   controller '/blog', cache: true do
         #
         #     get '/post/:id' do
         #       cache_key :my_name
@@ -81,14 +81,14 @@ module Padrino
         #   end
         #
         # @example
-        #     get '/foo', :cache => true do
+        #     get '/foo', cache: true do
         #       cache_key { param[:id] }
         #       "My id is #{param[:id}"
         #     end
         #   end
         #
         def cache_key(name = nil, &block)
-          fail "Can not provide both cache_key and a block" if name && block
+          raise 'Can not provide both cache_key and a block' if name && block
           @route.cache_key = name || block
         end
 
@@ -99,7 +99,7 @@ module Padrino
 
           route.before_filters do
             next unless settings.caching?
-            if cached_response = load_cached_response
+            if (cached_response = load_cached_response)
               content_type cached_response[:content_type]
               halt 200, cached_response[:body]
             end
@@ -117,25 +117,25 @@ module Padrino
           route_cache_key = resolve_cache_key || env['PATH_INFO']
 
           value = settings.cache[route_cache_key]
-          logger.debug "GET Cache", began_at, route_cache_key if defined?(logger) && value
+          logger.debug 'GET Cache', began_at, route_cache_key if defined?(logger) && value
 
           value
         end
 
         def save_cached_response(cache_expires)
-          return unless @_response_buffer.kind_of?(String)
+          return unless @_response_buffer.is_a?(String)
 
           began_at = Time.now
           route_cache_key = resolve_cache_key || env['PATH_INFO']
 
           content = {
-            :body         => @_response_buffer,
-            :content_type => response.content_type
+            body: @_response_buffer,
+            content_type: response.content_type
           }
 
-          settings.cache.store(route_cache_key, content, :expires => cache_expires)
+          settings.cache.store(route_cache_key, content, expires: cache_expires)
 
-          logger.debug "SET Cache", began_at, route_cache_key if defined?(logger)
+          logger.debug 'SET Cache', began_at, route_cache_key if defined?(logger)
         end
 
         ##

data/lib/padrino-cache.rb

@@ -10,7 +10,7 @@ module Padrino
     # Returns the caching engine.
     #
     # @example
-    #   # with: Padrino.cache = Padrino::Cache.new(:File, :dir => /my/cache/path)
+    #   # with: Padrino.cache = Padrino::Cache.new(:File, dir: /my/cache/path)
     #   Padrino.cache['val'] = 'test'
     #   Padrino.cache['val'] # => 'test'
     #   Padrino.cache.delete('val')
@@ -28,15 +28,15 @@ module Padrino
     #
     # @example
     #   Padrino.cache = Padrino::Cache.new(:LRUHash) # default choice
-    #   Padrino.cache = Padrino::Cache.new(:File, :dir => Padrino.root('tmp', app_name.to_s, 'cache')) # Keeps cached values in file
+    #   Padrino.cache = Padrino::Cache.new(:File, dir: Padrino.root('tmp', app_name.to_s, 'cache')) # Keeps cached values in file
     #   Padrino.cache = Padrino::Cache.new(:Memcached) # Uses default server at localhost
-    #   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(: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)
-    #   Padrino.cache = Padrino::Cache.new(:Redis, :backend => redis_instance)
+    #   Padrino.cache = Padrino::Cache.new(:Redis, host: '127.0.0.1', port: 6379, db: 0)
+    #   Padrino.cache = Padrino::Cache.new(:Redis, backend: redis_instance)
     #   Padrino.cache = Padrino::Cache.new(:Mongo) # Uses default server at localhost
-    #   Padrino.cache = Padrino::Cache.new(:Mongo, :backend => mongo_client_instance)
+    #   Padrino.cache = Padrino::Cache.new(:Mongo, backend: mongo_client_instance)
     #
     #   # You can manage your cache from anywhere in your app:
     #
@@ -46,7 +46,7 @@ module Padrino
     #   Padrino.cache.clear
     #
     def cache=(value)
-      @_cache= value
+      @_cache = value
     end
   end
 
@@ -70,20 +70,20 @@ module Padrino
       #
       # By default we use FileStore as showed below:
       #
-      #   set :cache, Padrino::Cache.new(:File, :dir => Padrino.root('tmp', app_name.to_s, 'cache'))
+      #   set :cache, Padrino::Cache.new(:File, dir: Padrino.root('tmp', app_name.to_s, 'cache'))
       #
       # However, you can also change the file store easily in your app.rb:
       #
       #   set :cache, Padrino::Cache.new(:LRUHash) # Keeps cached values in memory
       #   set :cache, Padrino::Cache.new(:Memcached) # Uses default server at localhost
-      #   set :cache, Padrino::Cache.new(:Memcached, '127.0.0.1:11211', :exception_retry_limit => 1)
-      #   set :cache, Padrino::Cache.new(:Memcached, :backend => memcached_or_dalli_instance)
+      #   set :cache, Padrino::Cache.new(:Memcached, '127.0.0.1:11211', exception_retry_limit: 1)
+      #   set :cache, Padrino::Cache.new(:Memcached, backend: memcached_or_dalli_instance)
       #   set :cache, Padrino::Cache.new(:Redis) # Uses default server at localhost
-      #   set :cache, Padrino::Cache.new(:Redis, :host => '127.0.0.1', :port => 6379, :db => 0)
-      #   set :cache, Padrino::Cache.new(:Redis, :backend => redis_instance)
+      #   set :cache, Padrino::Cache.new(:Redis, host: '127.0.0.1', port: 6379, db: 0)
+      #   set :cache, Padrino::Cache.new(:Redis, backend: redis_instance)
       #   set :cache, Padrino::Cache.new(:Mongo) # Uses default server at localhost
-      #   set :cache, Padrino::Cache.new(:Mongo, :backend => mongo_client_instance)
-      #   set :cache, Padrino::Cache.new(:File, :dir => Padrino.root('tmp', app_name.to_s, 'cache')) # default choice
+      #   set :cache, Padrino::Cache.new(:Mongo, backend: mongo_client_instance)
+      #   set :cache, Padrino::Cache.new(:File, dir: Padrino.root('tmp', app_name.to_s, 'cache')) # default choice
       #
       # You can manage your cache from anywhere in your app:
       #
@@ -99,7 +99,7 @@ module Padrino
         app.helpers Padrino::Cache::Helpers::Page
         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)
+          app.set :cache, Padrino::Cache.new(:File, dir: cache_dir)
         end
         app.disable :caching unless app.respond_to?(:caching)
         included(app)

data/padrino-cache.gemspec

@@ -1,28 +1,28 @@
 #!/usr/bin/env gem build
 # encoding: utf-8
 
-require File.expand_path("../../padrino-core/lib/padrino-core/version.rb", __FILE__)
+require File.expand_path('../padrino-core/lib/padrino-core/version.rb', __dir__)
 
 Gem::Specification.new do |s|
-  s.name = "padrino-cache"
-  s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.email = "padrinorb@gmail.com"
-  s.summary = "Page and fragment caching for Padrino"
-  s.homepage = "http://www.padrinorb.com"
-  s.description = "Caching support for memcached, page and fragment"
-  s.required_rubygems_version = ">= 1.3.6"
+  s.name = 'padrino-cache'
+  s.authors = ['Padrino Team', 'Nathan Esquenazi', "Davide D'Agostino", 'Arthur Chiu']
+  s.email = 'padrinorb@gmail.com'
+  s.summary = 'Page and fragment caching for Padrino'
+  s.homepage = 'http://www.padrinorb.com'
+  s.description = 'Caching support for memcached, page and fragment'
+  s.required_rubygems_version = '>= 1.3.6'
   s.version = Padrino.version
-  s.date = Time.now.strftime("%Y-%m-%d")
-  s.license = "MIT"
+  s.date = Time.now.strftime('%Y-%m-%d')
+  s.license = 'MIT'
 
-  s.extra_rdoc_files = Dir["*.rdoc"]
+  s.extra_rdoc_files = Dir['*.rdoc']
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-  s.rdoc_options  = ["--charset=UTF-8"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
+  s.rdoc_options  = ['--charset=UTF-8']
 
-  s.add_runtime_dependency("padrino-core", Padrino.version)
-  s.add_runtime_dependency("padrino-helpers", Padrino.version)
-  s.add_runtime_dependency("moneta", ["~> 1.6"])
+  s.add_runtime_dependency('padrino-core', Padrino.version)
+  s.add_runtime_dependency('padrino-helpers', Padrino.version)
+  s.add_runtime_dependency('moneta', ['~> 1.6'])
 end

data/test/helper.rb

@@ -1,5 +1,5 @@
 ENV['RACK_ENV'] = 'test'
-PADRINO_ROOT = File.dirname(__FILE__) unless defined?(PADRINO_ROOT)
+PADRINO_ROOT = __dir__ unless defined?(PADRINO_ROOT)
 
 require 'minitest/autorun'
 require 'minitest/pride'
@@ -14,7 +14,7 @@ class Minitest::Spec
   # Sets up a Sinatra::Base subclass defined with the block
   # given. Used in setup or individual spec methods to establish
   # the application.
-  def mock_app(base=Padrino::Application, &block)
+  def mock_app(base = Padrino::Application, &block)
     @app = Sinatra.new(base, &block)
   end
 

data/test/test_moneta_store.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
+require_relative 'helper'
 
 describe 'Padrino::Cache - Moneta store' do
   def setup
@@ -10,7 +10,7 @@ describe 'Padrino::Cache - Moneta store' do
   end
 
   class Foo
-    def bar; "bar"; end
+    def bar; 'bar'; end
   end
 
   it "return nil trying to get a value that doesn't exist" do
@@ -20,7 +20,7 @@ describe 'Padrino::Cache - Moneta store' do
 
   it 'set and get an object with marshal' do
     Padrino.cache[@test_key] = Foo.new
-    assert_equal "bar", Padrino.cache[@test_key].bar
+    assert_equal 'bar', Padrino.cache[@test_key].bar
   end
 
   it 'set and get a nil value' do
@@ -33,15 +33,15 @@ describe 'Padrino::Cache - Moneta store' do
     assert_equal 'foo', Padrino.cache[@test_key]
   end
 
-  it "set a value that expires" do
-    init_time = ( Time.now - 20 )
-    Time.stub(:now, init_time) { Padrino.cache.store(@test_key, 'test', :expires => 1) }
+  it 'set a value that expires' do
+    init_time = Time.now - 20
+    Time.stub(:now, init_time) { Padrino.cache.store(@test_key, 'test', expires: 1) }
     Time.stub(:now, init_time + 20) { assert_nil Padrino.cache[@test_key] }
   end
 
-  it "be able to cache forever" do
-    Padrino.cache.store('forever', 'cached', :expires => false)
-    2.times { |i| assert_equal 'cached', Padrino.cache['forever'] }
+  it 'be able to cache forever' do
+    Padrino.cache.store('forever', 'cached', expires: false)
+    2.times { assert_equal 'cached', Padrino.cache['forever'] }
   end
 
   it 'delete a value' do

data/test/test_padrino_cache.rb

@@ -1,9 +1,9 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
-describe "PadrinoCache" do
+describe 'PadrinoCache' do
   after do
-    tmp = File.expand_path("../tmp", __FILE__)
-    %x[rm -rf #{tmp}]
+    tmp = File.expand_path('tmp', __dir__)
+    `rm -rf #{tmp}`
   end
 
   it 'should cache a fragment' do
@@ -11,12 +11,12 @@ describe "PadrinoCache" do
     mock_app do
       register Padrino::Cache
       enable :caching
-      get("/foo"){ cache(:test) { called ? halt(500) : (called = 'test fragment') } }
+      get('/foo') { cache(:test) { called ? halt(500) : (called = 'test fragment') } }
     end
-    get "/foo"
+    get '/foo'
     assert_equal 200, status
     assert_equal 'test fragment', body
-    get "/foo"
+    get '/foo'
     assert_equal 200, status
     assert_equal 'test fragment', body
     refute_equal called, false
@@ -27,12 +27,12 @@ describe "PadrinoCache" do
     mock_app do
       register Padrino::Cache
       enable :caching
-      get('/foo', :cache => true){ called ? halt(500) : (called = 'test page') }
+      get('/foo', cache: true) { called ? halt(500) : (called = 'test page') }
     end
-    get "/foo"
+    get '/foo'
     assert_equal 200, status
     assert_equal 'test page', body
-    get "/foo"
+    get '/foo'
     assert_equal 200, status
     assert_equal 'test page', body
     refute_equal false, called
@@ -43,10 +43,10 @@ describe "PadrinoCache" do
     mock_app do
       register Padrino::Cache
       enable :caching
-      get('/foo', :cache => true){ called_times += 1; called_times.to_s }
+      get('/foo', cache: true) { called_times += 1; called_times.to_s }
     end
-    head "/foo"
-    head "/foo"
+    head '/foo'
+    head '/foo'
     assert_equal 1, called_times
   end
 
@@ -55,11 +55,11 @@ describe "PadrinoCache" do
     mock_app do
       register Padrino::Cache
       enable :caching
-      post('/foo', :cache => true){ called_times += 1; called_times.to_s }
+      post('/foo', cache: true) { called_times += 1; called_times.to_s }
     end
-    post "/foo"
+    post '/foo'
     assert_equal 1, called_times
-    post "/foo"
+    post '/foo'
     assert_equal 2, called_times
   end
 
@@ -68,11 +68,11 @@ describe "PadrinoCache" do
     mock_app do
       register Padrino::Cache
       enable :caching
-      delete('/foo', :cache => true){ called_times += 1; called_times.to_s }
+      delete('/foo', cache: true) { called_times += 1; called_times.to_s }
     end
-    delete "/foo"
+    delete '/foo'
     assert_equal 1, called_times
-    delete "/foo"
+    delete '/foo'
     assert_equal 2, called_times
   end
 
@@ -81,11 +81,11 @@ describe "PadrinoCache" do
     mock_app do
       register Padrino::Cache
       enable :caching
-      put('/foo', :cache => true){ called_times += 1; called_times.to_s }
+      put('/foo', cache: true) { called_times += 1; called_times.to_s }
     end
-    put "/foo"
+    put '/foo'
     assert_equal 1, called_times
-    put "/foo"
+    put '/foo'
     assert_equal 2, called_times
   end
 
@@ -94,14 +94,14 @@ describe "PadrinoCache" do
     mock_app do
       register Padrino::Cache
       enable :caching
-      get('/foo', :cache => true){ called ? 'test page again' : (called = 'test page') }
-      get('/delete_foo'){ expire('/foo') }
+      get('/foo', cache: true) { called ? 'test page again' : (called = 'test page') }
+      get('/delete_foo') { expire('/foo') }
     end
-    get "/foo"
+    get '/foo'
     assert_equal 200, status
     assert_equal 'test page', body
-    get "/delete_foo"
-    get "/foo"
+    get '/delete_foo'
+    get '/foo'
     assert_equal 200, status
     assert_equal 'test page again', body
     refute_equal false, called
@@ -112,7 +112,7 @@ describe "PadrinoCache" do
     mock_app do
       register Padrino::Cache
       enable :caching
-      get '/foo', :cache => true do
+      get '/foo', cache: true do
         if called
           "you'll never see me"
         else
@@ -123,7 +123,7 @@ describe "PadrinoCache" do
         end
       end
 
-      get '/bar', :cache => true do
+      get '/bar', cache: true do
         if called
           cache_key :bar
           called = 'bar'
@@ -134,18 +134,18 @@ describe "PadrinoCache" do
         end
       end
     end
-    get "/foo"
+    get '/foo'
     assert_equal 200, status
     assert_equal 'foo', body
     assert_equal 'foo', @app.cache[:foo][:body]
-    get "/foo"
+    get '/foo'
     assert_equal 'foo', body
 
-    get "/bar"
+    get '/bar'
     assert_equal 200, status
     assert_equal 'bar', body
     assert_equal 'bar', @app.cache[:bar][:body]
-    get "/bar"
+    get '/bar'
     assert_equal 'bar', body
   end
 
@@ -154,14 +154,14 @@ describe "PadrinoCache" do
     mock_app do
       register Padrino::Cache
       enable :caching
-      get(:foo, :with => :id, :cache => true) { called ? 'test page again' : (called = 'test page') }
-      get(:delete_foo, :with => :id) { expire(:foo, params[:id]) }
+      get(:foo, with: :id, cache: true) { called ? 'test page again' : (called = 'test page') }
+      get(:delete_foo, with: :id) { expire(:foo, params[:id]) }
     end
-    get "/foo/12"
+    get '/foo/12'
     assert_equal 200, status
     assert_equal 'test page', body
-    get "/delete_foo/12"
-    get "/foo/12"
+    get '/delete_foo/12'
+    get '/foo/12'
     assert_equal 200, status
     assert_equal 'test page again', body
   end
@@ -169,16 +169,16 @@ describe "PadrinoCache" do
   it 'should allow controller-wide caching' do
     called = false
     mock_app do
-      controller :cache => true do
+      controller cache: true do
         register Padrino::Cache
         enable :caching
-        get("/foo"){ called ? halt(500) : (called = 'test') }
+        get('/foo') { called ? halt(500) : (called = 'test') }
       end
     end
-    get "/foo"
+    get '/foo'
     assert_equal 200, status
     assert_equal 'test', body
-    get "/foo"
+    get '/foo'
     assert_equal 200, status
     assert_equal 'test', body
   end
@@ -187,19 +187,19 @@ describe "PadrinoCache" do
     called = false
     mock_app do
       register Padrino::Cache
-      controller :cache => true do
+      controller cache: true do
         enable :caching
         expires 1
-        get("/foo"){ called ? halt(500) : (called = 'test') }
+        get('/foo') { called ? halt(500) : (called = 'test') }
       end
     end
-    get "/foo"
+    get '/foo'
     assert_equal 200, status
     assert_equal 'test', body
-    get "/foo"
+    get '/foo'
     assert_equal 200, status
     assert_equal 'test', body
-    Time.stub(:now, Time.now + 2) { get "/foo" }
+    Time.stub(:now, Time.now + 2) { get '/foo' }
     assert_equal 500, status
   end
 
@@ -208,14 +208,14 @@ describe "PadrinoCache" do
     mock_app do
       register Padrino::Cache
       enable :caching
-      controller :cache => true do
-        get("/foo", :cache => false){ called ? 'test again' : (called = 'test') }
+      controller cache: true do
+        get('/foo', cache: false) { called ? 'test again' : (called = 'test') }
       end
     end
-    get "/foo"
+    get '/foo'
     assert_equal 200, status
     assert_equal 'test', body
-    get "/foo"
+    get '/foo'
     assert_equal 200, status
     assert_equal 'test again', body
   end
@@ -225,20 +225,20 @@ describe "PadrinoCache" do
     mock_app do
       register Padrino::Cache
       enable :caching
-      controller :cache => true do
-        get("/foo") {
+      controller cache: true do
+        get('/foo') do
           expires 1
           called ? 'test again' : (called = 'test')
-        }
+        end
       end
     end
-    get "/foo"
+    get '/foo'
     assert_equal 200, status
     assert_equal 'test', body
-    get "/foo"
+    get '/foo'
     assert_equal 200, status
     assert_equal 'test', body
-    Time.stub(:now, Time.now + 3) { get "/foo" }
+    Time.stub(:now, Time.now + 3) { get '/foo' }
     assert_equal 200, status
     assert_equal 'test again', body
   end
@@ -249,21 +249,21 @@ describe "PadrinoCache" do
       register Padrino::Cache
       enable :caching
       controller do
-        get("/foo") {
+        get('/foo') do
           expires 1
-          cache(:test, :expires => 2) do
+          cache(:test, expires: 2) do
             called ? 'test again' : (called = 'test')
           end
-        }
+        end
       end
     end
-    get "/foo"
+    get '/foo'
     assert_equal 200, status
     assert_equal 'test', body
-    get "/foo"
+    get '/foo'
     assert_equal 200, status
     assert_equal 'test', body
-    Time.stub(:now, Time.now + 3) { get "/foo" }
+    Time.stub(:now, Time.now + 3) { get '/foo' }
     assert_equal 200, status
     assert_equal 'test again', body
   end
@@ -273,14 +273,14 @@ describe "PadrinoCache" do
     mock_app do
       register Padrino::Cache
       disable :caching
-      controller :cache => true do
-        get("/foo"){ called ? halt(500) : (called = 'test') }
+      controller cache: true do
+        get('/foo') { called ? halt(500) : (called = 'test') }
       end
     end
-    get "/foo"
+    get '/foo'
     assert_equal 200, status
     assert_equal 'test', body
-    get "/foo"
+    get '/foo'
     assert_equal 500, status
   end
 
@@ -288,10 +288,10 @@ describe "PadrinoCache" do
     mock_app do
       register Padrino::Cache
       enable :caching
-      get( '/404', :cache => true ) { not_found }
-      get( '/503', :cache => true ) { error 503 }
+      get('/404', cache: true) { not_found }
+      get('/503', cache: true) { error 503 }
       not_found { 'fancy 404' }
-      error( 503 ) { 'fancy 503' }
+      error(503) { 'fancy 503' }
     end
     get '/404'
     assert_equal 'fancy 404', body
@@ -318,7 +318,7 @@ describe "PadrinoCache" do
         param = params[:test] || 'none'
         cache_key "foo?#{param}"
       end
-      get '/foo/:test', :cache => true do
+      get '/foo/:test', cache: true do
         param = params[:test] || 'none'
         call_count += 1
         "foo?#{param}"
@@ -342,7 +342,7 @@ describe "PadrinoCache" do
       register Padrino::Cache
       enable :caching
 
-      get '/foo', :cache => true do
+      get '/foo', cache: true do
         cache_key { "key #{params[:id]}" }
         call_count += 1
         params[:id]
@@ -363,7 +363,7 @@ describe "PadrinoCache" do
       register Padrino::Cache
       enable :caching
 
-      get '/foo', :cache => true do
+      get '/foo', cache: true do
         cache_key(:some_key) { "key #{params[:id]}" }
       end
     end
@@ -376,7 +376,7 @@ describe "PadrinoCache" do
     mock_app do
       register Padrino::Cache
       enable :caching
-      get '/foo', :cache => true do
+      get '/foo', cache: true do
         content_type :json
         if called
           "you'll never see me"
@@ -388,13 +388,13 @@ describe "PadrinoCache" do
         end
       end
     end
-    get "/foo"
+    get '/foo'
     assert_equal 200, status
     assert_equal '{"foo":"bar"}', body
     assert_equal '{"foo":"bar"}', @app.cache[:foo][:body]
-    get "/foo"
+    get '/foo'
     assert_equal '{"foo":"bar"}', body
-    assert_match /json/, last_response.content_type
+    assert_match(/json/, last_response.content_type)
   end
 
   it 'should cache an object' do
@@ -407,7 +407,7 @@ describe "PadrinoCache" do
         2.times do
           result = cache_object 'object1' do
             counter += 1
-            { :foo => 'bar' }
+            { foo: 'bar' }
           end
         end
         result[:foo].to_s
@@ -425,35 +425,35 @@ describe "PadrinoCache" do
     mock_app do
       register Padrino::Cache
       enable :caching
-      controller :cache => true do
-        get("/foo") do
+      controller cache: true do
+        get('/foo') do
           expires 1
           called_times_a += 1
           called_times_b.to_s
         end
-        get("/bar") do
+        get('/bar') do
           expires 3
           called_times_b += 1
           called_times_b.to_s
         end
       end
     end
-    Time.stub(:now, Time.now) { get "/foo"; get "/bar" }
+    Time.stub(:now, Time.now) { get '/foo'; get '/bar' }
     assert_equal 1, called_times_a
     assert_equal 1, called_times_b
-    Time.stub(:now, Time.now + 0.5) { get "/foo"; get "/bar" }
+    Time.stub(:now, Time.now + 0.5) { get '/foo'; get '/bar' }
     assert_equal 1, called_times_a
     assert_equal 1, called_times_b
-    Time.stub(:now, Time.now + 2) { get "/foo"; get "/bar" }
+    Time.stub(:now, Time.now + 2) { get '/foo'; get '/bar' }
     assert_equal 2, called_times_a
     assert_equal 1, called_times_b
-    Time.stub(:now, Time.now + 2.5) { get "/foo"; get "/bar" }
+    Time.stub(:now, Time.now + 2.5) { get '/foo'; get '/bar' }
     assert_equal 2, called_times_a
     assert_equal 1, called_times_b
-    Time.stub(:now, Time.now + 4) { get "/foo"; get "/bar" }
+    Time.stub(:now, Time.now + 4) { get '/foo'; get '/bar' }
     assert_equal 3, called_times_a
     assert_equal 2, called_times_b
-    Time.stub(:now, Time.now + 5.5) { get "/foo"; get "/bar" }
+    Time.stub(:now, Time.now + 5.5) { get '/foo'; get '/bar' }
     assert_equal 4, called_times_a
     assert_equal 2, called_times_b
   end
@@ -474,18 +474,16 @@ describe "PadrinoCache" do
     end
 
     adapter = @app.cache.adapter
-    while adapter.respond_to? :adapter
-      adapter = adapter.adapter
-    end
+    adapter = adapter.adapter while adapter.respond_to?(:adapter)
     assert_kind_of Moneta::Adapters::Memory, adapter
   end
 
-  it "should check key existence" do
+  it 'should check key existence' do
     count1, count2 = 0, 0
     mock_app do
       register Padrino::Cache
       enable :caching
-      get "/" do
+      get '/' do
         cache(:foo) do
           count1 += 1
           nil
@@ -493,7 +491,7 @@ describe "PadrinoCache" do
         count1.inspect
       end
 
-      get "/object" do
+      get '/object' do
         cache_object(:bar) do
           count2 += 1
           nil
@@ -501,24 +499,24 @@ describe "PadrinoCache" do
         count2.inspect
       end
     end
-    2.times { get "/" }
-    assert_equal "1", body
-    2.times { get "/object" }
-    assert_equal "1", body
+    2.times { get '/' }
+    assert_equal '1', body
+    2.times { get '/object' }
+    assert_equal '1', body
   end
 
   it 'should cache full mime type of content_type' do
     mock_app do
       register Padrino::Cache
       enable :caching
-      get '/foo', :cache => true do
-        content_type :json, :charset => 'utf-8'
+      get '/foo', cache: true do
+        content_type :json, charset: 'utf-8'
         '{}'
       end
     end
-    get "/foo"
+    get '/foo'
     assert_equal 'application/json;charset=utf-8', last_response.content_type
-    get "/foo"
+    get '/foo'
     assert_equal 'application/json;charset=utf-8', last_response.content_type
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-cache
 version: !ruby/object:Gem::Version
-  version: 0.16.0.pre4
+  version: 0.16.0
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-19 00:00:00.000000000 Z
+date: 2025-12-02 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.16.0.pre4
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre4
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre4
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre4
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: moneta
   requirement: !ruby/object:Gem::Requirement
@@ -93,9 +93,9 @@ 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: []
 rubygems_version: 3.4.19
 signing_key: