hairtrigger 0.2.25 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0537ad012af8bad34a62b81241c8517ac38fabeae279954e3e27ecc86e89cc9a
-  data.tar.gz: fe75190bc7fb5b8d2956929f5e72d2b48b0dbc81b5bdd27eac6fd48ccedf81cb
+  metadata.gz: d99ce209cb3572d2bcc2987758e5887b203f3fdf50ef295b18169a9f030d0d3a
+  data.tar.gz: 8e79c7bf238ebb1339bdefce635eb47050d509faad270c4af88d39a7ba89a8a3
 SHA512:
-  metadata.gz: f8df4419131442b648d2ed1a8315281e5d289638a228cf112882faacbcc27ebf5ca136474d1bf34d2b84e920187b23ec42365de67d1856112aa2449413571b52
-  data.tar.gz: 97193387286d4ed659612eca3d4d4a3266965f259a95c15494a627e494904d7a48c3b40a705455400aa5fb65bb90219a1485fd5494d8f006b472e8ac690eca6e
+  metadata.gz: ffee9a6cac525abb8d0d7e49ec3f78877b54cdbfcaa77a2e2c5b6ac86d4b87401e02f0b54da8a62ebd8029d35ad7d0e798cdbcae34c9db429a4dea5d05aa8e51
+  data.tar.gz: d0c6a189591d1e0722fcbd72b51392efacd222734ae7da513f2f8da651f9c9ed5cf035174d6af04cb1206913873329cf3d8ec645d722810df86889030586ab96

data/lib/hair_trigger/version.rb

@@ -1,5 +1,5 @@
 module HairTrigger
-  VERSION = "0.2.25"
+  VERSION = "1.0.0"
 
   def VERSION.<=>(other)
     split(/\./).map(&:to_i) <=> other.split(/\./).map(&:to_i)

data/lib/hair_trigger.rb

@@ -39,19 +39,14 @@ module HairTrigger
     end
 
     def migrator
-      version = ActiveRecord::VERSION::STRING
-      if version >= "6.0."
+      if ActiveRecord::VERSION::STRING >= "7.1."
+        connection = ActiveRecord::Tasks::DatabaseTasks.migration_connection
+        schema_migration = connection.schema_migration
+        migrations = ActiveRecord::MigrationContext.new(migration_path, schema_migration).migrations
+        ActiveRecord::Migrator.new(:up, migrations, schema_migration, ActiveRecord::InternalMetadata.new(connection))
+      else
         migrations = ActiveRecord::MigrationContext.new(migration_path, ActiveRecord::SchemaMigration).migrations
-      elsif version >= "5.2."
-        migrations = ActiveRecord::MigrationContext.new(migration_path).migrations
-      else # version >= "4.0."
-        migrations = ActiveRecord::Migrator.migrations(migration_path)
-      end
-
-      if version >= "6.0."
         ActiveRecord::Migrator.new(:up, migrations, ActiveRecord::SchemaMigration)
-      else
-        ActiveRecord::Migrator.new(:up, migrations)
       end
     end
 
@@ -82,7 +77,7 @@ module HairTrigger
       if previous_schema = (options.has_key?(:previous_schema) ? options[:previous_schema] : File.exist?(schema_rb_path) && File.read(schema_rb_path))
         base_triggers = MigrationReader.get_triggers(previous_schema, options)
         unless base_triggers.empty?
-          version = (previous_schema =~ /ActiveRecord::Schema\.define\(.*?(\d+)\)/) && $1.to_i
+          version = (previous_schema =~ /ActiveRecord::Schema(\[\d\.\d\])?\.define\(version\: (.*)\)/) && $2.to_i
           migrations.unshift [OpenStruct.new({:version => version}), base_triggers]
         end
       end
@@ -200,8 +195,16 @@ end
       "#{migration_base_name}#{name_version}"
     end
 
+    def timestamped_migrations
+      if ActiveRecord::VERSION::STRING >= "7.0."
+        ActiveRecord.timestamped_migrations
+      else
+        ActiveRecord::Base.timestamped_migrations
+      end
+    end
+
     def infer_migration_version(migration_name)
-      ActiveRecord::Base.timestamped_migrations ?
+      timestamped_migrations ?
         Time.now.getutc.strftime("%Y%m%d%H%M%S") :
         Dir.glob(migration_path + '/*rb').
           map{ |f| f.gsub(/.*\/(\d+)_.*/, '\1').to_i}.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hairtrigger
 version: !ruby/object:Gem::Version
-  version: 0.2.25
+  version: 1.0.0
 platform: ruby
 authors:
 - Jon Jensen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
@@ -83,7 +83,7 @@ homepage: http://github.com/jenseng/hair_trigger
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -91,15 +91,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: easy database triggers for active record
 test_files: []