libmemcached_store 0.7.2 → 0.8.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 81049d49ca34851708a4420138dcda2e5f066cc3
+  data.tar.gz: c2a1cab1fa37246d1c9488a826992f06d42582a6
+SHA512:
+  metadata.gz: 0893cf06da549233d33041a00ada8de50380eb2d3bb0e95ed2534abe24c889622f9a0139272a28927edd88962000c5e6050fccb3f28f28e042043cd50ded332b
+  data.tar.gz: 5f935624798ce3060f7d0bcd3f0fb67f04d660c84aba61ee0451880da385cb75febc27d56895c7c5a7d2dce1077ae60605f31fcc17785fe1a9f0bc08a2f0adde

data/lib/active_support/cache/libmemcached_local_store.rb

@@ -0,0 +1,105 @@
+require 'active_support/cache/libmemcached_store'
+
+# cache nils
+# https://github.com/rails/rails/pull/22194
+if ActiveSupport::VERSION::MAJOR < 5
+  ActiveSupport::Cache::Strategy::LocalCache::LocalStore.class_eval do
+    def fetch_entry(key, options=nil)
+      @data.fetch(key) { @data[key] = yield }
+    end
+  end
+
+  ActiveSupport::Cache::Strategy::LocalCache.class_eval do
+    def read_entry(key, options) # :nodoc:
+      if cache = local_cache
+        cache.fetch_entry(key) { super }
+      else
+        super
+      end
+    end
+  end
+end
+
+module ActiveSupport
+  module Cache
+    class LibmemcachedLocalStore < LibmemcachedStore
+      include ActiveSupport::Cache::Strategy::LocalCache
+
+      # if we read from local_cache then the return value from read_entry will be an Entry,
+      # so convert it to it's value
+      def read(*args)
+        result = super
+        result = result.value if result.is_a?(ActiveSupport::Cache::Entry)
+        result
+      end
+
+      # make read multi hit local cache
+      def read_multi(*names)
+        return super unless cache = local_cache
+
+        options = names.extract_options!
+
+        missing_names = []
+
+        # We write raw values to the local cache, unlike rails MemcachedStore, so we cannot use local_cache.read_multi.
+        # Once read_multi_entry is available we can switch to that.
+        results = names.each_with_object({}) do |name, results|
+          value = local_cache.fetch_entry(name) do
+            missing_names << name
+            nil
+          end
+          results[name] = value unless value.nil?
+        end
+
+        if missing_names.any?
+          missing_names << options
+          missing = super(*missing_names)
+          missing.each { |k,v| cache.write_entry(k, v, nil) }
+          results.merge!(missing)
+        end
+
+        results
+      end
+
+      # memcached returns a fixnum on increment, but the value that is stored is raw / a string
+      def increment(key, amount, options={})
+        result = super
+        if result && (cache = local_cache)
+          cache.write(key, result.to_s)
+        end
+        result
+      end
+
+      # memcached returns a fixnum on decrement, but the value that is stored is raw / a string
+      def decrement(key, amount, options={})
+        result = super
+        if result && (cache = local_cache)
+          cache.write(key, result.to_s)
+        end
+        result
+      end
+
+      private
+
+      # when trying to do a raw read we want the marshaled value to behave the same as memcached
+      def read_entry(key, options)
+        entry = super
+
+        if options && options[:raw] && local_cache && entry && !entry.is_a?(Entry)
+          entry = Marshal.dump(entry)
+        end
+
+        entry
+      end
+
+      # for memcached writing raw means writing a string and not the actual value
+      def write_entry(key, entry, options) # :nodoc:
+        written = super
+        if options && options[:raw] && local_cache && written
+          local_cache.write_entry(key, Entry.new(entry.to_s), options)
+        end
+        written
+      end
+    end
+  end
+end

data/lib/active_support/cache/libmemcached_store.rb

@@ -119,31 +119,6 @@ module ActiveSupport
         end
       end
 
-      def fetch_with_race_condition_ttl(key, options={}, &block)
-        options = options.dup
-
-        race_ttl = options.delete(:race_condition_ttl) || raise("Use :race_condition_ttl option or normal fetch")
-        expires_in = options.fetch(:expires_in)
-        options[:expires_in] = expires_in + race_ttl
-        options[:preserve_race_condition_entry] = true
-
-        value = fetch(key, options) { FetchWithRaceConditionTTLEntry.new(yield, expires_in) }
-
-        return value unless value.is_a?(FetchWithRaceConditionTTLEntry)
-
-        if value.expired? && !value.extended
-          # we take care of refreshing the cache, all others should keep reading
-          value.extended = true
-          write(key, value, options.merge(:expires_in => value.expires_in + race_ttl))
-
-          # calculate new value and store it
-          value = FetchWithRaceConditionTTLEntry.new(yield, expires_in)
-          write(key, value, options)
-        end
-
-        value.value
-      end
-
       def read(key, options = nil)
         key = expanded_key(key)
         instrument(:read, key, options) do |payload|
@@ -281,6 +256,31 @@ module ActiveSupport
 
       private
 
+      def fetch_with_race_condition_ttl(key, options={}, &block)
+        options = options.dup
+
+        race_ttl = options.delete(:race_condition_ttl) || raise("Use :race_condition_ttl option or normal fetch")
+        expires_in = options.fetch(:expires_in)
+        options[:expires_in] = expires_in + race_ttl
+        options[:preserve_race_condition_entry] = true
+
+        value = fetch(key, options) { FetchWithRaceConditionTTLEntry.new(yield, expires_in) }
+
+        return value unless value.is_a?(FetchWithRaceConditionTTLEntry)
+
+        if value.expired? && !value.extended
+          # we take care of refreshing the cache, all others should keep reading
+          value.extended = true
+          write(key, value, options.merge(:expires_in => value.expires_in + race_ttl))
+
+          # calculate new value and store it
+          value = FetchWithRaceConditionTTLEntry.new(yield, expires_in)
+          write(key, value, options)
+        end
+
+        value.value
+      end
+
       def convert_race_condition_entry(value, options={})
         if !options[:preserve_race_condition_entry] && value.is_a?(FetchWithRaceConditionTTLEntry)
           value.value

data/lib/memcached/version.rb

@@ -1,3 +1,3 @@
 module LibmemcachedStore
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libmemcached_store
 version: !ruby/object:Gem::Version
-  version: 0.7.2
-  prerelease: 
+  version: 0.8.0
 platform: ruby
 authors:
 - Christopher Cocchi-Perrier
@@ -11,189 +10,185 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memcached
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dalli
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-rg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
-description: ! "An ActiveSupport cache store that uses the C-based libmemcached client
-  through\n      Evan Weaver's Ruby/SWIG wrapper, memcached. libmemcached is fast,
-  lightweight,\n      and supports consistent hashing, non-blocking IO, and graceful
-  server failover."
+description: |-
+  An ActiveSupport cache store that uses the C-based libmemcached client through
+        Evan Weaver's Ruby/SWIG wrapper, memcached. libmemcached is fast, lightweight,
+        and supports consistent hashing, non-blocking IO, and graceful server failover.
 email: cocchi.c@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/action_dispatch/session/libmemcached_store.rb
+- lib/active_support/cache/libmemcached_local_store.rb
 - lib/active_support/cache/libmemcached_store.rb
 - lib/libmemcached_store.rb
 - lib/memcached/get_with_flags.rb
 - lib/memcached/version.rb
-homepage: http://github.com/ccocchi/libmemcached_store
+homepage: https://github.com/ccocchi/libmemcached_store
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ActiveSupport 3+ cache store for the C-based libmemcached client
 test_files: []