seamusabshere-cache-money 0.2.7 → 0.2.8

data/lib/cash/finders.rb

@@ -15,23 +15,38 @@ module Cash
         end
       end
 
+      def _default_order
+        @default_order ||= { :order => default_scope.first[:find][:order] || 'id ASC' }
+      end
+      
+      def _find_scope_with_default_order
+        find_scope = scope(:find) || {}
+        find_scope[:order] ? find_scope : find_scope.merge(_default_order)
+      end
+
+      def find_by_id_with_exclusive_scope(id)
+        with_exclusive_scope({ :find => _default_order }) do
+          find_from_ids_without_cache([id], {})
+        end
+      end
+
       def without_cache(&block)
         with_scope(:find => {:readonly => true}, &block)
       end
 
       # 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, scope(:find))
+        Query::Select.perform(self, options, _find_scope_with_default_order)
       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, scope(:find))
+        Query::PrimaryKey.perform(self, ids, options, _find_scope_with_default_order)
       end
 
       # User.count(:all), User.count, User.sum(...)
       def calculate_with_cache(operation, column_name, options = {})
-        Query::Calculation.perform(self, operation, column_name, options, scope(:find))
+        Query::Calculation.perform(self, operation, column_name, options, _find_scope_with_default_order)
       end
     end
   end

data/lib/cash/query/abstract.rb

@@ -116,10 +116,11 @@ module Cash
       alias_method :index_for, :indexed_on?
 
       def format_results(cache_keys, objects)
-        return objects if objects.blank?
+        return [] if objects.blank? # nobody is depending on this returning nil, right?
 
         objects = convert_to_array(cache_keys, objects)
         objects = apply_limits_and_offsets(objects, @options1)
+        return [] if objects.blank?
         deserialize_objects(objects)
       end
 
@@ -155,7 +156,7 @@ module Cash
 
       def find_from_keys(*missing_keys)
         missing_ids = Array(missing_keys).flatten.collect { |key| key.split('/')[2].to_i }
-        find_from_ids_without_cache(missing_ids, {})
+        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.7
+  version: 0.2.8
 platform: ruby
 authors: 
 - Nick Kallen