any_cache 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4257f6b3fe2d927086723caf69eec54042cca687633f6737ee42f6604f434a8
-  data.tar.gz: dd574909f6c2668f13f19e97cafb948dd1f8c5b4a284705a221b486ccdf29872
+  metadata.gz: ffa4d18aa6e7fdabf6cbb94da73a58c5daf2ced4aa74b28a7f16a73ed24cfc3e
+  data.tar.gz: 3a275c65d65426dfa41ba0fc00ac9b9de2da3684427e6ead5de9586021bcd574
 SHA512:
-  metadata.gz: 88934a670129cf8a67177471884cc8aa493868c4a0ebe6e73899939d2ffd86c5877341965aba82860752e22fe72fb04abbc51c3e071d6f90507367581cba830c
-  data.tar.gz: 676ed5568765a5916992333417503942cb545113aa30241c966b0723b7e521334991c56e008284e9f641db33e368509a8aa244a99658c07ca619ff67ce015c91
+  metadata.gz: 01e02bdaa716816ff2be016843337c1968a865b99ac98418ae2b7fa6bc5d7e32b9be986e48ffcd417b65fd6e88dc635b2087d14ee12b057c7e7b1cddf8e7706f
+  data.tar.gz: cf62adafcbf850fd47147e6b35f2dd9fc8adaf34735bebed6a66b86bb89bbc0d76d035774dfae885a708c5ef542684fea13891d06d7e93d2fb8e50d002d9c488

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.3.1] - 2018-10-08
+### Added
+- patch interface `AnyCache.enable_patch!(:patch_series_name)`:
+  - `ActiveSupport::Cache::DalliStore` patch: now the `#fetch` method provides
+    a cache key attribute to the fallback proc (can be enabled via `.enable(:dalli_store)`);
+
 ## [0.3.0] - 2018-10-06
 ### Added
 - support for `ActiveSupport::Cache::DalliStore` client;

data/README.md

@@ -60,6 +60,7 @@ require 'any_cache'
     - [Persist](#persist)
     - [Existence](#existence)
     - [Clear](#clear)
+- [Roadmap](#roadmap)
 
 ---
 
@@ -195,6 +196,8 @@ require 'dalli'
 require 'active_support'
 require 'any_cache'
 
+AnyCache.enable_patch!(:dalli_store)
+
 AnyCache.configure do |conf|
   conf.driver = :as_dalli_store
   conf.as_dalli_store.servers = ... # string or array of strings

data/lib/any_cache.rb

@@ -14,12 +14,14 @@ class AnyCache
   require_relative 'any_cache/adapters'
   require_relative 'any_cache/logging'
   require_relative 'any_cache/delegation'
+  require_relative 'any_cache/patches'
 
   # @since 0.2.0
   include Qonfig::Configurable
-
   # @since 0.3.0
   include Delegation
+  # @since 0.3.1
+  extend Patches::InterfaceAccessMixin
 
   # @since 0.2.0
   # rubocop:disable Metrics/BlockLength

data/lib/any_cache/error.rb

@@ -8,4 +8,7 @@ class AnyCache
 
   # @since 0.1.0
   UnsupportedDriverError = Class.new(Error)
+
+  # @since 0.3.1
+  NonexistentPatchError = Class.new(Error)
 end

data/lib/any_cache/patches.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+# @api private
+# @since 0.3.1
+module AnyCache::Patches
+  # @since 0.3.1
+  require_relative 'patches/dalli_store'
+
+  class << self
+    # @param patch_series [Symbol, String]
+    # @return [void]
+    #
+    # @raise [AnyCache::NonexistentPatchError]
+    #
+    # @api private
+    # @since 0.3.1
+    def enable!(patch_series)
+      case patch_series
+      when :dalli_store, 'dalli_store'
+        AnyCache::Patches::DalliStore.enable!
+      else
+        raise AnyCache::NonexistentPatchError, "Can't enable nonexistnet patch! (#{patch_series})"
+      end
+    end
+  end
+
+  # @api private
+  # @since 0.3.1
+  module InterfaceAccessMixin
+    # @param patch_series [Symbol, String]
+    # @return [void]
+    #
+    # @see AnyCache::Patches#enable!
+    #
+    # @api private
+    # @since 0.3.1
+    def enable_patch!(patch_series)
+      AnyCache::Patches.enable!(patch_series)
+    end
+  end
+end

data/lib/any_cache/patches/dalli_store.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+# @api private
+# @since 0.3.1
+module AnyCache::Patches::DalliStore
+  class << self
+    # @return [void]
+    #
+    # @api private
+    # @since 0.3.1
+    def enable!
+      defined?(::Dalli) &&
+      defined?(::ActiveSupport::Cache::DalliStore) &&
+      Gem::Version.new(::Dalli::VERSION) <= Gem::Version.new('2.7.8') &&
+      ::ActiveSupport::Cache::DalliStore.prepend(ActiveSupportFetchWithKey)
+    end
+  end
+
+  # @api private
+  # @since 0.3.1
+  module ActiveSupportFetchWithKey
+    # NOTE: original fetch implementation with my own little fix (see #43 line of code below)
+    # rubocop:disable all
+    def fetch(name, options=nil)
+      options ||= {}
+      options[:cache_nils] = true if @options[:cache_nils]
+      namespaced_name = namespaced_key(name, options)
+      not_found = options[:cache_nils] ? Dalli::Server::NOT_FOUND : nil
+      if block_given?
+        entry = not_found
+        unless options[:force]
+          entry = instrument_with_log(:read, namespaced_name, options) do |payload|
+            read_entry(namespaced_name, options).tap do |result|
+              if payload
+                payload[:super_operation] = :fetch
+                payload[:hit] = not_found != result
+              end
+            end
+          end
+        end
+
+        if not_found == entry
+          result = instrument_with_log(:generate, namespaced_name, options) do |payload|
+            # FIX: https://github.com/petergoldstein/dalli/pull/701
+            yield(name)
+            # FIX: https://github.com/petergoldstein/dalli/pull/701
+          end
+          write(name, result, options)
+          result
+        else
+          instrument_with_log(:fetch_hit, namespaced_name, options) { |payload| }
+          entry
+        end
+      else
+        read(name, options)
+      end
+    end
+    # rubocop:enable all
+  end
+end
+

data/lib/any_cache/version.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 class AnyCache
+  # @return [String]
+  #
+  # @api public
   # @since 0.1.0
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: any_cache
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Rustam Ibragimov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-06 00:00:00.000000000 Z
+date: 2018-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -209,6 +209,8 @@ files:
 - lib/any_cache/logging.rb
 - lib/any_cache/logging/activity.rb
 - lib/any_cache/logging/logger.rb
+- lib/any_cache/patches.rb
+- lib/any_cache/patches/dalli_store.rb
 - lib/any_cache/version.rb
 homepage: https://github.com/0exp/any_cache
 licenses: