statisfy 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bf901bb209f43e88099e395db0b4651e1c9b49aa119fdcbe0d941b8434e058a
-  data.tar.gz: 5330f8c09b29c28c16117c9ef633cd94cd9af12df70f299a4ef71bb730cde91c
+  metadata.gz: e3a10099a0ae5de62cc548fc5eed38c6d05c06b3bc04f4e32846627024260325
+  data.tar.gz: bc282b5f30c8ae07565ae24f8352f2724860a76b763c8be4d1e18484c76d4a3e
 SHA512:
-  metadata.gz: 4d2ad92ebf235e4114f424e770487d29d78940cba1d6b590840bb15610446125d7713623e692f9817d3b4cc5a34eafb2cbe3930509e1b20d07bdcd7a06dbf701
-  data.tar.gz: 3e4e9141247f501ca1c7a7aeb0fff50a63c27020e5035b4a3c21d5e0ebcd482ab6ce4146c1d1c7834144e630ec39b574973ec1721b3d96e541d468d8c6df6ea7
+  metadata.gz: bfc687b9a1f56733ccb8c484e39f6b7d79c7844bedc5f46963eeb478568ee45c7c8278d3725aec189058d2076aff4deb304a905c23d770d22b9d76a95f3dbf3e
+  data.tar.gz: 4115d693fda17370ebe46a34088159ac39986b77280c7e8894bc39b1cf060562dd0c00adfac6743e0429918cdfc164a5f1ccee3dee0463a9246bc35f87409bed

data/lib/statisfy/counter.rb

@@ -27,7 +27,7 @@ module Statisfy
       def count(args = {})
         raise ArgumentError, "You must provide at least one event" if args[:every].blank?
 
-        catch_events(*args[:every], if: args[:if] || -> { true })
+        catch_events(*args[:every])
         apply_default_counter_options(args)
         const_set(:COUNTER_TYPE, args[:type] || :increment)
         class_eval(&Statisfy.configuration.append_to_counters) if Statisfy.configuration.append_to_counters.present?
@@ -45,6 +45,10 @@ module Statisfy
         define_method(:decrement?, args[:decrement_if] || -> { false })
         define_method(:value, args[:value] || -> {})
         define_method(:should_run?, args[:if] || -> { true })
+        define_method(:on_destroy, args[:on_destroy]) if args[:on_destroy].present?
+        define_method(:decrement_on_destroy?, args[:decrement_on_destroy].is_a?(Proc) ? args[:decrement_on_destroy] : lambda {
+                                                                                                                        args[:decrement_on_destroy] || true
+                                                                                                                      })
       end
 
       #
@@ -62,14 +66,10 @@ module Statisfy
         if const_get(:COUNTER_TYPE) == :aggregate
           average(scope:, month:)
         else
-          size(scope:, month:)
+          elements_in(scope:, month:).uniq.size
         end
       end
 
-      def size(scope: nil, month: nil)
-        redis_client.scard(key_for(scope:, month:))
-      end
-
       #
       # Returns the list of elements in the set (in case you use .append and not .increment)
       #
@@ -168,13 +168,24 @@ module Statisfy
     end
 
     def process_event
+      return if destroy_event_handled?
       return unless if_async
 
-      if value.present?
-        append(value:)
-      else
-        decrement? ? decrement : increment
+      decrement? ? decrement : increment
+    end
+
+    def destroy_event_handled?
+      return false unless params[:statisfy_trigger] == :destroy
+
+      if decrement_on_destroy?
+        decrement
+        return true
+      elsif respond_to?(:on_destroy)
+        on_destroy
+        return true
       end
+
+      false
     end
 
     #
@@ -184,29 +195,20 @@ module Statisfy
     def all_counters
       [month_to_set, nil].each do |month|
         scopes_with_global.each do |scope|
-          yield self.class.key_for(scope:, month:), identifier
+          yield self.class.key_for(scope:, month:)
         end
       end
     end
 
     def increment
-      all_counters do |key, id|
-        self.class.redis_client.sadd?(key, id)
+      all_counters do |key|
+        self.class.redis_client.rpush(key, value || identifier)
       end
     end
 
     def decrement
-      all_counters do |key, id|
-        self.class.redis_client.srem?(key, id)
-      end
-    end
-
-    #
-    # To be used to store a list of values instead of a basic counter
-    #
-    def append(value:)
       all_counters do |key|
-        self.class.redis_client.rpush(key, value)
+        self.class.redis_client.lrem(key, 1, value || identifier)
       end
     end
   end

data/lib/statisfy/subscriber.rb

@@ -5,8 +5,7 @@ module Statisfy
     end
 
     module ClassMethods
-      def catch_events(*event_names, **options)
-        define_method(:should_run?, &options[:if] || -> { true })
+      def catch_events(*event_names)
         [*event_names].flatten.map do |event_name|
           model_and_event_from_event_name(event_name).tap do |model, event|
             append_callback_to_model(model, event)
@@ -17,18 +16,34 @@ module Statisfy
 
       def append_callback_to_model(model, event)
         listener = self
+
+        statisfy_counter = lambda {
+          counter = listener.new
+          counter.subject = self
+          counter.params = attributes
+          counter
+        }
+
+        trigger_event = lambda { |statisfy_trigger|
+          if listener.respond_to?(Statisfy.configuration.default_async_method) && statisfy_trigger != :destroy
+            listener.send(Statisfy.configuration.default_async_method, attributes.merge(statisfy_trigger:))
+          else
+            instance_exec(&statisfy_counter).perform(attributes.merge(statisfy_trigger:))
+          end
+        }
+
         model.class_eval do
-          after_commit on: event do
-            counter = listener.new
-            counter.subject = self
+          after_commit on: [:destroy] do
+            counter = instance_exec(&statisfy_counter)
+            next unless counter.decrement_on_destroy? || counter.respond_to?(:on_destroy)
+
+            instance_exec(:destroy, &trigger_event)
+          end
 
-            next unless counter.should_run?
+          after_commit on: [event] do
+            next unless instance_exec(&statisfy_counter).should_run?
 
-            if listener.respond_to?(Statisfy.configuration.default_async_method)
-              listener.send(Statisfy.configuration.default_async_method, attributes)
-            else
-              counter.perform(attributes)
-            end
+            instance_exec(event, &trigger_event)
           end
         end
       end
@@ -64,7 +79,6 @@ module Statisfy
     # This is the method that will be called when an event is triggered
     # It will be executed in the background by Sidekiq
     #
-    # @resource_or_hash [Hash] The attributes of the model that triggered the event + the previous_changes
     #
     def perform(resource_or_hash)
       @params = resource_or_hash

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statisfy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Michaël Villeneuve