dalli 0.9.3 → 0.9.4

data/History.md

@@ -1,6 +1,14 @@
 Dalli Changelog
 =====================
 
+0.9.4
+-----
+
+ - Dalli support now in rack-bug (http://github.com/brynary/rack-bug), give it a try!
+ - Namespace support for Rails 2.3 (bpardee)
+ - Bug fixes
+
+
 0.9.3
 -----
 

data/Performance.md

@@ -23,3 +23,13 @@ Times are from a Unibody MBP 2.4Ghz Core 2 Duo running Snow Leopard.
     multiget:ruby:dalli              0.950000   0.310000   1.260000 (  1.269679)
     missing:ruby:dalli               1.650000   0.380000   2.030000 (  2.054383)
     mixed:ruby:dalli                 3.470000   0.750000   4.220000 (  4.323265)
+
+    Testing 0.9.4 with ruby 1.9.2p0 (2010-08-18 revision 29036) [x86_64-darwin10.4.0]
+                                         user     system      total        real
+    set:plain:dalli                  1.380000   0.350000   1.730000 (  1.818374)
+    set:ruby:dalli                   1.460000   0.320000   1.780000 (  1.851925)
+    get:plain:dalli                  1.420000   0.350000   1.770000 (  1.866443)
+    get:ruby:dalli                   1.570000   0.380000   1.950000 (  2.028747)
+    multiget:ruby:dalli              0.870000   0.300000   1.170000 (  1.295592)
+    missing:ruby:dalli               1.420000   0.370000   1.790000 (  1.925094)
+    mixed:ruby:dalli                 2.800000   0.680000   3.480000 (  3.820694)

data/lib/active_support/cache/dalli_store.rb

@@ -1,3 +1,4 @@
+# encoding: ascii
 begin
   require 'dalli'
 rescue LoadError => e
@@ -81,7 +82,6 @@ module ActiveSupport
         response = instrument(:increment, name, :amount => amount) do
           @data.incr(escape_key(namespaced_key(name, options)), amount)
         end
-        response == Response::NOT_FOUND ? nil : response.to_i
       rescue Dalli::DalliError
         nil
       end
@@ -95,7 +95,6 @@ module ActiveSupport
         response = instrument(:decrement, name, :amount => amount) do
           @data.decr(escape_key(namespaced_key(name, options)), amount)
         end
-        response == Response::NOT_FOUND ? nil : response.to_i
       rescue Dalli::DalliError
         nil
       end

data/lib/active_support/cache/dalli_store23.rb

@@ -22,12 +22,11 @@ module ActiveSupport
         DELETED     = "DELETED\r\n"
       end
 
-      ESCAPE_KEY_CHARS = /[\x00-\x20%\x7F-\xFF]/
-
       def self.build_mem_cache(*addresses)
         addresses = addresses.flatten
         options = addresses.extract_options!
         addresses = ["localhost"] if addresses.empty?
+        # No need to marshal since we marshal here.
         Dalli::Client.new(addresses, options)
       end
 
@@ -41,10 +40,14 @@ module ActiveSupport
       # localhost port 11211 (the default memcached port).
       #
       def initialize(*addresses)
+        addresses = addresses.flatten
+        options = addresses.extract_options!
         if addresses.first.respond_to?(:get)
           @data = addresses.first
         else
-          @data = self.class.build_mem_cache(*addresses)
+          mem_cache_options = options.dup
+          @namespace = mem_cache_options.delete(:namespace)
+          @data = self.class.build_mem_cache(*(addresses + [mem_cache_options]))
         end
 
         extend Strategy::LocalCache
@@ -130,8 +133,6 @@ module ActiveSupport
       def write(key, value, options = nil)
         super
         method = options && options[:unless_exist] ? :add : :set
-        # memcache-client will break the connection if you send it an integer
-        # in raw mode, so we convert it to a string to be sure it continues working.
         value = Marshal.dump value
         @data.send(method, escape_key(key), value, expires_in(options))
       rescue Dalli::DalliError => e
@@ -162,9 +163,19 @@ module ActiveSupport
       end
 
       private
+
+      # Exists in 2.3.8 but not in 2.3.2 so roll our own version
+      def expires_in(options)
+        expires_in = options && options[:expires_in]
+
+        raise ":expires_in must be a number" if expires_in && !expires_in.is_a?(Numeric)
+
+        expires_in || 0
+      end
+
       def escape_key(key)
-        key = key.to_s.gsub(ESCAPE_KEY_CHARS){|match| "%#{match.getbyte(0).to_s(16).upcase}"}
-        key = "#{key[0, 213]}:md5:#{Digest::MD5.hexdigest(key)}" if key.size > 250
+        prefix = @namespace.is_a?(Proc) ? @namespace.call : @namespace
+        key = "#{prefix}:#{key}" if prefix
         key
       end
     end

data/lib/dalli.rb

@@ -12,7 +12,7 @@ module Dalli
 
   def self.logger
     @logger ||= begin
-      (defined?(Rails) && Rails.logger) ||
+      (defined?(Rails) && Rails.respond_to?(:logger) && Rails.logger) ||
       (defined?(RAILS_DEFAULT_LOGGER) && RAILS_DEFAULT_LOGGER) ||
       default_logger
     end

data/lib/dalli/version.rb

@@ -1,3 +1,3 @@
 module Dalli
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 end

data/test/memcached_mock.rb

@@ -69,7 +69,7 @@ module MemcachedMock
 #      puts "Starting: #{cmd}..."
       pid = IO.popen(cmd).pid
       begin
-        sleep 0.3
+        sleep 0.5
         yield Dalli::Client.new(["localhost:#{port}", "127.0.0.1:#{port}"])
       ensure
         Process.kill("TERM", pid)

data/test/test_active_support.rb

@@ -95,7 +95,7 @@ class TestActiveSupport < Test::Unit::TestCase
   end
   
   def connect
-    @dalli = ActiveSupport::Cache.lookup_store(:dalli_store, 'localhost:19122', :expires_in => 10.seconds)
+    @dalli = ActiveSupport::Cache.lookup_store(:dalli_store, 'localhost:19122', :expires_in => 10.seconds, :namespace => 'x')
     @mc = ActiveSupport::Cache.lookup_store(:mem_cache_store, 'localhost:19122', :expires_in => 10.seconds, :namespace => 'a')
     @dalli.clear
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Mike Perham