any_cache 0.3.1 → 0.4.0

data/lib/any_cache/adapters/delegator.rb

@@ -16,6 +16,7 @@ module AnyCache::Adapters
         driver.respond_to?(:read_multi) &&
         driver.respond_to?(:write) &&
         driver.respond_to?(:write_multi) &&
+        driver.respond_to?(:fetch) &&
         driver.respond_to?(:fetch_multi) &&
         driver.respond_to?(:delete) &&
         driver.respond_to?(:delete_matched) &&
@@ -24,8 +25,8 @@ module AnyCache::Adapters
         driver.respond_to?(:expire) &&
         driver.respond_to?(:persist) &&
         driver.respond_to?(:clear) &&
-        driver.respond_to?(:exist?) &&
-        driver.respond_to?(:fetch)
+        driver.respond_to?(:cleanup) &&
+        driver.respond_to?(:exist?)
       end
       # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/AbcSize
     end
@@ -36,6 +37,7 @@ module AnyCache::Adapters
                    :read_multi,
                    :write,
                    :write_multi,
+                   :fetch,
                    :fetch_multi,
                    :delete,
                    :delete_matched,
@@ -44,7 +46,7 @@ module AnyCache::Adapters
                    :expire,
                    :persist,
                    :clear,
-                   :exist?,
-                   :fetch
+                   :cleanup,
+                   :exist?
   end
 end

data/lib/any_cache/adapters/redis.rb

@@ -3,7 +3,7 @@
 module AnyCache::Adapters
   # @api private
   # @since 0.1.0
-  class Redis < Basic
+  class Redis < Basic # rubocop:disable Metrics/ClassLength
     class << self
       # @param driver [Object]
       # @return [Boolean]
@@ -61,45 +61,57 @@ module AnyCache::Adapters
                    :scan
 
     # @param key [String]
-    # @param options [Hash]
+    # @option raw [Boolean]
     # @return [Object]
     #
     # @api private
     # @since 0.1.0
     def read(key, **options)
-      get(key)
+      value = get(key)
+      raw = options.fetch(:raw, false)
+
+      raw ? value : detransform_value(value)
     end
 
     # @param keys [Array<String>]
-    # @param options [Hash]
+    # @option raw [Boolean]
     # @return [Hash]
     #
     # @api private
     # @since 0.3.0
     def read_multi(*keys, **options)
-      mapped_mget(*keys)
+      raw = options.fetch(:raw, false)
+      entries = mapped_mget(*keys)
+
+      raw ? entries : detransform_pairset(entries)
     end
 
     # @param key [String]
     # @param value [Object]
+    # @option raw [Boolean]
     # @option expires_in [NilClass, Integer] Time in seconds
     # @return [void]
     #
     # @api private
     # @since 0.1.0
     def write(key, value, **options)
+      raw = options.fetch(:raw, false)
       expires_in = options.fetch(:expires_in, NO_EXPIRATION_TTL)
+      value = transform_value(value) unless raw
 
       expires_in ? setex(key, expires_in, value) : set(key, value)
     end
 
     # @param entries [Hash]
-    # @param options [Hash]
+    # @option raw [Boolean]
     # @return [void]
     #
     # @api private
     # @since 0.3.0
     def write_multi(entries, **options)
+      raw = options.fetch(:raw, false)
+      entries = transform_pairset(entries) unless raw
+
       mapped_mset(entries)
     end
 
@@ -115,7 +127,7 @@ module AnyCache::Adapters
       force_rewrite = force_rewrite.call(key) if force_rewrite.respond_to?(:call)
 
       # NOTE: think about #pipelined
-      read(key).tap { |value| return value if value } unless force_rewrite
+      read(key, **options).tap { |value| return value if value } unless force_rewrite
 
       yield(key).tap { |value| write(key, value, **options) } if block_given?
     end
@@ -238,6 +250,15 @@ module AnyCache::Adapters
       flushdb
     end
 
+    # @param options [Hash]
+    # @return [void]
+    #
+    # @api private
+    # @since 0.4.0
+    def cleanup(**options)
+      # NOTE: manual removing is not suppored (redis doing this by itself)
+    end
+
     # @param key [String]
     # @param options [Hash]
     # @return [Boolean]

data/lib/any_cache/adapters/redis_store.rb

@@ -18,15 +18,16 @@ module AnyCache::Adapters
     def_delegators :driver, :mset
 
     # @param key [String]
-    # @param options [Hash]
+    # @option raw [Boolean]
     # @return [Object]
     #
     # @api private
     # @since 0.1.0
     def read(key, **options)
-      raw = options.fetch(:raw, true)
+      raw = options.fetch(:raw, false)
+      value = get(key, raw: true)
 
-      get(key, raw: raw)
+      raw ? value : detransform_value(value)
     end
 
     # @param keys [Array<String>]
@@ -43,24 +44,29 @@ module AnyCache::Adapters
     # @param key [String]
     # @param value [Object]
     # @option expires_in [NilClass, Integer] Time in seconds
+    # @option raw [Boolean]
     # @return [void]
     #
     # @api private
     # @since 0.1.0
     def write(key, value, **options)
       expires_in = options.fetch(:expires_in, NO_EXPIRATION_TTL)
-      raw = options.fetch(:raw, true)
+      raw = options.fetch(:raw, false)
+      value = transform_value(value) unless raw
 
-      expires_in ? setex(key, expires_in, value, raw: raw) : set(key, value, raw: raw)
+      expires_in ? setex(key, expires_in, value, raw: true) : set(key, value, raw: true)
     end
 
     # @param entries [Hash]
-    # @param options [Hash]
+    # @option raw [Boolean]
     # @return [void]
     #
     # @api private
     # @since 0.3.0
     def write_multi(entries, **options)
+      raw = options.fetch(:raw, false)
+      entries = transform_pairset(entries) unless raw
+
       mset(*entries.to_a.flatten!, raw: true)
     end
   end

data/lib/any_cache/delegation.rb

@@ -40,7 +40,7 @@ module AnyCache::Delegation
             AnyCache::Logging::Activity.log(
               self, logger, activity: delegat, message:
                 "performed <#{delegat}> operation with " \
-                "params: #{args.inspect} and options: #{opts.inspect}."
+                "attributes: #{args.inspect} and options: #{opts.inspect}."
             ) if logger
           end
         end

data/lib/any_cache/dumper.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+# @api private
+# @since 0.4.0
+module AnyCache::Dumper
+  require_relative 'dumper/interface_access_mixin'
+
+  class << self
+    # @param hash [Hash]
+    # @return [Hash]
+    #
+    # @api private
+    # @since 0.4.0
+    def transform_hash(hash)
+      {}.tap do |entries|
+        hash.each_pair do |key, value|
+          entries[key] = dump(value)
+        end
+      end
+    end
+
+    # @param hash [Hash]
+    # @return [Hash]
+    #
+    # @api private
+    # @since 0.4.0
+    def detransform_hash(hash)
+      {}.tap do |entries|
+        hash.each_pair do |key, value|
+          entries[key] = load(value)
+        end
+      end
+    end
+
+    # @param value [Object]
+    # @return [String]
+    #
+    # @api private
+    # @since 0.4.0
+    def dump(value)
+      return value if value.nil?
+      Zlib::Deflate.deflate(Marshal.dump(value))
+    end
+
+    # @param value [String]
+    # @return [Object]
+    #
+    # @api private
+    # @since 0.4.0
+    def load(value)
+      return value if value.nil?
+      Marshal.load(Zlib::Inflate.inflate(value))
+    end
+  end
+end

data/lib/any_cache/dumper/interface_access_mixin.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+# @api private
+# @since 0.4.0
+module AnyCache::Dumper::InterfaceAccessMixin
+  # @param value [Object]
+  # @return [Object]
+  #
+  # @api private
+  # @since 0.4.0
+  def transform_value(value)
+    AnyCache::Dumper.dump(value)
+  end
+
+  # @param value [Object]
+  # @return [Object]
+  #
+  # @api private
+  # @since 0.4.0
+  def detransform_value(value)
+    AnyCache::Dumper.load(value)
+  end
+
+  # @param pairset [Hash]
+  # @return [Hash]
+  #
+  # @api private
+  # @since 0.4.0
+  def transform_pairset(pairset)
+    AnyCache::Dumper.transform_hash(pairset)
+  end
+
+  # @param pairset [Hash]
+  # @return [Hash]
+  #
+  # @api private
+  # @since 0.4.0
+  def detransform_pairset(pairset)
+    AnyCache::Dumper.detransform_hash(pairset)
+  end
+end

data/lib/any_cache/patches/dalli_store.rb

@@ -58,4 +58,3 @@ module AnyCache::Patches::DalliStore
     # rubocop:enable all
   end
 end
-

data/lib/any_cache/version.rb

@@ -5,5 +5,5 @@ class AnyCache
   #
   # @api public
   # @since 0.1.0
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: any_cache
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Rustam Ibragimov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-08 00:00:00.000000000 Z
+date: 2018-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -205,6 +205,8 @@ files:
 - lib/any_cache/drivers/dalli.rb
 - lib/any_cache/drivers/redis.rb
 - lib/any_cache/drivers/redis_store.rb
+- lib/any_cache/dumper.rb
+- lib/any_cache/dumper/interface_access_mixin.rb
 - lib/any_cache/error.rb
 - lib/any_cache/logging.rb
 - lib/any_cache/logging/activity.rb
@@ -224,7 +226,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.7
+      version: 2.3.8
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="