h2ocube_rails_cache 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0289601a9b244df72fd7fe25a6efc79248550fced3d6b866bde35f1e70518c7b'
-  data.tar.gz: 3229f9da97c42c9a81038c9424a2fa38211238ae187f2bb32b952108e13f0ec9
+  metadata.gz: a2cfe66da39df5c16bf3aef04e9e33b11ad5e1518588916515965f67973ccd4f
+  data.tar.gz: 24d05e2c7afcbc6ca316bbb51028b172f9874de56c1cdccf068c3adce310e489
 SHA512:
-  metadata.gz: de46981ebbc21dbebbd0bd1340c84fe03034eb0235ac6ae47b82fec80bc73d83de0b1c506934e0e9d7bad77043ab16e6d2a9391712a56ee2affca96951415749
-  data.tar.gz: 606709734ddb3890ba891133ae21c739d23e4358a3b43118fe4863efb2c9b4e79e1381baeb2504905cc54e63cfdb79bacc9446f18c7df9387a2b01df71a79328
+  metadata.gz: 462463ed9d937cffa39fb84b04de25c7674ae5d3b7acab81bb7fc7c8f5e0471f3b652d51b24bbfd3c927628a6af4d4346651fe389bdc5e0e10ae975e45a5896a
+  data.tar.gz: aaf774d66b1203f2db36422c56b626b14c9f770645f0171f31cbf10d36fe8e77205dfd2d41b8a5bdc7d6043997cac5e7019c8dcfc733030fb80b3a112610d902

data/README.md

@@ -32,11 +32,12 @@ And then execute:
 
 ## Write Options
 
+* `expires_in` such as 5.minutes, when value is nil, will not be expired
 * `updated_at` will write timestamp with key_updated_at
 
 ## Fetch Options
 
-* `expires_in` such as 5.minutes
+* `expires_in` such as 5.minutes, when value is nil, will not be expired
 * `force` true / false or Proc that return true / false
 * `updated_at` will write timestamp with key_updated_at
 

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

data/lib/active_support/cache/h2ocube_rails_cache.rb

@@ -8,19 +8,18 @@ module ActiveSupport
       def initialize(options = {})
         options ||= {}
         @config = options
+        @namespace = options[:namespace]
         @data = Redis.new(options)
         super(options)
       end
 
       def keys(key = '*')
-        options.reverse_merge! config
-        key = normalize_key key, config
+        key = normalize_key key
         @data.keys key
       end
 
       def fetch(key, options = {}, &block)
-        options.reverse_merge! config
-        key = normalize_key(key, options)
+        key = normalize_key key
 
         if @data.exists(key)
           if options.key?(:force)
@@ -43,8 +42,7 @@ module ActiveSupport
       end
 
       def fetch_raw(key, options = {}, &block)
-        options.reverse_merge! config
-        key = normalize_key key, options
+        key = normalize_key key
         instrument :fetch, key, options do
           exist?(key) ? read(key) : write(key, block, options)
         end
@@ -52,7 +50,7 @@ module ActiveSupport
 
       def read(key, options = {})
         options.reverse_merge! config
-        key = normalize_key key, options
+        key = normalize_key key
         return nil if key.start_with?('http')
         instrument :read, key, options do
           exist?(key) ? load_entry(@data.get(key)) : nil
@@ -61,7 +59,7 @@ module ActiveSupport
 
       def read_raw(key, options = {})
         options.reverse_merge! config
-        key = normalize_key key, options
+        key = normalize_key key
         @data.get key
       end
 
@@ -77,9 +75,9 @@ module ActiveSupport
         results
       end
 
-      def write(key, entry, options = {})
-        options.reverse_merge! config
-        key = normalize_key(key, options)
+      def write(key, entry, opts = {})
+        options = opts.reverse_merge config
+        key = normalize_key key
 
         return false if key.start_with?('http')
 
@@ -89,9 +87,13 @@ module ActiveSupport
             Rails.logger.warn "CacheWarn: '#{key}' is not cacheable!"
             nil
           else
-            expires_in = options[:expires_in].to_i
-            @data.setex key, expires_in, entry
-            @data.setex "#{key}_updated_at", expires_in, Time.now.to_i if options[:updated_at]
+            if opts.key?(:expires_in) && opts[:expires_in].nil?
+              @data.set key, entry
+            else
+              expires_in = options[:expires_in].to_i
+              @data.setex key, expires_in, entry
+              @data.setex "#{key}_updated_at", expires_in, Time.now.to_i if options[:updated_at]
+            end
             load_entry entry
           end
         end
@@ -99,7 +101,7 @@ module ActiveSupport
 
       def delete(key, options = {})
         options.reverse_merge! config
-        key = normalize_key key, options
+        key = normalize_key key
 
         instrument :delete, key, options do
           @data.keys(key).each { |k| @data.del k }
@@ -107,9 +109,8 @@ module ActiveSupport
         end
       end
 
-      def exist?(key, options = {})
-        options.reverse_merge! config
-        key = normalize_key key, options
+      def exist?(key)
+        key = normalize_key key
         @data.exists key
       end
 
@@ -126,7 +127,7 @@ module ActiveSupport
 
       def expire(key, expires_in)
         options.reverse_merge! config
-        key = normalize_key key, options
+        key = normalize_key key
 
         instrument :expire, key, expires_in: expires_in.to_i do
           @data.expire key, expires_in.to_i
@@ -135,7 +136,7 @@ module ActiveSupport
 
       def increment(key, amount = 1, options = {})
         options.reverse_merge! config
-        key = normalize_key key, options
+        key = normalize_key key
 
         instrument :increment, key, amount: amount do
           if amount == 1
@@ -148,7 +149,7 @@ module ActiveSupport
 
       def decrement(key, amount = 1, options = {})
         options.reverse_merge! config
-        key = normalize_key key, options
+        key = normalize_key key
 
         instrument :decrement, key, amount: amount do
           if amount == 1
@@ -165,24 +166,24 @@ module ActiveSupport
 
       private
 
-      def normalize_key(key, options)
+      def normalize_key(key)
         key = expanded_key(key)
-        namespace = options[:namespace] if options
-        prefix = namespace.is_a?(Proc) ? namespace.call : namespace
-        key = "#{prefix}:#{key}" if prefix && !key.start_with?(prefix)
+        key = "#{namespace}:#{key}" if !key.start_with?(namespace)
         key
       end
 
-      # 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 = {})
-      #   return unless logger && logger.debug? && !silence?
-      #   logger.debug("  \e[95mCACHE #{operation}\e[0m #{key}#{options.blank? ? "" : " (#{options.inspect})"}")
-      # end
+      def instrument(operation, key, options = nil)
+        log { "Cache #{operation}: #{key}#{" (#{options.inspect})" unless options.blank?}" }
+
+        payload = { key: key }
+        payload.merge!(options) if options.is_a?(Hash)
+        ActiveSupport::Notifications.instrument("cache_#{operation}.active_support", payload) { yield(payload) }
+      end
+
+      def log
+        return unless logger && logger.debug? && !silence?
+        logger.debug(yield)
+      end
 
       def dump_entry(entry)
         entry = entry.call if entry.class.to_s == 'Proc'

data/test/cache_test.rb

@@ -40,6 +40,14 @@ describe 'h2ocube_rails_cache' do
     Rails.cache.exist?('expire').must_be_same_as false
   end
 
+  it '#write expire_in nil' do
+    Rails.cache.delete 'expire'
+    Rails.cache.write 'expire', true, expires_in: nil
+    Rails.cache.exist?('expire').must_be_same_as true
+    sleep 2
+    Rails.cache.exist?('expire').must_be_same_as true
+  end
+
   it '#expire' do
     Rails.cache.write 'expire', true
     Rails.cache.expire 'expire', 1.second
@@ -119,7 +127,7 @@ describe 'h2ocube_rails_cache' do
       'true'
     end.must_equal 'true'
 
-    Rails.cache.fetch 'fetch force', force: -> (key, options) { true } do
+    Rails.cache.fetch 'fetch force', force: -> (_key, _options) { true } do
       'true again'
     end.must_equal 'true again'
 
@@ -127,7 +135,7 @@ describe 'h2ocube_rails_cache' do
       'false'
     end.must_equal 'true again'
 
-    Rails.cache.fetch 'fetch force', force: -> (key, options) { false } do
+    Rails.cache.fetch 'fetch force', force: -> (_key, _options) { false } do
       'false again'
     end.must_equal 'true again'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: h2ocube_rails_cache
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Ben
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis