Remove redundant calls to namespace calculation and revise history.

History.md

@@ -1,10 +1,14 @@
 Dalli Changelog
 =====================
 
-2.6.0
+HEAD
 =======
 
 - Add lambda support for cache namespaces [joshwlewis, #311]
+
+2.6.0
+=======
+
 - read_multi optimization, now checks local_cache [chendo, #306]
 - Re-implement get_multi to be non-blocking [tmm1, #295]
 - Add `dalli` accessor to dalli_store to access the underlying

lib/dalli/client.rb

@@ -340,19 +340,18 @@ def validate_key(key)
       raise ArgumentError, "key cannot be blank" if !key || key.length == 0
       key = key_with_namespace(key)
       if key.length > 250
-        namespace_length = namespace ? namespace.size : 0
-        max_length_before_namespace = 212 - namespace_length
+        max_length_before_namespace = 212 - (namespace || '').size
         key = "#{key[0, max_length_before_namespace]}:md5:#{Digest::MD5.hexdigest(key)}"
       end
       return key
     end
 
     def key_with_namespace(key)
-      namespace ? "#{namespace}:#{key}" : key
+      (ns = namespace) ? "#{ns}:#{key}" : key
     end
 
     def key_without_namespace(key)
-      namespace ? key.sub(%r(\A#{namespace}:), '') : key
+      (ns = namespace) ? key.sub(%r(\A#{ns}:), '') : key
     end
 
     def namespace