counterwise 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac4f723a8cdebb397ea3c1035ee728599ce308ebe36fc5aaa9fb6afeff09474e
-  data.tar.gz: 5efc1f7fdbde64eab27962e0b37355ae16f8293c8173d101e85da97b81679dc7
+  metadata.gz: 4486834d3cd8109cdc40ecd6cdcb7d9b40b689960550d1c68bbadb564d548726
+  data.tar.gz: b839de58dfe853a2b8f45414cc184053104fed3568cdbcb3569bbde060a10c6a
 SHA512:
-  metadata.gz: 48b91a565a82de0da5dbdf3e6637721ae05ad4b5bea9e0b8c31366932e6b30f6460e526911a458ceda815910d1031046b2413eb0668207cd001c18afdb030002
-  data.tar.gz: 5d6fd86b0ab23cd378ed374c6bf91aab877626038f7c35acecd2b123777fb646340a4070e61e02cbbf98ce9ab521155c25d2e0b320de0879a927def69cf41b30
+  metadata.gz: 76a8089e1a783202ab3401982ea3877e12138fe6ea379478113d6f1ce5daae2ae252255201c4195b1ce12b8507b7494c2dda0c4f1f67445a765c31d74d31338b
+  data.tar.gz: c542c109b5431240594f2d9ba22c8c8acd8503fa54231f0932ef67fc7d108cd9e7451310340113ba837967600bb4c7aafbb43a2766a84d821563cc130b56e514

data/README.md

@@ -129,10 +129,15 @@ this would use the definition of the counter, including any option to sum a colu
 
 ### Reset a counter
 
-You can also reset a counter by calling `reset`. Since counters are ActiveRecord objects, you could also reset them using
+You can also reset a counter by calling `reset`.
 
 ```ruby
 store.order_revenue.reset
+```
+
+Since counters are ActiveRecord objects, you could also reset them using:
+
+```ruby
 Counter::Value.update value: 0
 ```
 

data/app/models/concerns/counter/definable.rb

@@ -4,13 +4,24 @@ module Counter::Definable
   extend ActiveSupport::Concern
 
   included do
+    def definition= definition
+      @definition = definition
+    end
+
     # Fetch the definition for this counter
     def definition
-      if parent.nil?
-        # We don't have a parent, so we're a global counter
-        Counter::Definition.find_definition name
-      else
-        parent.class.counter_configs.find { |c| c.record_name == name }
+      @definition ||= begin
+        if parent.nil?
+          # We don't have a parent, so we're a global counter
+          Counter::Definition.find_definition name
+        else
+          parent.class.ancestors.find do |ancestor|
+            return nil if ancestor == ApplicationRecord
+            next unless ancestor.respond_to?(:counter_configs)
+            config = ancestor.counter_configs.find { |c| c.record_name == name }
+            return config if config
+          end
+        end
       end
     end
   end

data/app/models/concerns/counter/recalculatable.rb

@@ -9,7 +9,15 @@ module Counter::Recalculatable
     else
       with_lock do
         new_value = definition.sum? ? sum_by_sql : count_by_sql
-        update! value: new_value
+
+        self.class.upsert(
+          attributes.without("id", "created_at", "updated_at").symbolize_keys.merge(value: new_value),
+          unique_by: [:parent_type, :parent_id, :name],
+          on_duplicate: Arel.sql("value = counter_values.value + EXCLUDED.value"),
+          record_timestamps: true
+        )
+
+        reload
       end
     end
   end

data/app/models/concerns/counter/verifyable.rb

@@ -35,11 +35,12 @@ module Counter::Verifyable
     def sample_and_verify scope: -> { all }, samples: 1000, verbose: true, on_error: :raise
       incorrect_counters = 0
 
-      counter_range = Counter::Value.minimum(:id)..Counter::Value.maximum(:id)
+      counters = Counter::Value.merge(scope)
+      counter_range = counters.minimum(:id)..counters.maximum(:id)
 
       samples.times do
         random_id = rand(counter_range)
-        counter = Counter::Value.merge(scope).where("id >= ?", random_id).limit(1).first
+        counter = counters.where("id >= ?", random_id).limit(1).first
         next if counter.nil?
 
         if counter.definition.global? || counter.definition.calculated?
@@ -56,7 +57,9 @@ module Counter::Verifyable
           case on_error
           when :raise then raise Counter::Error.new(message)
           when :log then Rails.logger.error message
-          when :correct then counter.correct!
+          when :correct
+            counter.correct!
+            puts "🔧 Corrected counter #{counter.id}" if verbose
           end
         end
         sleep 0.1

data/lib/counter/integration/countable.rb

@@ -47,5 +47,10 @@ module Counter::Countable
       @counted_by ||= []
       @counted_by << config
     end
+
+    def inherited subclass
+      super
+      @counted_by.each { |c| subclass.add_counted_by c }
+    end
   end
 end

data/lib/counter/version.rb

@@ -1,3 +1,3 @@
 module Counter
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: counterwise
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Jamie Lawrence
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-16 00:00:00.000000000 Z
+date: 2024-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7'
-- !ruby/object:Gem::Dependency
-  name: standard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7'
 description: Counting and aggregation library for Rails.
 email:
 - jamie@ideasasylum.com
@@ -101,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Counters and the counting counters that count them