restrict_cache 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4a37b2b0b86aaf69fda3297713e32fdd1951722
-  data.tar.gz: f221ff5b19e8c16e2844d0e45e70aa1989226ac8
+  metadata.gz: 1c29fdf424ebafc1734aacbc3da69ca1a5ff9563
+  data.tar.gz: 48cc0cd115be5e997c74763b02569a7c8a978b17
 SHA512:
-  metadata.gz: a80b5f4e4070bf06a1bd4ec645c1d05f320f5b69dce451779c524677168b5578dab87744061d127502185cad5171677f7a8775164f7ffec1a4df1053ba0a8cda
-  data.tar.gz: 2833d2da4631d6873c4e7b5fc8ba3a5f6809850d7f78a0e12e1432851a5752740e3c9969fb47ccb5f6328a43bbe4f3178b211488ff6d6928c416d3c7870adec7
+  metadata.gz: c29896eacf36a4e75f08752e1119ac5f65599894191ce44ee005790782d2164dd28a186df8fd37dc7e729ff4548c2350a1c208a2eca39642ce43ce8381bb9d93
+  data.tar.gz: 680747417162f543812e2ce6c34bca13b13d5847f6fe8e746cbd0b26c1329f3ba1cbba12e806c701964aa3f1796457e914e7685e99ff446ed27ea33d75781581

data/README.md

@@ -34,6 +34,15 @@ end
 
 #### Callbacks (Around Action)
 
+```ruby
+class MyController < ApplicationController
+  # cache_sweep_action :index, :show
+  cache_sweep_action
+end
+```
+
+#### ActiveRecord Cache
+
 ```ruby
 class MyModel < ActiveRecord::Base; end
 MyModel.find_with_restrict_cache(id_or_ids)

data/lib/restrict_cache/accessible.rb

@@ -2,13 +2,23 @@ module RestrictCache
   module Accessible
     THREAD_KEY = :restrict_cache
 
-    def collection
+    def cache
       Thread.current[THREAD_KEY] ||= Cacheable.new
     end
 
     def clear
       Thread.current[THREAD_KEY] = nil
     end
+
+    def method_missing(name, *args, &block)
+      super unless cache.respond_to?(name)
+
+      define_singleton_method(name) do |*a, &b|
+        cache.public_send(name, *a, &b)
+      end
+
+      send(name, *args, &block)
+    end
   end
 
   extend Accessible

data/lib/restrict_cache/action_controller_ext.rb

@@ -1,5 +1,5 @@
 module RestrictCache
-  class ActionControllerExt
+  module ActionControllerExt
     include ActiveSupport::Concern
 
     module ClassMethods

data/lib/restrict_cache/active_record_ext.rb

@@ -1,10 +1,20 @@
 module RestrictCache
   module ActiveRecordExt
-    def self.included(base)
-      base.extend ClassMethods
+    module Base
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        delegate :find_with_restrict_cache, to: :all
+      end
+
+      def restrict_cache
+        RestrictCache.add(self)
+      end
     end
 
-    module ClassMethods
+    module Relation
+      AR_CACHE_KEY = Cacheable::CacheKey::ACTIVERECORD
+
       def find_and_restrict_cache(arg)
         records = find(arg)
         Array(records).each(&:restrict_cache)
@@ -12,7 +22,7 @@ module RestrictCache
       end
 
       def find_from_restrict_cache(arg)
-        contents = RestrictCache.collection.active_record.contents(self.table_name)
+        contents = RestrictCache.send(AR_CACHE_KEY).contents(self.table_name)
         return nil unless contents
 
         case arg
@@ -36,18 +46,19 @@ module RestrictCache
         end
       end
 
+      def with_restrict_cache
+        self.each(&:restrict_cache)
+        self
+      end
+
       private
         def restrict_cached?(args)
-          content = RestrictCache.collection.active_record.contents(self.table_name)
+          content = RestrictCache.send(AR_CACHE_KEY).contents(self.table_name)
           return false unless content
           ids = content.keys
           args.all? {|index| ids.include?(index) }
         end
     end
-
-    def restrict_cache
-      RestrictCache.collection.add(self)
-    end
   end
 end
 

data/lib/restrict_cache/cacheable.rb

@@ -10,10 +10,12 @@ module RestrictCache
       ALL = [ACTIVERECORD, CUSTOM]
 
       def self.get(content)
-        if defined?(ActiveRecord) && content.class < ActiveRecord::Base
-          return ACTIVERECORD
+        case
+        when defined?(ActiveRecord) && content.class < ActiveRecord::Base
+          ACTIVERECORD
+        else
+          CUSTOM
         end
-        CUSTOM
       end
     end
 

data/lib/restrict_cache/railtie.rb

@@ -9,7 +9,8 @@ module RestrictCache
       end
 
       ActiveSupport.on_load(:active_record) do
-         ::ActiveRecord::Base.send(:include, RestrictCache::ActiveRecordExt)
+         ::ActiveRecord::Base.send(:include, RestrictCache::ActiveRecordExt::Base)
+         ::ActiveRecord::Relation.send(:include, RestrictCache::ActiveRecordExt::Relation)
       end
     end
   end

data/lib/restrict_cache/version.rb

@@ -1,3 +1,4 @@
 module RestrictCache
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restrict_cache
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - i2bskn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-14 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler