level2 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0da09ce71772bfe62d6e3b123a66b0f308b973f9
-  data.tar.gz: 97ae48d6a7e1583ed4496503b28979ee9a8ec416
+  metadata.gz: 89ba62e1f21baef8ee3a80060af7097b77ac6d98
+  data.tar.gz: 24b666e5ceeaacf63769b2928483afc83567e79e
 SHA512:
-  metadata.gz: c7016bd999b92dbbc226db2c8f46ad4e0805d3325b42c6a02b3326261619440ebbba1f2b9dc7d885654355e8b8b28a514b25e7021d435ec86aae2f40795a72e5
-  data.tar.gz: 3fb8c7b2c4690376a1769d27d590dcf4bfcbfee40433a48e25313d7dc4fb53e703c3f722cc9cb87e484b938cdca075e9bdd96ce1b5e7faa9cc29090ca57f3b48
+  metadata.gz: 6e9274d7574970ff0542c3ec84cb524680f08feb1c1da7fb404faa0897e8b1c5b2b3e144ddccd0a9317a75bcccdb111ed5274f4cde00f8b3da2a0fdd274bbaa9
+  data.tar.gz: 4753d3f1e2a4b77e4b8a9523aaf87627393b0289c245570e39981a432ee424853f28bf4b5cb9a07286159e9e0da328eececc85ae83cbc8843638d38eb55f261f

data/README.md

@@ -50,14 +50,35 @@ Example:
 ```ruby
 # in config/application.rb
 
-config.cache_store = :level2, [
-    :memory_store, size: 32.megabytes
-  ],[
-    :mem_cache_store, 'host1.example.org:11211', 'host2.example.org:11211'
-  ]
+config.cache_store = :level2, 
+    L1: [
+      :memory_store, size: 32.megabytes
+    ],
+    L2: [
+      :mem_cache_store, 'host1.example.org:11211'
+    ]
 ```
 
+## Notifications
 
+Level2 enriches
+[`ActiveSupport::Notifications`](http://edgeguides.rubyonrails.org/active_support_instrumentation.html#active-support).
+
+Event payloads will include a `:level` field. On cache hits, this will indicate
+where the hit comes from; on misses, or any other event, the field may be
+present but the value is unspecified.
+
+Example:
+
+```ruby
+# in an initializer
+ActiveSupport::Notifications.subscribe 'cache_read.active_support' do |*args|
+  event = ActiveSupport::Notifications::Event.new(*args)
+  if event.payload[:hit]
+    Rails.logger.info "Hit from #{event.payload[:level]}"
+  end
+end
+```
 
 ## Development
 

data/level2.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'level2'
-  spec.version       = '0.1.0'
+  spec.version       = '0.2.0'
   spec.authors       = ['Julien Letessier']
   spec.email         = ['julien.letessier@gmail.com']
 

data/lib/active_support/cache/level2.rb

@@ -5,10 +5,10 @@ module ActiveSupport
     class Level2 < Store
       attr_reader :stores
 
-      def initialize(*store_options)
+      def initialize(store_options)
         @lock = Mutex.new
-        @stores = store_options.each_slice(2).map do |name,options|
-          ActiveSupport::Cache.lookup_store(name, options)
+        @stores = store_options.each_with_object({}) do |(name,options), h|
+          h[name] = ActiveSupport::Cache.lookup_store(options)
         end
         @options = {}
       end
@@ -27,6 +27,13 @@ module ActiveSupport
 
       protected
 
+      def instrument(operation, key, options = nil, &block)
+        super(operation, key, options) do |payload|
+          payload[:level] = current_level
+          block.call(payload)
+        end
+      end
+
       def read_entry(key, options)
         @lock.synchronize do
           read_entry_from(@stores, key, options)
@@ -35,7 +42,7 @@ module ActiveSupport
 
       def write_entry(key, entry, options)
         @lock.synchronize do
-          @stores.each do |store|
+          @stores.each do |name, store|
             result = store.send :write_entry, key, entry, options
             return false unless result
           end
@@ -45,7 +52,7 @@ module ActiveSupport
 
       def delete_entry(key, options)
         @lock.synchronize do
-          @stores.map { |store|
+          @stores.map { |name,store|
             store.send :delete_entry, key, options
           }.all?
         end
@@ -53,10 +60,19 @@ module ActiveSupport
 
       private
 
+      def current_level
+        Thread.current[:level2_current]
+      end
+
+      def current_level!(name)
+        Thread.current[:level2_current] = name
+      end
+
       def read_entry_from(stores, key, options)
         return if stores.empty?
 
-        store, *other_stores = stores
+        (name,store), *other_stores = stores.to_a
+        current_level! name
         entry = store.send :read_entry, key, options
         return entry if entry.present?
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: level2
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler