lib/merb_helpers.rb in merb_helpers-0.9.2 vs lib/merb_helpers.rb in merb_helpers-0.9.3

@@ -7,10 +7,17 @@
     def self.load_helpers(helpers = HELPERS_FILES)
       helpers.each {|h| Kernel.load(File.join(HELPERS_DIR, "#{h}.rb") )} # using load here allows specs to work
     end
     
     def self.load
+      require HELPERS_DIR + '/time_dsl'
+      require HELPERS_DIR + '/ordinalize'
+      # TODO remove with and without and only allow 2 options:
+      # config[:load] 
+      # if defined then load the modules passed along
+      # otherwise load everything
+       
       if Merb::Plugins.config[:merb_helpers]
         config = Merb::Plugins.config[:merb_helpers]
         raise "With and Without options cannot be used with merb_helpers plugin configuration" if config[:with] && config[:without]
         if config[:include]
           load_helpers(config[:include])
@@ -29,7 +36,7 @@
   end
   
 end
 
 Merb::BootLoader.before_app_loads do  
-  Merb::Helpers.load if defined?(Merb::Plugins)
-end
+  Merb::Helpers.load
+end
\ No newline at end of file