hairtrigger 0.2.19 → 0.2.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f42f7d04b773f6a0ce1f5acc86e90746f35322b1
-  data.tar.gz: d05ccf70ece346e5e73ed4433e11dc678c0bd6e9
+  metadata.gz: b3a4b255f8184decc442a9c455f5b8a5a5c9bd48
+  data.tar.gz: b6c202c7328de121c67161cc4d31d83926076044
 SHA512:
-  metadata.gz: 5d78e2251de79e05fdd17f1194b7f3ac7afd1711bd5cd5a40fd0205f39f4f884ca63839152e45d3a70bc60c50f2210fef4a9a6ff72e736ba05c69f0d78bda570
-  data.tar.gz: 970c56031d52a6ad9f355e97dcad81f877ccf806a9bc4a7d6d1a659b5a5e0c04cc9505251be5982a126e625e227859c99217c3ef140678a889915a0a8f806ca2
+  metadata.gz: 5eb6f48db749f2841ee9a0b986dbaf9cf2d93f48f687822e8a6dda52c90e45165fba783510e7fb1e5ec8a490ce4a6dd58df5f2ebd04567e3d2839f87ef82815f
+  data.tar.gz: c8eebfc8a7a45d4987f1d6ea5281a06c333a4eee929830a73a78521c442983b1743f14a4f677fb31de9d4a7ce6b144f67000f84cd7c068d08160ef260bb815cf

data/README.md

@@ -7,8 +7,15 @@ and a simple rake task does all the dirty work for you.
 
 ## Installation
 
-If you are using Rails 3 or beyond, just add `gem 'hairtrigger'` to your
-Gemfile. For Rails 2, it's [slightly more involved](RAILS2.md)
+HairTrigger works with Rails 5.0 onwards. Add the following line to your Gemfile:
+
+```ruby
+gem 'hairtrigger'
+```
+
+Then run `bundle install`
+
+For older versions of Rails check the last [0.2 release](https://github.com/jenseng/hair_trigger/tree/v0.2.21)
 
 ## Usage
 
@@ -248,7 +255,7 @@ create.
 
 ## Warnings and Errors
 
-There are a couple classes of errors: declaration errors and generation 
+There are a couple classes of errors: declaration errors and generation
 errors/warnings.
 
 Declaration errors happen if your trigger declaration is obviously wrong, and
@@ -313,10 +320,26 @@ existing trigger if you wish to redefine it.
 * Manual `create_trigger` statements have some gotchas. See the section
   "Manual triggers and :compatibility"
 
+## Contributing
+
+Contributions welcome! I don't write much Ruby these days 😢 (and haven't used this
+gem in years 😬) but am happy to take contributions. If I'm slow to respond, don't
+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:
+
+1. make sure you have mysql and postgres installed (homebrew or whatever)
+2. `bundle exec appraisal install` -- get all the dependencies
+3. `bundle exec appraisal rake` -- run the specs every which way
+
 ## Compatibility
 
-* Ruby 1.8.7+
-* Rails 2.3+
+* Ruby 2.3.0+
+* Rails 5.0+
 * PostgreSQL 8.0+
 * MySQL 5.0.10+
 * SQLite 3.3.8+
@@ -325,4 +348,4 @@ existing trigger if you wish to redefine it.
 
 ## Copyright
 
-Copyright (c) 2011-2015 Jon Jensen. See LICENSE.txt for further details.
+Copyright (c) 2011-2021 Jon Jensen. See LICENSE.txt for further details.

data/lib/hair_trigger.rb

@@ -1,4 +1,5 @@
 require 'ostruct'
+require 'fileutils'
 require 'active_record'
 require 'hair_trigger/base'
 require 'hair_trigger/migrator'
@@ -21,7 +22,7 @@ module HairTrigger
     end
 
     def models
-      if defined?(Rails) && Rails::VERSION::MAJOR > 2
+      if defined?(Rails)
         Rails.application.eager_load!
       else
         Dir[model_path + '/*rb'].each do |model|
@@ -34,16 +35,24 @@ module HairTrigger
           end
         end
       end
-      ActiveRecord::VERSION::STRING < "3.0." ?
-        ActiveRecord::Base.send(:subclasses) :
-        ActiveRecord::Base.descendants
+      ActiveRecord::Base.descendants
     end
 
     def migrator
-      migrations = ActiveRecord::VERSION::STRING >= "4.0." ?
-        ActiveRecord::Migrator.migrations(migration_path) :
-        migration_path
-      ActiveRecord::Migrator.new(:up, migrations)
+      version = ActiveRecord::VERSION::STRING
+      if version >= "6.0."
+        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
 
     def current_migrations(options = {})
@@ -52,7 +61,7 @@ module HairTrigger
         options[:schema_rb_first] = true
         options[:skip_pending_migrations] = true
       end
-  
+
       # if we're in a db:schema:dump task (explict 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
@@ -69,7 +78,7 @@ module HairTrigger
         triggers = MigrationReader.get_triggers(migration, options)
         migrations << [migration, triggers] unless triggers.empty?
       end
-  
+
       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?
@@ -77,9 +86,9 @@ module HairTrigger
           migrations.unshift [OpenStruct.new({:version => version}), base_triggers]
         end
       end
-      
+
       migrations = migrations.sort_by{|(migration, triggers)| migration.version} unless options[:schema_rb_first]
-  
+
       all_builders = []
       migrations.each do |(migration, triggers)|
         triggers.each do |new_trigger|
@@ -90,7 +99,7 @@ module HairTrigger
           all_builders << [migration.name, new_trigger] unless new_trigger.options[:drop]
         end
       end
-  
+
       all_builders
     end
 
@@ -101,27 +110,27 @@ module HairTrigger
     def generate_migration(silent = false)
       begin
         canonical_triggers = current_triggers
-      rescue 
+      rescue
         $stderr.puts $!
         exit 1
       end
-  
+
       migrations = current_migrations
       migration_names = migrations.map(&:first)
       existing_triggers = migrations.map(&:last)
-  
+
       up_drop_triggers = []
       up_create_triggers = []
       down_drop_triggers = []
       down_create_triggers = []
-  
+
       # see which triggers need to be dropped
       existing_triggers.each do |existing|
         next if canonical_triggers.any?{ |t| t.prepared_name == existing.prepared_name }
         up_drop_triggers.concat existing.drop_triggers
         down_create_triggers << existing
       end
-  
+
       # see which triggers need to be added/replaced
       (canonical_triggers - existing_triggers).each do |new_trigger|
         up_create_triggers << new_trigger
@@ -134,28 +143,28 @@ module HairTrigger
           down_create_triggers << existing
         end
       end
-  
+
       return if up_drop_triggers.empty? && up_create_triggers.empty?
 
       migration_name = infer_migration_name(migration_names, up_create_triggers, up_drop_triggers)
       migration_version = infer_migration_version(migration_name)
       file_name = migration_path + '/' + migration_version + "_" + migration_name.underscore + ".rb"
-      prefix = ActiveRecord::VERSION::STRING < "3.1." ? "self." : ""
-      File.open(file_name, "w"){ |f| f.write <<-MIGRATION }
+      FileUtils.mkdir_p migration_path
+      File.open(file_name, "w") { |f| f.write <<-RUBY }
 # This migration was auto-generated via `rake db:generate_trigger_migration'.
 # While you can edit this file, any changes you make to the definitions here
 # will be undone by the next auto-generated trigger migration.
 
-class #{migration_name} < ActiveRecord::Migration
-  def #{prefix}up
+class #{migration_name} < ActiveRecord::Migration[#{ActiveRecord::Migration.current_version}]
+  def up
     #{(up_drop_triggers + up_create_triggers).map{ |t| t.to_ruby('    ') }.join("\n\n").lstrip}
   end
 
-  def #{prefix}down
+  def down
     #{(down_drop_triggers + down_create_triggers).map{ |t| t.to_ruby('    ') }.join("\n\n").lstrip}
   end
 end
-      MIGRATION
+      RUBY
       file_name
     end
 
@@ -217,11 +226,9 @@ end
   end
 end
 
-ActiveRecord::Base.send :extend, HairTrigger::Base
-if ActiveRecord::VERSION::STRING < "4.1."
-  ActiveRecord::Migrator.send :extend, HairTrigger::Migrator
-else
+ActiveSupport.on_load(:active_record) do
+  ActiveRecord::Base.send :extend, HairTrigger::Base
   ActiveRecord::Migration.send :include, HairTrigger::Migrator
+  ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval { include HairTrigger::Adapter }
+  ActiveRecord::SchemaDumper.class_eval { include HairTrigger::SchemaDumper }
 end
-ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval { include HairTrigger::Adapter }
-ActiveRecord::SchemaDumper.class_eval { include HairTrigger::SchemaDumper }

data/lib/hair_trigger/builder.rb

@@ -137,22 +137,22 @@ module HairTrigger
       methods.each do |method|
         class_eval <<-METHOD, __FILE__, __LINE__ + 1
           alias #{method}_orig #{method}
-          def #{method}(*args)
+          def #{method}(*args, &block)
             @chained_calls << :#{method}
             if @triggers || @trigger_group
               @errors << ["mysql doesn't support #{method} within a trigger group", :mysql] unless [:name, :where, :all, :of].include?(:#{method})
             end
-            set_#{method}(*args, &(block_given? ? Proc.new : nil))
+            set_#{method}(*args, &(block_given? ? block : nil))
           end
-          def set_#{method}(*args)
+          def set_#{method}(*args, &block)
             if @triggers # i.e. each time we say t.something within a trigger group block
               @chained_calls.pop # the subtrigger will get this, we don't need it
               @chained_calls = @chained_calls.uniq
               @triggers << trigger = clone
-              trigger.#{method}(*args, &(block_given? ? Proc.new : nil))
+              trigger.#{method}(*args, &(block_given? ? block : nil))
             else
-              #{method}_orig(*args)
-              maybe_execute(&Proc.new) if block_given?
+              #{method}_orig(*args, &block)
+              maybe_execute(&block) if block_given?
               self
             end
           end
@@ -335,10 +335,11 @@ module HairTrigger
         block.call(self)
         raise DeclarationError, "trigger group did not define any triggers" if @triggers.empty?
       else
-        @actions = block.call
-        (@actions.is_a?(Hash) ? @actions.values : [@actions]).each do |actions|
-          actions.sub!(/(\s*)\z/, ';\1') if actions && actions !~ /;\s*\z/
-        end
+        @actions =
+          case (actions = block.call)
+          when Hash then actions.map { |key, action| [key, ensure_semicolon(action)] }.to_h
+          else ensure_semicolon(actions)
+          end
       end
       # only the top-most block actually executes
       if !@trigger_group
@@ -350,6 +351,10 @@ module HairTrigger
       self
     end
 
+    def ensure_semicolon(action)
+      action && action !~ /;\s*\z/ ? action.sub(/(\s*)\z/, ';\1') : action
+    end
+
     def validate_names!
       subtriggers = all_triggers(false)
       named_subtriggers = subtriggers.select{ |t| t.options[:name] }
@@ -427,7 +432,7 @@ END;
       raise GenerationError, "declare cannot be used in conjunction with nowrap" if options[:nowrap] && options[:declare]
       raise GenerationError, "security cannot be used in conjunction with nowrap" if options[:nowrap] && options[:security]
       raise GenerationError, "where can only be used in conjunction with nowrap on postgres 9.0 and greater" if options[:nowrap] && prepared_where && db_version < 90000
-      raise GenerationError, "of can only be used in conjunction with nowrap on postgres 9.1 and greater" if options[:nowrap] && options[:of] && db_version < 91000
+      raise GenerationError, "of can only be used in conjunction with nowrap on postgres 9.1 and greater" if options[:nowrap] && options[:of] && db_version < 90100
 
       sql = ''
 

data/lib/hair_trigger/migrator.rb

@@ -1,23 +1,25 @@
 module HairTrigger
   module Migrator
-    def proper_table_name_with_hash_awareness(*args)
-      name = args.first
-      return name if name.is_a?(Hash)
-      proper_table_name_without_hash_awareness(*args)
-    end
-
     class << self
+      module ProperTableNameWithHashAwarenessSupport
+        def proper_table_name(*args)
+          name = args.first
+          return name if name.is_a?(Hash)
+          super
+        end
+      end
+
       def extended(base)
         base.class_eval do
           class << self
-            alias_method_chain :proper_table_name, :hash_awareness
+            prepend ProperTableNameWithHashAwarenessSupport
           end
         end
       end
 
       def included(base)
         base.instance_eval do
-          alias_method_chain :proper_table_name, :hash_awareness
+          prepend ProperTableNameWithHashAwarenessSupport
         end
       end
     end

data/lib/hair_trigger/schema_dumper.rb

@@ -1,13 +1,14 @@
 module HairTrigger
   module SchemaDumper
-
-    def trailer_with_triggers(stream)
-      orig_show_warnings = Builder.show_warnings
-      Builder.show_warnings = false # we already show them when running the migration
-      triggers(stream)
-      trailer_without_triggers(stream)
-    ensure
-      Builder.show_warnings = orig_show_warnings
+    module TrailerWithTriggersSupport
+      def trailer(stream)
+        orig_show_warnings = Builder.show_warnings
+        Builder.show_warnings = false # we already show them when running the migration
+        triggers(stream)
+        super
+      ensure
+        Builder.show_warnings = orig_show_warnings
+      end
     end
 
     def triggers(stream)
@@ -54,7 +55,7 @@ module HairTrigger
           stream.puts "  # no candidate create_trigger statement could be found, creating an adapter-specific one"
         end
         if definition =~ /\n/
-          stream.print "  execute(<<-TRIGGERSQL)\n#{definition.rstrip}\n  TRIGGERSQL\n\n"
+          stream.print "  execute(<<-SQL)\n#{definition.rstrip}\n  SQL\n\n"
         else
           stream.print "  execute(#{definition.inspect})\n\n"
         end
@@ -66,7 +67,7 @@ module HairTrigger
     def normalize_trigger(name, definition, type)
       @adapter_name = @connection.adapter_name.downcase.to_sym
 
-      return definition unless @adapter_name == :postgresql
+      return definition unless @adapter_name == :postgresql || @adapter_name == :postgis
       # because postgres does not preserve the original CREATE TRIGGER/
       # FUNCTION statements, its decompiled reconstruction will not match
       # ours. we work around it by creating our generated trigger/function,
@@ -97,10 +98,9 @@ module HairTrigger
 
     def self.included(base)
       base.class_eval do
-        alias_method_chain :trailer, :triggers
-        class << self
-          attr_accessor :previous_schema
-        end
+        prepend TrailerWithTriggersSupport
+
+        class_attribute :previous_schema
       end
     end
   end

data/lib/hair_trigger/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hairtrigger
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.2.24
 platform: ruby
 authors:
 - Jon Jensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-26 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,42 +16,48 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: ruby2ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
 description: allows you to declare database triggers in ruby in your models, and then
   generate appropriate migrations as they change
 email: jenseng@gmail.com
@@ -73,19 +79,6 @@ files:
 - lib/hair_trigger/version.rb
 - lib/hairtrigger.rb
 - lib/tasks/hair_trigger.rake
-- spec/adapter_spec.rb
-- spec/builder_spec.rb
-- spec/migrations-pre-3.1/20110331212003_initial_tables.rb
-- spec/migrations-pre-3.1/20110331212631_user_trigger.rb
-- spec/migrations-pre-3.1/20110417185102_manual_user_trigger.rb
-- spec/migrations/20110331212003_initial_tables.rb
-- spec/migrations/20110331212631_user_trigger.rb
-- spec/migrations/20110417185102_manual_user_trigger.rb
-- spec/migrations_spec.rb
-- spec/models/group.rb
-- spec/models/user.rb
-- spec/schema_dumper_spec.rb
-- spec/spec_helper.rb
 homepage: http://github.com/jenseng/hair_trigger
 licenses:
 - MIT
@@ -98,15 +91,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.5
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: easy database triggers for active record