statisfy 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3a10099a0ae5de62cc548fc5eed38c6d05c06b3bc04f4e32846627024260325
-  data.tar.gz: bc282b5f30c8ae07565ae24f8352f2724860a76b763c8be4d1e18484c76d4a3e
+  metadata.gz: b0232129b80c1b67a7e31c77256fcfea55d199e8bddb41d5acc75738290b54ed
+  data.tar.gz: f9172db49c79f90d71e49907220db46772991bacda7356eac9dea539e900b115
 SHA512:
-  metadata.gz: bfc687b9a1f56733ccb8c484e39f6b7d79c7844bedc5f46963eeb478568ee45c7c8278d3725aec189058d2076aff4deb304a905c23d770d22b9d76a95f3dbf3e
-  data.tar.gz: 4115d693fda17370ebe46a34088159ac39986b77280c7e8894bc39b1cf060562dd0c00adfac6743e0429918cdfc164a5f1ccee3dee0463a9246bc35f87409bed
+  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,7 +39,7 @@ 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 })
@@ -66,10 +66,18 @@ module Statisfy
         if const_get(:COUNTER_TYPE) == :aggregate
           average(scope:, month:)
         else
-          elements_in(scope:, month:).uniq.size
+          size(scope:, month:)
         end
       end
 
+      def size(scope: nil, month: nil)
+        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)
       #
@@ -102,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
 
@@ -171,11 +180,15 @@ module Statisfy
       return if destroy_event_handled?
       return unless if_async
 
-      decrement? ? decrement : increment
+      if value.present?
+        append(value:)
+      else
+        decrement? ? decrement : increment
+      end
     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
@@ -188,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)
@@ -202,15 +223,36 @@ module Statisfy
 
     def increment
       all_counters do |key|
-        self.class.redis_client.rpush(key, value || identifier)
+        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
 
+    #
+    # 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)
+      end
+    end
+
+    # rubocop:disable Metrics/AbcSize
     def decrement
       all_counters do |key|
-        self.class.redis_client.lrem(key, 1, value || identifier)
+        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.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Michaël Villeneuve