hairtrigger 0.2.24 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b3a4b255f8184decc442a9c455f5b8a5a5c9bd48
-  data.tar.gz: b6c202c7328de121c67161cc4d31d83926076044
+SHA256:
+  metadata.gz: d99ce209cb3572d2bcc2987758e5887b203f3fdf50ef295b18169a9f030d0d3a
+  data.tar.gz: 8e79c7bf238ebb1339bdefce635eb47050d509faad270c4af88d39a7ba89a8a3
 SHA512:
-  metadata.gz: 5eb6f48db749f2841ee9a0b986dbaf9cf2d93f48f687822e8a6dda52c90e45165fba783510e7fb1e5ec8a490ce4a6dd58df5f2ebd04567e3d2839f87ef82815f
-  data.tar.gz: c8eebfc8a7a45d4987f1d6ea5281a06c333a4eee929830a73a78521c442983b1743f14a4f677fb31de9d4a7ce6b144f67000f84cd7c068d08160ef260bb815cf
+  metadata.gz: ffee9a6cac525abb8d0d7e49ec3f78877b54cdbfcaa77a2e2c5b6ac86d4b87401e02f0b54da8a62ebd8029d35ad7d0e798cdbcae34c9db429a4dea5d05aa8e51
+  data.tar.gz: d0c6a189591d1e0722fcbd72b51392efacd222734ae7da513f2f8da651f9c9ed5cf035174d6af04cb1206913873329cf3d8ec645d722810df86889030586ab96

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2015 Jon Jensen
+Copyright (c) 2011-2022 Jon Jensen
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,5 +1,5 @@
 # HairTrigger
-[<img src="https://secure.travis-ci.org/jenseng/hair_trigger.svg?branch=master" />](http://travis-ci.org/jenseng/hair_trigger)
+[<img src="https://github.com/jenseng/hair_trigger/workflows/CI/badge.svg" />](https://github.com/jenseng/hair_trigger/actions?query=workflow%3ACI)
 
 HairTrigger lets you create and manage database triggers in a concise,
 db-agnostic, Rails-y way. You declare triggers right in your models in Ruby,
@@ -101,10 +101,10 @@ Only fire the update trigger if at least one of the columns is specified in the
 Permissions/role to check when calling trigger. PostgreSQL supports `:invoker` (default) and `:definer`, MySQL supports `:definer` (default) and arbitrary users (syntax: `'user'@'host'`).
 
 #### timing(timing)
-Required (but may be satisified by `before`/`after`). Possible values are `:before`/`:after`.
+Required (but may be satisfied by `before`/`after`). Possible values are `:before`/`:after`.
 
 #### events(*events)
-Required (but may be satisified by `before`/`after`). Possible values are `:insert`/`:update`/`:delete`/`:truncate`. MySQL/SQLite only support one action per trigger, and don't support `:truncate`.
+Required (but may be satisfied by `before`/`after`). Possible values are `:insert`/`:update`/`:delete`/`:truncate`. MySQL/SQLite only support one action per trigger, and don't support `:truncate`.
 
 #### nowrap(flag = true)
 PostgreSQL-specific option to prevent the trigger action from being wrapped in a `CREATE FUNCTION`. This is useful for executing existing triggers/functions directly, but is not compatible with the `security` setting nor can it be used with pre-9.0 PostgreSQL when supplying a `where` condition.
@@ -240,6 +240,21 @@ As long as you don't delete old migrations and schema.rb prior to running
 If you have deleted all trigger migrations, you can regenerate a new
 baseline for model triggers via `rake db:generate_trigger_migration`.
 
+### Filtering
+
+It is possible to filter which triggers are dumped by setting any of these
+configuration values:
+
+```ruby
+HairTrigger::SchemaDumper::Configuration.ignore_triggers = 'exact_trigger_name'
+HairTrigger::SchemaDumper::Configuration.ignore_tables = [/partial_/, 'exact_table_name']
+HairTrigger::SchemaDumper::Configuration.allow_triggers = [/partial_/, 'exact_trigger_name']
+HairTrigger::SchemaDumper::Configuration.allow_tables = 'exact_table_name'
+```
+
+Each option can accept a single String or Regexp, or a mixed array of both.
+
+
 ## Testing
 
 To stay on top of things, it's strongly recommended that you add a test or
@@ -327,10 +342,10 @@ gem in years 😬) but am happy to take contributions. If I'm slow to respond, d
 hesitate to @ me repeatedly, sometimes those github notifications slip through
 the cracks. 😆.
 
-If you want to add a feature/bugfix, you can rely on Travis to run the tests, but
-do also run them locally (especially if you are changing supported railses/etc).
-HairTrigger uses [appraisal](https://github.com/thoughtbot/appraisal) to manage all
-that w/ automagical gemfiles. So the tl;dr when testing locally is:
+If you want to add a feature/bugfix, you can rely on Github Actions to run the
+tests, but do also run them locally (especially if you are changing supported
+railses/etc). HairTrigger uses [appraisal](https://github.com/thoughtbot/appraisal)
+to manage all that w/ automagical gemfiles. So the tl;dr when testing locally is:
 
 1. make sure you have mysql and postgres installed (homebrew or whatever)
 2. `bundle exec appraisal install` -- get all the dependencies
@@ -348,4 +363,4 @@ that w/ automagical gemfiles. So the tl;dr when testing locally is:
 
 ## Copyright
 
-Copyright (c) 2011-2021 Jon Jensen. See LICENSE.txt for further details.
+Copyright (c) 2011-2022 Jon Jensen. See LICENSE.txt for further details.

data/lib/hair_trigger/schema_dumper.rb

@@ -1,5 +1,12 @@
 module HairTrigger
   module SchemaDumper
+    module Configuration
+      mattr_accessor :allow_tables
+      mattr_accessor :allow_triggers
+      mattr_accessor :ignore_tables
+      mattr_accessor :ignore_triggers
+    end
+
     module TrailerWithTriggersSupport
       def trailer(stream)
         orig_show_warnings = Builder.show_warnings
@@ -91,9 +98,35 @@ module HairTrigger
     end
 
     def whitelist_triggers(triggers)
-      triggers.reject do |name, source|
+      triggers = triggers.reject do |name, source|
         ActiveRecord::SchemaDumper.ignore_tables.any? { |ignored_table_name| source =~ /ON\s+#{@connection.quote_table_name(ignored_table_name)}\s/ }
       end
+
+      if Configuration.allow_tables.present?
+        triggers = triggers.select do |name, source|
+          Array(Configuration.allow_tables).any? { |allowed_table_name| source =~ /ON\s+#{@connection.quote_table_name(allowed_table_name)}\s/ }
+        end
+      end
+
+      if Configuration.allow_triggers.present?
+        triggers = triggers.select do |name, source|
+          Array(Configuration.allow_triggers).any? { |allowed_trigger_name| allowed_trigger_name === name } # Triple equals to allow regexps or strings as allowed_trigger_name
+        end
+      end
+
+      if Configuration.ignore_tables.present?
+        triggers = triggers.reject do |name, source|
+          Array(Configuration.ignore_tables).any? { |allowed_table_name| source =~ /ON\s+#{@connection.quote_table_name(allowed_table_name)}\s/ }
+        end
+      end
+
+      if Configuration.ignore_triggers.present?
+        triggers = triggers.reject do |name, source|
+          Array(Configuration.ignore_triggers).any? { |allowed_trigger_name| allowed_trigger_name === name } # Triple equals to allow regexps or strings as allowed_trigger_name
+        end
+      end
+
+      triggers
     end
 
     def self.included(base)

data/lib/hair_trigger/version.rb

@@ -1,5 +1,5 @@
 module HairTrigger
-  VERSION = "0.2.24"
+  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
 
@@ -62,7 +57,7 @@ module HairTrigger
         options[:skip_pending_migrations] = true
       end
 
-      # if we're in a db:schema:dump task (explict or kicked off by db:migrate),
+      # if we're in a db:schema:dump task (explicit or kicked off by db:migrate),
       # we evaluate the previous schema.rb (if it exists), and then all applied
       # migrations in order (even ones older than schema.rb). this ensures we
       # handle db:migrate:down scenarios correctly
@@ -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.24
+  version: 1.0.0
 platform: ruby
 authors:
 - Jon Jensen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-01 00:00:00.000000000 Z
+date: 2022-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
@@ -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,16 +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: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: easy database triggers for active record
 test_files: []