hairtrigger 0.2.20 → 0.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8b4e42be78944baeb498703bd62358dc5e496fd
-  data.tar.gz: 44fffb42e6f6a47afa81b0383b793f75ac93a594
+  metadata.gz: f20c9f46678e0f212a8dddf861f0872609c4a519
+  data.tar.gz: 3dd34ed254df8230ff6ffd32020be89d9b63c386
 SHA512:
-  metadata.gz: 4076623ae117821f499bc3b8854085c2fb9fb107106ff53f2a2a7fb9dd33d4e368181db5817f5f317995486bbd74db343a9c32932432acc3dbff268d6a57a261
-  data.tar.gz: 07297019167a8320348100210225785d15c9631d37d585f1fcc338b8e782f49b9c088dc024870be3dbdda06e40bca511f7918145c0bc7008f8cc4ed9a71819c8
+  metadata.gz: a8db4cbe050c37d6aed248679e72770767e4b1b05812f8dc704ae2234e02ff5c7a8d38e3f4663ef23642b9c2aa3d39d18a813b73eb3f5ccc25cc24b5019170ca
+  data.tar.gz: 827a7536fcee643bc4652a6cb7b073e13ab182b1b03f69bf80b63deb63f7618c6b564d3a91df5fa48acda4059f3e8c7eed03eb06510c79e4ed45d3aa7ffa6794

data/lib/hair_trigger.rb

@@ -41,9 +41,15 @@ module HairTrigger
     end
 
     def migrator
-      migrations = ActiveRecord::VERSION::STRING >= "4.0." ?
-        ActiveRecord::Migrator.migrations(migration_path) :
-        migration_path
+      version = ActiveRecord::VERSION::STRING
+      if version >= "5.2."
+        migrations = ActiveRecord::MigrationContext.new(migration_path).migrations
+      elsif version < "4.0."
+        migrations = migration_path
+      else # version >= "4.0."
+        migrations = ActiveRecord::Migrator.migrations(migration_path)
+      end
+
       ActiveRecord::Migrator.new(:up, migrations)
     end
 

data/lib/hair_trigger/version.rb

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

data/spec/adapter_spec.rb

@@ -37,7 +37,7 @@ describe "adapter" do
           CREATE TRIGGER foos_tr AFTER DELETE ON users
           FOR EACH ROW
           BEGIN
-            UPDATE groups SET bob_count = bob_count - 1;
+            UPDATE user_groups SET bob_count = bob_count - 1;
           END
         SQL
 
@@ -63,7 +63,7 @@ describe "adapter" do
           CREATE FUNCTION foos_tr()
           RETURNS TRIGGER AS $$
           BEGIN
-            UPDATE groups SET bob_count = bob_count - 1;
+            UPDATE user_groups SET bob_count = bob_count - 1;
           END;
           $$ LANGUAGE plpgsql;
 
@@ -83,7 +83,7 @@ describe "adapter" do
           CREATE TRIGGER foos_tr AFTER DELETE ON users
           FOR EACH ROW
           BEGIN
-            UPDATE groups SET bob_count = bob_count - 1;
+            UPDATE user_groups SET bob_count = bob_count - 1;
           END;
         SQL
 
@@ -92,4 +92,3 @@ describe "adapter" do
     end
   end
 end
-

data/spec/migrations-3.2/20110331212003_initial_tables.rb

@@ -1,11 +1,11 @@
 class InitialTables < ActiveRecord::Migration
   def up
     create_table "users" do |t|
-      t.integer  "group_id"
+      t.integer  "user_group_id"
       t.string   "name"
     end
 
-    create_table "groups" do |t|
+    create_table "user_groups" do |t|
       t.integer  "bob_count", :default => 0
       t.integer  "updated_joe_count", :default => 0
     end
@@ -13,6 +13,6 @@ class InitialTables < ActiveRecord::Migration
 
   def down
     drop_table "users"
-    drop_table "groups"
+    drop_table "user_groups"
   end
-end
+end

data/spec/migrations-3.2/20110331212631_user_trigger.rb

@@ -8,7 +8,7 @@ class UserTrigger < ActiveRecord::Migration
         on("users").
         after(:insert).
         where("NEW.name = 'bob'") do
-      "UPDATE groups SET bob_count = bob_count + 1"
+      "UPDATE user_groups SET bob_count = bob_count + 1"
     end
   end
 

data/spec/migrations-3.2/20110417185102_manual_user_trigger.rb

@@ -4,7 +4,7 @@ class ManualUserTrigger < ActiveRecord::Migration
         on("users").
         after(:update).
         where("NEW.name = 'joe'") do
-      "UPDATE groups SET updated_joe_count = updated_joe_count + 1"
+      "UPDATE user_groups SET updated_joe_count = updated_joe_count + 1"
     end
   end
 end

data/spec/migrations-pre-3.1/20110331212003_initial_tables.rb

@@ -1,11 +1,11 @@
 class InitialTables < ActiveRecord::Migration
   def self.up
     create_table "users" do |t|
-      t.integer  "group_id"
+      t.integer  "user_group_id"
       t.string   "name"
     end
 
-    create_table "groups" do |t|
+    create_table "user_groups" do |t|
       t.integer  "bob_count", :default => 0
       t.integer  "updated_joe_count", :default => 0
     end
@@ -13,6 +13,6 @@ class InitialTables < ActiveRecord::Migration
 
   def self.down
     drop_table "users"
-    drop_table "groups"
+    drop_table "user_groups"
   end
-end
+end

data/spec/migrations-pre-3.1/20110331212631_user_trigger.rb

@@ -8,7 +8,7 @@ class UserTrigger < ActiveRecord::Migration
         on("users").
         after(:insert).
         where("NEW.name = 'bob'") do
-      "UPDATE groups SET bob_count = bob_count + 1"
+      "UPDATE user_groups SET bob_count = bob_count + 1"
     end
   end
 

data/spec/migrations-pre-3.1/20110417185102_manual_user_trigger.rb

@@ -4,7 +4,7 @@ class ManualUserTrigger < ActiveRecord::Migration
         on("users").
         after(:update).
         where("NEW.name = 'joe'") do
-      "UPDATE groups SET updated_joe_count = updated_joe_count + 1"
+      "UPDATE user_groups SET updated_joe_count = updated_joe_count + 1"
     end
   end
 end

data/spec/migrations/20110331212003_initial_tables.rb

@@ -1,11 +1,11 @@
 class InitialTables < ActiveRecord::Migration[5.0]
   def up
     create_table "users" do |t|
-      t.integer  "group_id"
+      t.integer  "user_group_id"
       t.string   "name"
     end
 
-    create_table "groups" do |t|
+    create_table "user_groups" do |t|
       t.integer  "bob_count", :default => 0
       t.integer  "updated_joe_count", :default => 0
     end
@@ -13,6 +13,6 @@ class InitialTables < ActiveRecord::Migration[5.0]
 
   def down
     drop_table "users"
-    drop_table "groups"
+    drop_table "user_groups"
   end
-end
+end

data/spec/migrations/20110331212631_user_trigger.rb

@@ -8,7 +8,7 @@ class UserTrigger < ActiveRecord::Migration[5.0]
         on("users").
         after(:insert).
         where("NEW.name = 'bob'") do
-      "UPDATE groups SET bob_count = bob_count + 1"
+      "UPDATE user_groups SET bob_count = bob_count + 1"
     end
   end
 

data/spec/migrations/20110417185102_manual_user_trigger.rb

@@ -4,7 +4,7 @@ class ManualUserTrigger < ActiveRecord::Migration[5.0]
         on("users").
         after(:update).
         where("NEW.name = 'joe'") do
-      "UPDATE groups SET updated_joe_count = updated_joe_count + 1"
+      "UPDATE user_groups SET updated_joe_count = updated_joe_count + 1"
     end
   end
 end

data/spec/models/user.rb

@@ -1,6 +1,6 @@
 class User < ActiveRecord::Base
   belongs_to :group
   trigger.after(:insert).where("NEW.name = 'bob'") do
-    "UPDATE groups SET bob_count = bob_count + 1"
+    "UPDATE user_groups SET bob_count = bob_count + 1"
   end
-end
+end

data/spec/models/user_group.rb

@@ -0,0 +1,3 @@
+class UserGroup < ActiveRecord::Base
+  has_many :users
+end

data/spec/schema_dumper_spec.rb

@@ -32,8 +32,8 @@ describe "schema dumping" do
       it "should not dump triggers in migrations that haven't run" do
         # edit our model trigger, generate a new migration
         replace_file_contents HairTrigger.model_path + '/user.rb',
-          '"UPDATE groups SET bob_count = bob_count + 1"',
-          '{:default => "UPDATE groups SET bob_count = bob_count + 2"}'
+          '"UPDATE user_groups SET bob_count = bob_count + 1"',
+          '{:default => "UPDATE user_groups SET bob_count = bob_count + 2"}'
         reset_models
 
         HairTrigger.should_not be_migrations_current
@@ -87,8 +87,8 @@ describe "schema dumping" do
       it "should evaluate all migrations even if they haven't run" do
         # edit our model trigger, generate a new migration
         replace_file_contents HairTrigger.model_path + '/user.rb',
-          '"UPDATE groups SET bob_count = bob_count + 1"',
-          '{:default => "UPDATE groups SET bob_count = bob_count + 2"}'
+          '"UPDATE user_groups SET bob_count = bob_count + 1"',
+          '{:default => "UPDATE user_groups SET bob_count = bob_count + 2"}'
         reset_models
 
         HairTrigger.should_not be_migrations_current

data/spec/spec_helper.rb

@@ -60,8 +60,9 @@ shared_context "hairtrigger utils" do
         ret = `echo "drop database if exists #{config['database']}; create database #{config['database']};" | mysql -u #{config['username']}`
         raise "error creating database: #{ret}" unless $?.exitstatus == 0
       when :postgresql
-        `dropdb -U #{config['username']} #{config['database']} &>/dev/null`
-        ret = `createdb -U #{config['username']} #{config['database']} 2>&1`
+        user_arg = "-U #{config['username']}" if config['username']
+        `dropdb #{user_arg} #{config['database']} &>/dev/null`
+        ret = `createdb #{user_arg} #{config['database']} 2>&1`
         raise "error creating database: #{ret}" unless $?.exitstatus == 0
     end
     # Arel has an issue in that it keeps using original connection for quoting,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hairtrigger
 version: !ruby/object:Gem::Version
-  version: 0.2.20
+  version: 0.2.21
 platform: ruby
 authors:
 - Jon Jensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-26 00:00:00.000000000 Z
+date: 2018-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -85,8 +85,8 @@ files:
 - 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/models/user_group.rb
 - spec/schema_dumper_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/jenseng/hair_trigger
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: easy database triggers for active record

data/spec/models/group.rb

@@ -1,3 +0,0 @@
-class Group < ActiveRecord::Base
-  has_many :users
-end