counter_cache-rails 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a301bec859d9975f7f3ae56d2cb8cdec25eaf88
-  data.tar.gz: 1c6fd54aaeb967af245952fda02c38664f9f389e
+  metadata.gz: a0177b69e46bfbf965db0bcada7ad01d3a28dc21
+  data.tar.gz: 5012ff36ad9de6c329754120b63ac3766793e352
 SHA512:
-  metadata.gz: 8b3f71843d81520b28fa6c181896b59bf92dd74bff620e84f88a5d762c127d1c519f0c59d4fee2752075ba592dd31aed03ccf2b65cc75077433ad40f58adfa42
-  data.tar.gz: da0a571830ded5a810330aab215c9010bace1d5201a052041081bf7a0e8df1895fa200223de9b7e811e1fd15b40bad10fdd576a3cc05380446f3b7bbbfc8ba19
+  metadata.gz: b0f2fe3906b8fc859bc86760b321b8ffd2af53487930229ff5b1838b6cc971f95239f0514d9134ddbe0426185f6d2d9d7a8876ac034e2475603064bfb3fbfe59
+  data.tar.gz: 526ada510c6987f8b7a177e8444c7c58af18eddd193b7c37da2e8cf92b9946aad356e2dac0f92f0d076b06caabdc03a4b77705515c28ddfb79eec11e64085c5a

data/README.md

@@ -15,7 +15,10 @@ gem 'counter_cache-rails'
 ```rb
 class Post
   has_many :comments
-  counter_cache :comments
+
+  counter_cache :comments,
+                if: ->(comment) { comment.visible? },
+                scope: ->(comments) { comments.visible }
 
   after_update_comments_count do
     # you can use callbacks on update counter cache

data/lib/counter_cache-rails.rb

@@ -1,2 +1,3 @@
 # frozen_string_literal: true
+
 require 'counter_cache_rails'

data/lib/counter_cache_rails.rb

@@ -1,2 +1,16 @@
 # frozen_string_literal: true
+
+require 'counter_cache_rails/configuration'
 require 'counter_cache_rails/railtie'
+
+module CounterCacheRails
+  class << self
+    def configuration
+      @configuration ||= Configuration.new
+    end
+
+    def configure
+      yield configuration
+    end
+  end
+end

data/lib/counter_cache_rails/active_record_extention.rb

@@ -1,28 +1,38 @@
 # frozen_string_literal: true
+
 module CounterCacheRails
   module ActiveRecordExtention
     extend ActiveSupport::Concern
 
     included do
-      def self.counter_cache(tableized_model)
-        class_name = self.to_s.downcase
-        child_model_class = tableized_model.to_s.classify.constantize
+      # Enable counter cache for a child association
+      #
+      # @param tableized_model [Symbol] Name of the child association
+      # @param options [Hash]
+      # @option options [Proc] :if
+      # @option options [Proc] :unless
+      # @option options [Proc] :scope
+      def self.counter_cache(tableized_model, options = {})
+        class_name            = self.to_s.downcase
+        child_model_class     = tableized_model.to_s.classify.constantize
         tableized_child_model = tableized_model.to_sym
-        primary_key = self.primary_key.to_sym
-        callback_name = "update_#{tableized_child_model}_count".to_sym
+        primary_key           = self.primary_key.to_sym
+        callback_name         = "update_#{tableized_child_model}_count".to_sym
 
         define_model_callbacks callback_name
 
         define_method "#{tableized_child_model}_count" do |force: false|
-
           count = Rails.cache.read(_counter_cache_key(class_name, primary_key, tableized_child_model), raw: true)
 
           if count.nil? || force
-            count = self.send(tableized_child_model).count
+            scope = options[:scope] ? options[:scope].call(self.send(tableized_child_model)) : self.send(tableized_child_model)
+            count = scope.count
+
             Rails.cache.write(
               self._counter_cache_key(class_name, primary_key, tableized_child_model),
               count,
-              raw: true
+              raw: true,
+              expires_in: CounterCacheRails.configuration.expires_in,
             )
           end
 
@@ -42,19 +52,27 @@ module CounterCacheRails
         end
 
         after_create do
+          scope = options[:scope] ? options[:scope].call(self.send(tableized_child_model)) : self.send(tableized_child_model)
+
           Rails.cache.write(
             self._counter_cache_key(class_name, primary_key, tableized_child_model),
-            self.send(tableized_child_model).count,
+            scope.count,
             raw: true
           )
         end
 
         child_model_class.class_eval do
           after_create do
+            next unless options[:if].nil? || options[:if].call(self)
+            next if !options[:unless].nil? && options[:unless].call(self)
+
             self.send(class_name.to_sym).send("_#{tableized_child_model}_count_incr")
           end
 
           after_destroy do
+            next unless options[:if].nil? || options[:if].call(self)
+            next if !options[:unless].nil? && options[:unless].call(self)
+
             self.send(class_name.to_sym).send("_#{tableized_child_model}_count_decr")
           end
         end

data/lib/counter_cache_rails/configuration.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module CounterCacheRails
+  class Configuration
+    attr_accessor :expires_in
+
+    def initialize(expires_in: nil)
+      @expires_in = expires_in
+    end
+  end
+end

data/lib/counter_cache_rails/railtie.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module CounterCacheRails
   class Railtie < ::Rails::Railtie
     initializer 'counter_cache-rails' do

data/lib/counter_cache_rails/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module CounterCacheRails
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_cache-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Shota Iguchi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-17 00:00:00.000000000 Z
+date: 2018-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -233,6 +233,7 @@ files:
 - lib/counter_cache-rails.rb
 - lib/counter_cache_rails.rb
 - lib/counter_cache_rails/active_record_extention.rb
+- lib/counter_cache_rails/configuration.rb
 - lib/counter_cache_rails/railtie.rb
 - lib/counter_cache_rails/version.rb
 homepage: https://github.com/iguchi1124/counter_cache-rails