h2ocube_rails_cache 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8035a1f77233f7ff3329e9c709e58053fb7b5e5
-  data.tar.gz: 2278ba3f53b73bdfe300a77a3b937007949f3140
+  metadata.gz: fb26049cd9b2c220429a627cd0e72106c283215a
+  data.tar.gz: a3886f5a62833fc2334bd14027c6de2f40fb5d21
 SHA512:
-  metadata.gz: 6ecad18d2d880acccbd9a3dfebb5d01df2e5a7c4d246a01775227157e254697b3a3317a532964cfdd6f4d1a6bb74a4a860996033ed35655f3357014619004617
-  data.tar.gz: 6cccea34813f6e1ffbc7e34bba2943a2857f364041665398c43451ee1d2f46e53545c2cfb0c1ad23a3af7a4aaa7d3cabbcd864440d19dc6e631beeeb06254f49
+  metadata.gz: d9dc5b840bbeae7865f2206dc0f2650717782f41ebd568b29177f132b238a58703241d0d23b9a7665f754f900cddf272212c297da8985aa499edf95f16c74341
+  data.tar.gz: e90bd05c7877aa8a9f96c58cd567482a82ce0a5d869e080c267ed239f231c549f142eee5925f2603496ecf0a162d49f8f9206be1d9c7bd96264d48d47c1eba6c

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.3.1
 services:
   - redis-server
 script: bundle exec rake test

data/README.md

@@ -22,7 +22,7 @@ Disable default session_store in config/initializers/session_store.rb
 * `keys key = '*'`
 * `read key, options = nil`
 * `write key, entry, options = nil`
-* `fetch key, options = nil, &blk`
+* `fetch key, options = nil, &block`
 * `delete key, options = nil`
 * `exist? key, options = nil`
 * `increment key, amount = 1, options = nil`
@@ -30,9 +30,15 @@ Disable default session_store in config/initializers/session_store.rb
 * `clear`
 * `info`
 
-## Support Options
+## Write Options
 
-* `expires_in` # Rails.cache.write 'key', 'value', expires_in: 1.minute
+* `created_at` will write timestamp with key_created_at
+
+## Fetch Options
+
+* `expires_in` such as 5.minutes
+* `if` true / false or Proc that return true / false
+* `created_at` will write timestamp with key_created_at
 
 ## Task changed
 

data/Rakefile

@@ -1,11 +1,10 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
 end
 
-task :default => :test
+task default: :test

data/h2ocube_rails_cache.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'h2ocube_rails_cache'
-  gem.version       = '0.0.10'
+  gem.version       = '0.0.11'
   gem.authors       = ['Ben']
   gem.email         = ['ben@h2ocube.com']
   gem.description   = 'Just an redis cache.'
@@ -13,11 +13,11 @@ Gem::Specification.new do |gem|
   gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
   gem.add_dependency 'redis-namespace'
 
-  %w(rails minitest-rails).each{ |g| gem.add_development_dependency g }
+  %w(rails minitest-rails).each { |g| gem.add_development_dependency g }
 end

data/lib/active_support/cache/h2ocube_rails_cache.rb

@@ -15,15 +15,32 @@ module ActiveSupport
         @data.keys key
       end
 
-      def fetch(key, options = nil, &block)
+      def fetch(key, options = {}, &block)
         key = expanded_key key
 
+        if options.key?(:force)
+          result = options[:force].is_a?(Proc) ? options[:force].call(key, options) : options[:force]
+          if result
+            fetch_raw key, options do
+              yield
+            end
+          else
+            write key, yield, options
+          end
+        else
+          fetch_raw(key, options) do
+            yield
+          end
+        end
+      end
+
+      def fetch_raw(key, options = {}, &block)
         instrument :fetch, key, options do
           exist?(key) ? read(key, options) : write(key, block, options)
         end
       end
 
-      def read(key, options = nil)
+      def read(key, options = {})
         key = expanded_key key
         return nil if key.start_with?('http')
         instrument :read, key, options do
@@ -31,12 +48,12 @@ module ActiveSupport
         end
       end
 
-      def read_raw(key, _options = nil)
+      def read_raw(key, _options = {})
         key = expanded_key key
         @data.get key
       end
 
-      def write(key, entry, options = nil)
+      def write(key, entry, options = {})
         key = expanded_key key
         return false if key.start_with?('http')
 
@@ -47,12 +64,13 @@ module ActiveSupport
             nil
           else
             @data.set key, entry, options
+            @data.set "#{key}_updated_at", Time.now.to_i if options[:updated_at]
             load_entry entry
           end
         end
       end
 
-      def delete(key, options = nil)
+      def delete(key, options = {})
         key = expanded_key key
 
         instrument :delete, key, options do
@@ -61,7 +79,7 @@ module ActiveSupport
         end
       end
 
-      def exist?(key, _options = nil)
+      def exist?(key, _options = {})
         key = expanded_key key
         @data.exists key
       end
@@ -77,7 +95,7 @@ module ActiveSupport
         @data.info
       end
 
-      def increment(key, amount = 1, _options = nil)
+      def increment(key, amount = 1, _options = {})
         key = expanded_key key
 
         instrument :increment, key, amount do
@@ -89,7 +107,7 @@ module ActiveSupport
         end
       end
 
-      def decrement(key, amount = 1, _options = nil)
+      def decrement(key, amount = 1, _options = {})
         key = expanded_key key
 
         instrument :decrement, key, amount do
@@ -107,13 +125,13 @@ module ActiveSupport
 
       private
 
-      def instrument(operation, key, options = nil)
+      def instrument(operation, key, options = {})
         payload = { key: key }
         payload.merge!(options) if options.is_a?(Hash)
         ActiveSupport::Notifications.instrument("cache_#{operation}.active_support", payload) { yield(payload) }
       end
 
-      def log(operation, key, options = nil)
+      def log(operation, key, options = {})
         return unless logger && logger.debug? && !silence?
         logger.debug("  \e[95mCACHE #{operation}\e[0m #{key}#{options.blank? ? "" : " (#{options.inspect})"}")
       end

data/lib/h2ocube_rails_cache.rb

@@ -6,8 +6,8 @@ require 'action_dispatch/middleware/session/h2ocube_rails_cache_session'
 class Redis
   class Store < self
     def set(key, value, options = nil)
-      if options && ttl = options[:expire_after] || options[:expires_in] || options[:expire_in] || nil
-        setex(key, ttl.to_i, value)
+      if options && options[:expires_in]
+        setex(key, options[:expires_in].to_i, value)
       else
         super(key, value)
       end

data/test/cache_test.rb

@@ -111,11 +111,48 @@ describe 'h2ocube_rails_cache' do
 
     Rails.cache.exist?('fetch error').must_be_same_as false
   end
+
+  it 'fetch with force' do
+    Rails.cache.write 'fetch force', 'content'
+
+    Rails.cache.fetch 'fetch force', force: true do
+      'true'
+    end.must_equal 'content'
+
+    Rails.cache.fetch 'fetch force', force: -> (key, options) { true } do
+      'true'
+    end.must_equal 'content'
+
+    Rails.cache.fetch 'fetch force', force: false do
+      'false'
+    end.must_equal 'false'
+
+    Rails.cache.fetch 'fetch force', force: -> (key, options) { false } do
+      'false again'
+    end.must_equal 'false again'
+  end
+
+  it 'fetch with updated_at' do
+    Rails.cache.fetch 'fetch updated_at', updated_at: true do
+      'content'
+    end.must_equal 'content'
+
+    Rails.cache.exist?('fetch updated_at_updated_at').must_be_same_as true
+
+    sleep 1
+
+    now = Time.now.to_i
+    Rails.cache.fetch 'fetch updated_at', updated_at: true, force: -> (key, options) { now < Rails.cache.read("#{key}_updated_at") } do
+      'new content'
+    end.must_equal 'new content'
+
+    Rails.cache.read('fetch updated_at_updated_at').must_equal now
+  end
 end
 
 describe ApplicationController do
   it 'get home' do
-    get :home
+    get '/'
     assert_response :success
   end
 end

data/test/dummy/config/routes.rb

@@ -1,3 +1,3 @@
 Dummy::Application.routes.draw do
-  root to: 'application#home'
+  get '/' => 'application#home'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: h2ocube_rails_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Ben