redcrumbs 0.1.9 → 0.2.2

data/app/models/redcrumbs/crumb.rb

@@ -14,7 +14,7 @@ module Redcrumbs
     include Crumb::Setters
     include Crumb::Expiry
     
-    DataMapper.setup(:default, {:adapter  => "redis"})
+    DataMapper.setup(:default, {:adapter  => "redis", :host => Redcrumbs.redis.client.host, :port => Redcrumbs.redis.client.port, :password => Redcrumbs.redis.client.password})
     
     property :id, Serial
     property :subject_id, Integer, :index => true, :lazy => false

data/lib/redcrumbs/config.rb

@@ -18,5 +18,39 @@ module Redcrumbs
   @@store_creator_attributes ||= []
   @@store_target_attributes ||= []
   
-  @@redis ||= Redis.new
+  # Stolen from resque. Thanks!
+  # Accepts:
+  #   1. A 'hostname:port' String
+  #   2. A 'hostname:port:db' String (to select the Redis db)
+  #   3. A 'hostname:port/namespace' String (to set the Redis namespace)
+  #   4. A Redis URL String 'redis://host:port'
+  #   5. An instance of `Redis`, `Redis::Client`, `Redis::DistRedis`,
+  #      or `Redis::Namespace`.
+  def redis=(server)
+    case server
+    when String
+      if server =~ /redis\:\/\//
+        redis = Redis.connect(:url => server, :thread_safe => true)
+      else
+        server, namespace = server.split('/', 2)
+        host, port, db = server.split(':')
+        redis = Redis.new(:host => host, :port => port,
+          :thread_safe => true, :db => db)
+      end
+      namespace ||= :redcrumbs
+
+      @redis = Redis::Namespace.new(namespace, :redis => redis)
+    when Redis::Namespace
+      @redis = server
+    else
+      @redis = Redis::Namespace.new(:redcrumbs, :redis => server)
+    end
+    @redis
+  end
+  
+  def redis
+    return @redis if @redis
+    self.redis = Redis.respond_to?(:connect) ? Redis.connect : "localhost:6379"
+    self.redis
+  end
 end

data/lib/redcrumbs/version.rb

@@ -1,3 +1,3 @@
 module Redcrumbs
-  VERSION = "0.1.9"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redcrumbs
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_mapper
-  requirement: &2156109300 !ruby/object:Gem::Requirement
+  requirement: &2160652140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156109300
+  version_requirements: *2160652140
 - !ruby/object:Gem::Dependency
   name: dm-redis-adapter
-  requirement: &2156108800 !ruby/object:Gem::Requirement
+  requirement: &2160651640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: 0.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156108800
+  version_requirements: *2160651640
 description: Fast and unobtrusive activity tracking of ActiveRecord models using DataMapper
   and Redis
 email: