h2ocube_rails_cache 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2731a7dce9f62d11312415d58be8ea9a3cf8222b
-  data.tar.gz: 6dc223280dc7d0e37b312459641105825cde2fe9
+  metadata.gz: d8035a1f77233f7ff3329e9c709e58053fb7b5e5
+  data.tar.gz: 2278ba3f53b73bdfe300a77a3b937007949f3140
 SHA512:
-  metadata.gz: beceb3d7ed1b330ae518f4cebddea7b4d000a742677ff84e2c6165a786c8ffb911b3fe786f62df64232edae8174c8bb9b6d7c177c85184269fe796b670b8281f
-  data.tar.gz: 1c19a97d1175b585308ec00a9a87f6e65523a54f11bd4d711e3a36dc41fcb5bd98770c81bb58411edbef63709ec85bb18b0dd2b47cd2b0605810159c9589dc65
+  metadata.gz: 6ecad18d2d880acccbd9a3dfebb5d01df2e5a7c4d246a01775227157e254697b3a3317a532964cfdd6f4d1a6bb74a4a860996033ed35655f3357014619004617
+  data.tar.gz: 6cccea34813f6e1ffbc7e34bba2943a2857f364041665398c43451ee1d2f46e53545c2cfb0c1ad23a3af7a4aaa7d3cabbcd864440d19dc6e631beeeb06254f49

data/README.md

@@ -30,6 +30,10 @@ Disable default session_store in config/initializers/session_store.rb
 * `clear`
 * `info`
 
+## Support Options
+
+* `expires_in` # Rails.cache.write 'key', 'value', expires_in: 1.minute
+
 ## Task changed
 
     rake tmp:sessions:clear # will clear redis session data too

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

data/lib/active_support/cache/h2ocube_rails_cache.rb

@@ -7,86 +7,97 @@ module ActiveSupport
       def initialize(options = nil, &blk)
         options ||= {}
         super(options)
-        @data = Redis::Namespace.new("#{Rails.application.class.to_s.split("::").first}:#{Rails.env}:Cache", redis: Redis::Store.new)
+        @data = Redis::Namespace.new("#{Rails.application.class.to_s.split('::').first}:#{Rails.env}:Cache", redis: Redis::Store.new)
       end
 
-      def keys key = '*'
+      def keys(key = '*')
         key = expanded_key key
         @data.keys key
       end
 
-      def fetch key, options = nil, &blk
+      def fetch(key, options = nil, &block)
         key = expanded_key key
 
-        return read(key, options) if exist?(key)
-
-        write key, blk, options if block_given?
+        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 = nil)
         key = expanded_key key
         return nil if key.start_with?('http')
-        if exist? key
-          load_entry(@data.get key)
-        else
-          nil
+        instrument :read, key, options do
+          exist?(key) ? load_entry(@data.get(key)) : nil
         end
       end
 
-      def read_raw key, options = nil
+      def read_raw(key, _options = nil)
         key = expanded_key key
         @data.get key
       end
 
-
-      def write key, entry, options = nil
+      def write(key, entry, options = nil)
         key = expanded_key key
         return false if key.start_with?('http')
-        entry = dump_entry entry
-        if entry.nil?
-          Rails.logger.warn "CacheWarn: '#{key}' is not cacheable!"
-          nil
-        else
-          @data.set key, entry, options
-          load_entry entry
+
+        instrument :write, key, options do
+          entry = dump_entry entry
+          if entry.nil?
+            Rails.logger.warn "CacheWarn: '#{key}' is not cacheable!"
+            nil
+          else
+            @data.set key, entry, options
+            load_entry entry
+          end
         end
       end
 
-      def delete key, options = nil
+      def delete(key, options = nil)
         key = expanded_key key
-        @data.keys(key).each{ |k| @data.del k }
-        true
+
+        instrument :delete, key, options do
+          @data.keys(key).each { |k| @data.del k }
+          true
+        end
       end
 
-      def exist? key, options = nil
+      def exist?(key, _options = nil)
         key = expanded_key key
         @data.exists key
       end
 
       def clear
-        @data.keys('*').each{ |k| @data.del k }
-        true
+        instrument :clear, nil, nil do
+          @data.keys('*').each { |k| @data.del k }
+          true
+        end
       end
 
       def info
         @data.info
       end
 
-      def increment key, amount = 1, options = nil
+      def increment(key, amount = 1, _options = nil)
         key = expanded_key key
-        if amount == 1
-          @data.incr key
-        else
-          @data.incrby key, amount
+
+        instrument :increment, key, amount do
+          if amount == 1
+            @data.incr key
+          else
+            @data.incrby key, amount
+          end
         end
       end
 
-      def decrement key, amount = 1, options = nil
+      def decrement(key, amount = 1, _options = nil)
         key = expanded_key key
-        if amount == 1
-          @data.decr key
-        else
-          @data.decrby key, amount
+
+        instrument :decrement, key, amount do
+          if amount == 1
+            @data.decr key
+          else
+            @data.decrby key, amount
+          end
         end
       end
 
@@ -96,7 +107,18 @@ module ActiveSupport
 
       private
 
-      def dump_entry entry
+      def instrument(operation, key, options = nil)
+        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)
+        return unless logger && logger.debug? && !silence?
+        logger.debug("  \e[95mCACHE #{operation}\e[0m #{key}#{options.blank? ? "" : " (#{options.inspect})"}")
+      end
+
+      def dump_entry(entry)
         entry = entry.call if entry.class.to_s == 'Proc'
 
         case entry.class.to_s
@@ -112,7 +134,7 @@ module ActiveSupport
         end
       end
 
-      def load_entry entry
+      def load_entry(entry)
         begin
           Marshal.load entry
         rescue

data/lib/h2ocube_rails_cache.rb

@@ -22,6 +22,14 @@ module H2ocubeRailsCache
       app.config.session_store :h2ocube_rails_cache_session
     end
 
+    config.after_initialize do
+      Rails.cache.logger = Rails.logger
+
+      ActiveSupport::Notifications.subscribe(/cache_[^.]+.active_support/) do |name, start, finish, id, payload|
+        Rails.cache.logger.debug "  \e[95mCACHE #{name} (#{((finish - start) * 1000).round 2}ms)\e[0m #{payload[:key]} (#{payload[:options].inspect})"
+      end if Rails.cache.logger.debug? && !Rails.cache.silence?
+    end
+
     rake_tasks do
       load 'tasks/tmp.rake'
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: h2ocube_rails_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Ben
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-namespace
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Just an redis cache.