migration_queries 0.4.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ff997e1ebe254c3fd23a538365fa0cafbcfc010c3e5199054202ed6bd1b2851
-  data.tar.gz: 70bef9fc0517130bc9158cc1f48c32b38c098ab9f93248de3957da1ea52ae87a
+  metadata.gz: 62f8b4f72f64212491d3cb2e3062ca7fc2e32a79c951e3c21fc5b23e37286f01
+  data.tar.gz: b4c174e6969d8969c169207cb5f1786e8aa66d71b3c3692710b187102efc7986
 SHA512:
-  metadata.gz: 55526a659e9ea130374069cc062a9895ffe8734845f91490514a64ad24ae11b3b574c7ccdc2011364585a2d63ec4037596a3d31c33e5e6724036714695b59f6a
-  data.tar.gz: f80f52f70194dd955c697d931ac42cc6c08b85cdd67e2ffb717ec5c1dc1b307e1d5b40f383117774c769a2630aec96777ac6cb75076fdf0db16dec7a8ee244ab
+  metadata.gz: 8205a98bbd53287dd1d984a8a683e6419a3c73bcd938c10772239d11fd36ed8710c778b627ccde5d488335794a2249d4922eceb272c8b624cfabef99229bb85d
+  data.tar.gz: 38e06a529ce0ca44b7a362f4f500b8d4d1752f99f97e0f3a48b3dbe7d35be489a30f5b843ea5a8b0a33395ae6a38eb735bae97a4eea465bc7d8658641a018380

data/README.md

@@ -14,12 +14,6 @@ end
 
 Then, run `bundle install` to install the gem.
 
-And then execute:
-
-```bash
-bundle exec rake migration_queries:install
-```
-
 ## Usage
 
 The gem is going to automatically track migration queries executed by ActiveRecord. You can view the logged queries in your Rails console or in the log files.
@@ -50,7 +44,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/migration_queries. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/migration_queries/blob/master/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/szymonlipka/migration_queries. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/migration_queries/blob/master/CODE_OF_CONDUCT.md).
 
 ## License
 

data/Rakefile

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-load("lib/tasks/setup_migration_queries.rake")
-
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 

data/lib/migration_queries/executer.rb

@@ -7,19 +7,38 @@ module MigrationQueries
   # with logic to capture SQL queries executed during migrations.
   module Executer
     def execute(sql, *_args)
-      stack_trace = caller.detect { |path| path.include?(Rails.root.to_s) && path.include?("db/migrate") }
-      file_path = stack_trace.match(/(.+):\d+:in/)[1] if stack_trace
-      if defined?(file_path) && file_path
-        data_object = MigrationQueries.gatherer.queries_data_objects.detect do |data_object|
-          data_object.file_path == file_path
-        end || MigrationQueries::Data.new(file_path: file_path)
-        data_object.sql_queries << sql
-
-        unless MigrationQueries.gatherer.queries_data_objects.include?(data_object)
-          MigrationQueries.gatherer.queries_data_objects << data_object
-        end
-      end
+      gather_queries(sql, caller)
       super
     end
+
+    private
+
+    def gather_queries(sql, caller)
+      stack_trace = detect_stack_trace(caller)
+      file_path = extract_file_path(stack_trace) if stack_trace
+      gatherer = load_gatherer
+      return unless defined?(file_path) && file_path
+
+      data_object = gatherer.queries_data_objects.detect do |data_object|
+        data_object.file_path == file_path
+      end || MigrationQueries::Data.new(file_path: file_path)
+      data_object.sql_queries << sql
+
+      return if gatherer.queries_data_objects.include?(data_object)
+
+      MigrationQueries.gatherer.queries_data_objects << data_object
+    end
+
+    def load_gatherer
+      MigrationQueries.gatherer
+    end
+
+    def detect_stack_trace(caller)
+      caller.detect { |path| path.include?(Rails.root.to_s) && path.include?("db/migrate") }
+    end
+
+    def extract_file_path(stack_trace)
+      stack_trace.match(/(.+):\d+:in/)[1]
+    end
   end
 end

data/lib/migration_queries/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MigrationQueries
-  VERSION = "0.4.0"
+  VERSION = "1.1.0"
 end

data/lib/migration_queries.rb

@@ -6,6 +6,9 @@ require_relative "migration_queries/executer"
 require_relative "migration_queries/migrater"
 require "active_record"
 
+ActiveRecord::ConnectionAdapters::AbstractAdapter.include(MigrationQueries::Executer)
+ActiveRecord::Migration::Current.include(MigrationQueries::Migrater)
+
 # MigrationQueries is a module that provides functionality to gather, execute, and migrate SQL queries
 # during ActiveRecord migrations. It includes the Gatherer, Executer, and Migrater modules to handle
 # different aspects of SQL query management.
@@ -15,9 +18,4 @@ module MigrationQueries
   def self.gatherer
     @gatherer ||= MigrationQueries::Gatherer.new
   end
-
-  def self.init!
-    ActiveRecord::ConnectionAdapters::AbstractAdapter.include(MigrationQueries::Executer)
-    ActiveRecord::Migration::Current.include(MigrationQueries::Migrater)
-  end
 end

data/sig/migration_queries/executer.rbs

@@ -1,5 +1,15 @@
 module MigrationQueries
   module Executer
     def execute: -> untyped
+
+    private
+
+    def detect_stack_trace: -> String
+
+    def extract_file_path: -> String
+
+    def gather_queries: -> untyped
+
+    def load_gatherer: -> MigrationQueries::Gatherer
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: migration_queries
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Szymon Lipka
@@ -46,7 +46,6 @@ files:
 - lib/migration_queries/gatherer.rb
 - lib/migration_queries/migrater.rb
 - lib/migration_queries/version.rb
-- lib/tasks/setup_migration_queries.rake
 - sig/migration_queries.rbs
 - sig/migration_queries/data.rbs
 - sig/migration_queries/executer.rbs

data/lib/tasks/setup_migration_queries.rake

@@ -1,24 +0,0 @@
-# lib/tasks/setup_migration_queries.rake
-
-namespace :migration_queries do
-  desc "Create migration_queries.rb initializer"
-  task :setup do
-    initializer_path = Rails.root.join("config", "initializers", "migration_queries.rb")
-    content = <<~RUBY
-      # frozen_string_literal: true
-
-      if Rails.env.development?
-        require 'migration_queries'
-
-        MigrationQueries.init!
-      end
-    RUBY
-
-    if File.exist?(initializer_path)
-      puts "Initializer file already exists at #{initializer_path}"
-    else
-      File.write(initializer_path, content)
-      puts "Created initializer file at #{initializer_path}"
-    end
-  end
-end