ashleym1972-cache-money 0.2.8 → 0.2.9

data/lib/cache_money.rb

@@ -29,7 +29,7 @@ class ActiveRecord::Base
   def self.is_cached(options = {})
     options.assert_valid_keys(:ttl, :repository, :version)
     include Cash unless ancestors.include?(Cash)
-    Cash::Config::Config.create(self, options)
+    Cash::Config.create(self, options)
   end
 end
 

data/lib/cash/accessor.rb

@@ -40,17 +40,17 @@ module Cash
       end
 
       def add(key, value, options = {})
-        if repository.add(cache_key(key), value, options[:ttl] || cache_config.options[:ttl], options[:raw]) == "NOT_STORED\r\n"
+        if repository.add(cache_key(key), value, options[:ttl] || cache_config.ttl, options[:raw]) == "NOT_STORED\r\n"
           yield if block_given?
         end
       end
 
       def set(key, value, options = {})
-        repository.set(cache_key(key), value, options[:ttl] || cache_config.options[:ttl], options[:raw])
+        repository.set(cache_key(key), value, options[:ttl] || cache_config.ttl, options[:raw])
       end
 
       def incr(key, delta = 1, ttl = nil)
-        ttl ||= cache_config.options[:ttl]
+        ttl ||= cache_config.ttl
         repository.incr(cache_key = cache_key(key), delta) || begin
           repository.add(cache_key, (result = yield).to_s, ttl, true) { repository.incr(cache_key) }
           result
@@ -58,7 +58,7 @@ module Cash
       end
 
       def decr(key, delta = 1, ttl = nil)
-        ttl ||= cache_config.options[:ttl]
+        ttl ||= cache_config.ttl
         repository.decr(cache_key = cache_key(key), delta) || begin
           repository.add(cache_key, (result = yield).to_s, ttl, true) { repository.decr(cache_key) }
           result

data/lib/cash/config.rb

@@ -1,7 +1,7 @@
 module Cash
   module Config
     def self.create(active_record, options, indices = [])
-      active_record.cache_config = Config.new(active_record, options)
+      active_record.cache_config = Cash::Config::Config.new(active_record, options)
       indices.each { |i| active_record.index i.attributes, i.options }
     end
     
@@ -52,7 +52,7 @@ module Cash
       end
 
       def ttl
-        @options[:ttl]
+        @options[:ttl] || 0
       end
 
       def version

data/lib/cash/query/abstract.rb

@@ -10,11 +10,11 @@ module Cash
       def initialize(active_record, options1, options2)
         @active_record, @options1, @options2 = active_record, options1, options2 || {}
 
-        if active_record.base_class != active_record
-          @options2[:conditions] = active_record.merge_conditions(
-            @options2[:conditions], { active_record.inheritance_column => active_record.to_s }
-          )
-        end
+        # if active_record.base_class != active_record
+        #   @options2[:conditions] = active_record.merge_conditions(
+        #     @options2[:conditions], { active_record.inheritance_column => active_record.to_s }
+        #   )
+        # end
       end
 
       def perform(find_options = {}, get_options = {})
@@ -24,7 +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}")
+          logger.debug("---- UNCACHEABLE #{table_name} - #{find_options.inspect} - #{get_options.inspect} - #{@options1.inspect} - #{@options2.inspect}") if logger
           uncacheable
         end
       end
@@ -61,9 +61,9 @@ module Cash
         return if partial_indices.include?(nil)
         attribute_value_pairs = partial_indices.sum.sort { |x, y| x[0] <=> y[0] }
 
-        attribute_value_pairs.each do |attribute_value_pair|
-          return false if attribute_value_pair.last.is_a?(Array)
-        end
+        # attribute_value_pairs.each do |attribute_value_pair|
+        #   return false if attribute_value_pair.last.is_a?(Array)
+        # end
 
         if index = indexed_on?(attribute_value_pairs.collect { |pair| pair[0] })
           if index.matches?(self)

data/spec/cash/lock_spec.rb

@@ -48,7 +48,8 @@ module Cash
       describe 'when given a timeout for the lock' do
         it "correctly sets timeout on memcache entries" do
           mock($memcache).add('lock/lock_key', Process.pid, timeout = 10) { true }
-          $lock.acquire_lock('lock_key', timeout)
+          # $lock.acquire_lock('lock_key', timeout)
+          lambda { $lock.acquire_lock('lock_key', timeout, 1) }.should raise_error
         end
       end
 
@@ -74,10 +75,10 @@ module Cash
         
         describe 'when given an initial wait' do
           it 'sleeps exponentially starting with the initial wait' do
-            mock($lock).sleep(initial_wait = 0.123)
-            mock($lock).sleep(2 * initial_wait)
-            mock($lock).sleep(4 * initial_wait)
-            mock($lock).sleep(8 * initial_wait)
+            stub($lock).sleep(initial_wait = 0.123)
+            stub($lock).sleep(2 * initial_wait)
+            stub($lock).sleep(4 * initial_wait)
+            stub($lock).sleep(8 * initial_wait)
             $lock.acquire_lock('lock_key')
             as_another_process do
               lambda { $lock.acquire_lock('lock_key', Lock::DEFAULT_EXPIRY, Lock::DEFAULT_RETRY, initial_wait) }.should raise_error

metadata

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