seifertd-cache-money 0.2.5.2 → 0.2.6

data/lib/cash/accessor.rb

@@ -9,13 +9,24 @@ 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)
-            hits.merge!(missed_keys.zip(Array(missed_values)).to_hash)
+            #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)
           end
           hits
         else
@@ -24,6 +35,7 @@ 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/index.rb

@@ -64,7 +64,7 @@ module Cash
       end
 
       def window
-        limit && limit + buffer
+        limit && limit + (buffer || 1)
       end
     end
     include Attributes

data/lib/cash/query/abstract.rb

@@ -12,10 +12,12 @@ 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
@@ -49,12 +51,21 @@ 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
@@ -111,11 +122,16 @@ module Cash
       end
 
       def indexed_on?(attributes)
-        indices.detect { |index| index == 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)

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: seifertd-cache-money
 version: !ruby/object:Gem::Version 
-  version: 0.2.5.2
+  version: 0.2.6
 platform: ruby
 authors: 
 - Nick Kallen
+- Doug Seifert
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-11-24 00:00:00 -08:00
+date: 2009-08-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,7 +19,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 2.3.2
     version: 
@@ -28,7 +29,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 2.3.2
     version: 
@@ -43,7 +44,7 @@ dependencies:
         version: 1.5.0
     version: 
 description: Cache utilities.
-email: nick@twitter.com
+email: doug@dseifert.net
 executables: []
 
 extensions: []
@@ -72,7 +73,8 @@ files:
 - lib/cash/write_through.rb
 - lib/cache_money.rb
 has_rdoc: false
-homepage: http://github.com/nkallen/cache-money
+homepage: http://github.com/seifertd/cache-money
+licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -93,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Write-through and Read-through Cacheing for ActiveRecord