h2ocube_rails_cache 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb26049cd9b2c220429a627cd0e72106c283215a
-  data.tar.gz: a3886f5a62833fc2334bd14027c6de2f40fb5d21
+  metadata.gz: 970d3130443c25f9d9ad4b4ea743a093c855c278
+  data.tar.gz: 6988038c4058ffbb5e92d835b3ad193856c532cf
 SHA512:
-  metadata.gz: d9dc5b840bbeae7865f2206dc0f2650717782f41ebd568b29177f132b238a58703241d0d23b9a7665f754f900cddf272212c297da8985aa499edf95f16c74341
-  data.tar.gz: e90bd05c7877aa8a9f96c58cd567482a82ce0a5d869e080c267ed239f231c549f142eee5925f2603496ecf0a162d49f8f9206be1d9c7bd96264d48d47c1eba6c
+  metadata.gz: 225df978a051539130158dd667649f3484a2de61d05f9e7504129a3911005f84b38ea32d2d888cb945f1e90ae2bc803a234a2789dbca7ddf07acd25a820a88d7
+  data.tar.gz: 170ca11920ba240eb2f878047b61b66033c2f88564e09d6e55d73d2c68f2d3370f178c5a96c566d7cbac3069d58146937a5d65032f6758727ca821a6c9760f0a

data/README.md

@@ -20,25 +20,25 @@ Disable default session_store in config/initializers/session_store.rb
 ## Rails.cache support methods
 
 * `keys key = '*'`
-* `read key, options = nil`
-* `write key, entry, options = nil`
-* `fetch key, options = nil, &block`
-* `delete key, options = nil`
-* `exist? key, options = nil`
-* `increment key, amount = 1, options = nil`
-* `decrement key, amount = 1, options = nil`
+* `read key, options = {}`
+* `write key, entry, options = {}`
+* `fetch key, options = {}, &block`
+* `delete key, options = {}`
+* `exist? key, options = {}`
+* `increment key, amount = 1, options = {}`
+* `decrement key, amount = 1, options = {}`
 * `clear`
 * `info`
 
 ## Write Options
 
-* `created_at` will write timestamp with key_created_at
+* `updated_at` will write timestamp with key_updated_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
+* `force` true / false or Proc that return true / false
+* `updated_at` will write timestamp with key_updated_at
 
 ## Task changed
 

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.11'
+  gem.version       = '0.0.12'
   gem.authors       = ['Ben']
   gem.email         = ['ben@h2ocube.com']
   gem.description   = 'Just an redis cache.'

data/lib/active_support/cache/h2ocube_rails_cache.rb

@@ -18,19 +18,23 @@ module ActiveSupport
       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
+        if exist?(key)
+          if options.key?(:force)
+            force = options[:force].is_a?(Proc) ? options[:force].call(key, options) : options[:force]
+            if force
+              write key, yield, options
+            else
+              fetch_raw key, options do
+                yield
+              end
             end
           else
-            write key, yield, options
+            fetch_raw(key, options) do
+              yield
+            end
           end
         else
-          fetch_raw(key, options) do
-            yield
-          end
+          write key, yield, options
         end
       end
 

data/test/cache_test.rb

@@ -117,19 +117,19 @@ describe 'h2ocube_rails_cache' do
 
     Rails.cache.fetch 'fetch force', force: true do
       'true'
-    end.must_equal 'content'
+    end.must_equal 'true'
 
     Rails.cache.fetch 'fetch force', force: -> (key, options) { true } do
-      'true'
-    end.must_equal 'content'
+      'true again'
+    end.must_equal 'true again'
 
     Rails.cache.fetch 'fetch force', force: false do
       'false'
-    end.must_equal 'false'
+    end.must_equal 'true again'
 
     Rails.cache.fetch 'fetch force', force: -> (key, options) { false } do
       'false again'
-    end.must_equal 'false again'
+    end.must_equal 'true again'
   end
 
   it 'fetch with updated_at' do
@@ -142,7 +142,7 @@ describe 'h2ocube_rails_cache' do
     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
+    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'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: h2ocube_rails_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Ben
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-namespace