Attempt rails 6 w/ zeitwerk

indirect · Apr 20, 2020 · e27d816 · e27d816
1 parent 23e8f8c
commit e27d816
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 25 deletions.
diff --git a/app/controllers/confirmations_controller.rb → ...rollers/milia/confirmations_controller.rb b/app/controllers/confirmations_controller.rb → ...rollers/milia/confirmations_controller.rb
diff --git a/app/controllers/passwords_controller.rb → ...controllers/milia/passwords_controller.rb b/app/controllers/passwords_controller.rb → ...controllers/milia/passwords_controller.rb
diff --git a/app/controllers/registrations_controller.rb → ...rollers/milia/registrations_controller.rb b/app/controllers/registrations_controller.rb → ...rollers/milia/registrations_controller.rb
diff --git a/app/controllers/sessions_controller.rb → app/controllers/milia/sessions_controller.rb b/app/controllers/sessions_controller.rb → app/controllers/milia/sessions_controller.rb
diff --git a/lib/milia.rb b/lib/milia.rb
@@ -4,7 +4,7 @@
 require File.dirname(__FILE__) + '/milia/password_generator'
 require File.dirname(__FILE__) + '/milia/invite_member'
 
-require File.dirname(__FILE__) + '/milia/railtie' if defined?(Rails::Railtie)
+require File.dirname(__FILE__) + '/milia/engine' if defined?(Rails::Engine)
 
 module Milia
 
@@ -67,9 +67,9 @@ def self.whitelist_coupon_params()
   mattr_accessor :trace_on
   @@trace_on = false
 
-  # Default way to setup milia. 
+  # Default way to setup milia.
   def self.setup
     yield self
   end
-  
+
 end # module Milia
diff --git a/lib/milia/engine.rb b/lib/milia/engine.rb
@@ -0,0 +1,20 @@
+require 'milia'
+
+module Milia
+  class Engine < Rails::Engine
+    initializer 'milia.include' do
+
+        ActiveSupport.on_load(:active_record) do
+          include Milia::Base
+        end
+
+        ActiveSupport.on_load(:action_controller_base) do
+          include Milia::Control
+        end
+    end
+
+    rake_tasks do
+      load 'milia/tasks.rb'
+    end
+  end
+end
diff --git a/lib/milia/railtie.rb b/lib/milia/railtie.rb
diff --git a/milia.gemspec b/milia.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.platform      = Gem::Platform::RUBY
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'rails', '~> 5.0'
+  spec.add_runtime_dependency 'rails', '>= 5.0'
   spec.add_runtime_dependency 'devise', '~> 4.2'
 
   spec.add_development_dependency "bundler", "~> 1.7"