statisfy 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42017075ea6e11814c69273dad495fed1143fe56c84cca652f52c45e44f58be6
-  data.tar.gz: 855f430c83b255b10228675c387947689cfd4dc3147073f65e56c15acb2bd485
+  metadata.gz: b0232129b80c1b67a7e31c77256fcfea55d199e8bddb41d5acc75738290b54ed
+  data.tar.gz: f9172db49c79f90d71e49907220db46772991bacda7356eac9dea539e900b115
 SHA512:
-  metadata.gz: 8b716fee4967f50c59a19a4becfffa8097593bb22cd5ffbe60bea6dcae0d6a0fe4bc1be017e91c38c4f1f465f87a765e51d097e14ac8bb02ba344887a5bd9565
-  data.tar.gz: 21b5db159bc50e44c42b67b8ccbbb4d7b8f7f650f52f273983afcf4bc9ac5c5cc5be2553ed9ce3a2190fbc97e16c4b2dc521ae5c3f943cc1186a0e3093ba6494
+  metadata.gz: 1a7329d1ccd0da87a4eee455a885dc46b8e6bbcc24f1805348b77558114b8d946430ea33a443b432aba59f4e4a60314b4b53336539e1240e4afaffe4b1d33b51
+  data.tar.gz: 5cc4383205544ea34da8bf25b1683237f7f89e241dc393376cc1d4ac0f478ecf2cc2bfc91e885db4d0b89d2337af7adc9eeea30766b253f41949cdbfc4287d41

data/lib/statisfy/aggregate.rb

@@ -26,7 +26,6 @@ module Statisfy
       # @param month: the month for which you want the value of the counter (optional)
       #
       def value(scope: nil, month: nil)
-        p "HEIN???"
         month = month&.strftime("%Y-%m") if month.present?
         average(scope:, month:)
       end

data/lib/statisfy/counter.rb

@@ -39,14 +39,16 @@ module Statisfy
       # but the `count` DSL defines them automatically based on the options provided
       #
       def apply_default_counter_options(args)
-        define_method(:identifier, args[:uniq_by] || -> { params["id"] })
+        define_method(:identifier, args[:uniq_by] || -> { nil })
         define_method(:scopes, args[:scopes] || Statisfy.configuration.default_scopes || -> { [] })
         define_method(:if_async, args[:if_async] || -> { true })
         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] : -> { args[:decrement_on_destroy] || false })
+        define_method(:decrement_on_destroy?, args[:decrement_on_destroy].is_a?(Proc) ? args[:decrement_on_destroy] : lambda {
+                                                                                                                        args[:decrement_on_destroy] || true
+                                                                                                                      })
       end
 
       #
@@ -72,6 +74,10 @@ module Statisfy
         redis_client.scard(key_for(scope:, month:))
       end
 
+      def members(scope: nil, month: nil)
+        redis_client.smembers(key_for(scope:, month:))
+      end
+
       #
       # Returns the list of elements in the set (in case you use .append and not .increment)
       #
@@ -104,12 +110,13 @@ module Statisfy
       #
       # This is the name of the Redis key that will be used to store the counter
       #
-      def key_for(scope:, month: nil)
+      def key_for(scope:, month: nil, key_value: nil)
         {
           counter: name.demodulize.underscore,
           month:,
           scope_type: scope&.class&.name,
-          scope_id: scope&.id
+          scope_id: scope&.id,
+          key_value:
         }.to_json
       end
 
@@ -181,7 +188,7 @@ module Statisfy
     end
 
     def destroy_event_handled?
-      return false unless params[:statisfy_trigger] == :destroy
+      return false unless params[:statisfy_trigger] == :destroy && value.blank?
 
       if decrement_on_destroy?
         decrement
@@ -194,6 +201,14 @@ module Statisfy
       false
     end
 
+    def key_value
+      value || identifier || params["id"]
+    end
+
+    def custom_key_value?
+      identifier.present? || value.present?
+    end
+
     #
     # This allows to iterate over all the counters that need to be updated
     # (in general the Department(s) and Organisation(s) for both the current month and the global counter)
@@ -201,20 +216,15 @@ 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)
-      end
-    end
-
-    def decrement
-      all_counters do |key, id|
-        self.class.redis_client.srem?(key, id)
+      all_counters do |key|
+        self.class.redis_client.sadd?(key, key_value)
+        self.class.redis_client.sadd?(uniq_by_ids(key), params["id"]) if custom_key_value?
       end
     end
 
@@ -226,6 +236,23 @@ module Statisfy
         self.class.redis_client.rpush(key, value)
       end
     end
+
+    # rubocop:disable Metrics/AbcSize
+    def decrement
+      all_counters do |key|
+        if custom_key_value?
+          self.class.redis_client.srem?(uniq_by_ids(key), params["id"])
+          self.class.redis_client.srem?(key, key_value) if self.class.redis_client.scard(uniq_by_ids(key)).zero?
+        else
+          self.class.redis_client.srem?(key, key_value)
+        end
+      end
+    end
+    # rubocop:enable Metrics/AbcSize
+
+    def uniq_by_ids(key)
+      "#{key};#{key_value}"
+    end
   end
 end
 

metadata

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