Replace container initialization to system folder

hanami · Feb 14, 2018 · d06a7d6 · d06a7d6
1 parent a6a86a9
commit d06a7d6
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/config/environment.rb b/config/environment.rb
@@ -1,6 +1,7 @@
 require 'bundler/setup'
 require 'hanami/setup'
 require 'hanami/model'
+require_relative '../system/import'
 require_relative '../lib/contributors'
 require_relative '../apps/admin/application'
 require_relative '../apps/api/application'

diff --git a/config/initializers/application.rb b/config/initializers/application.rb
@@ -1,12 +1,9 @@
-require 'dry/system/container'
-
 # Configure the code that will yield each time Admin::Action is included
 # This is useful for sharing common functionality
 #
 # See: http://www.rubydoc.info/gems/hanami-controller#Configuration
 ADMIN_USERNAME = ENV.fetch('ADMIN_USERNAME')
 ADMIN_PASSWORD = ENV.fetch('ADMIN_PASSWORD')
 
-class Application < Dry::System::Container
-  configure
-end
+# Enable pagination helpers for repositories
+CommitRepository.enable_pagination!
diff --git a/config/initializers/enable_pagination.rb b/config/initializers/enable_pagination.rb
diff --git a/lib/contributors.rb b/lib/contributors.rb
@@ -1 +0,0 @@
-Hanami::Utils.require!("#{__dir__}/contributors")

diff --git a/system/container.rb b/system/container.rb
@@ -0,0 +1,5 @@
+require 'dry/system/container'
+
+class Application < Dry::System::Container
+  configure
+end
diff --git a/system/import.rb b/system/import.rb
@@ -1,2 +1,2 @@
-require 'system/container'
+require_relative './container'
 Import = Application.injector
Original file line number	Diff line number	Diff line change
		@@ -1 +0,0 @@
		Hanami::Utils.require!("#{__dir__}/contributors")