iron_trail 0.3.0.pre.alpha1 → 0.3.0.pre.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f71f8c85d8b8b0bb81528cba7696a279cd012a85035f4882f61607a4f032778
-  data.tar.gz: b9aaf678019f278724a510cfd6df566288976939dda0f5f37aa67b01538a9ab4
+  metadata.gz: 25117e0591f067570aa8feed5b58cde1c01c09a0fdb386b48fe80e9349684ac4
+  data.tar.gz: e73f15bcc8bb2c2e26e6a1f9de39ecf6517e1f60489d9a795df863c0e082c207
 SHA512:
-  metadata.gz: 56f449260f7c0f83cde52d4311e370828bf2a4d0250f6490003de296066e2717f56afebc969dfe97d74fba2ecefd1a43d72236bdc32450ce7384f1e3b8fc9a56
-  data.tar.gz: 1b3ce44bad0e293d3c6eb38e21d1d076713ff53240bce114bcb5504f74457db94dc4978cfacb8d182ec590ae08aa5d67008d2e06a923bf8ae17aacaa05053fec
+  metadata.gz: 87ae15bd0c12904c32d7bc10d4d89eb8a50e719a0ca3eb518bebf42eef5383c860eb165251bb8406a3ae63497541e3cdbf676066f1e3fa354af7bb07d28b15a0
+  data.tar.gz: 975ba22ccae12a3d90f9b7fbb35cc837b1c2d93c7fbbb1abe271724f62480450b72c8999fcfcc640079c7646e26539967cee504674ec8caba370ec66e65caa09

data/lib/iron_trail/change_model_concern.rb

@@ -66,7 +66,9 @@ module IronTrail
       # This works by inspecting whether there are any keys in the rec_delta column
       # other than the columns specified in the `columns` parameter.
       def with_delta_other_than(*columns)
-        quoted_columns = columns.map { |col_name| connection.quote(col_name) }
+        quoted_columns = with_connection do |conn|
+          columns.map { |col_name| conn.quote(col_name) }
+        end
         exclude_array = "ARRAY[#{quoted_columns.join(', ')}]::text[]"
 
         sql = "rec_delta IS NULL OR (rec_delta - #{exclude_array}) <> '{}'::jsonb"
@@ -79,17 +81,19 @@ module IronTrail
         ary_index = Integer(ary_index)
         scope = all
 
-        args.each do |col_name, value|
-          col_delta = "rec_delta->#{connection.quote(col_name)}"
-          node = if value == nil
-            ::Arel::Nodes::SqlLiteral.new("#{col_delta}->#{ary_index} = 'null'::jsonb")
-          else
-            ::Arel::Nodes::SqlLiteral.new("#{col_delta}->>#{ary_index}").eq(
-              ::Arel::Nodes::BindParam.new(value.to_s)
-            )
+        with_connection do |conn|
+          args.each do |col_name, value|
+            col_delta = "rec_delta->#{conn.quote(col_name)}"
+            node = if value == nil
+              ::Arel::Nodes::SqlLiteral.new("#{col_delta}->#{ary_index} = 'null'::jsonb")
+            else
+              ::Arel::Nodes::SqlLiteral.new("#{col_delta}->>#{ary_index}").eq(
+                ::Arel::Nodes::BindParam.new(value.to_s)
+              )
+            end
+
+            scope.where!(node)
           end
-
-          scope.where!(node)
         end
 
         scope

data/lib/iron_trail/testing/rspec.rb

@@ -27,7 +27,7 @@ module IronTrail
       attr_accessor :enabled
 
       def enable!
-        with_connection { |conn| DbFunctions.new(conn).install_functions }
+        ActiveRecord::Base.with_connection { |conn| DbFunctions.new(conn).install_functions }
         @enabled = true
       end
 
@@ -44,7 +44,7 @@ module IronTrail
           $$ LANGUAGE plpgsql;
         SQL
 
-        with_connection { |conn| conn.execute(sql) }
+        ActiveRecord::Base.with_connection { |conn| conn.execute(sql) }
         @enabled = false
       end
 
@@ -65,20 +65,6 @@ module IronTrail
           ::IronTrail::Testing.enable!
         end
       end
-
-      private
-
-      # Checks out a connection for the duration of the block, mirroring
-      # ActiveRecord::Base.with_connection (Rails 7.2+). On Rails 7.1, where
-      # that method does not exist yet, it falls back to yielding the
-      # (soft-deprecated on Rails 8.1+) ActiveRecord::Base.connection.
-      def with_connection(&block)
-        if ActiveRecord::Base.respond_to?(:with_connection)
-          ActiveRecord::Base.with_connection(&block)
-        else
-          yield ActiveRecord::Base.connection
-        end
-      end
     end
   end
 end

data/lib/iron_trail/version.rb

@@ -1,5 +1,5 @@
 # frozen_literal_string: true
 
 module IronTrail
-  VERSION = '0.3.0-alpha1'
+  VERSION = '0.3.0-alpha3'
 end

data/lib/tasks/tracking.rake

@@ -2,8 +2,8 @@
 
 module IronTrail::RakeHelper
   class << self
-    def db_functions
-      IronTrail::DbFunctions.new(ActiveRecord::Base.connection)
+    def db_functions(connection)
+      IronTrail::DbFunctions.new(connection)
     end
 
     def abort_when_unsafe!
@@ -22,28 +22,33 @@ namespace :iron_trail do
   namespace :tracking do
     desc 'Enables tracking for all missing tables.'
     task enable: :environment do
-      tables = IronTrail::RakeHelper.db_functions.collect_tables_tracking_status[:missing]
-      unless tables.length > 0
-        puts "All tables are being tracked already (no missing tables found)."
-        puts "If you think this is wrong, check your ignored_tables list."
-        return
-      end
-
-      puts "Will start tracking #{tables.length} tables."
-      tables.each do |table_name|
-        IronTrail::RakeHelper.db_functions.enable_tracking_for_table(table_name)
+      ActiveRecord::Base.with_connection do |conn|
+        db_functions = IronTrail::RakeHelper.db_functions(conn)
+        tables = db_functions.collect_tables_tracking_status[:missing]
+
+        if tables.empty?
+          puts "All tables are being tracked already (no missing tables found)."
+          puts "If you think this is wrong, check your ignored_tables list."
+        else
+          puts "Will start tracking #{tables.length} tables."
+          tables.each do |table_name|
+            db_functions.enable_tracking_for_table(table_name)
+          end
+        end
       end
     end
 
     desc 'Disabled tracking for any ignored table that might still have the trigger enabled.'
     task disable_on_ignored: :environment do
-      affected_tables = IronTrail::RakeHelper.db_functions.disable_for_all_ignored_tables
+      ActiveRecord::Base.with_connection do |conn|
+        affected_tables = IronTrail::RakeHelper.db_functions(conn).disable_for_all_ignored_tables
 
-      unless affected_tables.empty?
-        puts "Removed tracking from #{affected_tables.length} tables:"
+        unless affected_tables.empty?
+          puts "Removed tracking from #{affected_tables.length} tables:"
 
-        affected_tables.each do |table_name|
-          puts "\t#{table_name}"
+          affected_tables.each do |table_name|
+            puts "\t#{table_name}"
+          end
         end
       end
     end
@@ -52,24 +57,30 @@ namespace :iron_trail do
     task disable: :environment do
       IronTrail::RakeHelper.abort_when_unsafe!
 
-      tables = IronTrail::RakeHelper.db_functions.collect_tables_tracking_status[:tracked]
-      puts "Will stop tracking #{tables.length} tables."
-      tables.each do |table_name|
-        IronTrail::RakeHelper.db_functions.disable_tracking_for_table(table_name)
-      end
+      ActiveRecord::Base.with_connection do |conn|
+        db_functions = IronTrail::RakeHelper.db_functions(conn)
 
-      tables = IronTrail::RakeHelper.db_functions.collect_tables_tracking_status[:tracked]
-      if tables.length > 0
-        puts "WARNING: Something went wrong. There are still #{tables.length}" + \
-             " tables being tracked."
-      else
-        puts "Done!"
+        tables = db_functions.collect_tables_tracking_status[:tracked]
+        puts "Will stop tracking #{tables.length} tables."
+        tables.each do |table_name|
+          db_functions.disable_tracking_for_table(table_name)
+        end
+
+        tables = db_functions.collect_tables_tracking_status[:tracked]
+        if tables.length > 0
+          puts "WARNING: Something went wrong. There are still #{tables.length}" + \
+               " tables being tracked."
+        else
+          puts "Done!"
+        end
       end
     end
 
     desc 'Shows which tables are tracking, missing and ignored.'
     task status: :environment do
-      status = IronTrail::RakeHelper.db_functions.collect_tables_tracking_status
+      status = ActiveRecord::Base.with_connection do |conn|
+        IronTrail::RakeHelper.db_functions(conn).collect_tables_tracking_status
+      end
       ignored = (IronTrail.config.ignored_tables || [])
 
       # We likely want to keep this structure of text untouched as someone

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_trail
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre.alpha1
+  version: 0.3.0.pre.alpha3
 platform: ruby
 authors:
 - André Diego Piske
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -77,14 +77,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -105,14 +105,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
 email: andrepiske@gmail.com
 executables: []
 extensions: []
@@ -159,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="