dalli 1.1.4 → 1.1.5

data/History.md

@@ -1,6 +1,20 @@
 Dalli Changelog
 =====================
 
+WARNING: This is the last 1.1.x release.  The next release will be 2.0
+and not compatible with 1.x; lock dalli in your Gemfile so it does not
+pick up 2.x releases:
+
+    gem 'dalli', '~> 1.1'
+
+1.1.5
+=======
+
+- Coerce input to incr/decr to integer via #to\_i [#165]
+- Convert test suite to minitest/spec (crigor, #166)
+- Fix encoding issue with keys [#162]
+- Fix double namespacing with Rails and dalli\_store. [#160]
+
 1.1.4
 =======
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Mike Perham
+Copyright (c) 2012 Mike Perham
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -7,13 +7,13 @@ The name is a variant of Salvador Dali for his famous painting [The Persistence
 
 ![Persistence of Memory](http://www.virtualdali.com/assets/paintings/31PersistenceOfMemory.jpg)
 
-Dalli's development is sponsored by [Membase](http://www.membase.com/).  Many thanks to them!
+Dalli's initial development was sponsored by [CouchBase](http://www.couchbase.com/).  Many thanks to them!
 
 
 Design
 ------------
 
-I decided to write Dalli after maintaining memcache-client for the last two years for a few specific reasons:
+I decided to write Dalli after maintaining memcache-client for two years for a few specific reasons:
 
  0. The code is mostly old and gross.  The bulk of the code is a single 1000 line .rb file.
  1. It has a lot of options that are infrequently used which complicate the codebase.
@@ -34,12 +34,14 @@ So a few notes.  Dalli:
 Supported Ruby versions and implementations
 ------------------------------------------------
 
-Dalli is geared towards 1.9.2+ but known to work on
+Dalli should work identically on:
 
- * Ruby 1.9.2
- * Ruby 1.9.3
- * Ruby 1.8.7
- * Rubinius 2.0 Preview
+ * JRuby 1.6+
+ * Ruby 1.9.2+
+ * Ruby 1.8.7+
+ * Rubinius 2.0
+
+If you have problems, please enter an issue.
 
 
 Installation and Usage
@@ -163,9 +165,7 @@ Eric Wong - for help using his [kgio](http://unicorn.bogomips.org/kgio/index.htm
 
 Brian Mitchell - for his remix-stash project which was helpful when implementing and testing the binary protocol support.
 
-[Membase](http://membase.com) - for their project sponsorship
-
-[Bootspring](http://bootspring.com) is my Ruby and Rails consulting company.  We specialize in Ruby infrastructure, performance and scalability tuning for Rails applications.  If you need help, please [contact us](mailto:info@bootspring.com) today.
+[CouchBase](http://couchbase.com) - for their project sponsorship
 
 
 Author
@@ -177,4 +177,4 @@ Mike Perham, mperham@gmail.com, [mikeperham.com](http://mikeperham.com), [@mperh
 Copyright
 -----------
 
-Copyright (c) 2010 Mike Perham. See LICENSE for details.
+Copyright (c) 2012 Mike Perham. See LICENSE for details.

data/dalli.gemspec

@@ -23,9 +23,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.summary = %q{High performance memcached client for Ruby}
   s.test_files = Dir.glob("test/**/*")
-  s.add_development_dependency(%q<shoulda>, [">= 0"])
+  s.add_development_dependency(%q<mini_shoulda>, [">= 0"])
   s.add_development_dependency(%q<mocha>, [">= 0"])
-  s.add_development_dependency(%q<rails>, [">= 3.0.0"])
+  s.add_development_dependency(%q<rails>, [">= 3.0"])
   s.add_development_dependency(%q<memcache-client>, [">= 1.8.5"])
 end
 

data/lib/active_support/cache/dalli_store.rb

@@ -36,6 +36,7 @@ module ActiveSupport
 
         addresses << 'localhost:11211' if addresses.empty?
         options = options.dup
+        options.delete(:namespace)
         # Extend expiry by stale TTL or else memcached will never return stale data.
         # See ActiveSupport::Cache#fetch.
         options[:expires_in] += options[:race_condition_ttl] if options[:expires_in] && options[:race_condition_ttl]
@@ -148,8 +149,8 @@ module ActiveSupport
 
       private
         def escape_key(key)
-          key = key.to_s
-          key = key.force_encoding('ASCII-8BIT') if key.respond_to? :force_encoding
+          key = key.to_s.dup
+          key = key.force_encoding('BINARY') if key.respond_to? :force_encoding
           key = key.gsub(ESCAPE_KEY_CHARS){|match| "%#{match.getbyte(0).to_s(16).upcase}"}
           key = "#{key[0, 213]}:md5:#{Digest::MD5.hexdigest(key)}" if key.size > 250
           key

data/lib/dalli/client.rb

@@ -183,7 +183,7 @@ module Dalli
 
     ##
     # Incr adds the given amount to the counter on the memcached server.
-    # Amt must be a positive value.
+    # Amt must be a positive integer value.
     #
     # If default is nil, the counter must already exist or the operation
     # will fail and will return nil.  Otherwise this method will return
@@ -195,12 +195,12 @@ module Dalli
     def incr(key, amt=1, ttl=nil, default=nil)
       raise ArgumentError, "Positive values only: #{amt}" if amt < 0
       ttl ||= @options[:expires_in]
-      perform(:incr, key, amt, ttl, default)
+      perform(:incr, key, amt.to_i, ttl, default)
     end
 
     ##
     # Decr subtracts the given amount from the counter on the memcached server.
-    # Amt must be a positive value.
+    # Amt must be a positive integer value.
     #
     # memcached counters are unsigned and cannot hold negative values.  Calling
     # decr on a counter which is 0 will just return 0.
@@ -215,7 +215,7 @@ module Dalli
     def decr(key, amt=1, ttl=nil, default=nil)
       raise ArgumentError, "Positive values only: #{amt}" if amt < 0
       ttl ||= @options[:expires_in]
-      perform(:decr, key, amt, ttl, default)
+      perform(:decr, key, amt.to_i, ttl, default)
     end
 
     ##

data/lib/dalli/version.rb

@@ -1,3 +1,3 @@
 module Dalli
-  VERSION = '1.1.4'
+  VERSION = '1.1.5'
 end

data/lib/rack/session/dalli.rb

@@ -14,7 +14,7 @@ module Rack
         super
         mserv = @default_options[:memcache_server]
         mopts = @default_options.reject{|k,v| !DEFAULT_OPTIONS.include? k }
-        @pool = options[:cache] || Dalli::Client.new(mserv, mopts)
+        @pool = options[:cache] || ::Dalli::Client.new(mserv, mopts)
       end
 
       def generate_sid

data/test/abstract_unit.rb

@@ -141,7 +141,6 @@ end
 class ActionController::IntegrationTest < ActiveSupport::TestCase
   def self.build_app(routes = nil)
     RoutedRackApp.new(routes || ActionDispatch::Routing::RouteSet.new) do |middleware|
-      middleware.use "ActionDispatch::ShowExceptions"
       middleware.use "ActionDispatch::Callbacks"
       middleware.use "ActionDispatch::ParamsParser"
       middleware.use "ActionDispatch::Cookies"

data/test/benchmark_test.rb

@@ -1,9 +1,9 @@
 require 'helper'
 require 'benchmark'
+require 'active_support/cache/dalli_store'
 
-class TestBenchmark < Test::Unit::TestCase
-
-  def setup
+describe 'performance' do
+  before do
     puts "Testing #{Dalli::VERSION} with #{RUBY_DESCRIPTION}"
     # We'll use a simple @value to try to avoid spending time in Marshal,
     # which is a constant penalty that both clients have to pay
@@ -21,13 +21,29 @@ class TestBenchmark < Test::Unit::TestCase
     @counter = 'counter'
   end
 
-  def test_benchmark
+  should 'run benchmarks' do
     memcached do
 
       Benchmark.bm(31) do |x|
 
         n = 2500
 
+        @ds = ActiveSupport::Cache::DalliStore.new(@servers)
+        x.report("mixed:rails:dalli") do
+          n.times do
+            @ds.read @key1
+            @ds.write @key2, @value
+            @ds.fetch(@key3) { @value }
+            @ds.fetch(@key2) { @value }
+            @ds.fetch(@key1) { @value }
+            @ds.write @key2, @value, :unless_exists => true
+            @ds.delete @key2
+            @ds.increment @counter, 1, :initial => 100
+            @ds.increment @counter, 1, :expires_in => 12
+            @ds.decrement @counter, 1
+          end
+        end
+
         @m = Dalli::Client.new(@servers)
         x.report("set:plain:dalli") do
           n.times do
@@ -153,18 +169,19 @@ class TestBenchmark < Test::Unit::TestCase
 
         @m = Dalli::Client.new(@servers)
         x.report("incr:ruby:dalli") do
+          counter = 'foocount'
           n.times do
-            @m.incr @counter, 1, 0, 1
+            @m.incr counter, 1, 0, 1
           end
           n.times do
-            @m.decr @counter, 1
+            @m.decr counter, 1
           end
 
-          assert_equal 0, @m.incr(@counter, 0)
+          assert_equal 0, @m.incr(counter, 0)
         end
 
       end
     end
 
   end
-end
+end

data/test/helper.rb

@@ -7,8 +7,10 @@ gem 'rails', WANT_RAILS_VERSION
 require 'rails'
 puts "Testing with Rails #{Rails.version}"
 
-require 'test/unit'
-require 'shoulda'
+require 'minitest/spec'
+require 'mini_shoulda'
+require 'minitest/pride'
+require 'minitest/autorun'
 require 'memcached_mock'
 require 'mocha'
 
@@ -18,16 +20,17 @@ require 'logger'
 Dalli.logger = Logger.new(STDOUT)
 Dalli.logger.level = Logger::ERROR
 
-class Test::Unit::TestCase
+class MiniTest::Spec
   include MemcachedMock::Helper
 
   def assert_error(error, regexp=nil, &block)
-    ex = assert_raise(error, &block)
+    ex = assert_raises(error, &block)
     assert_match(regexp, ex.message, "#{ex.class.name}: #{ex.message}\n#{ex.backtrace.join("\n\t")}")
   end
 
   def with_activesupport
     require 'active_support/all'
+    require 'active_support/cache/dalli_store'
     yield
   end
 

data/test/test_active_support.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'helper'
 
-class TestActiveSupport < Test::Unit::TestCase
+describe 'ActiveSupport' do
   context 'active_support caching' do
 
     should 'support fetch' do

data/test/test_compatibility.rb

@@ -1,8 +1,8 @@
 require 'helper'
 
-class TestCompatibility < Test::Unit::TestCase
+describe 'Compatibility' do
 
-  def setup
+  before do
     require 'dalli/memcache-client'
   end
 
@@ -26,8 +26,8 @@ class TestCompatibility < Test::Unit::TestCase
 
   end
 
-  def teardown
+  after do
     Dalli::Client.compatibility_mode = false
   end
 
-end
+end

data/test/test_dalli.rb

@@ -1,7 +1,7 @@
 require 'helper'
 require 'memcached_mock'
 
-class TestDalli < Test::Unit::TestCase
+describe 'Dalli' do
 
   should "default to localhost:11211" do
     dc = Dalli::Client.new
@@ -251,7 +251,7 @@ class TestDalli < Test::Unit::TestCase
 
         # rollover the 64-bit value, we'll get something undefined.
         resp = dc.incr('big', 1)
-        assert_not_equal 0x10000000000000000, resp
+        0x10000000000000000.wont_equal resp
         dc.reset
       end
     end
@@ -273,7 +273,7 @@ class TestDalli < Test::Unit::TestCase
     should "pass a simple smoke test" do
       memcached do |dc|
         resp = dc.flush
-        assert_not_nil resp
+        resp.wont_be_nil
         assert_equal [true, true], resp
 
         assert_equal true, dc.set(:foo, 'bar')
@@ -343,7 +343,7 @@ class TestDalli < Test::Unit::TestCase
               cache.set('b', 11)
               inc = cache.incr('cat', 10, 0, 10)
               cache.set('f', 'zzz')
-              assert_not_nil(cache.cas('f') do |value|
+              wont_be_nil(cache.cas('f') do |value|
                 value << 'z'
               end)
               assert_equal false, cache.add('a', 11)
@@ -399,7 +399,7 @@ class TestDalli < Test::Unit::TestCase
           dalli = Dalli::Client.new(dc.instance_variable_get(:@servers), :compression => true)
 
           value = "0"*1024*1024
-          assert_raise Dalli::DalliError, /too large/ do
+          assert_raises Dalli::DalliError, /too large/ do
             dc.set('verylarge', value)
           end
           dalli.set('verylarge', value)

data/test/test_encoding.rb

@@ -2,7 +2,7 @@
 require 'helper'
 require 'memcached_mock'
 
-class TestEncoding < Test::Unit::TestCase
+describe 'Encoding' do
 
   context 'using a live server' do
     should 'support i18n content' do
@@ -14,7 +14,7 @@ class TestEncoding < Test::Unit::TestCase
         assert_equal utf8, dc.get(key)
 
         # keys must be ASCII
-        assert_raise ArgumentError, /illegal character/ do
+        assert_raises ArgumentError, /illegal character/ do
           dc.set(bad_key, utf8)
         end
       end
@@ -33,11 +33,11 @@ class TestEncoding < Test::Unit::TestCase
     should 'not allow non-ASCII keys' do
       memcached do |dc|
         key = 'fooƒ'
-        assert_raise ArgumentError do
+        assert_raises ArgumentError do
           dc.set(key, 'bar')
         end
       end
     end
 
   end
-end
+end

data/test/test_failover.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestFailover < Test::Unit::TestCase
+describe 'FailOver' do
   context 'assuming some bad servers' do
 
     should 'silently reconnect if server hiccups' do
@@ -37,7 +37,7 @@ class TestFailover < Test::Unit::TestCase
 
           memcached_kill(29126)
 
-          assert_raise Dalli::RingError, :message => "No server available" do
+          assert_raises Dalli::RingError, :message => "No server available" do
             dc.set 'foo', 'bar'
           end
         end

data/test/test_network.rb

@@ -1,11 +1,11 @@
 require 'helper'
 
-class TestNetwork < Test::Unit::TestCase
+describe 'Network' do
 
   context 'assuming a bad network' do
 
     should 'handle no server available' do
-      assert_raise Dalli::RingError, :message => "No server available" do
+      assert_raises Dalli::RingError, :message => "No server available" do
         dc = Dalli::Client.new 'localhost:19333'
         dc.get 'foo'
       end
@@ -14,7 +14,7 @@ class TestNetwork < Test::Unit::TestCase
     context 'with a fake server' do
       should 'handle connection reset' do
         memcached_mock(lambda {|sock| sock.close }) do
-          assert_raise Dalli::RingError, :message => "No server available" do
+          assert_raises Dalli::RingError, :message => "No server available" do
             dc = Dalli::Client.new('localhost:19123')
             dc.get('abc')
           end
@@ -23,7 +23,7 @@ class TestNetwork < Test::Unit::TestCase
 
       should 'handle malformed response' do
         memcached_mock(lambda {|sock| sock.write('123') }) do
-          assert_raise Dalli::RingError, :message => "No server available" do
+          assert_raises Dalli::RingError, :message => "No server available" do
             dc = Dalli::Client.new('localhost:19123')
             dc.get('abc')
           end
@@ -32,7 +32,7 @@ class TestNetwork < Test::Unit::TestCase
 
       should 'handle connect timeouts' do
         memcached_mock(lambda {|sock| sleep(0.6); sock.close }, :delayed_start) do
-          assert_raise Dalli::RingError, :message => "No server available" do
+          assert_raises Dalli::RingError, :message => "No server available" do
             dc = Dalli::Client.new('localhost:19123')
             dc.get('abc')
           end
@@ -41,7 +41,7 @@ class TestNetwork < Test::Unit::TestCase
 
       should 'handle read timeouts' do
         memcached_mock(lambda {|sock| sleep(0.6); sock.write('giraffe') }) do
-          assert_raise Dalli::RingError, :message => "No server available" do
+          assert_raises Dalli::RingError, :message => "No server available" do
             dc = Dalli::Client.new('localhost:19123')
             dc.get('abc')
           end

data/test/test_ring.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestRing < Test::Unit::TestCase
+describe 'Ring' do
 
   context 'a ring of servers' do
 
@@ -17,7 +17,7 @@ class TestRing < Test::Unit::TestCase
 
     should 'raise when no servers are available/defined' do
       ring = Dalli::Ring.new([], {})
-      assert_raise Dalli::RingError, :message => "No server available" do
+      assert_raises Dalli::RingError, :message => "No server available" do
         ring.server_for_key('test')
       end
     end
@@ -28,7 +28,7 @@ class TestRing < Test::Unit::TestCase
           Dalli::Server.new("localhost:12345"),
         ]
         ring = Dalli::Ring.new(servers, {})
-        assert_raise Dalli::RingError, :message => "No server available" do
+        assert_raises Dalli::RingError, :message => "No server available" do
           ring.server_for_key('test')
         end
       end
@@ -52,7 +52,7 @@ class TestRing < Test::Unit::TestCase
           Dalli::Server.new("localhost:12346"),
         ]
         ring = Dalli::Ring.new(servers, {})
-        assert_raise Dalli::RingError, :message => "No server available" do
+        assert_raises Dalli::RingError, :message => "No server available" do
           ring.server_for_key('test')
         end
       end
@@ -71,12 +71,12 @@ class TestRing < Test::Unit::TestCase
     end
 
     should 'detect when a dead server is up again' do
-      memcached(29125) do
+      memcached(19997) do
         down_retry_delay = 0.5
-        dc = Dalli::Client.new(['localhost:29125', 'localhost:29126'], :down_retry_delay => down_retry_delay)
+        dc = Dalli::Client.new(['localhost:19997', 'localhost:19998'], :down_retry_delay => down_retry_delay)
         assert_equal 1, dc.stats.values.compact.count
 
-        memcached(29126) do
+        memcached(19998) do
           assert_equal 2, dc.stats.values.compact.count
         end
       end

data/test/test_sasl.rb

@@ -1,16 +1,16 @@
 require 'helper'
 
-class TestSasl < Test::Unit::TestCase
+describe 'Sasl' do
 
   context 'a server requiring authentication' do
 
     context 'without authentication credentials' do
-      setup do
+      before do
         ENV['MEMCACHE_USERNAME'] = 'foo'
         ENV['MEMCACHE_PASSWORD'] = 'wrongpwd'
       end
 
-      teardown do
+      after do
         ENV['MEMCACHE_USERNAME'] = nil
         ENV['MEMCACHE_PASSWORD'] = nil
       end
@@ -43,12 +43,12 @@ class TestSasl < Test::Unit::TestCase
     #
     # with password 'testtest'
     context 'in an authenticated environment' do
-      setup do
+      before do
         ENV['MEMCACHE_USERNAME'] = 'testuser'
         ENV['MEMCACHE_PASSWORD'] = 'testtest'
       end
 
-      teardown do
+      after do
         ENV['MEMCACHE_USERNAME'] = nil
         ENV['MEMCACHE_PASSWORD'] = nil
       end

data/test/test_session_store.rb

@@ -216,10 +216,9 @@ class TestSessionStore < ActionController::IntegrationTest
 
       @app = self.class.build_app(set) do |middleware|
         middleware.use ActionDispatch::Session::DalliStore, options
-        middleware.delete "ActionDispatch::ShowExceptions"
       end
 
       yield
     end
   end
-end
+end

data/test/test_synchrony.rb

@@ -4,7 +4,7 @@ if defined?(RUBY_ENGINE) && RUBY_ENGINE != 'jruby'
 begin
 require 'em-spec/test'
 
-class TestSynchrony < Test::Unit::TestCase
+describe 'Synchrony' do
   include EM::TestHelper
 
   context 'using a live server' do
@@ -156,7 +156,7 @@ class TestSynchrony < Test::Unit::TestCase
             dalli = Dalli::Client.new(dc.instance_variable_get(:@servers), :compression => true, :async => true)
 
             value = "0"*1024*1024
-            assert_raise Dalli::DalliError, /too large/ do
+            assert_raises Dalli::DalliError, /too large/ do
               dc.set('verylarge', value)
             end
             dalli.set('verylarge', value)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dalli
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-11 00:00:00.000000000 Z
+date: 2012-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &70233391291560 !ruby/object:Gem::Requirement
+  name: mini_shoulda
+  requirement: &70232123468080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233391291560
+  version_requirements: *70232123468080
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70233391290560 !ruby/object:Gem::Requirement
+  requirement: &70232123467180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233391290560
+  version_requirements: *70232123467180
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70233391290000 !ruby/object:Gem::Requirement
+  requirement: &70232123465920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70233391290000
+  version_requirements: *70232123465920
 - !ruby/object:Gem::Dependency
   name: memcache-client
-  requirement: &70233391289240 !ruby/object:Gem::Requirement
+  requirement: &70232123465100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 1.8.5
   type: :development
   prerelease: false
-  version_requirements: *70233391289240
+  version_requirements: *70232123465100
 description: High performance memcached client for Ruby
 email: mperham@gmail.com
 executables: []
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: High performance memcached client for Ruby