dalli 1.1.2 → 1.1.3

data/History.md

@@ -1,6 +1,14 @@
 Dalli Changelog
 =====================
 
+1.1.3
+=======
+
+- Support Rails's autoloading hack for loading sessions with objects
+  whose classes have not be required yet, GH-129
+- Support Unix sockets for connectivity.  Shows a 2x performance
+  increase but keep in mind they only work on localhost. (dfens)
+
 1.1.2
 =======
 

data/README.md

@@ -31,10 +31,27 @@ So a few notes.  Dalli:
  6. has a backwards-compatibility mode for people migrating from memcache-client (see Upgrade.md).
 
 
+Supported Ruby versions and implementations
+------------------------------------------------
+
+Dalli is geared towards 1.9.2+ but known to work on
+
+ * Ruby 1.9.2
+ * Ruby 1.9.3
+ * Ruby 1.8.7
+ * Rubinius 2.0 Preview
+
+
 Installation and Usage
 ------------------------
 
-Remember, Dalli **requires** memcached 1.4+.  You can check the version with `memcached -h`.
+Remember, Dalli **requires** memcached 1.4+. You can check the version with `memcached -h`. Please note that memcached that Mac OS X Snow Leopard ships with is 1.2.8 and
+won't work. Install 1.4.x using Homebrew with
+
+    brew install memcached
+
+
+You can verify your installation using this piece of code:
 
     gem install dalli
 
@@ -84,8 +101,13 @@ Put this at the bottom of `config/environment.rb`:
 
     if defined?(PhusionPassenger)
       PhusionPassenger.on_event(:starting_worker_process) do |forked|
+        # Reset Rails's object cache
         # Only works with DalliStore
         Rails.cache.reset if forked
+
+        # 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
     end
 

data/lib/action_dispatch/middleware/session/dalli_store.rb

@@ -33,8 +33,10 @@ module ActionDispatch
         sid ||= generate_sid
         begin
           session = @pool.get(sid) || {}
-        rescue Dalli::DalliError
-          Rails.logger.warn("Session::DalliStore#get: #{$!.message}")
+        rescue Dalli::DalliError => ex
+          # re-raise ArgumentError so Rails' session abstract_store.rb can autoload any missing models
+          raise ArgumentError, ex.message if ex.message =~ /unmarshal/
+          Rails.logger.warn("Session::DalliStore#get: #{ex.message}")
           session = {}
         end
         [sid, session]

data/lib/dalli/client.rb

@@ -5,15 +5,22 @@ module Dalli
     ##
     # Dalli::Client is the main class which developers will use to interact with
     # the memcached server.  Usage:
-    # 
+    #
     #   Dalli::Client.new(['localhost:11211:10', 'cache-2.example.com:11211:5', '192.168.0.1:22122:5'], 
     #                   :threadsafe => true, :failover => true, :expires_in => 300)
-    # 
+    #
     # servers is an Array of "host:port:weight" where weight allows you to distribute cache unevenly.
     # Both weight and port are optional.  If you pass in nil, Dalli will default to 'localhost:11211'.
     # Note that the <tt>MEMCACHE_SERVERS</tt> environment variable will override the servers parameter for use
     # in managed environments like Heroku.
     #
+    # You can also provide a Unix socket as an argument, for example:
+    #
+    #   Dalli::Client.new("/tmp/memcached.sock")
+    #
+    # Initial testing shows that Unix sockets are about twice as fast as TCP sockets
+    # but Unix sockets only work on localhost.
+    #
     # Options:
     # - :failover - if a server is down, look for and store values on another server in the ring.  Default: true.
     # - :threadsafe - ensure that only one thread is actively using a socket at a time. Default: true.

data/lib/dalli/server.rb

@@ -92,6 +92,10 @@ module Dalli
 
     private
 
+    def is_unix_socket?(string)
+      !!(/^\/(.+)$/ =~ string)
+    end
+
     def failure!
       Dalli.logger.info { "#{hostname}:#{port} failed (count: #{@fail_count})" }
 
@@ -382,7 +386,9 @@ module Dalli
       Dalli.logger.debug { "Dalli::Server#connect #{hostname}:#{port}" }
 
       begin
-        if options[:async]
+        if @hostname =~ /^\//
+          @sock = USocket.new(hostname)
+        elsif options[:async]
           raise Dalli::DalliError, "EM support not enabled, as em-synchrony is not installed." if not defined?(AsyncSocket)
           @sock = AsyncSocket.open(hostname, port, :timeout => options[:socket_timeout])
         else

data/lib/dalli/socket.rb

@@ -34,6 +34,8 @@ begin
 
   end
 
+
+
   if ::Kgio.respond_to?(:wait_readable=)
     ::Kgio.wait_readable = :kgio_wait_readable
     ::Kgio.wait_writable = :kgio_wait_writable
@@ -147,3 +149,13 @@ rescue LoadError
   puts "Could not define alternate em-synchrony socket IO" if defined?($TESTING) && $TESTING
 end
 
+class Dalli::Server::USocket < UNIXSocket
+  def readfull(count)
+    value = ''
+    loop do
+      value << read(count - value.bytesize)
+      break if value.bytesize == count
+    end 
+    value
+  end
+end

data/lib/dalli/version.rb

@@ -1,3 +1,3 @@
 module Dalli
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

data/test/memcached_mock.rb

@@ -15,6 +15,10 @@ module MemcachedMock
     block.call server
   end
 
+  def self.tmp_socket_path
+    "#{Dir.pwd}/tmp.sock"
+  end
+ 
   module Helper
     # Forks the current process and starts a new mock Memcached server on
     # port 22122.
@@ -69,7 +73,13 @@ module MemcachedMock
     def memcached(port=19122, args='', options={})
       return unless supports_fork?
       Memcached.path ||= find_memcached
-      cmd = "#{Memcached.path}memcached #{args} -p #{port}"
+
+      cmd = if options[:unix] 
+        "#{Memcached.path}memcached #{args} -s #{MemcachedMock.tmp_socket_path}"
+      else
+        "#{Memcached.path}memcached #{args} -p #{port}"
+      end
+
       $started[port] ||= begin
         #puts "Starting: #{cmd}..."
         pid = IO.popen(cmd).pid
@@ -77,18 +87,22 @@ module MemcachedMock
           begin
             Process.kill("TERM", pid)
             Process.wait(pid)
+            File.delete(MemcachedMock.tmp_socket_path) if options[:unix]
           rescue Errno::ECHILD, Errno::ESRCH
           end
         end
         sleep 0.1
         pid
       end
-
-      yield Dalli::Client.new(["localhost:#{port}", "127.0.0.1:#{port}"], options)
+      if options[:unix]
+        yield Dalli::Client.new(MemcachedMock.tmp_socket_path)
+      else
+        yield Dalli::Client.new(["localhost:#{port}", "127.0.0.1:#{port}"], options)
+      end
     end
 
     def supports_fork?
-      RUBY_ENGINE != 'jruby'
+      !defined?(RUBY_ENGINE) || RUBY_ENGINE != 'jruby'
     end
 
     def memcached_kill(port)

data/test/test_dalli.rb

@@ -26,6 +26,60 @@ class TestDalli < Test::Unit::TestCase
     assert_equal s2, s3
   end
 
+  context 'using unix sockets' do
+    should 'pass smoke test' do
+      memcached(nil,'',{:unix => true}) do |dc|
+        # get/set
+        dc.flush
+        assert_nil dc.get(:a)
+        assert dc.set(:a,1)
+        assert_equal 1, dc.get(:a)
+
+        # replace
+        dc.set(:a,1)
+        dc.replace(:a,2)
+        assert_equal 2, dc.get(:a)
+
+        # delete
+        dc.delete(:a)
+        assert_nil dc.get(:a)
+
+        # fetch
+        executed, expected = false, 1
+
+        value = dc.fetch(:fetched) do
+          executed = true
+          expected
+        end
+
+        assert executed
+        assert_equal expected, value
+
+        executed = false
+        value = dc.fetch(:fetched) do
+          executed = true
+          expected
+        end
+
+        assert !executed
+        assert_equal expected, value
+
+        # cas
+        dc.set(:a,1)
+        3.times { dc.cas(:a){|a| a+=1} }
+        assert_equal 4, dc.get(:a)
+
+        # get_multi
+        resp = dc.get_multi(%w(b c d))
+        assert_equal({}, resp)
+        dc.set("b",1)
+        dc.set("c",11)
+        resp = dc.get_multi(%w(b c d))
+        assert_equal({"b" => 1, "c" => 11}, resp)
+      end
+    end
+  end
+
   context 'using a live server' do
 
     should "support get/set" do

data/test/test_synchrony.rb

@@ -1,6 +1,6 @@
 require 'helper'
 require 'memcached_mock'
-if RUBY_ENGINE != 'jruby'
+if defined?(RUBY_ENGINE) && RUBY_ENGINE != 'jruby'
 begin
 require 'em-spec/test'
 

metadata

@@ -1,71 +1,66 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dalli
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.1.3
   prerelease: 
-  version: 1.1.2
 platform: ruby
-authors: 
+authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-06 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-26 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152632040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2152632040
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2152630860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2152630860
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &2152629740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: memcache-client
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2152629740
+- !ruby/object:Gem::Dependency
+  name: memcache-client
+  requirement: &2152628780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.8.5
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *2152628780
 description: High performance memcached client for Ruby
 email: mperham@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/action_dispatch/middleware/session/dalli_store.rb
 - lib/active_support/cache/dalli_store.rb
 - lib/active_support/cache/dalli_store23.rb
@@ -100,35 +95,32 @@ files:
 - test/test_sasl.rb
 - test/test_session_store.rb
 - test/test_synchrony.rb
-has_rdoc: true
 homepage: http://github.com/mperham/dalli
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: High performance memcached client for Ruby
-test_files: 
+test_files:
 - test/abstract_unit.rb
 - test/benchmark_test.rb
 - test/helper.rb