Merge pull request petergoldstein#191 from teeparham/warn-compress

fix warning about valid :compress option
mixellent · Apr 5, 2012 · 669bd18 · 669bd18
2 parents 68c498b + 785805e
commit 669bd18
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/active_support/cache/dalli_store.rb b/lib/active_support/cache/dalli_store.rb
@@ -20,7 +20,7 @@ class DalliStore
       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

diff --git a/test/test_dalli.rb b/test/test_dalli.rb
@@ -6,6 +6,13 @@
     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