libmemcached_store 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2d87f1bd5de0cc28f40c93a4150466fb4861d779
-  data.tar.gz: b7270e1c498201ab93354f799b41bb2d0de560fe
+SHA256:
+  metadata.gz: d6640a808c446950da52f6d7276241a6fa2f11e675564afbe9f2300e968e55ea
+  data.tar.gz: af0d711fa82540e1dded2d6ce7a3d9dbf6311a269645ffdacbd744c73c6e783b
 SHA512:
-  metadata.gz: 25681bfd4c7fc16fbae4fd306df48597fb1f5e6c83151114e1c46579bd4b7df615f0fff346fd8a2c236fb3f30bf1767c90bbbe0777c6005903dd0f185289f42b
-  data.tar.gz: ed9a4e4d2f3b7b8671f35e371be419c59d2ae6b5879ce377797baa0f54582ea13e48b659e69860aaad75ba7da2d85533bc4bfa2b7e189d49928fcff442014976
+  metadata.gz: bc2be35a5c0e401bddb5af06f6c06859734708228ba69cc1f92a1287c3de60a62e7efb3364cd4508977eaddd4a86789ef8f84c9b1b366fb92bbf0f0d9b04d193
+  data.tar.gz: 3a559423aff027fb95d7de114f6b56775b7386a89dc6fd807731912603f6e8b0ddd1e8fd7749892a29f27cc822da345a1ccda128dc4e9729d525acc4db2f393d

data/lib/active_support/cache/libmemcached_store.rb

@@ -1,5 +1,5 @@
 require 'memcached'
-require 'memcached/get_with_flags'
+require 'libmemcached_store/memcached_with_flags'
 
 require 'digest/md5'
 
@@ -23,10 +23,6 @@ module ActiveSupport
     # :client => { :no_block => true }
     #
     class LibmemcachedStore
-      class MemcachedWithFlags < Memcached
-        include GetWithFlags
-      end
-
       class FetchWithRaceConditionTTLEntry
         attr_accessor :value, :extended
 
@@ -82,7 +78,7 @@ module ActiveSupport
 
         @options = {compress_threshold: DEFAULT_COMPRESS_THRESHOLD}.merge(options)
         @addresses = addresses
-        @cache = MemcachedWithFlags.new(@addresses, DEFAULT_CLIENT_OPTIONS.merge(client_options))
+        @cache = ::LibmemcachedStore::MemcachedWithFlags.new(@addresses, DEFAULT_CLIENT_OPTIONS.merge(client_options))
       end
 
       def fetch(key, options = nil, &block)
@@ -295,7 +291,8 @@ module ActiveSupport
         value
       end
 
-      def normalize_key(key)
+      # TODO: support namespace or other things passed as option
+      def normalize_key(key, _options = nil)
         escape_and_normalize(expanded_key(key))
       end
 

data/lib/libmemcached_store/memcached_with_flags.rb

@@ -0,0 +1,47 @@
+#
+# Allow get method to returns value + entry's flags
+# This is useful to set compression flag.
+#
+
+require 'memcached'
+
+module LibmemcachedStore
+  class MemcachedWithFlags < Memcached
+    def get(keys, decode=true, with_flags=false)
+      if keys.is_a? Array
+        # inlined multi_get with changes to make it return flags and ignore cas
+        ret = Lib.memcached_mget(@struct, keys)
+        check_return_code(ret, keys)
+
+        hash = {}
+        flags_hash = {} if with_flags
+        value, key, flags, ret = Lib.memcached_fetch_rvalue(@struct)
+        while ret != 21 do # Lib::MEMCACHED_END
+          if ret == 0 # Lib::MEMCACHED_SUCCESS
+            flags_hash[key] = flags if with_flags
+            hash[key] = decode ? [value, flags] : value
+          elsif ret != 16 # Lib::MEMCACHED_NOTFOUND
+            check_return_code(ret, key)
+          end
+          value, key, flags, ret = Lib.memcached_fetch_rvalue(@struct)
+        end
+        if decode
+          hash.each do |key, value_and_flags|
+            hash[key] = @codec.decode(key, *value_and_flags)
+          end
+        end
+
+        # actual code we need
+        with_flags ? [hash, flags_hash] : hash
+      else
+        result = single_get(keys, decode)
+        with_flags ? result.first(2) : result.first
+      end
+    rescue => e
+      tries ||= 0
+      raise unless tries < options[:exception_retry_limit] && should_retry(e)
+      tries += 1
+      retry
+    end
+  end
+end

data/lib/{memcached → libmemcached_store}/version.rb

@@ -1,3 +1,3 @@
 module LibmemcachedStore
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libmemcached_store
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Christopher Cocchi-Perrier
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memcached
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +131,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,6 +141,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +151,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -152,6 +161,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: single_cov
+  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'
 description: |-
   An ActiveSupport cache store that uses the C-based libmemcached client through
         Evan Weaver's Ruby/SWIG wrapper, memcached. libmemcached is fast, lightweight,
@@ -165,8 +191,8 @@ files:
 - 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
+- lib/libmemcached_store/memcached_with_flags.rb
+- lib/libmemcached_store/version.rb
 homepage: https://github.com/ccocchi/libmemcached_store
 licenses:
 - MIT
@@ -179,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -187,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: ActiveSupport 3+ cache store for the C-based libmemcached client

data/lib/memcached/get_with_flags.rb

@@ -1,42 +0,0 @@
-#
-# Allow get method to returns value + entry's flags
-# This is useful to set compression flag.
-#
-module GetWithFlags
-  def get(keys, marshal=true, with_flags=false)
-    if keys.is_a? Array
-      # Multi get
-      ret = Memcached::Lib.memcached_mget(@struct, keys);
-      check_return_code(ret, keys)
-
-      hash, flags_hash = {}, {}
-      value, key, flags, ret = Memcached::Lib.memcached_fetch_rvalue(@struct)
-      while ret != 21 do # Lib::MEMCACHED_END
-        if ret == 0 # Lib::MEMCACHED_SUCCESS
-          hash[key] = value
-          flags_hash[key] = flags if with_flags
-        elsif ret != 16 # Lib::MEMCACHED_NOTFOUND
-          check_return_code(ret, key)
-        end
-        value, key, flags, ret = Memcached::Lib.memcached_fetch_rvalue(@struct)
-      end
-      if marshal
-        hash.each do |key, value|
-          hash[key] = Marshal.load(value)
-        end
-      end
-      with_flags ? [hash, flags_hash] : hash
-    else
-      # Single get
-      value, flags, ret = Memcached::Lib.memcached_get_rvalue(@struct, keys)
-      check_return_code(ret, keys)
-      value =  Marshal.load(value) if marshal
-      with_flags ? [value, flags] : value
-    end
-  rescue => e
-    tries ||= 0
-    raise unless tries < options[:exception_retry_limit] && should_retry(e)
-    tries += 1
-    retry
-  end
-end