ngmoco-cache-money 0.2.16 → 0.2.20

data/lib/cache_money.rb

@@ -1,5 +1,4 @@
 require 'active_support'
-require 'active_support/all'
 require 'active_record'
 
 require 'cash/lock'

data/lib/cash/query/abstract.rb

@@ -180,7 +180,7 @@ module Cash
           objects
         else
           cache_keys = objects.collect { |id| "id/#{id}" }
-          objects = get(cache_keys, &method(:find_from_keys))
+          with_exclusive_scope(:find => {}) { objects = get(cache_keys, &method(:find_from_keys)) }
           convert_to_array(cache_keys, objects)
         end
       end

data/lib/cash/relation/cached_finder_methods.rb

@@ -0,0 +1,31 @@
+module Cash
+  module Relation
+    module CachedFinderMethods
+      def find_one_with_cache(id)
+        return find_one_without_cache unless is_cached
+      
+        id = id.id if ActiveRecord::Base === id
+
+        cache_miss = false
+        result = @klass.get(id) do
+          cache_miss = true
+          find_one_without_cache(id)
+        end
+        @klass.set(id, result) if cache_miss && result
+      end
+  
+      def find_some_with_cache(ids)
+        return find_some_without_cache unless is_cached
+
+        cache_miss = false
+        result = @klass.get(ids) do
+          cache_miss = true
+          find_some_without_cache(ids)
+        end
+        if cache_miss && result
+          result.each {|r| @klass.set(r.id, r) if r} if result.is_a?(Array)
+        end
+      end
+    end
+  end
+end

data/rails/init.rb

@@ -31,12 +31,7 @@ else
   $cache = Cash::Transactional.new($local, $lock)
 
   # allow setting up caching on a per-model basis
-  if memcache_config[:automatic_caching].to_s == 'false'
-    Rails.logger.info "cache-money: global model caching disabled"
-    class ActiveRecord::Base
-      is_cached(false)
-    end
-  else
+  unless memcache_config[:automatic_caching].to_s == 'false'
     Rails.logger.info "cache-money: global model caching enabled"
     class ActiveRecord::Base
       is_cached(:repository => $cache)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ngmoco-cache-money
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 2
-  - 16
-  version: 0.2.16
+  - 20
+  version: 0.2.20
 platform: ruby
 authors: 
 - Nick Kallen
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 -07:00
+date: 2010-10-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,6 +83,7 @@ files:
 - lib/cash/query/calculation.rb
 - lib/cash/query/primary_key.rb
 - lib/cash/query/select.rb
+- lib/cash/relation/cached_finder_methods.rb
 - lib/cash/request.rb
 - lib/cash/transactional.rb
 - lib/cash/util/array.rb