cachetastic 3.5.2 → 3.5.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cachetastic (3.5.1)
+    cachetastic (3.5.2)
       activesupport
       configatron
 

data/lib/cachetastic/adapters/redis.rb

@@ -6,12 +6,17 @@ module Cachetastic
         define_accessor(:redis_host)
         define_accessor(:redis_options)
         define_accessor(:delete_delay)
+        super
         self.redis_host ||= "redis://localhost:6379/"
+        parsed_url = URI.parse(self.redis_host)
         self.redis_options = ::Redis::Client::DEFAULTS.merge({
           db: "cachetastic",
-          url: self.redis_host
+          url: self.redis_host,
+          scheme: parsed_url.scheme,
+          host: parsed_url.host,
+          port: parsed_url.port,
+          password: parsed_url.password
         })
-        super(klass)
         self.marshal_method = :yaml if self.marshal_method == :none
         connection
       end

data/lib/cachetastic/version.rb

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

data/spec/cachetastic/adapters/base_spec.rb

@@ -1,7 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-class CarCache < Cachetastic::Cache
-end
+require 'spec_helper'
 
 describe Cachetastic::Adapters do
 

data/spec/cachetastic/adapters/file_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 class AnimalCache < Cachetastic::Cache
 end

data/spec/cachetastic/adapters/local_memory_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe Cachetastic::Adapters::LocalMemory do
   

data/spec/cachetastic/adapters/memcached_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe Cachetastic::Adapters::Memcached do
   

data/spec/cachetastic/adapters/redis_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Cachetastic::Adapters::Redis do
+
+  describe "connection" do
+
+    it "respects the configatron.defaults.redis_host option" do
+      configatron.temp do
+        configatron.cachetastic.defaults.redis_host = "redis://example.com:1234/"
+        ::Redis.should_receive(:new).with({
+          url: "redis://example.com:1234/",
+          scheme: "redis",
+          host: "example.com",
+          port: 1234,
+          path: nil,
+          timeout: 5.0,
+          password: nil,
+          db: "cachetastic",
+          driver: nil,
+          id: nil,
+          tcp_keepalive: 0
+        })
+        adapter = Cachetastic::Adapters::Redis.new(CarCache)
+      end
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -17,5 +17,8 @@ RSpec.configure do |config|
 
 end
 
+class CarCache < Cachetastic::Cache
+end
+
 class Cachetastic::BlockError < StandardError
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cachetastic
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 3.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -89,6 +89,7 @@ files:
 - spec/cachetastic/adapters/file_spec.rb
 - spec/cachetastic/adapters/local_memory_spec.rb
 - spec/cachetastic/adapters/memcached_spec.rb
+- spec/cachetastic/adapters/redis_spec.rb
 - spec/cachetastic/cache_spec.rb
 - spec/cachetastic/cacheable_spec.rb
 - spec/cachetastic/logger_spec.rb
@@ -124,6 +125,7 @@ test_files:
 - spec/cachetastic/adapters/file_spec.rb
 - spec/cachetastic/adapters/local_memory_spec.rb
 - spec/cachetastic/adapters/memcached_spec.rb
+- spec/cachetastic/adapters/redis_spec.rb
 - spec/cachetastic/cache_spec.rb
 - spec/cachetastic/cacheable_spec.rb
 - spec/cachetastic/logger_spec.rb