dalli 2.2.1 → 2.3.0

data/Gemfile

@@ -3,6 +3,7 @@ source :rubygems
 gemspec
 
 gem 'rake'
+gem 'kgio', :platform => :mri
 
 group :test do
   gem 'simplecov'

data/History.md

@@ -1,6 +1,10 @@
 Dalli Changelog
 =====================
 
+2.3.0
+=======
+- Added the ability to swap out the serializer used to [de]serialize cache data [brianmario, #274]
+
 2.2.1
 =======
 

data/README.md

@@ -86,8 +86,15 @@ Here's a more comprehensive example that sets a reasonable default for maximum c
 
 To use Dalli for Rails session storage that times out after 20 minutes, in `config/initializers/session_store.rb`:
 
+For Rails >= 3.2.4:
+
     Rails.application.config.session_store ActionDispatch::Session::CacheStore, :expire_after => 20.minutes
 
+For Rails 3.x:
+
+    require 'action_dispatch/middleware/session/dalli_store'
+    Rails.application.config.session_store :dalli_store, :memcache_server => ['host1', 'host2'], :namespace => 'sessions', :key => '_foundation_session', :expire_after => 20.minutes
+
 Dalli does not support Rails 2.x.
 
 

data/lib/active_support/cache/dalli_store.rb

@@ -186,6 +186,14 @@ module ActiveSupport
         @data.reset
       end
 
+      def logger
+        Dalli.logger
+      end
+
+      def logger=(new_logger)
+        Dalli.logger = new_logger
+      end
+
       protected
 
       # Read an entry from the cache.
@@ -264,10 +272,6 @@ module ActiveSupport
         logger.debug("Cache #{operation}: #{key}#{options.blank? ? "" : " (#{options.inspect})"}")
       end
 
-      def logger
-        Dalli.logger
-      end
-
     end
   end
 end

data/lib/dalli.rb

@@ -35,6 +35,17 @@ module Dalli
   def self.logger=(logger)
     @logger = logger
   end
+
+  # Default serialization to Marshal
+  @serializer = Marshal
+
+  def self.serializer
+    @serializer
+  end
+
+  def self.serializer=(serializer)
+    @serializer = serializer
+  end
 end
 
 if defined?(RAILS_VERSION) && RAILS_VERSION < '3'

data/lib/dalli/server.rb

@@ -273,7 +273,7 @@ module Dalli
     # http://www.hjp.at/zettel/m/memcached_flags.rxml
     # Looks like most clients use bit 0 to indicate native language serialization
     # and bit 1 to indicate gzip compression.
-    FLAG_MARSHALLED = 0x1
+    FLAG_SERIALIZED = 0x1
     FLAG_COMPRESSED = 0x2
 
     def serialize(key, value, options=nil)
@@ -281,7 +281,7 @@ module Dalli
       value = unless options && options[:raw]
         marshalled = true
         begin
-          Marshal.dump(value)
+          Dalli.serializer.dump(value)
         rescue => ex
           # Marshalling can throw several different types of generic Ruby exceptions.
           # Convert to a specific exception so we can special case it higher up the stack.
@@ -300,13 +300,13 @@ module Dalli
       raise Dalli::DalliError, "Value too large, memcached can only store #{@options[:value_max_bytes]} bytes per key [key: #{key}, size: #{value.bytesize}]" if value.bytesize > @options[:value_max_bytes]
       flags = 0
       flags |= FLAG_COMPRESSED if compressed
-      flags |= FLAG_MARSHALLED if marshalled
+      flags |= FLAG_SERIALIZED if marshalled
       [value, flags]
     end
 
     def deserialize(value, flags)
       value = Zlib::Inflate.inflate(value) if (flags & FLAG_COMPRESSED) != 0
-      value = Marshal.load(value) if (flags & FLAG_MARSHALLED) != 0
+      value = Dalli.serializer.load(value) if (flags & FLAG_SERIALIZED) != 0
       value
     rescue TypeError, ArgumentError
       raise DalliError, "Unable to unmarshal value: #{$!.message}"

data/lib/dalli/version.rb

@@ -1,3 +1,3 @@
 module Dalli
-  VERSION = '2.2.1'
+  VERSION = '2.3.0'
 end

data/test/test_encoding.rb

@@ -23,7 +23,7 @@ describe 'Encoding' do
         key = 'foo'
         assert dc.set(key, 'bar', 1)
         assert_equal 'bar', dc.get(key)
-        sleep 2
+        sleep 1.2
         assert_equal nil, dc.get(key)
       end
     end

data/test/test_serializer.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+require 'helper'
+require 'json'
+require 'memcached_mock'
+
+describe 'Serializer' do
+
+  should 'default to Marshal' do
+    assert_equal Marshal, Dalli.serializer
+  end
+
+  should 'support a custom serializer' do
+    original_serializer = Dalli.serializer
+    begin
+      Dalli.serializer = JSON
+      assert_equal JSON, Dalli.serializer
+
+      memcached(19127) do |dc|
+        assert dc.set("json_test", {"foo" => "bar"})
+        assert_equal({"foo" => "bar"}, dc.get("json_test"))
+      end
+    ensure
+      Dalli.serializer = original_serializer
+    end
+  end
+end

metadata

@@ -1,137 +1,130 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: dalli
-version: !ruby/object:Gem::Version
-  version: 2.2.1
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 2.3.0
 platform: ruby
-authors:
-- Mike Perham
+authors: 
+  - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: mini_shoulda
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3'
+
+date: 2012-10-15 00:00:00 Z
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: mini_shoulda
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      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 
+      none: false
+      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 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: "3"
+    type: :development
+    version_requirements: *id003
 description: High performance memcached client for Ruby
 email: mperham@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- lib/action_dispatch/middleware/session/dalli_store.rb
-- lib/active_support/cache/dalli_store.rb
-- lib/dalli/client.rb
-- lib/dalli/options.rb
-- lib/dalli/railtie.rb
-- lib/dalli/ring.rb
-- lib/dalli/server.rb
-- lib/dalli/socket.rb
-- lib/dalli/version.rb
-- lib/dalli.rb
-- lib/rack/session/dalli.rb
-- LICENSE
-- README.md
-- History.md
-- Rakefile
-- Gemfile
-- dalli.gemspec
-- Performance.md
-- test/abstract_unit.rb
-- test/benchmark_test.rb
-- test/helper.rb
-- test/memcached_mock.rb
-- test/test_active_support.rb
-- test/test_dalli.rb
-- test/test_encoding.rb
-- test/test_failover.rb
-- test/test_network.rb
-- test/test_rack_session.rb
-- test/test_ring.rb
-- test/test_sasl.rb
-- test/test_session_store.rb
+
+files: 
+  - lib/dalli.rb
+  - lib/action_dispatch/middleware/session/dalli_store.rb
+  - lib/active_support/cache/dalli_store.rb
+  - lib/dalli/client.rb
+  - lib/dalli/options.rb
+  - lib/dalli/railtie.rb
+  - lib/dalli/ring.rb
+  - lib/dalli/server.rb
+  - lib/dalli/socket.rb
+  - lib/dalli/version.rb
+  - lib/rack/session/dalli.rb
+  - LICENSE
+  - README.md
+  - History.md
+  - Rakefile
+  - Gemfile
+  - dalli.gemspec
+  - Performance.md
+  - test/abstract_unit.rb
+  - test/benchmark_test.rb
+  - test/helper.rb
+  - test/memcached_mock.rb
+  - test/test_active_support.rb
+  - test/test_dalli.rb
+  - test/test_encoding.rb
+  - test/test_failover.rb
+  - test/test_network.rb
+  - test/test_rack_session.rb
+  - test/test_ring.rb
+  - test/test_sasl.rb
+  - test/test_serializer.rb
+  - test/test_session_store.rb
 homepage: http://github.com/mperham/dalli
 licenses: []
+
 post_install_message: 
-rdoc_options:
-- --charset=UTF-8
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
+rdoc_options: 
+  - --charset=UTF-8
+require_paths: 
+  - lib
+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.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: High performance memcached client for Ruby
-test_files:
-- test/abstract_unit.rb
-- test/benchmark_test.rb
-- test/helper.rb
-- test/memcached_mock.rb
-- test/test_active_support.rb
-- test/test_dalli.rb
-- test/test_encoding.rb
-- test/test_failover.rb
-- test/test_network.rb
-- test/test_rack_session.rb
-- test/test_ring.rb
-- test/test_sasl.rb
-- test/test_session_store.rb
+test_files: 
+  - test/abstract_unit.rb
+  - test/benchmark_test.rb
+  - test/helper.rb
+  - test/memcached_mock.rb
+  - test/test_active_support.rb
+  - test/test_dalli.rb
+  - test/test_encoding.rb
+  - test/test_failover.rb
+  - test/test_network.rb
+  - test/test_rack_session.rb
+  - test/test_ring.rb
+  - test/test_sasl.rb
+  - test/test_serializer.rb
+  - test/test_session_store.rb