background_cache 0.2.5 → 0.2.6

data/background_cache.gemspec

@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "background_cache"
-  s.version     = '0.2.5'
+  s.version     = '0.2.6'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ "Winton Welsh" ]
   s.email       = [ "mail@wintoni.us" ]

data/lib/background_cache/controller.rb

@@ -11,7 +11,7 @@ module BackgroundCache
     
     def read_fragment_with_background_cache(key, options=nil)
       if BackgroundCache.active? && BackgroundCache.match?(key)
-        RAILS_DEFAULT_LOGGER.info "Cached fragment busted (read_fragment method): #{key}"
+        Rails.logger.info "Cached fragment busted (read_fragment method): #{key}"
         nil
       else
         read_fragment_without_background_cache(key, options)
@@ -35,7 +35,11 @@ module BackgroundCache
         cache = BackgroundCache::Config.current_cache
         if cache
           if cache[:layout] == false
-            @background_cache_layout = controller.active_layout
+            if controller.respond_to?(:active_layout)
+              @background_cache_layout = controller.active_layout
+            else
+              @background_cache_layout = controller.send :_layout
+            end
             controller.class.layout(false)
           else
             @background_cache_layout = nil

data/lib/background_cache/mem_cache.rb

@@ -3,6 +3,7 @@ module BackgroundCache
     
     def self.included(base)
       base.alias_method_chain :get, :background_cache
+      base.alias_method_chain :get_multi, :background_cache
     end
 
     def get_with_background_cache(key, raw=false)
@@ -16,5 +17,17 @@ module BackgroundCache
         get_without_background_cache(key, raw)
       end
     end
+
+    def get_multi_with_background_cache(key, options={})
+      match = (
+        BackgroundCache.active? &&
+        BackgroundCache.match?(key)
+      )
+      if match
+        nil
+      else
+        get_multi_without_background_cache(key, options)
+      end
+    end
   end
 end

data/lib/background_cache.rb

@@ -37,6 +37,17 @@ module BackgroundCache
     BackgroundCache::Config.current_cache
   end
 
+  def self.attach!
+    ActionController::Base.send(:include, BackgroundCache::Controller)
+    ActionView::Helpers::CacheHelper.send(:include, BackgroundCache::Helper)
+
+    ::Dalli::Client.send(:include, BackgroundCache::Memcache)    if defined?(::Dalli::Client)
+    ::MemCache.send(:include, BackgroundCache::Memcache)         if defined?(::MemCache)
+    ::Memcached::Rails.send(:include, BackgroundCache::Memcache) if defined?(::Memcached::Rails)
+
+    puts "ATTACH!"
+  end
+
   def self.cache!(group=nil, instance=nil)
     unless instance
       instance = self.boot

data/rails/init.rb

@@ -1,8 +1,3 @@
 require File.expand_path('../../lib/background_cache.rb', __FILE__)
 
-ActionController::Base.send(:include, BackgroundCache::Controller)
-ActionView::Helpers::CacheHelper.send(:include, BackgroundCache::Helper)
-
-::Dalli::Client.send(:include, BackgroundCache::Memcache)    if defined?(::Dalli::Client)
-::MemCache.send(:include, BackgroundCache::Memcache)         if defined?(::MemCache)
-::Memcached::Rails.send(:include, BackgroundCache::Memcache) if defined?(::Memcached::Rails)
+BackgroundCache.attach!

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: background_cache
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Winton Welsh
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-03 00:00:00 Z
+date: 2011-11-07 00:00:00 -08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -137,6 +138,7 @@ files:
 - spec/fixtures/rails/lib/background_cache_config.rb
 - spec/spec_helper.rb
 - tasks/background_cache.rake
+has_rdoc: true
 homepage: http://github.com/winton/background_cache
 licenses: []
 
@@ -166,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Bust caches before your users do