seamusabshere-cache-money 0.2.8 → 0.2.9

data/lib/cash/finders.rb

@@ -24,11 +24,22 @@ module Cash
         find_scope[:order] ? find_scope : find_scope.merge(_default_order)
       end
 
-      def find_by_id_with_exclusive_scope(id)
+      def _find_by_id_with_exclusive_scope(id)
         with_exclusive_scope({ :find => _default_order }) do
           find_from_ids_without_cache([id], {})
         end
       end
+      
+      # http://github.com/entombedvirus/cache_fu/commit/78cf070aa281208dc63c58e58578afc04f9874c6
+      def _run_callbacks(result)
+        if result.respond_to?(:each)
+          result.each { |r| _run_callbacks(r) }
+        elsif result.is_a?(ActiveRecord::Base)
+          result.send(:callback, :after_initialize) if result.respond_to?(:after_initialize)
+          result.send(:callback, :after_find) if result.respond_to?(:after_find)
+        end
+        nil
+      end
 
       def without_cache(&block)
         with_scope(:find => {:readonly => true}, &block)
@@ -36,12 +47,16 @@ module Cash
 
       # User.find(:first, ...), User.find_by_foo(...), User.find(:all, ...), User.find_all_by_foo(...)
       def find_every_with_cache(options)
-        Query::Select.perform(self, options, _find_scope_with_default_order)
+        results = Query::Select.perform(self, options, _find_scope_with_default_order)
+        _run_callbacks(results)
+        results
       end
 
       # User.find(1), User.find(1, 2, 3), User.find([1, 2, 3]), User.find([])
       def find_from_ids_with_cache(ids, options)
-        Query::PrimaryKey.perform(self, ids, options, _find_scope_with_default_order)
+        results = Query::PrimaryKey.perform(self, ids, options, _find_scope_with_default_order)
+        _run_callbacks(results)
+        results
       end
 
       # User.count(:all), User.count, User.sum(...)

data/lib/cash/query/abstract.rb

@@ -156,7 +156,7 @@ module Cash
 
       def find_from_keys(*missing_keys)
         missing_ids = Array(missing_keys).flatten.collect { |key| key.split('/')[2].to_i }
-        missing_ids.map { |id| @active_record.find_by_id_with_exclusive_scope(id) }
+        missing_ids.map { |id| @active_record._find_by_id_with_exclusive_scope(id) }
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: seamusabshere-cache-money
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors: 
 - Nick Kallen