dalli 2.0.2 → 2.0.3

data/History.md

@@ -1,6 +1,13 @@
 Dalli Changelog
 =====================
 
+2.0.3
+=======
+
+- Allow proper retrieval of stored `false` values [laserlemon, #197]
+- Allow non-ascii and whitespace keys, only the text protocol has those restrictions [#145]
+- Fix DalliStore#delete error-handling [#196]
+
 2.0.2
 =======
 

data/README.md

@@ -106,6 +106,19 @@ Put this at the bottom of `config/environment.rb`:
       end
     end
 
+Usage with Unicorn
+-----------------------
+
+Modify the `after_fork` block in your unicorn config file:
+
+    after\_fork do |server, worker|
+      Rails.cache.reset if Rails.cache.respond_to?(:reset)
+
+      # Reset Rails's session store
+      # If you know a cleaner way to find the session store instance, please let me know
+      ObjectSpace.each_object(ActionDispatch::Session::DalliStore) { |obj| obj.reset }
+    end
+
 
 Configuration
 ------------------------

data/lib/active_support/cache/dalli_store.rb

@@ -20,7 +20,7 @@ module ActiveSupport
       def initialize(*addresses)
         addresses = addresses.flatten
         options = addresses.extract_options!
-        options[:compression] = options.delete(:compress) || options[:compression]
+        options[:compress] ||= options[:compression]
         addresses << 'localhost:11211' if addresses.empty?
         @data = Dalli::Client.new(addresses, options)
       end
@@ -72,7 +72,7 @@ module ActiveSupport
       end
 
       def delete(name, options=nil)
-        @data.delete(name)
+        delete_entry(name, options)
       end
 
       # Reads multiple keys from the cache using a single call to the

data/lib/dalli/client.rb

@@ -46,7 +46,7 @@ module Dalli
 
     def get(key, options=nil)
       resp = perform(:get, key)
-      (!resp || resp == 'Not found') ? nil : resp
+      resp.nil? || resp == 'Not found' ? nil : resp
     end
 
     ##
@@ -257,8 +257,6 @@ module Dalli
 
     def validate_key(key)
       raise ArgumentError, "key cannot be blank" if !key || key.length == 0
-      raise ArgumentError, "illegal character in key #{key}" if key.respond_to?(:ascii_only?) && !key.ascii_only?
-      raise ArgumentError, "illegal character in key #{key}" if key =~ /[\x00-\x20\x7F-\xFF]/
       raise ArgumentError, "key too long #{key.inspect}" if key.length > 250
     end
 

data/lib/dalli/version.rb

@@ -1,3 +1,3 @@
 module Dalli
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

data/test/test_active_support.rb

@@ -13,6 +13,7 @@ describe 'ActiveSupport' do
       assert_equal 1, @dalli.increment('lkjsa', 1, nil)
       assert_equal 2, @dalli.increment('lkjsa', 1, nil)
       assert_equal 1, @dalli.decrement('lkjsa', 1, nil)
+      assert_equal true, @dalli.delete('lkjsa')
     end
 
     should 'support fetch' do

data/test/test_dalli.rb

@@ -6,21 +6,25 @@ describe 'Dalli' do
     should 'handle deprecated options' do
       dc = Dalli::Client.new('foo', :compression => true)
       assert dc.instance_variable_get(:@options)[:compress]
+      refute dc.instance_variable_get(:@options)[:compression]
+    end
+
+    should 'not warn about valid options' do
+      dc = Dalli::Client.new('foo', :compress => true)
+      # Rails.logger.expects :warn
+      assert dc.instance_variable_get(:@options)[:compress]
     end
   end
 
   describe 'key validation' do
-    should 'not allow whitespace' do
+    should 'not allow blanks' do
       dc = Dalli::Client.new
-      assert_raises ArgumentError do
-        dc.set '   ', 1
-      end
-      assert_raises ArgumentError do
-        dc.set "\t", 1
-      end
-      assert_raises ArgumentError do
-        dc.set "\n", 1
-      end
+      dc.set '   ', 1
+      assert_equal 1, dc.get('   ')
+      dc.set "\t", 1
+      assert_equal 1, dc.get("\t")
+      dc.set "\n", 1
+      assert_equal 1, dc.get("\n")
       assert_raises ArgumentError do
         dc.set "", 1
       end
@@ -326,6 +330,12 @@ describe 'Dalli' do
         resp = dc.get('456', :raw => true)
         assert_equal '0xyz9', resp
 
+        resp = dc.set('456', false)
+        assert_equal true, resp
+
+        resp = dc.get('456')
+        assert_equal false, resp
+
         resp = dc.stats
         assert_equal Hash, resp.class
 

data/test/test_encoding.rb

@@ -8,15 +8,13 @@ describe 'Encoding' do
     should 'support i18n content' do
       memcached do |dc|
         key = 'foo'
-        bad_key = utf8 = 'ƒ©åÍÎ'
+        utf_key = utf8 = 'ƒ©åÍÎ'
 
         assert dc.set(key, utf8)
         assert_equal utf8, dc.get(key)
 
-        # keys must be ASCII
-        assert_raises ArgumentError, /illegal character/ do
-          dc.set(bad_key, utf8)
-        end
+        dc.set(utf_key, utf8)
+        assert_equal utf8, dc.get(utf_key)
       end
     end
 
@@ -30,14 +28,5 @@ describe 'Encoding' do
       end
     end
 
-    should 'not allow non-ASCII keys' do
-      memcached do |dc|
-        key = 'fooƒ'
-        assert_raises ArgumentError do
-          dc.set(key, 'bar')
-        end
-      end
-    end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dalli
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-30 00:00:00.000000000 Z
+date: 2012-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_shoulda
-  requirement: &70329087195200 !ruby/object:Gem::Requirement
+  requirement: &70360909279380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70329087195200
+  version_requirements: *70360909279380
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70329087190140 !ruby/object:Gem::Requirement
+  requirement: &70360909278440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70329087190140
+  version_requirements: *70360909278440
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70329087188860 !ruby/object:Gem::Requirement
+  requirement: &70360909277240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70329087188860
+  version_requirements: *70360909277240
 description: High performance memcached client for Ruby
 email: mperham@gmail.com
 executables: []