cache_fu 0.2.0.pre2 → 0.2.0.pre3

data/lib/acts_as_cached/cache_methods.rb

@@ -43,7 +43,7 @@ module ActsAsCached
       keys_map = Hash[*keys.zip(cache_ids).flatten]
 
       # Call get_multi and figure out which keys were missed based on what was a hit
-      hits = ActsAsCached.config[:disabled] ? {} : (Rails.cache.read_multi(*keys) || {})
+      hits = Rails.cache.read_multi(*keys) || {}
 
       # Misses can take the form of key => nil
       hits.delete_if { |key, value| value.nil? }
@@ -78,10 +78,9 @@ module ActsAsCached
     end
 
     def set_cache(cache_id, value, options = nil)
-      value.tap do |v|
-        v = @@nil_sentinel if v.nil?
-        Rails.cache.write(cache_key(cache_id), v, options)
-      end
+      v = value.nil? ? @@nil_sentinel : value
+      Rails.cache.write(cache_key(cache_id), v, options)
+      value
     end
 
     def expire_cache(cache_id = nil)
@@ -143,13 +142,11 @@ module ActsAsCached
     alias :cached :caches
 
     def cached?(cache_id = nil)
-      return false if ActsAsCached.config[:skip_gets]
       Rails.cache.exist?(cache_key(cache_id))
     end
     alias :is_cached? :cached?
 
     def fetch_cache(cache_id)
-      return if ActsAsCached.config[:skip_gets]
       Rails.cache.read(cache_key(cache_id))
     end
 

data/lib/acts_as_cached/railtie.rb

@@ -8,6 +8,12 @@ module ActsAsCached
         extend ActsAsCached::Mixin
       end
 
+      if File.exists?(config_file = Rails.root.join('config', 'memcached.yml'))
+        ActsAsCached.config = YAML.load(ERB.new(IO.read(config_file)).result)
+      else
+        ActsAsCached.config = {}
+      end
+
       ActiveSupport.on_load :action_controller do
         include ActsAsCached::MemcacheRuntime
       end

data/lib/cache_fu.rb

@@ -36,10 +36,3 @@ module ActsAsCached
     end
   end
 end
-
-Rails::Application.initializer("cache_fu") do
-  if File.exists?(config_file = Rails.root.join('config', 'memcached.yml'))
-    ActsAsCached.config = YAML.load(ERB.new(IO.read(config_file)).result)
-  end
-  ActsAsCached.config = {}
-end

metadata

@@ -1,14 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: cache_fu
 version: !ruby/object:Gem::Version 
-  hash: -1876988175
-  prerelease: true
-  segments: 
-  - 0
-  - 2
-  - 0
-  - pre2
-  version: 0.2.0.pre2
+  prerelease: 6
+  version: 0.2.0.pre3
 platform: ruby
 authors: 
 - Surendra Singhi
@@ -16,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-14 00:00:00 +05:30
+date: 2011-10-31 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,10 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
         version: "3.0"
   type: :runtime
   version_requirements: *id001
@@ -42,10 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
         version: "3.0"
   type: :development
   version_requirements: *id002
@@ -88,25 +74,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Makes caching easy for ActiveRecord models