memcache-client-activerecord 0.2.0 → 1.0.0

data/Rakefile

@@ -11,9 +11,9 @@ begin
     gem.homepage = "http://github.com/m4i/memcache-client-activerecord"
     gem.authors = ["ISHIHARA Masaki"]
     gem.rubyforge_project = "mc-activerecord"
-    gem.add_runtime_dependency "activerecord", ">= 2.1"
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_development_dependency "memcache-client", ">= 1.7.7"
+    gem.add_development_dependency "activerecord", "~> 2.1"
+    gem.add_development_dependency "rspec", ">= 1.3.0"
+    gem.add_development_dependency "memcache-client", ">= 1.7.8"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.0
+1.0.0

data/lib/memcache/activerecord.rb

@@ -223,23 +223,30 @@ class MemCache
       end
 
       def make_cache_key(key)
-        if @autofix_keys && (key =~ /\s/ ||
-          (key.length + (namespace.nil? ? 0 : namespace.length)) > MAX_KEY_SIZE)
+        if @autofix_keys && (key =~ /\s/ || key_length(key) > MAX_KEY_SIZE)
           key = "#{Digest::SHA1.hexdigest(key)}-autofixed"
         end
 
-        key = namespace.nil? ?
+        cache_key = namespace.nil? ?
           key :
           "#{namespace}#{@namespace_separator}#{key}"
 
-        if key =~ /\s/
-          raise ArgumentError, "illegal character in key #{key.inspect}"
+        if cache_key =~ /\s/
+          raise ArgumentError, "illegal character in key #{cache_key.inspect}"
         end
-        if key.length > MAX_KEY_SIZE
-          raise ArgumentError, "key too long #{key.inspect}"
+        if cache_key.length > MAX_KEY_SIZE
+          raise ArgumentError, "key too long #{cache_key.inspect}"
         end
 
-        key
+        cache_key
+      end
+
+      def key_length(key)
+        key.length + (
+          namespace.nil? ?
+            0 :
+            namespace.length + @namespace_separator.to_s.length
+        )
       end
 
       def value_to_storable(value, raw)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: memcache-client-activerecord
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors: 
 - ISHIHARA Masaki
@@ -9,16 +9,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-31 00:00:00 +09:00
+date: 2010-02-06 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: "2.1"
     version: 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.9
+        version: 1.3.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: memcache-client
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.7
+        version: 1.7.8
     version: 
 description: memcache-client-activerecord has the same interface as memcache-client, and provides the functionality of saving to ActiveRecord instead of Memcached.
 email: m.ishihara@gmail.com