cachetastic 3.5.3 → 3.6.0

data/Gemfile

@@ -6,4 +6,5 @@ gemspec
 gem 'memcache-client'
 gem 'rspec'
 gem 'timecop'
-gem 'redis'
+gem 'redis'
+gem 'dalli'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cachetastic (3.5.2)
+    cachetastic (3.6.0)
       activesupport
       configatron
 
@@ -13,6 +13,7 @@ GEM
       multi_json (~> 1.0)
     configatron (2.9.1)
       yamler (>= 0.1.0)
+    dalli (2.6.0)
     diff-lcs (1.1.3)
     i18n (0.6.1)
     memcache-client (1.8.5)
@@ -35,6 +36,7 @@ PLATFORMS
 
 DEPENDENCIES
   cachetastic!
+  dalli
   memcache-client
   rake
   redis

data/lib/cachetastic.rb

@@ -9,6 +9,11 @@ begin
 rescue Exception => e
   puts "Memcached support is unavailable. To use Memcached do `gem install memcache-client`"
 end
+begin
+  require 'dalli'
+rescue Exception => e
+  puts "Memcached (via Dalli) support is unavailable. To use Memcached (via Dalli) do `gem install dalli`"
+end
 begin
   require 'redis'
 rescue Exception => e

data/lib/cachetastic/adapters/dalli.rb

@@ -0,0 +1,84 @@
+module Cachetastic # :nodoc:
+  module Adapters
+    class Dalli < Cachetastic::Adapters::Base
+
+      def initialize(klass) # :nodoc:
+        define_accessor(:dalli_servers)
+        define_accessor(:dalli_options)
+        define_accessor(:dalli_username)
+        define_accessor(:dalli_password)
+        self.dalli_servers = ['127.0.0.1:11211']
+        self.dalli_options = {}
+        super
+        connection
+      end
+
+      def get(key) # :nodoc:
+        connection.get(transform_key(key), false)
+      end # get
+
+      def set(key, value, expiry_time = configatron.cachetastic.defaults.default_expiry) # :nodoc:
+        connection.set(transform_key(key), marshal(value), expiry_time, false)
+      end # set
+
+      def delete(key) # :nodoc:
+        connection.delete(transform_key(key))
+      end # delete
+
+      def expire_all # :nodoc:
+        increment_version
+        @_mc_connection = nil
+        return nil
+      end # expire_all
+
+      def transform_key(key) # :nodoc:
+        key.to_s.hexdigest
+      end
+
+      # Return <tt>false</tt> if the connection to Memcached is
+      # either <tt>nil</tt> or not active.
+      def valid?
+        return false if @_mc_connection.nil?
+        return false unless @_mc_connection.stats
+        return true
+      end
+
+      private
+      def connection
+        unless @_mc_connection && valid? && @_ns_version == get_version
+          @_mc_connection = ::Dalli::Client.new(self.dalli_servers, self.dalli_options.merge(namespace: namespace))
+        end
+        @_mc_connection
+      end
+
+      def ns_connection
+        if !@_ns_connection || !@_ns_connection.stats
+          @_ns_connection = ::Dalli::Client.new(self.dalli_servers, self.dalli_options.merge(namespace: :namespace_versions))
+        end
+        @_ns_connection
+      end
+
+      def increment_version
+        name = self.klass.name
+        v = get_version
+        ns_connection.set(name, v + Time.now.to_i)
+      end
+
+      def get_version
+        name = self.klass.name
+        v = ns_connection.get(name)
+        if v.nil?
+          v = Time.now.to_i
+          ns_connection.set(name, v)
+        end
+        v.to_i
+      end
+
+      def namespace
+        @_ns_version = get_version
+        "#{self.klass.name}.#{@_ns_version}"
+      end
+
+    end
+  end
+end

data/lib/cachetastic/adapters/file.rb

@@ -31,7 +31,7 @@ module Cachetastic # :nodoc:
       end # get
       
       def set(key, value, expiry_time = configatron.cachetastic.defaults.default_expiry) # :nodoc:
-        so = Cachetastic::Cache::StoreObject.new(key, value, expiry_time.from_now)
+        so = Cachetastic::Cache::StoreObject.new(key, unmarshal(value), expiry_time.from_now)
         path = file_path(key)
         ::File.open(path, 'w') {|f| f.write marshal(so)}
         value

data/lib/cachetastic/adapters/memcached.rb

@@ -5,7 +5,7 @@ module Cachetastic # :nodoc:
     # This adapter supports the following configuration settings,
     # in addition to the default settings:
     # 
-    #   configatron.cachetastic.defaults.servers = ['127.0.0.1:11211']
+    #   configatron.cachetastic.defaults.mc_servers = ['127.0.0.1:11211']
     #   configatron.cachetastic.defaults.mc_options = {c_threshold: 10_000,
     #                                                  compression: true,
     #                                                  debug: false,
@@ -13,8 +13,8 @@ module Cachetastic # :nodoc:
     #                                                  urlencode: false}
     #   configatron.cachetastic.delete_delay = 0
     # 
-    # The <tt>servers</tt> setting defines an <tt>Array</tt> of Mecached
-    # servers, represented as "<host>:<port>".
+    # The <tt>mc_servers</tt> setting defines an <tt>Array</tt> of Memcached
+    # mc_servers, represented as "<host>:<port>".
     # 
     # The <tt>mc_options</tt> setting is a <tt>Hash</tt> of settings required
     # by Memcached. See the Memcached documentation for more information on
@@ -28,16 +28,12 @@ module Cachetastic # :nodoc:
     # methods.
     class Memcached < Cachetastic::Adapters::Base
 
-      attr_accessor :servers
-      attr_accessor :mc_options
-      attr_accessor :delete_delay
-      
       def initialize(klass) # :nodoc:
-        define_accessor(:servers)
+        define_accessor(:mc_servers)
         define_accessor(:mc_options)
         define_accessor(:delete_delay)
         self.delete_delay = 0
-        self.servers = ['127.0.0.1:11211']
+        self.mc_servers = ['127.0.0.1:11211']
         self.mc_options = {
           c_threshold: 10_000,
           compression: true,
@@ -82,14 +78,14 @@ module Cachetastic # :nodoc:
       private
       def connection
         unless @_mc_connection && valid? && @_ns_version == get_version
-          @_mc_connection = MemCache.new(self.servers, self.mc_options.merge(namespace: namespace))
+          @_mc_connection = MemCache.new(self.mc_servers, self.mc_options.merge(namespace: namespace))
         end
         @_mc_connection
       end
       
       def ns_connection
         if !@_ns_connection || !@_ns_connection.active?
-          @_ns_connection = MemCache.new(self.servers, self.mc_options.merge(namespace: :namespace_versions))
+          @_ns_connection = MemCache.new(self.mc_servers, self.mc_options.merge(namespace: :namespace_versions))
         end
         @_ns_connection
       end

data/lib/cachetastic/adapters/redis.rb

@@ -26,7 +26,7 @@ module Cachetastic
       end # get
 
       def set(key, value, expiry_time = configatron.cachetastic.defaults.default_expiry) # :nodoc:
-        connection.setex(transform_key(key), expiry_time, marshal(value))
+        connection.setex(transform_key(key), expiry_time, value)
         return value
       end # set
 

data/lib/cachetastic/cache.rb

@@ -72,7 +72,7 @@ module Cachetastic # :nodoc:
     def set(key, value, expiry_time = nil)
       do_with_logging(:set, key) do
         retryable do
-          self.adapter.set(key, value, calculate_expiry_time(expiry_time))
+          self.adapter.set(key, adapter.marshal(value), calculate_expiry_time(expiry_time))
         end
       end
     end # set
@@ -174,6 +174,7 @@ module Cachetastic # :nodoc:
         end_time = Time.now
         str = ''
         unless res.nil?
+          res = adapter.unmarshal(res)
           str = "[#{res.class.name}]"
           str << "\t[Size = #{res.size}]" if res.respond_to? :size
           str << "\t" << res.inspect

data/lib/cachetastic/version.rb

@@ -1,3 +1,3 @@
 module Cachetastic
-  VERSION = "3.5.3"
+  VERSION = "3.6.0"
 end

data/spec/cachetastic/adapters/base_spec.rb

@@ -89,7 +89,7 @@ describe Cachetastic::Adapters do
     
   end
   
-  ['LocalMemory', 'File', 'Memcached', 'Redis'].each do |adapter|
+  ['LocalMemory', 'File', 'Memcached', 'Redis', 'Dalli'].each do |adapter|
     
     describe "#{adapter} (Common)" do
 
@@ -151,7 +151,7 @@ describe Cachetastic::Adapters do
           CarCache.get(:bmw).should_not be_nil
         end
         
-        unless ["Memcached", "Redis"].include?(adapter)
+        unless ["Memcached", "Redis", "Dalli"].include?(adapter)
           it 'should set an object into the cache with an expiry' do
             CarCache.get(:bmw).should be_nil
             CarCache.set(:bmw, 'Beamer!', 1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cachetastic
 version: !ruby/object:Gem::Version
-  version: 3.5.3
+  version: 3.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -75,6 +75,7 @@ files:
 - cachetastic.gemspec
 - lib/cachetastic.rb
 - lib/cachetastic/adapters/base.rb
+- lib/cachetastic/adapters/dalli.rb
 - lib/cachetastic/adapters/file.rb
 - lib/cachetastic/adapters/local_memory.rb
 - lib/cachetastic/adapters/memcached.rb