hairtrigger 0.2.19 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f42f7d04b773f6a0ce1f5acc86e90746f35322b1
-  data.tar.gz: d05ccf70ece346e5e73ed4433e11dc678c0bd6e9
+  metadata.gz: f8b4e42be78944baeb498703bd62358dc5e496fd
+  data.tar.gz: 44fffb42e6f6a47afa81b0383b793f75ac93a594
 SHA512:
-  metadata.gz: 5d78e2251de79e05fdd17f1194b7f3ac7afd1711bd5cd5a40fd0205f39f4f884ca63839152e45d3a70bc60c50f2210fef4a9a6ff72e736ba05c69f0d78bda570
-  data.tar.gz: 970c56031d52a6ad9f355e97dcad81f877ccf806a9bc4a7d6d1a659b5a5e0c04cc9505251be5982a126e625e227859c99217c3ef140678a889915a0a8f806ca2
+  metadata.gz: 4076623ae117821f499bc3b8854085c2fb9fb107106ff53f2a2a7fb9dd33d4e368181db5817f5f317995486bbd74db343a9c32932432acc3dbff268d6a57a261
+  data.tar.gz: 07297019167a8320348100210225785d15c9631d37d585f1fcc338b8e782f49b9c088dc024870be3dbdda06e40bca511f7918145c0bc7008f8cc4ed9a71819c8

data/README.md

@@ -325,4 +325,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-2017 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'
@@ -140,6 +141,7 @@ module HairTrigger
       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"
+      FileUtils.mkdir_p migration_path
       prefix = ActiveRecord::VERSION::STRING < "3.1." ? "self." : ""
       File.open(file_name, "w"){ |f| f.write <<-MIGRATION }
 # This migration was auto-generated via `rake db:generate_trigger_migration'.

data/lib/hair_trigger/builder.rb

@@ -427,7 +427,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)
@@ -97,7 +98,7 @@ module HairTrigger
 
     def self.included(base)
       base.class_eval do
-        alias_method_chain :trailer, :triggers
+        prepend TrailerWithTriggersSupport
         class << self
           attr_accessor :previous_schema
         end

data/lib/hair_trigger/version.rb

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

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

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

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

@@ -0,0 +1,18 @@
+# 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 UserTrigger < ActiveRecord::Migration
+  def up
+    create_trigger("users_after_insert_row_when_new_name_bob__tr", :generated => true, :compatibility => 1).
+        on("users").
+        after(:insert).
+        where("NEW.name = 'bob'") do
+      "UPDATE groups SET bob_count = bob_count + 1"
+    end
+  end
+
+  def down
+    drop_trigger("users_after_insert_row_when_new_name_bob__tr", "users")
+  end
+end

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

@@ -0,0 +1,10 @@
+class ManualUserTrigger < ActiveRecord::Migration
+  def up
+    create_trigger(:compatibility => 1).
+        on("users").
+        after(:update).
+        where("NEW.name = 'joe'") do
+      "UPDATE groups SET updated_joe_count = updated_joe_count + 1"
+    end
+  end
+end

data/spec/migrations/20110331212003_initial_tables.rb

@@ -1,4 +1,4 @@
-class InitialTables < ActiveRecord::Migration
+class InitialTables < ActiveRecord::Migration[5.0]
   def up
     create_table "users" do |t|
       t.integer  "group_id"

data/spec/migrations/20110331212631_user_trigger.rb

@@ -2,7 +2,7 @@
 # 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 UserTrigger < ActiveRecord::Migration
+class UserTrigger < ActiveRecord::Migration[5.0]
   def up
     create_trigger("users_after_insert_row_when_new_name_bob__tr", :generated => true, :compatibility => 1).
         on("users").

data/spec/migrations/20110417185102_manual_user_trigger.rb

@@ -1,4 +1,4 @@
-class ManualUserTrigger < ActiveRecord::Migration
+class ManualUserTrigger < ActiveRecord::Migration[5.0]
   def up
     create_trigger(:compatibility => 1).
         on("users").

data/spec/spec_helper.rb

@@ -39,7 +39,17 @@ shared_context "hairtrigger utils" do
     FileUtils.mkdir_p(HairTrigger.migration_path)
     FileUtils.cp_r('spec/models', 'tmp')
     reset_models
-    FileUtils.cp_r(Dir.glob("spec/migrations#{ActiveRecord::VERSION::STRING < "3.1." ? "-pre-3.1" : ""}/#{options[:migration_glob]}"), HairTrigger.migration_path)
+    FileUtils.cp_r(Dir.glob("spec/migrations#{migrations_sufix}/#{options[:migration_glob]}"), HairTrigger.migration_path)
+  end
+
+  def migrations_sufix
+    if ActiveRecord::VERSION::STRING < '3.1.'
+      '-pre-3.1'
+    elsif ActiveRecord::VERSION::STRING < '5.0'
+      '-3.2'
+    else
+      ''
+    end
   end
 
   def initialize_db

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hairtrigger
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.2.20
 platform: ruby
 authors:
 - Jon Jensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-26 00:00:00.000000000 Z
+date: 2017-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,28 +30,28 @@ dependencies:
     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
@@ -75,6 +75,9 @@ files:
 - lib/tasks/hair_trigger.rake
 - spec/adapter_spec.rb
 - spec/builder_spec.rb
+- spec/migrations-3.2/20110331212003_initial_tables.rb
+- spec/migrations-3.2/20110331212631_user_trigger.rb
+- spec/migrations-3.2/20110417185102_manual_user_trigger.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
@@ -106,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: easy database triggers for active record