hairtrigger 0.1.10 → 0.1.11

data/Gemfile

@@ -1,13 +1,16 @@
 source "http://rubygems.org"
 
 gem "activerecord", ">=2.3.0"
+gem 'ruby_parser', '2.0.6'
+gem 'ruby2ruby', '1.2.5'
 group :development do
   gem "rspec", "~> 2.3.0"
   gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
+  gem "jeweler", "~> 1.6.1"
   gem "rcov", ">= 0"
   gem 'mysql', '>= 2.8.1'
-  gem 'mysql2', '>= 0.2.7'
+  gem 'mysql2', '>= 0.2.7', '< 0.3'
   gem 'pg', '>= 0.10.1'
   gem 'sqlite3-ruby', '>= 1.3.2'
+  gem 'ruby-debug',   '0.10.4'
 end

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.11

data/lib/hair_trigger.rb

@@ -1,11 +1,10 @@
 require 'ostruct'
 require 'hair_trigger/base'
 require 'hair_trigger/builder'
+require 'hair_trigger/migration_reader'
 require 'hair_trigger/migrator'
-require 'hair_trigger/migration'
 require 'hair_trigger/adapter'
 require 'hair_trigger/schema_dumper'
-require 'hair_trigger/schema'
 
 module HairTrigger
   def self.current_triggers
@@ -13,12 +12,12 @@ module HairTrigger
     canonical_triggers = []
     Dir[model_path + '/*rb'].each do |model|
       class_name = model.sub(/\A.*\/(.*?)\.rb\z/, '\1').camelize
+      next unless File.read(model) =~ /^\s*trigger[\.\(]/
       begin
         require model unless klass = Kernel.const_get(class_name) rescue nil
         klass = Kernel.const_get(class_name)
       rescue StandardError, LoadError
         raise "unable to load #{class_name} and its trigger(s)" if File.read(model) =~ /^\s*trigger[\.\(]/
-        next
       end
       canonical_triggers += klass.triggers if klass < ActiveRecord::Base && klass.triggers
     end
@@ -32,11 +31,6 @@ module HairTrigger
       options[:skip_pending_migrations] = true
     end
 
-    prev_verbose = ActiveRecord::Migration.verbose
-    ActiveRecord::Migration.verbose = false
-    ActiveRecord::Migration.extract_trigger_builders = true
-    ActiveRecord::Migration.extract_all_triggers = options[:include_manual_triggers] || false
-    
     # 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
@@ -47,27 +41,26 @@ module HairTrigger
     # evaluate all migrations along with schema.rb, ordered by version
     migrator = ActiveRecord::Migrator.new(:up, migration_path)
     migrated = migrator.migrated rescue []
-    migrations = migrator.migrations.select{ |migration|
-      File.read(migration.filename) =~ /(create|drop)_trigger/ &&
-      (options[:skip_pending_migrations] ? migrated.include?(migration.version) : true)
-    }.each{ |migration|
-      migration.migrate(:up)
-    }
-
-    if options.has_key?(:previous_schema)
-      eval(options[:previous_schema]) if options[:previous_schema]
-    elsif File.exist?(schema_rb_path)
-      load(schema_rb_path)
+    migrations = []
+    migrator.migrations.each do |migration|
+      next if options[:skip_pending_migrations] && !migrated.include?(migration.version)
+      triggers = MigrationReader.get_triggers(migration, options)
+      migrations << [migration, triggers] unless triggers.empty?
     end
-    if ActiveRecord::Schema.info && ActiveRecord::Schema.trigger_builders
-      migrations.unshift OpenStruct.new({:version => ActiveRecord::Schema.info[:version], :trigger_builders => ActiveRecord::Schema.trigger_builders})
+
+    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\(:version => (\d+)\)/) && $1.to_i
+        migrations.unshift [OpenStruct.new({:version => version}), base_triggers]
+      end
     end
-    migrations = migrations.sort_by(&:version) unless options[:schema_rb_first]
+    
+    migrations = migrations.sort_by{|(migration, triggers)| migration.version} unless options[:schema_rb_first]
 
     all_builders = []
-    migrations.each do |migration|
-      next unless migration.trigger_builders
-      migration.trigger_builders.each do |new_trigger|
+    migrations.each do |(migration, triggers)|
+      triggers.each do |new_trigger|
         # if there is already a trigger with this name, delete it since we are
         # either dropping it or replacing it
         new_trigger.prepare!
@@ -77,11 +70,6 @@ module HairTrigger
     end
 
     all_builders
-
-  ensure
-    ActiveRecord::Migration.verbose = prev_verbose
-    ActiveRecord::Migration.extract_trigger_builders = false
-    ActiveRecord::Migration.extract_all_triggers = false
   end
 
   def self.migrations_current?
@@ -185,9 +173,6 @@ end
 end
 
 ActiveRecord::Base.send :extend, HairTrigger::Base
-ActiveRecord::Migration.send :extend, HairTrigger::Migration
-ActiveRecord::MigrationProxy.send :delegate, :trigger_builders, :to=>:migration
 ActiveRecord::Migrator.send :extend, HairTrigger::Migrator
 ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval { include HairTrigger::Adapter }
-ActiveRecord::SchemaDumper.class_eval { include HairTrigger::SchemaDumper }
-ActiveRecord::Schema.send :extend, HairTrigger::Schema
+ActiveRecord::SchemaDumper.class_eval { include HairTrigger::SchemaDumper }

data/lib/hair_trigger/base.rb

@@ -8,6 +8,7 @@ module HairTrigger
         name = nil
       end
       options[:compatibility] ||= ::HairTrigger::Builder::compatibility
+      options[:generated] = true
       @triggers ||= []
       trigger = ::HairTrigger::Builder.new(name, options)
       @triggers << trigger

data/lib/hair_trigger/builder.rb

@@ -212,17 +212,25 @@ module HairTrigger
 
     def <=>(other)
       ret = prepared_name <=> other.prepared_name
-      ret == 0 ? hash <=> other.hash : ret
+      return ret unless ret == 0
+      hash <=> other.hash
+    end
+
+    def ==(other)
+      components == other.components
     end
 
     def eql?(other)
-      return false unless other.is_a?(HairTrigger::Builder)
-      hash == other.hash
+      other.is_a?(HairTrigger::Builder) && self == other
     end
 
     def hash
       prepare!
-      [self.options.hash, self.prepared_actions.hash, self.prepared_where.hash, self.triggers.hash, @compatibility].hash
+      components.hash
+    end
+
+    def components
+      [self.options, self.prepared_actions, self.prepared_where, self.triggers, @compatibility]
     end
 
     def errors

data/lib/hair_trigger/migration_reader.rb

@@ -0,0 +1,64 @@
+require 'ruby_parser'
+require 'ruby2ruby'
+
+module HairTrigger
+  module MigrationReader
+    class << self
+      def get_triggers(source, options)
+        triggers = []
+        if source.is_a?(String)
+          # schema.rb contents... because it's auto-generated and we know
+          # exactly what it will look like, we can safely use a regex
+          source.scan(/^  create_trigger\(.*?\n  end\n\n/m).each do |match|
+            trigger = instance_eval("generate_" + match.strip)
+            triggers << trigger if options[:include_manual_triggers] || trigger.options[:generated]
+          end
+        else
+          contents = File.read(source.filename)
+          return [] unless contents =~ /(create|drop)_trigger/
+          sexps = RubyParser.new.parse(contents)
+          # find the migration class
+          sexps = [sexps] unless sexps[0] == :block
+          sexps = sexps.detect{ |s| s.is_a?(Sexp) && s[0] == :class && s[1] == source.name.to_sym }.last
+          # find the block of the up method
+          sexps = sexps.last if sexps.last.is_a?(Sexp) && sexps.last[0] == :block
+          sexps = sexps.detect{ |s| s.is_a?(Sexp) && s[0] == :defs && s[1] && s[1][0] == :self && s[2] == :up }.last.last
+          sexps.each do |sexp|
+            next unless (method = extract_method_call(sexp)) && [:create_trigger, :drop_trigger].include?(method)
+            trigger = instance_eval("generate_" + generator.process(sexp))
+            triggers << trigger if options[:include_manual_triggers] || trigger.options[:generated]
+          end
+        end
+        triggers
+      rescue
+        $stderr.puts "Error reading triggers in #{source.filename rescue "schema.rb"}: #{$!}"
+      end
+
+      private
+      def extract_method_call(exp)
+        return nil unless exp.is_a?(Array)
+        if exp[0] == :iter
+          exp = exp[1] while exp[1].is_a?(Array) && exp[1][0] == :call
+        end
+        if exp[0] == :call
+          exp[2]
+        end
+      end
+
+      def generate_create_trigger(*arguments)
+        arguments.unshift({}) if arguments.empty?
+        arguments.unshift(nil) if arguments.first.is_a?(Hash)
+        arguments[1][:compatibility] ||= HairTrigger::Builder.base_compatibility
+        ::HairTrigger::Builder.new(*arguments)
+      end
+
+      def generate_drop_trigger(*arguments)
+        ::HairTrigger::Builder.new(arguments[0], {:table => arguments[1], :drop => true})
+      end
+
+      def generator
+        @generator ||= Ruby2Ruby.new
+      end
+    end
+  end
+end

data/spec/schema_dumper_spec.rb

@@ -77,6 +77,7 @@ describe "schema" do
       }
       migration = HairTrigger.generate_migration
       ActiveRecord::Migrator.migrate(HairTrigger.migration_path)
+      HairTrigger.should be_migrations_current
       ActiveRecord::Base.connection.triggers.values.grep(/bob_count \+ 1/).size.should eql(0)
       ActiveRecord::Base.connection.triggers.values.grep(/bob_count \+ 2/).size.should eql(1)
       
@@ -100,6 +101,24 @@ describe "schema" do
       schema_rb4.should_not eql(schema_rb3)
       schema_rb4.should eql(schema_rb2)
       ActiveRecord::Base.connection.triggers.values.grep(/bob_count \+ 1/).size.should eql(1)
+
+      # delete our migrations, it should still dump correctly
+      FileUtils.rm_rf(Dir.glob('tmp/migrations/*rb'))
+      ActiveRecord::SchemaDumper.previous_schema = schema_rb4
+      io = StringIO.new
+      ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, io)
+      io.rewind
+      schema_rb5 = io.read
+      schema_rb5.should eql(schema_rb4)
+
+      # "delete" schema.rb too, now it should have adapter-specific triggers
+      ActiveRecord::SchemaDumper.previous_schema = nil
+      io = StringIO.new
+      ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, io)
+      io.rewind
+      schema_rb6 = io.read
+      schema_rb6.should_not match(/create_trigger\(/)
+      schema_rb6.should match(/no candidate create_trigger statement could be found, creating an adapter-specific one/)
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hairtrigger
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 1
-  - 10
-  version: 0.1.10
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - Jon Jensen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-24 00:00:00 -06:00
+date: 2011-05-31 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,8 +36,40 @@ dependencies:
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        - 6
+        version: 2.0.6
+  name: ruby_parser
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 2
+        - 5
+        version: 1.2.5
+  name: ruby2ruby
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -49,11 +81,11 @@ dependencies:
         - 0
         version: 2.3.0
   name: rspec
-  version_requirements: *id002
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -65,27 +97,27 @@ dependencies:
         - 0
         version: 1.0.0
   name: bundler
-  version_requirements: *id003
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 13
         segments: 
         - 1
-        - 5
-        - 2
-        version: 1.5.2
+        - 6
+        - 1
+        version: 1.6.1
   name: jeweler
-  version_requirements: *id004
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -95,11 +127,11 @@ dependencies:
         - 0
         version: "0"
   name: rcov
-  version_requirements: *id005
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -111,13 +143,20 @@ dependencies:
         - 1
         version: 2.8.1
   name: mysql
-  version_requirements: *id006
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 3
+        version: "0.3"
     - - ">="
       - !ruby/object:Gem::Version 
         hash: 25
@@ -127,11 +166,11 @@ dependencies:
         - 7
         version: 0.2.7
   name: mysql2
-  version_requirements: *id007
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -143,11 +182,11 @@ dependencies:
         - 1
         version: 0.10.1
   name: pg
-  version_requirements: *id008
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -159,11 +198,27 @@ dependencies:
         - 2
         version: 1.3.2
   name: sqlite3-ruby
-  version_requirements: *id009
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 10
+        - 4
+        version: 0.10.4
+  name: ruby-debug
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -175,11 +230,11 @@ dependencies:
         - 0
         version: 2.3.0
   name: activerecord
-  version_requirements: *id010
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -191,7 +246,7 @@ dependencies:
         - 0
         version: 2.3.0
   name: rspec
-  version_requirements: *id011
+  version_requirements: *id014
 description: allows you to declare database triggers in ruby in your models, and then generate appropriate migrations as they change
 email: jenseng@gmail.com
 executables: []
@@ -214,9 +269,8 @@ files:
 - lib/hair_trigger/adapter.rb
 - lib/hair_trigger/base.rb
 - lib/hair_trigger/builder.rb
-- lib/hair_trigger/migration.rb
+- lib/hair_trigger/migration_reader.rb
 - lib/hair_trigger/migrator.rb
-- lib/hair_trigger/schema.rb
 - lib/hair_trigger/schema_dumper.rb
 - lib/tasks/hair_trigger.rake
 - rails/init.rb
@@ -261,11 +315,5 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: easy database triggers for active record
-test_files: 
-- spec/builder_spec.rb
-- spec/migrations/20110331212003_initial_tables.rb
-- spec/migrations/20110331212631_user_trigger.rb
-- spec/migrations/20110417185102_manual_user_trigger.rb
-- spec/models/group.rb
-- spec/models/user.rb
-- spec/schema_dumper_spec.rb
+test_files: []
+

data/lib/hair_trigger/migration.rb

@@ -1,39 +0,0 @@
-module HairTrigger
-  module Migration
-    attr_reader :trigger_builders
-
-    def method_missing_with_trigger_building(method, *arguments, &block)
-      if extract_trigger_builders
-        extract_this_trigger = extract_all_triggers
-        trigger = if method.to_sym == :create_trigger
-          arguments.unshift({}) if arguments.empty?
-          arguments.unshift(nil) if arguments.first.is_a?(Hash)
-          extract_this_trigger ||= arguments[1].delete(:generated)
-          arguments[1][:compatibility] ||= HairTrigger::Builder.base_compatibility
-          ::HairTrigger::Builder.new(*arguments)
-        elsif method.to_sym == :drop_trigger
-          extract_this_trigger ||= arguments[2].delete(:generated) if arguments[2]
-          ::HairTrigger::Builder.new(arguments[0], {:table => arguments[1], :drop => true})
-        end
-        (@trigger_builders ||= []) << trigger if trigger && extract_this_trigger
-        trigger
-
-        # normally we would fall through to the connection for everything
-        # else, but we don't want to do that since we are not actually
-        # running the migration
-      else
-        method_missing_without_trigger_building(method, *arguments, &block)
-      end
-    end
-
-    def self.extended(base)
-      base.class_eval do
-        class << self
-          alias_method_chain :method_missing, :trigger_building
-          cattr_accessor :extract_trigger_builders
-          cattr_accessor :extract_all_triggers
-        end
-      end
-    end
-  end
-end

data/lib/hair_trigger/schema.rb

@@ -1,17 +0,0 @@
-module HairTrigger
-  module Schema
-    attr_reader :info
-    def define_with_no_save(info={}, &block)
-      instance_eval(&block)
-      @info = info
-    end
-
-    def self.extended(base)
-      base.instance_eval do
-        class << self
-          alias_method_chain :define, :no_save
-        end
-      end
-    end
-  end
-end