stephencelis · February 7, 2013 01:29 · Feb 7, 2013 · Feb 7, 2013 · Feb 7, 2013 · Feb 7, 2013
diff --git a/cached_account.rb b/cached_account.rb
@@ -7,7 +7,6 @@ class CachedAccount < CachedDelegateClass(Recurly::Account)
   cache(:subscription) { subscriptions.live.first }
   cache(:add_ons)      { subscription.try(:add_ons).to_a }
   cache(:plan)         { subscription.try :plan }
-  cache(:invoices)     { invoices.to_a }
   cache(:balance)      {
     BigDecimal('0.01') * invoices.past_due.map(&:total_in_cents).sum
   }

diff --git a/cached_delegate_class.rb b/cached_delegate_class.rb
@@ -1,31 +1,34 @@
-def CachedDelegateClass(superclass)
-  klass = DelegateClass(superclass)
+def CachedDelegateClass(superklass)
+  klass = DelegateClass(superklass)
 
-  klass.instance_eval <<-RUBY
+  klass.class_attribute :delegate_class
+  klass.delegate_class = superklass
+
+  klass.class_attribute :cache_key
+  klass.cache_key = :uuid
+
+  class << klass
     def cache_key_for *args
-      args.unshift #{superclass.to_s.tableize}
-      args.map(&:to_s).join('/')
+      args.unshift delegate_class.name.tableize
+      args.map(&:to_s).join '/'
     end
 
-    cattr_accessor :cache_key
-    self.cache_key = :uuid
-
     private
 
     def cache_constructor method_name
       define_singleton_method method_name do |*args|
         Rails.cache.fetch cache_key_for(*args) do
-          new(#{superclass}.send(method_name, *args))
+          new(delegate_class.send(method_name, *args))
         end
       end
     end
 
     def cache method_name, &block
-      ivar = "@_\#{method_name.to_s.gsub /\W/, ''}"
+      ivar = "@_#{method_name.to_s.gsub /\W/, ''}"
       define_method method_name do
         return instance_variable_get ivar if instance_variable_defined? ivar
         val = if block
-          __getobj__.instance_eval(&block)
+          instance_eval(&block)
         else
           __getobj__.send(method_name)
         end
@@ -34,17 +37,17 @@ def cache method_name, &block
         val
       end
     end
-RUBY
+  end
 
-  klass.module_eval do
+  klass.class_eval do
     def cache_key
       send self.class.cache_key
     end
 
     private
 
     def recache
-      Rails.cache.write self.class.cache_key_for(to_param), self
+      Rails.cache.write self.class.cache_key_for(cache_key), self
     end
   end
 

diff --git a/cached_delegate_class.rb b/cached_delegate_class.rb
@@ -3,7 +3,7 @@ def CachedDelegateClass(superclass)
 
   klass.instance_eval <<-RUBY
     def cache_key_for *args
-      args.unshift superclass.to_s.tableize
+      args.unshift #{superclass.to_s.tableize}
       args.map(&:to_s).join('/')
     end
 

diff --git a/cached_delegate_class.rb b/cached_delegate_class.rb
@@ -37,7 +37,7 @@ def cache method_name, &block
 RUBY
 
   klass.module_eval do
-    def to_param
+    def cache_key
       send self.class.cache_key
     end
 

diff --git a/cached_account.rb b/cached_account.rb
@@ -1,4 +1,4 @@
-class Account < CachedDelegateClass(Recurly::Account)
+class CachedAccount < CachedDelegateClass(Recurly::Account)
   self.cache_key = :account_code
 
   cache_constructor :find

diff --git a/account.rb → cached_account.rb b/account.rb → cached_account.rb
diff --git a/account.rb b/account.rb
@@ -0,0 +1,14 @@
+class Account < CachedDelegateClass(Recurly::Account)
+  self.cache_key = :account_code
+
+  cache_constructor :find
+
+  cache(:billing_info)
+  cache(:subscription) { subscriptions.live.first }
+  cache(:add_ons)      { subscription.try(:add_ons).to_a }
+  cache(:plan)         { subscription.try :plan }
+  cache(:invoices)     { invoices.to_a }
+  cache(:balance)      {
+    BigDecimal('0.01') * invoices.past_due.map(&:total_in_cents).sum
+  }
+end
diff --git a/cached_delegate_class.rb b/cached_delegate_class.rb
@@ -0,0 +1,52 @@
+def CachedDelegateClass(superclass)
+  klass = DelegateClass(superclass)
+
+  klass.instance_eval <<-RUBY
+    def cache_key_for *args
+      args.unshift superclass.to_s.tableize
+      args.map(&:to_s).join('/')
+    end
+
+    cattr_accessor :cache_key
+    self.cache_key = :uuid
+
+    private
+
+    def cache_constructor method_name
+      define_singleton_method method_name do |*args|
+        Rails.cache.fetch cache_key_for(*args) do
+          new(#{superclass}.send(method_name, *args))
+        end
+      end
+    end
+
+    def cache method_name, &block
+      ivar = "@_\#{method_name.to_s.gsub /\W/, ''}"
+      define_method method_name do
+        return instance_variable_get ivar if instance_variable_defined? ivar
+        val = if block
+          __getobj__.instance_eval(&block)
+        else
+          __getobj__.send(method_name)
+        end
+        instance_variable_set ivar, val
+        recache
+        val
+      end
+    end
+RUBY
+
+  klass.module_eval do
+    def to_param
+      send self.class.cache_key
+    end
+
+    private
+
+    def recache
+      Rails.cache.write self.class.cache_key_for(to_param), self
+    end
+  end
+
+  klass
+end
No results found