ngmoco-cache-money 0.2.9 → 0.2.10

data/UNSUPPORTED_FEATURES

@@ -7,7 +7,6 @@
 * attr_readonly - no technical obstacle, just not yet supported
 * attributes before typecast behave unpredictably - hard to support
 * ActiveRecord::Rollback is unsupported - the exception gets swallowed so there isn't an opportunity to rollback the cache transaction - not hard to support
-* Named bind variables :conditions => ["name = :name", { :name => "37signals!" }] - not hard to support
 * printf style binds: :conditions => ["name = '%s'", "37signals!"] - not too hard to support
 * objects as attributes that are serialized. story.title = {:foo => :bar}; customer.balance = Money.new(...) - these could be coerced using Column#type_cast?
 

data/lib/cash/lock.rb

@@ -2,8 +2,8 @@ module Cash
   class Lock
     class Error < RuntimeError; end
 
-    INITIAL_WAIT = 1
-    DEFAULT_RETRY = 5
+    INITIAL_WAIT = 2
+    DEFAULT_RETRY = 8
     DEFAULT_EXPIRY = 30
 
     def initialize(cache)
@@ -27,10 +27,10 @@ module Cash
       retries.times do |count|
         response = @cache.add("lock/#{key}", Process.pid, lock_expiry)
         return if response == "STORED\r\n"
-        raise Error if count == retries - 1
         exponential_sleep(count, initial_wait) unless count == retries - 1
       end
-      raise Error, "Couldn't acquire memcache lock for: #{key}"
+      debug_lock(key)
+      raise Error, "Couldn't acquire memcache lock for: #{key}   server: #{@cache.get_server_for_key(key)}"
     end
 
     def release_lock(key)
@@ -47,5 +47,10 @@ module Cash
       @cache.get("lock/#{key}") == Process.pid
     end
 
+    def debug_lock(key)
+      @cache.logger.warn("#{@cache.get("lock/#{key}")}") if @cache.respond_to?(:logger) && @cache.logger.respond_to?(:warn)
+    rescue
+      @cache.logger.warn("#{$!}") if @cache.respond_to?(:logger) && @cache.logger.respond_to?(:warn)
+    end
   end
 end

data/lib/cash/query/abstract.rb

@@ -119,7 +119,15 @@ module Cash
         conditions.split(AND).inject([]) do |indices, condition|
           matched, table_name, column_name, sql_value = *(KEY_EQ_VALUE.match(condition))
           if matched
-            value = sql_value == '?' ? values.shift : columns_hash[column_name].type_cast(sql_value)
+            # value = sql_value == '?' ? values.shift : columns_hash[column_name].type_cast(sql_value)
+            if sql_value == '?'
+              value = values.shift
+            elsif sql_value[0..0] == ':' && values && values.count > 0 && values[0].is_a?(Hash)
+              symb  = sql_value[1..-1].to_sym
+              value = columns_hash[column_name].type_cast(values[0][symb])
+            else
+              value = columns_hash[column_name].type_cast(sql_value)
+            end
             indices << [column_name, value]
           else
             return nil

data/lib/memcached_wrapper.rb

@@ -10,14 +10,14 @@
 ####### they have MemCache installed (don't need the wrapper)
 if defined? MemCache
 
-Rails.logger.info("cache-money: MemCache installed")
+Rails.logger.info("cache-money: MemCache installed") if defined? Rails
 #TODO add logging?
 class MemcachedWrapper < ::MemCache
 end
 
 ########## they have Memcached installed (do need the wrapper)
 elsif defined? Memcached
-Rails.logger.info("cache-money: Memcached installed")
+Rails.logger.info("cache-money: Memcached installed") if defined? Rails
 
 class Memcached
   alias :get_multi :get #:nodoc:
@@ -69,20 +69,25 @@ class MemcachedWrapper < ::Memcached
 
   # Wraps Memcached::Rails#add to return a text string - for cache money
   def add(key, value, ttl=@default_ttl, raw=false)
+    logger.debug("Memcached add: #{key.inspect}") if logger && @debug
     super(key, value, ttl, !raw)
+    logger.debug("Memcached hit: #{key.inspect}") if logger && @debug
     stored
   rescue Memcached::NotStored
+    logger.debug("Memcached miss: #{key.inspect}") if logger && @debug
     not_stored
   rescue Memcached::Error
-    log_error($!)
     log_error($!) if logger
     not_stored
   end
 
   def replace(key, value, ttl = @default_ttl, raw = false)
+    logger.debug("Memcached replace: #{key.inspect}") if logger && @debug
     super(key, value, ttl, !raw)
+    logger.debug("Memcached hit: #{key.inspect}") if logger && @debug
     stored
   rescue Memcached::NotStored
+    logger.debug("Memcached miss: #{key.inspect}") if logger && @debug
     not_stored
   rescue Memcached::Error
     log_error($!) if logger
@@ -122,9 +127,12 @@ class MemcachedWrapper < ::Memcached
 
   # Wraps Memcached#cas so that it doesn't raise. Doesn't set anything if no value is present.
   def cas(key, ttl=@default_ttl, raw=false, &block)
+    logger.debug("Memcached cas: #{key.inspect}") if logger && @debug
     super(key, ttl, !raw, &block)
+    logger.debug("Memcached hit: #{key.inspect}") if logger && @debug
     stored
   rescue Memcached::NotFound
+    logger.debug("Memcached miss: #{key.inspect}") if logger && @debug
   rescue TypeError
     log_error($!) if logger
     delete(key)
@@ -138,7 +146,13 @@ class MemcachedWrapper < ::Memcached
   
   def get_multi(*keys)
     keys.flatten!
-    super(keys, true)
+    logger.debug("Memcached get_multi: #{keys.inspect}") if logger && @debug
+    values = super(keys, true)
+    logger.debug("Memcached hit: #{keys.inspect}") if logger && @debug
+    values
+  rescue Memcached::NotFound
+    logger.debug("Memcached miss: #{keys.inspect}") if logger && @debug
+    {}
   rescue TypeError
     log_error($!) if logger
     keys.each { |key| delete(key) }
@@ -150,7 +164,9 @@ class MemcachedWrapper < ::Memcached
   end
 
   def set(key, value, ttl=@default_ttl, raw=false)
+    logger.debug("Memcached set: #{key.inspect}") if logger && @debug
     super(key, value, ttl, !raw)
+    logger.debug("Memcached hit: #{key.inspect}") if logger && @debug
     stored
   rescue Memcached::Error
     log_error($!) if logger
@@ -158,27 +174,36 @@ class MemcachedWrapper < ::Memcached
   end
 
   def append(key, value)
+    logger.debug("Memcached append: #{key.inspect}") if logger && @debug
     super(key, value)
+    logger.debug("Memcached hit: #{key.inspect}") if logger && @debug
     stored
   rescue Memcached::NotStored
+    logger.debug("Memcached miss: #{key.inspect}") if logger && @debug
     not_stored
   rescue Memcached::Error
     log_error($!) if logger
   end
 
   def prepend(key, value)
+    logger.debug("Memcached prepend: #{key.inspect}") if logger && @debug
     super(key, value)
+    logger.debug("Memcached hit: #{key.inspect}") if logger && @debug
     stored
   rescue Memcached::NotStored
+    logger.debug("Memcached miss: #{key.inspect}") if logger && @debug
     not_stored
   rescue Memcached::Error
     log_error($!) if logger
   end
 
   def delete(key)
+    logger.debug("Memcached delete: #{key.inspect}") if logger && @debug
     super(key)
+    logger.debug("Memcached hit: #{key.inspect}") if logger && @debug
     deleted
   rescue Memcached::NotFound
+    logger.debug("Memcached miss: #{key.inspect}") if logger && @debug
     not_found
   rescue Memcached::Error
     log_error($!) if logger
@@ -198,6 +223,10 @@ class MemcachedWrapper < ::Memcached
     log_error($!) if logger
   end
 
+  def get_server_for_key(key, options = {})
+    server_by_key(key)
+  end
+
   alias :reset :quit
   alias :close :quit #nodoc
   alias :flush_all :flush
@@ -229,5 +258,5 @@ private
   
 end
 else
-  Rails.logger.warn 'unable to determine memcache implementation'
+  Rails.logger.warn 'unable to determine memcache implementation' if defined? Rails
 end #include the wraper

data/spec/cash/finders_spec.rb

@@ -30,6 +30,14 @@ module Cash
               end
             end
 
+            describe '#find(:first, :conditions => [ "id = :id", { :id => story.id } ])' do
+              it "does not use the database" do
+                story = Story.create!
+                mock(Story.connection).execute.never
+                Story.find(:first, :conditions => [ "id = :id", { :id => story.id } ]).should == story
+              end
+            end
+
             describe "#find(:first, :conditions => 'id = ?')" do
               it "does not use the database" do
                 story = Story.create!

data/spec/spec_helper.rb

@@ -6,7 +6,8 @@ require 'spec'
 require 'pp'
 require 'cache_money'
 #require 'memcache'
-#require 'memcached'
+require 'memcached'
+require 'memcached_wrapper'
 
 require File.join(dir, '../config/environment')
 
@@ -16,7 +17,7 @@ Spec::Runner.configure do |config|
     load File.join(dir, "../db/schema.rb")
 
     config = YAML.load(IO.read((File.expand_path(File.dirname(__FILE__) + "/../config/memcached.yml"))))['test']
-    $memcache = MemcachedWrapper.new(config[:servers].gsub(' ', '').split(','), config)
+    $memcache = MemcachedWrapper.new(config["servers"].gsub(' ', '').split(','), config)
     $lock = Cash::Lock.new($memcache)
   end
 

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: ngmoco-cache-money
 version: !ruby/object:Gem::Version 
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors: 
 - Nick Kallen
+- Ashley Martens
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-10-26 00:00:00 -07:00
+date: 2010-01-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency