morlock 0.0.2 → 0.0.3

data/lib/morlock/rails.rb

@@ -3,8 +3,8 @@ require 'morlock/base'
 
 class Morlock
   class MorlockRailtie < ::Rails::Railtie
-    config.after_initialize do
-      if defined?(ActiveSupport::Cache::MemCacheStore) && Rails.cache.is_a?(ActiveSupport::Cache::MemCacheStore) && Rails.cache.instance_variable_get(:@data)
+    def self.setup_for_mem_cache_store
+      if Rails.cache.instance_variable_get(:@data)
         Rails.module_eval do
           class << self
             def morlock
@@ -12,9 +12,26 @@ class Morlock
             end
           end
         end
+      end
+    end
+
+    def self.setup_for_dalli_store
+      self.setup_for_mem_cache_store
+    end
+
+    def self.detect_memcache_gem
+      if defined?(ActiveSupport::Cache::MemCacheStore) && Rails.cache.is_a?(ActiveSupport::Cache::MemCacheStore)
+        setup_for_mem_cache_store
+      elsif defined?(ActiveSupport::Cache::DalliStore) && Rails.cache.is_a?(ActiveSupport::Cache::DalliStore)
+        setup_for_dalli_store
       else
         Rails.logger.warn "WARNING: Morlock detected that you are not using the Rails ActiveSupport::Cache::MemCacheStore.  Rails.morlock will not be setup."
       end
+
+    end
+
+    config.after_initialize do
+      detect_memcache_gem
     end
   end
 end

data/lib/morlock/version.rb

@@ -1,3 +1,3 @@
 class Morlock
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morlock
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-07 00:00:00.000000000 Z
+date: 2012-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70321470471640 !ruby/object:Gem::Requirement
+  requirement: &70342324414200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321470471640
+  version_requirements: *70342324414200
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70321470471160 !ruby/object:Gem::Requirement
+  requirement: &70342324413700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321470471160
+  version_requirements: *70342324413700
 description: ''
 email:
 - pair+andrew+chris@mavenlink.com