seifertd-cache-money 0.2.7 → 0.2.7.1

data/lib/cash/accessor.rb

@@ -9,21 +9,15 @@ module Cash
 
     module ClassMethods
       def fetch(keys, options = {}, &block)
-        #puts "IN FETCH, KEYS: #{keys.inspect}, OPTIONS: #{options.inspect}, BLOCK: #{block.inspect}"
         case keys
         when Array
           keys = keys.collect { |key| cache_key(key) }
-          #puts "KEYS ARE ARRAY #{keys.inspect}"
           hits = repository.get_multi(keys)
-          #puts "HITS: #{hits.keys.inspect}"
           if (missed_keys = keys - hits.keys).any?
-            #puts "MISSED KEYS: #{missed_keys.inspect}"
             missed_values = block.call(missed_keys)
-            #puts "MISSED VALUES: #{missed_values.inspect}"
             # Stuff the newly hit stuff into the cache? Dubious?
             key_to_value = missed_keys.zip(Array(missed_values)).to_hash
             key_to_value.each do |new_key, new_val|
-              #puts "CALLING SET #{new_key.inspect} => #{new_val.inspect}"
               repository.set(new_key, new_val, options[:ttl] || 0, options[:raw])
             end
             hits.merge!(key_to_value)
@@ -35,7 +29,6 @@ module Cash
       end
 
       def get(keys, options = {}, &block)
-        #puts "IN GET, KEYS: #{keys.inspect}, OPTIONS: #{options.inspect}"
         case keys
         when Array
           fetch(keys, options, &block)

data/lib/cash/query/abstract.rb

@@ -12,12 +12,9 @@ module Cash
       end
 
       def perform(find_options = {}, get_options = {})
-        #puts "CALLING PEFORM: options1: #{@options1.inspect}, options2: #{@options2.inspect}, find_options: #{find_options.inspect}, get_options: #{get_options.inspect}"
         if cache_config = cacheable?(@options1, @options2, find_options)
           cache_keys, index = cache_keys(cache_config[0]), cache_config[1]
-          #puts "CACHE KEYS: #{cache_keys.inspect}"
           misses, missed_keys, objects = hit_or_miss(cache_keys, index, get_options)
-          #puts "MISSES: #{misses.inspect}, MISSED_KEYS: #{missed_keys.inspect}"
           format_results(cache_keys, choose_deserialized_objects_if_possible(missed_keys, cache_keys, misses, objects))
         else
           uncacheable
@@ -51,21 +48,12 @@ module Cash
 
       private
       def cacheable?(*optionss)
-        #puts "CALLING CACHEABLE?: optionss: #{optionss.inspect}"
         optionss.each { |options| return unless safe_options_for_cache?(options) }
-        #puts "ALL OPTIONS ARE SAFE FOR CACHE"
         partial_indices = optionss.collect { |options| attribute_value_pairs_for_conditions(options[:conditions]) }
-        #puts "PARTIAL INDICES: #{partial_indices.inspect}"
         return if partial_indices.include?(nil)
-        #puts "NONE OF THE PARTIAL INDICES INCLUDED NIL"
-        #puts "SUM??? #{partial_indices.sum.inspect}"
         attribute_value_pairs = partial_indices.sum.sort { |x, y| x[0] <=> y[0] }
-        #puts "ATTRIBUTE_VALUE_PAIRS: #{attribute_value_pairs.inspect}"
         if index = indexed_on?(attribute_value_pairs.collect { |pair| pair[0] })
-          #puts "GOT A MATCHING INDEX: #{index.attributes.inspect}, CHECKING IF QUERY MATCHES"
-          #puts "QUERY ORDER: #{order.inspect}, INDEX ORDER: #{index.order.inspect}"
           if index.matches?(self)
-            #puts "QUERY MATCHES INDEX! YES!"
             [attribute_value_pairs, index]
           end
         end
@@ -122,16 +110,13 @@ module Cash
       end
 
       def indexed_on?(attributes)
-        #puts "CHECKING IF AN INDEX MATCHES: #{attributes.inspect}"
         indices.detect do |index|
-          #puts "   -> INDEX ATTRIBUTES: #{index.attributes.inspect}"
           index == attributes
         end
       end
       alias_method :index_for, :indexed_on?
 
       def format_results(cache_keys, objects)
-        #puts "IN FORMAT RESULTS"
         return objects if objects.blank?
 
         objects = convert_to_array(cache_keys, objects)
@@ -171,7 +156,9 @@ 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, {})
+        vals = find_from_ids_without_cache(missing_ids, {}).inject({}) {|h,obj| h[obj.id] = obj; h}
+        # Reorder according to input ids
+        return missing_ids.map{|id| vals[id]}
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: seifertd-cache-money
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
+  version: 0.2.7.1
 platform: ruby
 authors: 
 - Nick Kallen