libmemcached_store 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81049d49ca34851708a4420138dcda2e5f066cc3
-  data.tar.gz: c2a1cab1fa37246d1c9488a826992f06d42582a6
+  metadata.gz: 6bdacb0e84cc9933294795e0457a53a8057112d9
+  data.tar.gz: a6f3781d7d091169119a24a399af676cf9196c04
 SHA512:
-  metadata.gz: 0893cf06da549233d33041a00ada8de50380eb2d3bb0e95ed2534abe24c889622f9a0139272a28927edd88962000c5e6050fccb3f28f28e042043cd50ded332b
-  data.tar.gz: 5f935624798ce3060f7d0bcd3f0fb67f04d660c84aba61ee0451880da385cb75febc27d56895c7c5a7d2dce1077ae60605f31fcc17785fe1a9f0bc08a2f0adde
+  metadata.gz: 07c4437327c1b4faf968a0e63f107c689a35e2a33731de239bd234e75a9628b10ec28544e45626ef28ad5adf14b27fe6749313f63f89c90f4b2e0926bd285581
+  data.tar.gz: 1a1b3dd17f528032b63f8e6afb8a5f58884dd49a60531d990d7fc25d7a345ab5a38090d17f7cbc85aa0b8b5ffa121f7e28f5f6a4f9bf35de3df1b09c7c943701

data/lib/active_support/cache/libmemcached_local_store.rb

@@ -62,7 +62,7 @@ module ActiveSupport
       end
 
       # memcached returns a fixnum on increment, but the value that is stored is raw / a string
-      def increment(key, amount, options={})
+      def increment(key, amount = 1, options={})
         result = super
         if result && (cache = local_cache)
           cache.write(key, result.to_s)
@@ -71,7 +71,7 @@ module ActiveSupport
       end
 
       # memcached returns a fixnum on decrement, but the value that is stored is raw / a string
-      def decrement(key, amount, options={})
+      def decrement(key, amount = 1, options={})
         result = super
         if result && (cache = local_cache)
           cache.write(key, result.to_s)

data/lib/active_support/cache/libmemcached_store.rb

@@ -91,7 +91,7 @@ module ActiveSupport
           if options && options[:race_condition_ttl] && options[:expires_in]
             fetch_with_race_condition_ttl(key, options, &block)
           else
-            key = expanded_key(key)
+            key = normalize_key(key)
             unless options && options[:force]
               entry = instrument(:read, key, options) do |payload|
                 read_entry(key, options).tap do |result|
@@ -120,7 +120,7 @@ module ActiveSupport
       end
 
       def read(key, options = nil)
-        key = expanded_key(key)
+        key = normalize_key(key)
         instrument(:read, key, options) do |payload|
           entry = read_entry(key, options)
           payload[:hit] = !!entry if payload
@@ -129,24 +129,24 @@ module ActiveSupport
       end
 
       def write(key, value, options = nil)
-        key = expanded_key(key)
+        key = normalize_key(key)
         instrument(:write, key, options) do |payload|
           write_entry(key, value, options)
         end
       end
 
       def delete(key, options = nil)
-        key = expanded_key(key)
+        key = normalize_key(key)
         instrument(:delete, key) do |payload|
           delete_entry(key, options)
         end
       end
 
       def exist?(key, options = nil)
-        key = expanded_key(key)
+        key = normalize_key(key)
         instrument(:exist?, key) do |payload|
           if @cache.respond_to?(:exist)
-            @cache.exist(escape_and_normalize(key))
+            @cache.exist(key)
             true
           else
             read_entry(key, options) != nil
@@ -157,9 +157,9 @@ module ActiveSupport
       end
 
       def increment(key, amount = 1, options = nil)
-        key = expanded_key(key)
+        key = normalize_key(key)
         instrument(:increment, key, amount: amount) do
-          @cache.incr(escape_and_normalize(key), amount)
+          @cache.incr(key, amount)
         end
       rescue Memcached::NotFound
         nil
@@ -169,9 +169,9 @@ module ActiveSupport
       end
 
       def decrement(key, amount = 1, options = nil)
-        key = expanded_key(key)
+        key = normalize_key(key)
         instrument(:decrement, key, amount: amount) do
-          @cache.decr(escape_and_normalize(key), amount)
+          @cache.decr(key, amount)
         end
       rescue Memcached::NotFound
         nil
@@ -186,7 +186,7 @@ module ActiveSupport
 
         return {} if names.empty?
 
-        mapping = Hash[names.map {|name| [escape_and_normalize(expanded_key(name)), name] }]
+        mapping = Hash[names.map {|name| [normalize_key(name), name] }]
         keys = mapping.keys
         raw_values, flags = instrument(:read_multi, keys, options) do
           @cache.get(keys, false, true)
@@ -216,7 +216,7 @@ module ActiveSupport
 
       def read_entry(key, options = nil)
         options ||= {}
-        raw_value, flags = @cache.get(escape_and_normalize(key), false, true)
+        raw_value, flags = @cache.get(key, false, true)
         value = deserialize(raw_value, options[:raw], flags)
         convert_race_condition_entry(value, options)
       rescue Memcached::NotFound
@@ -237,7 +237,7 @@ module ActiveSupport
           flags |= FLAG_COMPRESSED
         end
 
-        @cache.send(method, escape_and_normalize(key), entry, options[:expires_in].to_i, false, flags)
+        @cache.send(method, key, entry, options[:expires_in].to_i, false, flags)
         true
       rescue Memcached::Error => e
         log_error(e)
@@ -245,7 +245,7 @@ module ActiveSupport
       end
 
       def delete_entry(key, options = nil)
-        @cache.delete(escape_and_normalize(key))
+        @cache.delete(key)
         true
       rescue Memcached::NotFound
         false
@@ -296,6 +296,10 @@ module ActiveSupport
         value
       end
 
+      def normalize_key(key)
+        escape_and_normalize(expanded_key(key))
+      end
+
       def escape_and_normalize(key)
         key = key.to_s.force_encoding("BINARY").gsub(ESCAPE_KEY_CHARS) { |match| "%#{match.getbyte(0).to_s(16).upcase}" }
         key_length = key.length

data/lib/memcached/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libmemcached_store
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Christopher Cocchi-Perrier
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memcached