dalli 0.9.5 → 0.9.6

data/History.md

@@ -1,13 +1,19 @@
 Dalli Changelog
 =====================
 
-HEAD
+0.9.6
+-----
+
+ - Patches for Rails 3.0.1 integration.
+
+0.9.5
 -----
 
  - Major design change - raw support is back to maximize compatibility with Rails
  and the increment/decrement operations.  You can now pass :raw => true to most methods
  to bypass (un)marshalling.
  - Support symbols as keys (ddollar)
+ - Rails 2.3 bug fixes
 
 
 0.9.4
@@ -43,4 +49,4 @@ HEAD
 0.9.0
 -----
 
- - Initial gem release.
+ - Initial gem release.

data/lib/active_support/cache/dalli_store.rb

@@ -64,27 +64,35 @@ module ActiveSupport
 
       # Increment a cached value. This method uses the memcached incr atomic
       # operator and can only be used on values written with the :raw option.
-      # Calling it on a value not stored with :raw will initialize that value
-      # to zero.
+      # Calling it on a value not stored with :raw will fail.
+      # :initial defaults to the amount passed in, as if the counter was initially zero.
+      # memcached counters cannot hold negative values.
       def increment(name, amount = 1, options = nil) # :nodoc:
         options = merged_options(options)
+        initial = options[:initial] || amount
+        expires_in = options[:expires_in].to_i
         response = instrument(:increment, name, :amount => amount) do
-          @data.incr(escape_key(namespaced_key(name, options)), amount)
+          @data.incr(escape_key(namespaced_key(name, options)), amount, expires_in, initial)
         end
-      rescue Dalli::DalliError
+      rescue Dalli::DalliError => e
+        logger.error("DalliError (#{e}): #{e.message}") if logger
         nil
       end
 
       # Decrement a cached value. This method uses the memcached decr atomic
       # operator and can only be used on values written with the :raw option.
-      # Calling it on a value not stored with :raw will initialize that value
-      # to zero.
+      # Calling it on a value not stored with :raw will fail.
+      # :initial defaults to zero, as if the counter was initially zero.
+      # memcached counters cannot hold negative values.
       def decrement(name, amount = 1, options = nil) # :nodoc:
         options = merged_options(options)
+        initial = options[:initial] || 0
+        expires_in = options[:expires_in].to_i
         response = instrument(:decrement, name, :amount => amount) do
-          @data.decr(escape_key(namespaced_key(name, options)), amount)
+          @data.decr(escape_key(namespaced_key(name, options)), amount, expires_in, initial)
         end
-      rescue Dalli::DalliError
+      rescue Dalli::DalliError => e
+        logger.error("DalliError (#{e}): #{e.message}") if logger
         nil
       end
 
@@ -106,7 +114,7 @@ module ActiveSupport
       protected
         # Read an entry from the cache.
         def read_entry(key, options) # :nodoc:
-          deserialize_entry(@data.get(escape_key(key), options))
+          deserialize_entry(@data.get(escape_key(key), :raw => true))
         rescue Dalli::DalliError => e
           logger.error("DalliError (#{e}): #{e.message}") if logger
           nil

data/lib/dalli/ring.rb

@@ -9,6 +9,7 @@ module Dalli
     
     def initialize(servers, options)
       @servers = servers
+      @continuum = nil
       if servers.size > 1
         total_weight = servers.inject(0) { |memo, srv| memo + srv.weight }
         continuum = []

data/lib/dalli/server.rb

@@ -13,6 +13,7 @@ module Dalli
       @port = Integer(@port)
       @weight ||= 1
       @weight = Integer(@weight)
+      @down_at = nil
       connection
       Dalli.logger.debug { "#{@hostname}:#{@port} running memcached v#{request(:version)}" }
     end

data/lib/dalli/version.rb

@@ -1,3 +1,3 @@
 module Dalli
-  VERSION = '0.9.5'
+  VERSION = '0.9.6'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Mike Perham
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 -07:00
+date: 2010-09-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency