raities clean up

vprokopchuk256 · Dec 27, 2014 · 3bcf495 · 3bcf495
1 parent 8a70a62
commit 3bcf495
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/lib/mv-core.rb b/lib/mv-core.rb
@@ -2,6 +2,8 @@
 require 'active_record'
 
 require 'mv/core/railtie'
+
+ActiveSupport.run_load_hooks(:mv_core)
 # require 'active_record/railtie'
 
 # require File.expand_path(File.dirname(__FILE__)) + '/options'

diff --git a/lib/mv/core/railtie.rb b/lib/mv/core/railtie.rb
@@ -6,15 +6,17 @@
 module Mv
   module Core
     class Railtie < ::Rails::Railtie
-      initializer 'mv-core.initilization.migration_validators_table', after: 'active_record.initialize_database' do
-        Mv::Core::Services::CreateMigrationValidatorsTable.new.execute
+      initializer 'mv-core.initialization' do
+        ActiveSupport.on_load(:active_record) do
+          # ::ActiveRecord::Base.connection.class.send(:prepend, Mv::Core::ActiveRecord::ConnectionAdapters::AbstractAdapterDecorator)
+          ::ActiveRecord::ConnectionAdapters::TableDefinition.send(:prepend, Mv::Core::ActiveRecord::ConnectionAdapters::TableDefinitionDecorator)
+          ::ActiveRecord::Migration.send(:prepend, Mv::Core::ActiveRecord::MigrationDecorator)
+        end
       end
 
-      initializer 'mv-core.initialization.active_record', after: 'mv-core.initilization.migration_validators_table' do
-        ::ActiveRecord::Base.connection.class.send(:prepend, Mv::Core::ActiveRecord::ConnectionAdapters::AbstractAdapterDecorator)
-        ::ActiveRecord::ConnectionAdapters::TableDefinition.send(:prepend, Mv::Core::ActiveRecord::ConnectionAdapters::TableDefinitionDecorator)
-        ::ActiveRecord::Migration.send(:prepend, Mv::Core::ActiveRecord::MigrationDecorator)
+      initializer 'mv-core.initilization.migration_validators_table', after: 'active_record.initialize_database' do
+        Mv::Core::Services::CreateMigrationValidatorsTable.new.execute
       end
     end
   end
-end
+end