Merge branch 'sunny4381-shirasagi-478'

shirasagi · May 29, 2015 · 7850f39 · 7850f39
2 parents 255e0ae + a4ac75d
commit 7850f39
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/app/models/ss/config.rb b/app/models/ss/config.rb
@@ -1,9 +1,4 @@
 module SS::Config
-  # Use SS.config
-  def SS.config
-    SS::Config
-  end
-
   class << self
     def method_missing(name, *args, &block)
       file  = "#{Rails.root}/config/#{name}.yml"

diff --git a/app/models/ss/initializer.rb b/app/models/ss/initializer.rb
@@ -1,6 +1,5 @@
 module SS
   class Initializer
-    SS::Config
     ActionView::Base.default_form_builder = SS::Helpers::FormBuilder
     ApplicationMailer.set :load_settings
   end

diff --git a/config/application.rb b/config/application.rb
@@ -30,6 +30,11 @@ class Application < Rails::Application
       config.paths["config/routes.rb"] << file
     end
   end
+
+  def self.config
+    # lazy loading
+    @_ss_config ||= "SS::Config".constantize
+  end
 end
 
 def dump(*args)