merb_app_config 1.0.2 → 1.0.3

data/README

@@ -8,6 +8,17 @@ Modified from Original Project (AppConfig by Christopher J. Bottaro)
 === Compatibility
 Rails 2.1/2.2 and Merb 1.0
 
+=== Installing on Merb
+add this to your config: dependencies.rb and run thor merb:gem:install
+
+    dependency "merb_app_config"
+
+
+=== Installing on Rails
+
+script/plugin install git://github.com/merbjedi/app_config.git 
+
+
 === Accessing the AppConfig object
 After installing this plugin, the AppConfig object will be global available.  Entries are accessed via object member notation:
  AppConfig.my_config_entry

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "merb_app_config"
-GEM_VERSION = "1.0.2"
+GEM_VERSION = "1.0.3"
 AUTHOR = "Jacques Crocker"
 EMAIL = "merbjedi@gmail.com"
 HOMEPAGE = "http://www.merbjedi.com/"

data/lib/application_config/view_helpers.rb

@@ -2,6 +2,7 @@ module ApplicationConfig
   module ViewHelpers
     def javascripts_from_config(options = {})
       html = ""
+      only = [options.delete(:only)].flatten.compact
       if defined?(AppConfig) and AppConfig.javascripts
         AppConfig.javascripts.each do |javascript|
           if javascript.is_a?(OpenStruct)
@@ -10,6 +11,8 @@ module ApplicationConfig
           
           if javascript.is_a? Hash
             javascript.each do |key, val|
+              next unless only.empty? || only.include?(key)
+
               args = [val].flatten
               args = args.map{|s| s.gsub("javascripts/", AppConfig.javascript_path)} if AppConfig.javascript_path
               if defined?(Merb)
@@ -38,6 +41,7 @@ module ApplicationConfig
     
     def stylesheets_from_config(options = {})
       html = ""
+      only = [options.delete(:only)].flatten.compact
       if defined?(AppConfig) and AppConfig.stylesheets
         AppConfig.stylesheets.each do |stylesheet|
           if stylesheet.is_a?(OpenStruct)
@@ -46,6 +50,8 @@ module ApplicationConfig
           
           if stylesheet.is_a? Hash
             stylesheet.each do |key, val|
+              next unless only.empty? || only.include?(key)
+              
               args = [val].flatten
               args = args.map{|s| s.gsub("stylesheets/", AppConfig.stylesheet_path)} if AppConfig.stylesheet_path
               if defined?(Merb)
@@ -60,7 +66,11 @@ module ApplicationConfig
             args = [stylesheet].flatten
             args = args.map{|s| s.gsub("stylesheets/", AppConfig.stylesheet_path)} if AppConfig.stylesheet_path
             args << options
-            html << stylesheet_link_tag(*args)
+            if defined?(Merb)
+              html << css_include_tag(*args)
+            elsif defined?(Rails)
+              html << stylesheet_link_tag(*args)
+            end
           end
           html << "\n"
         end

data/lib/merb_app_config.rb

@@ -5,7 +5,7 @@ require 'application_config/view_helpers'
 if defined?(Merb::Plugins)
   # Merb gives you a Merb::Plugins.config hash...feel free to put your stuff in your piece of it
   Merb::Plugins.config[:app_config] = {
-    :auto_reload => false,
+    :auto_reload => Merb.env?(:development),
     :view_helpers => true,
     :paths => [
       "#{Merb.root}/config/app_config.yml",
@@ -32,16 +32,20 @@ if defined?(Merb::Plugins)
     if Merb::Plugins.config[:app_config][:view_helpers]
       Merb::Controller.send(:include, ApplicationConfig::ViewHelpers)
     end
-  end
-  
-  Merb::BootLoader.after_app_loads do
+    
     if Merb::Plugins.config[:app_config][:auto_reload]
-      Merb.logger.info "[AppConfig] Auto reloading AppConfig on *every request*."
+      Merb.logger.info "[AppConfig] Auto reloading AppConfig on every request."
       Merb.logger.info "[AppConfig] Set via Merb::Plugins.config[:app_config][:auto_reload]"
-
-      Merb::Controller.before Proc.new{ AppConfig.reload! }
+      
+      # add before filter
+      ::Merb::Controller.before do
+        AppConfig.reload!
+      end
     end
   end
   
+  Merb::BootLoader.after_app_loads do
+  end
+  
   Merb::Plugins.add_rakefiles "merbtasks"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_app_config
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Jacques Crocker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-17 00:00:00 -08:00
+date: 2009-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency