merb-plugins-app-config 0.3 → 0.4

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "merb-plugins-app-config"
-GEM_VERSION = "0.3"
+GEM_VERSION = "0.4"
 AUTHOR = "Jacques Crocker"
 EMAIL = "merbjedi@gmail.com"
 HOMEPAGE = "http://www.merbjedi.com/"

data/lib/application_config/config_builder.rb

@@ -10,19 +10,26 @@ module ApplicationConfig
     # Create a config object (OpenStruct) from a yaml file.  If a second yaml file is given, then the sections of that file will overwrite the sections
     # if the first file if they exist in the first file.
     def self.load_files(*conf_load_paths)
-      @@conf_paths = []
-      @@conf_paths << conf_load_paths
-      @@conf_paths.flatten!.uniq!
-      return reload
-    end
-  
-    def self.reload
-      conf = {}
-      @@conf_paths.to_a.each do |path|
-        new_conf = YAML.load(ERB.new(IO.read(path)).result) if path and File.exists?(path)
-        conf.merge!(new_conf) if new_conf
+      config = OpenStruct.new
+      config.load_paths = []
+      config.load_paths << conf_load_paths
+      config.load_paths.flatten!.uniq!
+      
+      # add singleton method to our AppConfig that reloads its settings from the load_paths options
+      def config.reload!
+        conf = {:load_paths => self.load_paths}
+        self.load_paths.to_a.each do |path|
+          file_conf = YAML.load(ERB.new(IO.read(path)).result) if path and File.exists?(path)
+          conf.merge!(file_conf) if file_conf
+        end
+        
+        # load all the new values into the openstruct
+        marshal_load(ApplicationConfig::ConfigBuilder.convert(conf).marshal_dump)
+        return self
       end
-      return convert(conf)
+
+      config.reload!
+      return config
     end
   
     # Recursively converts Hashes to OpenStructs (including Hashes inside Arrays)

data/lib/application_config/view_helpers.rb

@@ -2,15 +2,22 @@ module ApplicationConfig
   module ViewHelpers
     def javascripts
       js_hash = AppConfigJavascripts.marshal_dump
-      js_hash.each do |key, val|
+      if AppConfig.javascripts
+        js_hash.merge!(AppConfig.javascripts.marshal_dump)
+      end
+      js_hash.reject{|key, val| key.to_s == "load_paths"}.each do |key, val|
         require_js val, :bundle => key.to_sym
       end
       include_required_js
     end
   
     def stylesheets
-      style_hash = AppConfigStylesheets.marshal_dump
-      style_hash.each do |key, val|
+      css_hash = AppConfigStylesheets.marshal_dump
+      if AppConfig.stylesheets
+        css_hash.merge!(AppConfig.stylesheets.marshal_dump)
+      end
+
+      css_hash.reject{|key, val| key.to_s == "load_paths"}.each do |key, val|
         require_css val, :bundle => key.to_sym
       end
       

data/lib/merb-plugins-app-config.rb

@@ -10,27 +10,44 @@ if defined?(Merb::Plugins)
   }
   
   Merb::BootLoader.before_app_loads do
-    ::AppConfig = ApplicationConfig::ConfigBuilder.load_files(Merb.root+"/config/app_config/settings.yml",
-                                                              Merb.root+"/config/app_config/#{Merb.env}.yml")
-
-    if Merb::Plugins.config[:app_config][:include_viewhelpers]
-      ::AppConfigStylesheets = ApplicationConfig::ConfigBuilder.load_files(Merb.root+"/config/app_config/stylesheets.yml")
-      ::AppConfigJavascripts = ApplicationConfig::ConfigBuilder.load_files(Merb.root+"/config/app_config/javascripts.yml")
+    if defined?(::AppConfig)
+      AppConfig.reload!
+    else
+      ::AppConfig = ApplicationConfig::ConfigBuilder.load_files("#{Merb.root}/config/app_config/settings.yml",
+                                                                "#{Merb.root}/config/app_config/#{Merb.env}.yml")
     end
 
-    # add reload method to our ostruct
-    def AppConfig.reload!
-      AppConfig.marshal_load(ApplicationConfig::ConfigBuilder.reload.marshal_dump)
-      return AppConfig
-    end
-    
     if Merb::Plugins.config[:app_config][:include_viewhelpers]
+      if defined?(::AppConfigStylesheets)
+        AppConfigStylesheets.reload!
+      else
+        ::AppConfigStylesheets = ApplicationConfig::ConfigBuilder.load_files("#{Merb.root}/config/stylesheets.yml",
+                                                                             "#{Merb.root}/config/app_config/stylesheets.yml")
+      end
+
+      if defined?(::AppConfigJavascripts)
+        AppConfigJavascripts.reload!
+      else
+        ::AppConfigJavascripts = ApplicationConfig::ConfigBuilder.load_files("#{Merb.root}/config/javascripts.yml",
+                                                                             "#{Merb.root}/config/app_config/javascripts.yml")
+      end
+      
       Merb::Controller.send(:include, ApplicationConfig::ViewHelpers)
     end
   end
   
-  # Merb::BootLoader.after_app_loads do
-  # end
+  Merb::BootLoader.after_app_loads do
+    if Merb::Plugins.config[:app_config][:auto_reload]
+      Merb.logger.info "Auto reloading AppConfig on *every request*. Set via Merb::Plugins.config[:app_config][:auto_reload]"
+      Merb::Controller.before do 
+        AppConfig.reload!
+        if Merb::Plugins.config[:app_config][:include_viewhelpers]
+          AppConfigStylesheets.reload!
+          AppConfigJavascripts.reload!
+        end
+      end
+    end
+  end
   
   Merb::Plugins.add_rakefiles "merbtasks"
 end

data/spec/app_config_spec.rb

@@ -30,17 +30,34 @@ describe "AppConfig Plugin" do
   end
 
   it "should not crash on missing files" do
-    config = ApplicationConfig::ConfigBuilder.load_files("#{@settings_path}/nothing_here.yml", "#{@settings_path}/nothing_here2.yml")
-    config.should == OpenStruct.new
+    files = ["#{@settings_path}/nothing_here.yml", "#{@settings_path}/nothing_here2.yml"]
+    config = ApplicationConfig::ConfigBuilder.load_files(*files)
+    config.should == OpenStruct.new(:load_paths => files)
   end
 
   it "should allow erb in settings" do
-    config = ApplicationConfig::ConfigBuilder.load_files("#{@settings_path}/development.yml")
+    files = ["#{@settings_path}/development.yml"]
+    config = ApplicationConfig::ConfigBuilder.load_files(*files)
     config.computed.should == 6
   end
   
   it "should not crash on empty files" do
-    config = ApplicationConfig::ConfigBuilder.load_files("#{@settings_path}/empty1.yml", "#{@settings_path}/empty2.yml")
-    config.should == OpenStruct.new
+    files = ["#{@settings_path}/empty1.yml", "#{@settings_path}/empty2.yml"]
+    config = ApplicationConfig::ConfigBuilder.load_files(*files)
+    config.should == OpenStruct.new(:load_paths => files)
+  end
+  
+  
+  it "should allow reloads" do
+    config = ApplicationConfig::ConfigBuilder.load_files("#{@settings_path}/development.yml")
+    check = lambda { |config|  
+      config.section.size.should == 3
+      config.section.servers.is_a?(Array).should be_true
+      config.section.servers.first.name.should == "yahoo.com"
+      config.section.servers.last.name.should == "amazon.com"
+    }
+    check.call(config)
+    config.reload!
+    check.call(config)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-plugins-app-config
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: "0.4"
 platform: ruby
 authors: 
 - Jacques Crocker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-15 00:00:00 -08:00
+date: 2008-11-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency