Refactoring file names and location

rubyconfig · Dec 30, 2015 · 3acb815 · 3acb815
1 parent 544c58a
commit 3acb815
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 16 deletions.
diff --git a/lib/config.rb b/lib/config.rb
@@ -3,17 +3,17 @@
 require 'config/compatibility'
 require 'config/options'
 require 'config/version'
-require 'config/engine' if defined?(::Rails)
+require 'config/integrations/rails/engine' if defined?(::Rails)
 require 'config/sources/yaml_source'
 require 'deep_merge'
 
 module Config
-  # ensures the setup only gets run once
+  # Ensures the setup only gets run once
   @@_ran_once = false
 
   mattr_accessor :const_name, :use_env
   @@const_name = "Settings"
-  @@use_env = false
+  @@use_env    = false
 
   def self.setup
     yield self if @@_ran_once == false
@@ -58,8 +58,8 @@ def self.reload!
   end
 end
 
-# add rails integration
-require('config/integration/rails') if defined?(::Rails)
+# Rails integration
+require('config/integrations/rails/railtie') if defined?(::Rails)
 
-# add sinatra integration
-require('config/integration/sinatra') if defined?(::Sinatra)
+# Sinatra integration
+require('config/integrations/sinatra') if defined?(::Sinatra)
diff --git a/lib/config/engine.rb → lib/config/integrations/rails/engine.rb b/lib/config/engine.rb → lib/config/integrations/rails/engine.rb
diff --git a/lib/config/integration/rails.rb → lib/config/integrations/rails/railtie.rb b/lib/config/integration/rails.rb → lib/config/integrations/rails/railtie.rb
diff --git a/lib/config/integration/sinatra.rb → lib/config/integrations/sinatra.rb b/lib/config/integration/sinatra.rb → lib/config/integrations/sinatra.rb
diff --git a/lib/config/railtie.rb b/lib/config/railtie.rb