libmemcached_store 0.2.2 → 0.2.3

data/lib/active_support/cache/libmemcached_store.rb

@@ -1,4 +1,5 @@
 require 'memcached'
+require 'digest/sha1'
 
 class Memcached
   # The latest version of memcached (0.11) doesn't support hostnames with dashes
@@ -32,9 +33,21 @@ module ActiveSupport
         extend ActiveSupport::Cache::Strategy::LocalCache
       end
 
+      def valid_key(key)
+        if key.is_a?(Array)
+          key.map {|k| valid_key(k) }
+        else
+          if key && key.size > 250
+            "#{Digest::SHA1.hexdigest(key)}-autofixed"
+          else
+            key
+          end
+        end
+      end
+
       def read(key, options = nil)
         super
-        @cache.get(key, marshal?(options))
+        @cache.get(valid_key(key), marshal?(options))
       rescue Memcached::NotFound
         nil
       rescue Memcached::Error => e
@@ -51,7 +64,7 @@ module ActiveSupport
       def write(key, value, options = nil)
         super
         method = (options && options[:unless_exist]) ? :add : :set
-        @cache.send(method, key, value, expires_in(options), marshal?(options))
+        @cache.send(method, valid_key(key), value, expires_in(options), marshal?(options))
         true
       rescue Memcached::Error => e
         log_error(e)
@@ -60,10 +73,10 @@ module ActiveSupport
 
       def delete(key, options = nil)
         super
-        @cache.delete(key)
+        @cache.delete(valid_key(key))
         true
       rescue Memcached::NotFound
-        nil  
+        nil
       rescue Memcached::Error => e
         log_error(e)
         false
@@ -75,14 +88,14 @@ module ActiveSupport
 
       def increment(key, amount=1)
         log 'incrementing', key, amount
-        @cache.incr(key, amount)
+        @cache.incr(valid_key(key), amount)
       rescue Memcached::Error
         nil
       end
 
       def decrement(key, amount=1)
         log 'decrementing', key, amount
-        @cache.decr(key, amount)
+        @cache.decr(valid_key(key), amount)
       rescue Memcached::Error
         nil
       end

data/test/libmemcached_store_test.rb

@@ -13,6 +13,7 @@ end
 class LibmemcachedStoreTest < Test::Unit::TestCase
   def setup
     @store = ActiveSupport::Cache.lookup_store :libmemcached_store
+    @store.clear
   end
 
   def test_should_identify_cache_store
@@ -55,22 +56,29 @@ class LibmemcachedStoreTest < Test::Unit::TestCase
     assert_equal false, store.options[:no_block]
     assert_equal false, store.options[:auto_eject_hosts]
   end
-  
+
   def test_should_use_local_cache
     @store.with_local_cache do
       @store.write('key', 'value')
-      assert_equal 'value', @store.send(:local_cache).read('key')      
+      assert_equal 'value', @store.send(:local_cache).read('key')
     end
-    
+
     assert_equal 'value', @store.read('key')
   end
-  
-  def test_should_read_multiple_keys    
+
+  def test_should_read_multiple_keys
      @store.write('a', 1)
      @store.write('b', 2)
-     
+
      assert_equal({ 'a' => 1, 'b' => 2 }, @store.read_multi('a', 'b', 'c'))
      assert_equal({}, @store.read_multi())
    end
 
+  def test_should_fix_long_keys
+    key = ("0123456789" * 100).freeze
+    assert key.size > 250
+    @store.write(key, 1)
+    assert_equal 1, @store.read(key)
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: libmemcached_store
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Jeffrey Hardy
@@ -15,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 -07:00
-default_executable: 
+date: 2012-04-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: memcached
+  name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -30,36 +29,60 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: memcached
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        version: "3"
+  type: :runtime
+  version_requirements: *id003
 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: packagethief@gmail.com
+email: 
+- packagethief@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README
+extra_rdoc_files: []
+
 files: 
-- .gitignore
-- MIT-LICENSE
-- README
-- Rakefile
 - lib/active_support/cache/compressed_libmemcached_store.rb
 - lib/active_support/cache/libmemcached_store.rb
 - lib/libmemcached_store.rb
-- libmemcached_store.gemspec
+- README
 - test/libmemcached_store_test.rb
-has_rdoc: true
 homepage: http://github.com/37signals/libmemcached_store
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -83,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: ActiveSupport::Cache wrapper for libmemcached

data/.gitignore

@@ -1,2 +0,0 @@
-.DS_Store
-pkg/

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2008 37signals
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,40 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "libmemcached_store"
-    gemspec.version = '0.2.2'
-    gemspec.summary = "ActiveSupport::Cache wrapper for libmemcached "
-    gemspec.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."
-    gemspec.email = "packagethief@gmail.com"
-    gemspec.homepage = "http://github.com/37signals/libmemcached_store"
-    gemspec.authors = ["Jeffrey Hardy"]
-    gemspec.add_runtime_dependency 'memcached'
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the libmemcached_store plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate documentation for the libmemcached_store plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'LibmemcachedStore'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/libmemcached_store.gemspec

@@ -1,53 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{libmemcached_store}
-  s.version = "0.2.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jeffrey Hardy"]
-  s.date = %q{2010-08-24}
-  s.description = %q{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.}
-  s.email = %q{packagethief@gmail.com}
-  s.extra_rdoc_files = [
-    "README"
-  ]
-  s.files = [
-    ".gitignore",
-     "MIT-LICENSE",
-     "README",
-     "Rakefile",
-     "lib/active_support/cache/compressed_libmemcached_store.rb",
-     "lib/active_support/cache/libmemcached_store.rb",
-     "lib/libmemcached_store.rb",
-     "libmemcached_store.gemspec",
-     "test/libmemcached_store_test.rb"
-  ]
-  s.homepage = %q{http://github.com/37signals/libmemcached_store}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{ActiveSupport::Cache wrapper for libmemcached}
-  s.test_files = [
-    "test/libmemcached_store_test.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<memcached>, [">= 0"])
-    else
-      s.add_dependency(%q<memcached>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<memcached>, [">= 0"])
-  end
-end
-