cachetastic 3.2.0 → 3.5.0

data/Gemfile

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cachetastic (3.2.0)
+    cachetastic (3.5.0)
       activesupport
       configatron
 
@@ -18,6 +18,7 @@ GEM
     memcache-client (1.8.5)
     multi_json (1.5.0)
     rake (10.0.3)
+    redis (3.0.2)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -36,5 +37,6 @@ DEPENDENCIES
   cachetastic!
   memcache-client
   rake
+  redis
   rspec
   timecop

data/README.md

@@ -22,9 +22,10 @@ configatron.cachetastic.defaults.debug = false
 configatron.cachetastic.defaults.adapter = Cachetastic::Adapters::LocalMemory
 configatron.cachetastic.defaults.adapter = Cachetastic::Adapters::File
 configatron.cachetastic.defaults.adapter = Cachetastic::Adapters::Memcached
+configatron.cachetastic.defaults.adapter = Cachetastic::Adapters::Redis
 
 # This will marshall objects into and out of the store.
-# The default is :none, except for Cachetastic::Adapters::File, which defaults to :yaml
+# The default is :none, except for Cachetastic::Adapters::File and Cachetastic::Adapters::Redis, which default to :yaml
 configatron.cachetastic.defaults.marshall_method = :none
 configatron.cachetastic.defaults.marshall_method = :yaml
 configatron.cachetastic.defaults.marshall_method = :ruby
@@ -32,7 +33,7 @@ configatron.cachetastic.defaults.marshall_method = :ruby
 # This sets how long objects will live in the cache before they are auto expired.
 configatron.cachetastic.defaults.default_expiry = 86400 # time in seconds (default: 24 hours)
 
-# When secodeing objects into the cache the expiry_swing is +/- to the expiry time.
+# When saving objects into the cache the expiry_swing is +/- to the expiry time.
 # Example: if the expiry time is 1 minute, and the swing is 15 seconds,
 # objects will go into the cache with an expiry time sometime between 45 seconds and 75 seconds.
 # The default is 0 seconds.

data/lib/cachetastic/adapters/memcached.rb

@@ -27,6 +27,10 @@ module Cachetastic # :nodoc:
     # See <tt>Cachetastic::Adapters::Base</tt> for a list of public API
     # methods.
     class Memcached < Cachetastic::Adapters::Base
+
+      attr_accessor :servers
+      attr_accessor :mc_options
+      attr_accessor :delete_delay
       
       def initialize(klass) # :nodoc:
         define_accessor(:servers)
@@ -34,11 +38,13 @@ module Cachetastic # :nodoc:
         define_accessor(:delete_delay)
         self.delete_delay = 0
         self.servers = ['127.0.0.1:11211']
-        self.mc_options = {c_threshold: 10_000,
-                           compression: true,
-                           debug: false,
-                           readonly: false,
-                           urlencode: false}
+        self.mc_options = {
+          c_threshold: 10_000,
+          compression: true,
+          debug: false,
+          readonly: false,
+          urlencode: false
+        }
         super
         connection
       end

data/lib/cachetastic/adapters/redis.rb

@@ -0,0 +1,56 @@
+module Cachetastic
+  module Adapters
+    class Redis < Cachetastic::Adapters::Base
+
+      def initialize(klass)
+        define_accessor(:redis_host)
+        define_accessor(:redis_options)
+        define_accessor(:delete_delay)
+        self.redis_host ||= "redis://localhost:6379/"
+        self.redis_options = ::Redis::Client::DEFAULTS.merge({
+          db: "cachetastic",
+          url: self.redis_host
+        })
+        super(klass)
+        self.marshal_method = :yaml if self.marshal_method == :none
+        connection
+      end
+
+      def get(key) # :nodoc:
+        connection.get(transform_key(key))
+      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)
+        connection.set(transform_key(key), marshal(so))
+        return value
+      end # set
+
+      def delete(key) # :nodoc:
+        connection.del(transform_key(key))
+      end # delete
+
+      def expire_all # :nodoc:
+        connection.flushdb
+        return nil
+      end # expire_all
+
+      def transform_key(key) # :nodoc:
+        key.to_s.hexdigest
+      end
+
+      def valid?
+        !connection.nil?
+      end
+
+      private
+      def connection
+        if @connection.nil?
+         @connection = ::Redis.new(self.redis_options)
+        end
+        return @connection
+      end
+
+    end
+  end
+end

data/lib/cachetastic/store_object.rb

@@ -15,6 +15,10 @@ module Cachetastic # :nodoc:
       def expired?
         return Time.now > self.expires_at
       end
+
+      def inspect
+        "#<Cachetastic::Cache::StoreObject key='#{self.key}' expires_at='#{self.expires_at}' value='#{self.value}'>"
+      end
       
     end # StoreObject
     

data/lib/cachetastic/version.rb

@@ -1,3 +1,3 @@
 module Cachetastic
-  VERSION = "3.2.0"
+  VERSION = "3.5.0"
 end

data/lib/cachetastic.rb

@@ -3,9 +3,16 @@ require 'logger'
 require 'active_support/core_ext'
 require 'fileutils'
 require 'singleton'
+require 'uri'
 begin
   require 'memcache'
 rescue Exception => e
+  puts "Memcached support is unavailable. To use Memcached do `gem install memcache-client`"
+end
+begin
+  require 'redis'
+rescue Exception => e
+  puts "Redis support is unavailable. To use Redis do `gem install redis`"
 end
 
 Dir.glob(File.join(File.dirname(__FILE__), 'cachetastic', '**/*.rb')).sort.each do |f|

data/spec/cachetastic/adapters/base_spec.rb

@@ -92,7 +92,7 @@ describe Cachetastic::Adapters do
     
   end
   
-  ['LocalMemory', 'File', 'Memcached'].each do |adapter|
+  ['LocalMemory', 'File', 'Memcached', 'Redis'].each do |adapter|
     
     describe "#{adapter} (Common)" do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cachetastic
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2013-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -78,6 +78,7 @@ files:
 - lib/cachetastic/adapters/file.rb
 - lib/cachetastic/adapters/local_memory.rb
 - lib/cachetastic/adapters/memcached.rb
+- lib/cachetastic/adapters/redis.rb
 - lib/cachetastic/cache.rb
 - lib/cachetastic/cacheable.rb
 - lib/cachetastic/extensions/string.rb