CachedSupermodel 0.1.0 → 0.1.1

data/Rakefile

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'hoe'
 require './lib/cached_supermodel.rb'
 
-Hoe.new('CachedSupermodel', '0.1.0') do |p|
+Hoe.new('CachedSupermodel', '0.1.1') do |p|
   p.rubyforge_name = 'adocca-plugins'
   p.summary = 'A library that automatically caches all ActiveRecord::Base instances in memcache using the AdoccaMemcache gem.'
   p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")

data/lib/cs_active_record.rb

@@ -53,7 +53,7 @@ class ActiveRecord::Base
           attribute_values = attributes.collect do |attribute|
             self[attribute.to_sym]
           end
-          expire_cached_namespace(self.class.name + ":#{finder}:" + attribute_values.inspect)
+          expire_cached_namespace("CachedSupermodel:" + self.class.name + ":#{finder}:" + attribute_values.inspect)
         end
       else
          raise "Unknown finder type #{finder}"
@@ -65,7 +65,7 @@ def self.#{finder}_get_ids(*args)
     attributes = match[2].to_s.split(/_and_/)
     normal_arguments = args[0...attributes.size]
     rest = args[attributes.size..-1]
-    cache_value([self.name + ':#{finder}:' + normal_arguments.inspect, rest.inspect]) do
+    cache_value(['CachedSupermodel:' + self.name + ':#{finder}:' + normal_arguments.inspect, rest.inspect]) do
        rval = method_missing(:#{finder}, *args)
        if Array === rval
           rval.collect(&:id)

data/lib/cs_associations.rb

@@ -23,7 +23,7 @@ ActiveRecord::Associations::ClassMethods.class_eval do
           type_field = reflection.primary_key_name.gsub(/_id$/, "_type")
           expire_proc = Proc.new do |instance|
             if instance.send(type_field) == our_name
-              key = "#{our_name}:#{instance.send(reflection.primary_key_name)}:#{reflection.name}"
+              key = "CachedSupermodel:#{our_name}:#{instance.send(reflection.primary_key_name)}:#{reflection.name}"
               expire_cached_value(key)
             end
           end
@@ -32,7 +32,7 @@ ActiveRecord::Associations::ClassMethods.class_eval do
           # Add invalidations for normal associations.
           #
           expire_proc = Proc.new do |instance|
-            key = "#{our_name}:#{instance.send(reflection.primary_key_name)}:#{reflection.name}"
+            key = "CachedSupermodel:#{our_name}:#{instance.send(reflection.primary_key_name)}:#{reflection.name}"
             expire_cached_value(key)
           end
         end        
@@ -60,7 +60,7 @@ ActiveRecord::Associations::ClassMethods.class_eval do
             retval = assoc.reload
             association = retval.nil? ? nil : assoc
           else
-            key = "#{self.class.name}:#{self.id}:#{reflection.name}"
+            key = "CachedSupermodel:#{self.class.name}:#{self.id}:#{reflection.name}"
             expire_cached_value(key) if force_reload
             association = cache_value(key) do
               assoc = association_proxy_class.new(self.remove_associations, reflection)
@@ -164,7 +164,7 @@ ActiveRecord::Associations::ClassMethods.class_eval do
         type_field = invalidating_reflection.primary_key_name.gsub(/_id$/, '_type')
         expire_proc = Proc.new do |instance|
           if instance.send(type_field) == our_name
-            key = "#{our_name}:#{instance.send(invalidating_reflection.primary_key_name)}:#{reflection.name}"
+            key = "CachedSupermodel:#{our_name}:#{instance.send(invalidating_reflection.primary_key_name)}:#{reflection.name}"
             expire_cached_value(key)
             key << ":cached_count"
             expire_cached_value(key)
@@ -175,7 +175,7 @@ ActiveRecord::Associations::ClassMethods.class_eval do
         # Non-polymorphic associations just invalidate their object regardless.
         #
         expire_proc = Proc.new do |instance|
-          key = "#{our_name}:#{instance.send(invalidating_reflection.primary_key_name)}:#{reflection.name}"
+          key = "CachedSupermodel:#{our_name}:#{instance.send(invalidating_reflection.primary_key_name)}:#{reflection.name}"
           expire_cached_value(key)
           key << ":cached_count"
           expire_cached_value(key)
@@ -196,7 +196,7 @@ ActiveRecord::Associations::ClassMethods.class_eval do
     #
     write_inheritable_array("before_remove_for_#{reflection.name}".to_sym, 
                             [Proc.new do |owner, record|
-                               key = "#{owner.class.name}:#{owner.id}:#{reflection.name}"
+                               key = "CachedSupermodel:#{owner.class.name}:#{owner.id}:#{reflection.name}"
                                expire_cached_value(key)
                                key << ":cached_count"
                                expire_cached_value(key)
@@ -204,7 +204,7 @@ ActiveRecord::Associations::ClassMethods.class_eval do
     
     class_eval "
 def self.#{reflection.name}_cached_count_for(oid)
-    key = self.name + ':' + oid.to_s + ':#{reflection.name}:cached_count'
+    key = 'CachedSupermodel:' + self.name + ':' + oid.to_s + ':#{reflection.name}:cached_count'
     cache_value(key) do
        self.find(oid).#{reflection.name}_cached_count
     end
@@ -215,7 +215,7 @@ end
     # The getter for the cached count of this association.
     #
     define_method("#{reflection.name}_cached_count") do |*params|
-      key = "#{self.class.name}:#{self.id}:#{reflection.name}:cached_count"
+      key = "CachedSupermodel:#{self.class.name}:#{self.id}:#{reflection.name}:cached_count"
       cache_value(key) do
         association_proxy_class.new(self.remove_associations, reflection).count
       end
@@ -232,7 +232,7 @@ end
         if new_record?
           association = association_proxy_class.new(self, reflection)
         else
-          key = "#{self.class.name}:#{self.id}:#{reflection.name}"
+          key = "CachedSupermodel:#{self.class.name}:#{self.id}:#{reflection.name}"
           expire_cached_value(key) if force_reload
           association = cache_value(key) do
             a = association_proxy_class.new(self.remove_associations, reflection)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: CachedSupermodel
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2006-11-13 00:00:00 +01:00
+  version: 0.1.1
+date: 2006-11-23 00:00:00 +01:00
 summary: A library that automatically caches all ActiveRecord::Base instances in memcache using the AdoccaMemcache gem.
 require_paths: 
 - lib