ashleym1972-cache-money 0.2.7 → 0.2.8

data/lib/cash/config.rb

@@ -27,7 +27,7 @@ module Cash
       end
 
       def index(attributes, options = {})
-        options.assert_valid_keys(:ttl, :order, :limit, :buffer)
+        options.assert_valid_keys(:ttl, :order, :limit, :buffer, :order_column)
         (@cache_config.indices.unshift(Index.new(@cache_config, self, attributes, options))).uniq!
       end
 

data/lib/cash/index.rb

@@ -2,7 +2,7 @@ module Cash
   class Index
     attr_reader :attributes, :options
     delegate :each, :hash, :to => :@attributes
-    delegate :get, :set, :expire, :find_every_without_cache, :calculate_without_cache, :calculate_with_cache, :incr, :decr, :primary_key, :to => :@active_record
+    delegate :get, :set, :expire, :find_every_without_cache, :calculate_without_cache, :calculate_with_cache, :incr, :decr, :primary_key, :logger, :to => :@active_record
 
     DEFAULT_OPTIONS = { :ttl => 1.day }
 
@@ -64,6 +64,10 @@ module Cash
       def window
         limit && limit + buffer
       end
+      
+      def order_column
+        options[:order_column] || 'id'
+      end
     end
     include Attributes
 
@@ -73,7 +77,7 @@ module Cash
 
     def matches?(query)
       query.calculation? ||
-      (query.order == ['id', order] &&
+      (query.order == [order_column, order] &&
       (!limit || (query.limit && query.limit + query.offset <= limit)))
     end
 

data/lib/cash/local.rb

@@ -8,7 +8,7 @@ module Cash
 
     def cache_locally
       @remote_cache = LocalBuffer.new(original_cache = @remote_cache)
-      yield
+      yield if block_given?
     ensure
       @remote_cache = original_cache
     end

data/lib/cash/query/abstract.rb

@@ -1,7 +1,7 @@
 module Cash
   module Query
     class Abstract
-      delegate :with_exclusive_scope, :get, :table_name, :indices, :find_from_ids_without_cache, :cache_key, :columns_hash, :to => :@active_record
+      delegate :with_exclusive_scope, :get, :table_name, :indices, :find_from_ids_without_cache, :cache_key, :columns_hash, :logger, :to => :@active_record
 
       def self.perform(*args)
         new(*args).perform
@@ -24,6 +24,7 @@ module Cash
           misses, missed_keys, objects = hit_or_miss(cache_keys, index, get_options)
           format_results(cache_keys, choose_deserialized_objects_if_possible(missed_keys, cache_keys, misses, objects))
         else
+          logger.debug("---- UNCACHEABLE #{table_name} - #{find_options.inspect} - #{get_options.inspect} - #{@options1.inspect} - #{@options2.inspect}")
           uncacheable
         end
       end
@@ -94,7 +95,7 @@ module Cash
         when Hash
           conditions.to_a.collect { |key, value| [key.to_s, value] }
         when String
-          parse_indices_from_condition(conditions)
+          parse_indices_from_condition(conditions.gsub('1 = 1 AND ', '')) #ignore unnecessary conditions
         when Array
           parse_indices_from_condition(*conditions)
         when NilClass

metadata

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