dalli 2.0.1 → 2.0.2

data/History.md

@@ -1,6 +1,12 @@
 Dalli Changelog
 =====================
 
+2.0.2
+=======
+
+- Fix all dalli\_store operations to handle nil options [#190]
+- Increment and decrement with :initial => nil now return nil (lawrencepit, #112)
+
 2.0.1
 =======
 

data/lib/active_support/cache/dalli_store.rb

@@ -25,7 +25,8 @@ module ActiveSupport
         @data = Dalli::Client.new(addresses, options)
       end
 
-      def fetch(name, options={})
+      def fetch(name, options=nil)
+        options ||= {}
         if block_given?
           unless options[:force]
             entry = instrument(:read, name, options) do |payload|
@@ -49,7 +50,8 @@ module ActiveSupport
         end
       end
 
-      def read(name, options={})
+      def read(name, options=nil)
+        options ||= {}
         instrument(:read, name, options) do |payload|
           entry = read_entry(name, options)
           payload[:hit] = !!entry if payload
@@ -57,17 +59,19 @@ module ActiveSupport
         end
       end
 
-      def write(name, value, options={})
+      def write(name, value, options=nil)
+        options ||= {}
         instrument(:write, name, options) do |payload|
           write_entry(name, value, options)
         end
       end
 
-      def exist?(name, options={})
+      def exist?(name, options=nil)
+        options ||= {}
         !!read_entry(name, options)
       end
 
-      def delete(name, options={})
+      def delete(name, options=nil)
         @data.delete(name)
       end
 
@@ -94,8 +98,9 @@ module ActiveSupport
       # Calling it on a value not stored with :raw will fail.
       # :initial defaults to the amount passed in, as if the counter was initially zero.
       # memcached counters cannot hold negative values.
-      def increment(name, amount = 1, options={}) # :nodoc:
-        initial = options[:initial] || amount
+      def increment(name, amount = 1, options=nil)
+        options ||= {}
+        initial = options.has_key?(:initial) ? options[:initial] : amount
         expires_in = options[:expires_in]
         instrument(:increment, name, :amount => amount) do
           @data.incr(name, amount, expires_in, initial)
@@ -110,8 +115,9 @@ module ActiveSupport
       # Calling it on a value not stored with :raw will fail.
       # :initial defaults to zero, as if the counter was initially zero.
       # memcached counters cannot hold negative values.
-      def decrement(name, amount = 1, options={}) # :nodoc:
-        initial = options[:initial] || 0
+      def decrement(name, amount = 1, options=nil)
+        options ||= {}
+        initial = options.has_key?(:initial) ? options[:initial] : 0
         expires_in = options[:expires_in]
         instrument(:decrement, name, :amount => amount) do
           @data.decr(name, amount, expires_in, initial)
@@ -150,7 +156,6 @@ module ActiveSupport
 
       # Write an entry to the cache.
       def write_entry(key, value, options) # :nodoc:
-        options ||= {}
         method = options[:unless_exist] ? :add : :set
         expires_in = options[:expires_in]
         @data.send(method, escape(key), value, expires_in, options)
@@ -177,7 +182,7 @@ module ActiveSupport
         key
       end
 
-      def instrument(operation, key, options = nil)
+      def instrument(operation, key, options=nil)
         log(operation, key, options)
 
         if ActiveSupport::Cache::Store.instrument
@@ -189,7 +194,7 @@ module ActiveSupport
         end
       end
 
-      def log(operation, key, options = nil)
+      def log(operation, key, options=nil)
         return unless logger && logger.debug?
         logger.debug("Cache #{operation}: #{key}#{options.blank? ? "" : " (#{options.inspect})"}")
       end

data/lib/dalli/version.rb

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

data/test/test_active_support.rb

@@ -4,9 +4,15 @@ require 'helper'
 describe 'ActiveSupport' do
   context 'active_support caching' do
 
-    should 'write should handle nil options' do
+    should 'dalli_store operations should handle nil options' do
       @dalli = ActiveSupport::Cache.lookup_store(:dalli_store, 'localhost:19122')
-      @dalli.write('foo', 'bar', nil)
+      assert_equal true, @dalli.write('foo', 'bar', nil)
+      assert_equal 'bar', @dalli.read('foo', nil)
+      assert_equal 18, @dalli.fetch('lkjsadlfk', nil) { 18 }
+      assert_equal 18, @dalli.fetch('lkjsadlfk', nil) { 18 }
+      assert_equal 1, @dalli.increment('lkjsa', 1, nil)
+      assert_equal 2, @dalli.increment('lkjsa', 1, nil)
+      assert_equal 1, @dalli.decrement('lkjsa', 1, nil)
     end
 
     should 'support fetch' do
@@ -108,6 +114,20 @@ describe 'ActiveSupport' do
           assert_equal 1, @dalli.increment('counterX')
           assert_equal 2, @dalli.increment('counterX')
           assert_equal 2, @dalli.read('counterX', :raw => true).to_i
+
+          assert_equal 5, @dalli.increment('counterY1', 1, :initial => 5)
+          assert_equal 6, @dalli.increment('counterY1', 1, :initial => 5)
+          assert_equal 6, @dalli.read('counterY1', :raw => true).to_i
+
+          assert_equal nil, @dalli.increment('counterZ1', 1, :initial => nil)
+          assert_equal nil, @dalli.read('counterZ1')
+
+          assert_equal 5, @dalli.decrement('counterY2', 1, :initial => 5)
+          assert_equal 4, @dalli.decrement('counterY2', 1, :initial => 5)
+          assert_equal 4, @dalli.read('counterY2', :raw => true).to_i
+
+          assert_equal nil, @dalli.decrement('counterZ2', 1, :initial => nil)
+          assert_equal nil, @dalli.read('counterZ2')
         end
       end
     end

metadata

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