Merge pull request #212 from dfens/master

Fix for long key_with_namespace

lib/dalli/client.rb

@@ -243,8 +243,7 @@ def env_servers
     # 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 @@ def perform(op, key, *args)
 
     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)

test/test_dalli.rb

@@ -404,6 +404,11 @@
         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