counter_culture 3.8.1 → 3.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4355ba12c0a0ecf776641647648a3422d5aafc76c48a5db418d381f51f0890de
-  data.tar.gz: 8b1dd8e1de14b7b5377deaa9143c0ffbc8e6f4418524931dcd494417de49d1ca
+  metadata.gz: 13f043a04b7cca0b364e7692c19425b049b45b4e965ed5caac0dbac2f91622c1
+  data.tar.gz: 50dfedf030e3c3823829aedc5e3b2a08fe65b63b50fc439d229afb5ab3fa5d5d
 SHA512:
-  metadata.gz: d3c7ec219454d12a50d79815da7fa920cd1644ca268fceea089d9eac28438b7a28df3949f969bc9c63ee60a56c0d6d4e8f56e42f0e2218cb9e42e9a157ca1420
-  data.tar.gz: 63c4cd5958f0a3a2fa9eb6b6018cc0891ced1f2ad2708d02ea49f9cce8416ffc42a62ae01eb7b2cf2dad5334e16061eac517c7f8be40b35068694b63a238c748
+  metadata.gz: 604bd858a6660d3e83b74b339a2675366b5d7908c87c37241ed9eb9a2b245ddb4d02b19d6782d3c30df793cd895be45e22455e34f9aca88e5fee462f472c2a48
+  data.tar.gz: a5828bb5f0bd66b6717401b47f8494687a371546c6f3df89c93dd9a524a055e074aeffc3fa6c02e0b2e2cd25c3e706e76c2ef654e22a0b3f48cfb3d0c0c401b7

data/Appraisals

@@ -7,7 +7,7 @@
   7.2
 ].each do |rails_version|
   appraise "rails-#{rails_version}" do
-    gem 'rails', "~> #{rails_version}.0"
+    gem 'activerecord', "~> #{rails_version}.0"
     if Gem::Version.new(rails_version) < Gem::Version.new("7.2")
       gem 'sqlite3', "~> 1.4"
     end

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 3.8.2 (October 21, 2024)
+
+Bugfixes:
+  - Use ActiveRecord version, not Rails version, to make it possible to use `counter_culture_fix_counts` without Rails
+  - Tests no longer require Rails, making sure we do not introduce this regression again
+
 ## 3.8.1 (October 18, 2024)
 
 Bugfixes:
@@ -268,7 +274,7 @@ Bugfixes:
 ## 1.8.1 (September 5, 2017)
 
 Improvements:
-  - Use ActiveRecord version, not Rails version, in `Reconciler`, makeing it possible to use `counter_culture_fix_counts` without Rails
+  - Use ActiveRecord version, not Rails version, in `Reconciler`, making it possible to use `counter_culture_fix_counts` without Rails
 
 ## 1.8.0 (August 30, 2017)
 

data/counter_culture.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'paper_trail'
   spec.add_development_dependency 'paranoia'
   spec.add_development_dependency 'after_commit_action'
-  spec.add_development_dependency 'rails', '>= 4.2'
+  spec.add_development_dependency 'activerecord', '>= 4.2'
   spec.add_development_dependency 'rake', '>= 10.0'
   spec.add_development_dependency 'rdoc', ">= 6.3.1"
   spec.add_development_dependency 'rspec', '~> 3.0'

data/gemfiles/rails_5.2.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.2.0"
+gem "activerecord", "~> 5.2.0"
 gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"

data/gemfiles/rails_6.0.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 6.0.0"
+gem "activerecord", "~> 6.0.0"
 gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"

data/gemfiles/rails_6.1.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 6.1.0"
+gem "activerecord", "~> 6.1.0"
 gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"

data/gemfiles/rails_7.0.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 7.0.0"
+gem "activerecord", "~> 7.0.0"
 gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"

data/gemfiles/rails_7.1.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 7.1.0"
+gem "activerecord", "~> 7.1.0"
 gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"

data/gemfiles/rails_7.2.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 7.2.0"
+gem "activerecord", "~> 7.2.0"
 
 gemspec path: "../"

data/lib/counter_culture/reconciler.rb

@@ -181,17 +181,17 @@ module CounterCulture
       def log(message)
         return unless log?
 
-        Rails.logger.info(message)
+        ActiveRecord::Base.logger.info(message)
       end
 
       def log_without_newline(message)
         return unless log?
 
-        Rails.logger << message if Rails.logger.info?
+        ActiveRecord::Base.logger << message if ActiveRecord::Base.logger.info?
       end
 
       def log?
-        options[:verbose] && Rails.logger
+        options[:verbose] && ActiveRecord::Base.logger
       end
 
       # keep track of what we fixed, e.g. for a notification email

data/lib/counter_culture/version.rb

@@ -1,3 +1,3 @@
 module CounterCulture
-  VERSION = '3.8.1'.freeze
+  VERSION = '3.8.2'.freeze
 end

data/lib/counter_culture/with_connection.rb

@@ -23,11 +23,11 @@ module CounterCulture
     private
 
     def rails_7_1?
-      Gem::Requirement.new('~> 7.1.0').satisfied_by?(Gem::Version.new(Rails.version))
+      Gem::Requirement.new('~> 7.1.0').satisfied_by?(ActiveRecord.version)
     end
 
     def rails_7_2_or_greater?
-      Gem::Requirement.new('>= 7.2.0').satisfied_by?(Gem::Version.new(Rails.version))
+      Gem::Requirement.new('>= 7.2.0').satisfied_by?(ActiveRecord.version)
     end
   end
 end

data/lib/generators/counter_culture_generator.rb

@@ -27,8 +27,8 @@ class CounterCultureGenerator < ActiveRecord::Generators::Base
   end
 
   def migration_version
-    if Gem::Version.new(Rails.version) >= Gem::Version.new('5.0.0')
-      "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+    if ActiveRecord.version >= Gem::Version.new('5.0.0')
+      "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 3.8.1
+  version: 3.8.2
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-18 00:00:00.000000000 Z
+date: 2024-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="