dalli 2.0.4 → 2.0.5

data/History.md

@@ -1,6 +1,13 @@
 Dalli Changelog
 =====================
 
+2.0.5
+=======
+
+- Create proper keys for arrays of objects passed as keys [twinturbo, #211]
+- Handle long key with namespace [#212]
+- Add NODELAY to TCP socket options [#206]
+
 2.0.4
 =======
 

data/lib/active_support/cache/dalli_store.rb

@@ -46,6 +46,8 @@ module ActiveSupport
 
       def fetch(name, options=nil)
         options ||= {}
+        name = expanded_key name
+
         if block_given?
           unless options[:force]
             entry = instrument(:read, name, options) do |payload|
@@ -71,6 +73,8 @@ module ActiveSupport
 
       def read(name, options=nil)
         options ||= {}
+        name = expanded_key name
+
         instrument(:read, name, options) do |payload|
           entry = read_entry(name, options)
           payload[:hit] = !!entry if payload
@@ -80,6 +84,8 @@ module ActiveSupport
 
       def write(name, value, options=nil)
         options ||= {}
+        name = expanded_key name
+
         instrument(:write, name, options) do |payload|
           write_entry(name, value, options)
         end
@@ -87,20 +93,24 @@ module ActiveSupport
 
       def exist?(name, options=nil)
         options ||= {}
+        name = expanded_key name
+
         !read_entry(name, options).nil?
       end
 
       def delete(name, options=nil)
+        options ||= {}
+        name = expanded_key name
+
         delete_entry(name, options)
       end
 
       # Reads multiple keys from the cache using a single call to the
       # servers for all keys. Keys must be Strings.
       def read_multi(*names)
-        names.extract_options!
+        options = names.extract_options!
         names = names.flatten
-
-        mapping = names.inject({}) { |memo, name| memo[escape(name)] = name; memo }
+        mapping = names.inject({}) { |memo, name| memo[escape(expanded_key(name))] = name; memo }
         instrument(:read_multi, names) do
           results = @data.get_multi(mapping.keys)
           results.inject({}) do |memo, (inner, value)|
@@ -119,6 +129,7 @@ module ActiveSupport
       # memcached counters cannot hold negative values.
       def increment(name, amount = 1, options=nil)
         options ||= {}
+        name = expanded_key name
         initial = options.has_key?(:initial) ? options[:initial] : amount
         expires_in = options[:expires_in]
         instrument(:increment, name, :amount => amount) do
@@ -137,6 +148,7 @@ module ActiveSupport
       # memcached counters cannot hold negative values.
       def decrement(name, amount = 1, options=nil)
         options ||= {}
+        name = expanded_key name
         initial = options.has_key?(:initial) ? options[:initial] : 0
         expires_in = options[:expires_in]
         instrument(:decrement, name, :amount => amount) do
@@ -197,6 +209,25 @@ module ActiveSupport
       end
 
       private
+      # Expand key to be a consistent string value. Invoke +cache_key+ if
+      # object responds to +cache_key+. Otherwise, to_param method will be
+      # called. If the key is a Hash, then keys will be sorted alphabetically.
+      def expanded_key(key) # :nodoc:
+        return key.cache_key.to_s if key.respond_to?(:cache_key)
+
+        case key
+        when Array
+          if key.size > 1
+            key = key.collect{|element| expanded_key(element)}
+          else
+            key = key.first
+          end
+        when Hash
+          key = key.sort_by { |k,_| k.to_s }.collect{|k,v| "#{k}=#{v}"}
+        end
+
+        key.to_param
+      end
 
       def escape(key)
         key = key.to_s.dup

data/lib/dalli/client.rb

@@ -243,8 +243,7 @@ module Dalli
     # Chokepoint method for instrumentation
     def perform(op, key, *args)
       key = key.to_s
-      validate_key(key)
-      key = key_with_namespace(key)
+      key = validate_key(key)
       begin
         server = ring.server_for_key(key)
         server.request(op, key, *args)
@@ -257,7 +256,9 @@ module Dalli
 
     def validate_key(key)
       raise ArgumentError, "key cannot be blank" if !key || key.length == 0
+      key = key_with_namespace(key)
       raise ArgumentError, "key too long #{key.inspect}" if key.length > 250
+      return key
     end
 
     def key_with_namespace(key)

data/lib/dalli/version.rb

@@ -1,3 +1,3 @@
 module Dalli
-  VERSION = '2.0.4'
+  VERSION = '2.0.5'
 end

data/test/test_active_support.rb

@@ -1,6 +1,12 @@
 # encoding: utf-8
 require 'helper'
 
+class MockUser
+  def cache_key
+    "users/1/21348793847982314"
+  end
+end
+
 describe 'ActiveSupport' do
   context 'active_support caching' do
 
@@ -50,6 +56,11 @@ describe 'ActiveSupport' do
           @dalli.write('false', false)
           dvalue = @dalli.fetch('false') { flunk }
           assert_equal false, dvalue
+
+          user = MockUser.new
+          @dalli.write(user.cache_key, false)
+          dvalue = @dalli.fetch(user) { flunk }
+          assert_equal false, dvalue
         end
       end
     end
@@ -118,6 +129,16 @@ describe 'ActiveSupport' do
 
           dres = @dalli.delete(y)
           assert_equal true, dres
+
+          user = MockUser.new
+          dres = @dalli.write(user.cache_key, "foo")
+          assert_equal true, dres
+
+          dres = @dalli.read(user)
+          assert_equal "foo", dres
+
+          dres = @dalli.delete(user)
+          assert_equal true, dres
         end
       end
     end
@@ -149,6 +170,13 @@ describe 'ActiveSupport' do
 
           assert_equal nil, @dalli.decrement('counterZ2', 1, :initial => nil)
           assert_equal nil, @dalli.read('counterZ2')
+
+          user = MockUser.new
+          assert_equal true, @dalli.write(user, 0, :raw => true)
+          assert_equal 1, @dalli.increment(user)
+          assert_equal 2, @dalli.increment(user)
+          assert_equal 1, @dalli.decrement(user)
+          assert_equal "1", @dalli.read(user, :raw => true)
         end
       end
     end
@@ -164,6 +192,10 @@ describe 'ActiveSupport' do
           assert_equal true, @dalli.exist?(:false_value)
 
           assert_equal false, @dalli.exist?(:bar)
+
+          user = MockUser.new
+          @dalli.write(user, 'foo')
+          assert_equal true, @dalli.exist?(user)
         end
       end
     end

data/test/test_dalli.rb

@@ -404,6 +404,11 @@ describe 'Dalli' do
         dc2.set('namespaced', 2)
         assert_equal 1, dc.get('namespaced')
         assert_equal 2, dc2.get('namespaced')
+
+        dc3 = Dalli::Client.new('localhost:19122', :namespace => 'c' * 100)
+        assert_raises ArgumentError do
+          dc3.get "a" * 151
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dalli
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-05 00:00:00.000000000 Z
+date: 2012-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_shoulda
-  requirement: &70263471981140 !ruby/object:Gem::Requirement
+  requirement: &70288172335520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70263471981140
+  version_requirements: *70288172335520
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70263471980400 !ruby/object:Gem::Requirement
+  requirement: &70288172334260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70263471980400
+  version_requirements: *70288172334260
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70263471979400 !ruby/object:Gem::Requirement
+  requirement: &70288172333720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70263471979400
+  version_requirements: *70288172333720
 description: High performance memcached client for Ruby
 email: mperham@gmail.com
 executables: []