restructure a bit

NullVoxPopuli · Sep 18, 2016 · df9c6c6 · df9c6c6
1 parent a63ed91
commit df9c6c6
Show file tree

Hide file tree

Showing 23 changed files with 142 additions and 5 deletions.
diff --git a/lib/rails_module_unification.rb b/lib/rails_module_unification.rb
@@ -6,6 +6,16 @@
 module RailsModuleUnification
   extend ActiveSupport::Autoload
 
+  module_function
+
+  def directory=(dir)
+    @directory = dir
+  end
+
+  def directory
+    @directory || ''
+  end
+
   require 'rails_module_unification/railtie'
-  ActiveSupport::Dependencies.extend ActiveSupportExtensions
+  ActiveSupport::Dependencies.extend RailsModuleUnification::ActiveSupportExtensions
 end
diff --git a/lib/rails_module_unification/railtie.rb b/lib/rails_module_unification/railtie.rb
@@ -5,7 +5,7 @@ module RailsModuleUnification
   class Railtie < Rails::Railtie
     initializer 'activeservice.autoload', before: :set_autoload_paths do |app|
       # TODO: make the module unification root directory configurable
-      mu_dir = "#{Rails.root}/app/mu"
+      mu_dir = "#{Rails.root}/app/#{RailsModuleUnification.directory}"
 
       # Data
       data_paths = Dir["#{mu_dir}/data/**/"]

diff --git a/spec/support/rails_app/Gemfile b/spec/support/rails_app/Gemfile
@@ -7,6 +7,7 @@ gem 'rails', '~> 5.0.0'
 gem 'sqlite3'
 
 gem 'active_model_serializers'
+gem 'rails_module_unification', path: '../rails_module_unification'
 
 # Use Puma as the app server
 gem 'puma', '~> 3.0'

diff --git a/.../mu/channels/application_cable/channel.rb → ...app/channels/application_cable/channel.rb b/.../mu/channels/application_cable/channel.rb → ...app/channels/application_cable/channel.rb
diff --git a/.../channels/application_cable/connection.rb → .../channels/application_cable/connection.rb b/.../channels/application_cable/connection.rb → .../channels/application_cable/connection.rb
diff --git a/.../app/mu/data/models/application_record.rb → ...app/app/data/models/application_record.rb b/.../app/mu/data/models/application_record.rb → ...app/app/data/models/application_record.rb
diff --git a/...rt/rails_app/app/mu/data/models/author.rb → ...pport/rails_app/app/data/models/author.rb b/...rt/rails_app/app/mu/data/models/author.rb → ...pport/rails_app/app/data/models/author.rb
diff --git a/...port/rails_app/app/mu/data/models/post.rb → ...support/rails_app/app/data/models/post.rb b/...port/rails_app/app/mu/data/models/post.rb → ...support/rails_app/app/data/models/post.rb
diff --git a/.../rails_app/app/mu/jobs/application_job.rb → ...ort/rails_app/app/jobs/application_job.rb b/.../rails_app/app/mu/jobs/application_job.rb → ...ort/rails_app/app/jobs/application_job.rb
diff --git a/..._app/app/mu/mailers/application_mailer.rb → ...ils_app/app/mailers/application_mailer.rb b/..._app/app/mu/mailers/application_mailer.rb → ...ils_app/app/mailers/application_mailer.rb
diff --git a/...pp/mu/resources/api/authors/controller.rb → ...p/app/resources/api/authors/controller.rb b/...pp/mu/resources/api/authors/controller.rb → ...p/app/resources/api/authors/controller.rb
diff --git a/...pp/mu/resources/api/authors/serializer.rb → ...p/app/resources/api/authors/serializer.rb b/...pp/mu/resources/api/authors/serializer.rb → ...p/app/resources/api/authors/serializer.rb
diff --git a/...p/app/mu/resources/api/base_controller.rb → ..._app/app/resources/api/base_controller.rb b/...p/app/mu/resources/api/base_controller.rb → ..._app/app/resources/api/base_controller.rb
diff --git a/...mu/resources/api/posts/post_serializer.rb → ...pp/resources/api/posts/post_serializer.rb b/...mu/resources/api/posts/post_serializer.rb → ...pp/resources/api/posts/post_serializer.rb
diff --git a/...u/resources/api/posts/posts_controller.rb → ...p/resources/api/posts/posts_controller.rb b/...u/resources/api/posts/posts_controller.rb → ...p/resources/api/posts/posts_controller.rb
diff --git a/...pp/mu/resources/application_controller.rb → ...p/app/resources/application_controller.rb b/...pp/mu/resources/application_controller.rb → ...p/app/resources/application_controller.rb
diff --git a/...p/app/mu/resources/comments/controller.rb → ..._app/app/resources/comments/controller.rb b/...p/app/mu/resources/comments/controller.rb → ..._app/app/resources/comments/controller.rb
diff --git a/...p/app/mu/resources/comments/serializer.rb → ..._app/app/resources/comments/serializer.rb b/...p/app/mu/resources/comments/serializer.rb → ..._app/app/resources/comments/serializer.rb
diff --git a/spec/support/rails_app/config/application.rb b/spec/support/rails_app/config/application.rb
@@ -1,5 +1,4 @@
 require_relative 'boot'
-
 require 'rails/all'
 
 # Require the gems listed in Gemfile, including any gems

diff --git a/spec/support/rails_app/config/environment.rb b/spec/support/rails_app/config/environment.rb
@@ -1,7 +1,5 @@
 # Load the Rails application.
 require_relative 'application'
 
-require 'rails_module_unification'
-
 # Initialize the Rails application.
 Rails.application.initialize!
diff --git a/spec/support/rails_app/config/initializers/rails_module_unification.rb b/spec/support/rails_app/config/initializers/rails_module_unification.rb
@@ -0,0 +1,3 @@
+# TODO: this currently doesn't work, because the railtie
+# adds to the autoload paths before this file is required
+# RailsModuleUnification.directory = 'mu'
diff --git a/spec/support/rails_app/log/development.log b/spec/support/rails_app/log/development.log
diff --git a/spec/unit/active_support_extensions_spec.rb b/spec/unit/active_support_extensions_spec.rb
@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe RailsModuleUnification::ActiveSupportExtensions do
+  describe 'load_from_parent' do
+
+  end
+
+  describe 'load_from_path' do
+
+  end
+
+  describe 'load_missing_constant' do
+
+
+  end
+end