@@ -1,5 +1,3 @@ -require 'typus/extensions/routes' - module Typus class << self @@ -69,8 +67,13 @@ module Typus File.exist?("#{Rails.root}/vendor/plugins/typus") end - # Enable application. This is used at boot time. - def enable + def boot! + + return if %w( script/generate script/destroy ).include?($0) + + if testing? + Typus::Configuration.options[:config_folder] = 'vendor/plugins/typus/test/config/working' + end # Ruby Extensions require 'typus/hash' @@ -93,6 +96,7 @@ module Typus # Rails Extensions. require 'typus/active_record' + require 'typus/extensions/routes' # Mixins. require 'typus/authentication' @@ -107,6 +111,9 @@ module Typus require 'vendor/active_record' require 'vendor/paginator' + # Run controllers generator ... + generator unless testing? || Rails.env.production? + end end lib/typus.rb @@ -1,16 +1,3 @@ require 'typus' -if Typus.testing? - Typus::Configuration.options[:config_folder] = 'vendor/plugins/typus/test/config/working' -end - -## -# Do not Typus.enable or Typus.generate if we are running a generator. -# - -scripts = %w( script/generate script/destroy ) - -unless scripts.include?($0) - Typus.enable - Typus.generator unless Typus.testing? || Rails.env.production? -end \ No newline at end of file +Typus.boot! \ No newline at end of file rails/init.rb b5b253d03401c99debf16c01a8a5bf7412fab523 Francesc Esplugas francesc@intraducibles.com http://github.com/fesplugas/typus/commit/1f9244b10dbc6e7cbfb2d2dee3ac83bfdb95c920 1f9244b10dbc6e7cbfb2d2dee3ac83bfdb95c920 2009-08-13T02:31:24-07:00 2009-08-13T02:31:24-07:00 Refactor application booting. e5ae8caa73a08a3580060a3954e0107feb138aed Francesc Esplugas francesc@intraducibles.com