@@ -1,48 +1,46 @@ module Shoulda # :nodoc: - module Macros # :nodoc: - # Call autoload_macros when you want to load test macros automatically in a non-Rails - # project (it's done automatically for Rails projects). - # You don't need to specify ROOT/test/shoulda_macros explicitly. Your custom macros - # are loaded automatically when you call autoload_macros. - # - # The first argument is the path to you application's root directory. - # All following arguments are directories relative to your root, which contain - # shoulda_macros subdirectories. These directories support the same kinds of globs as the - # Dir class. - # - # Basic usage (from a test_helper): - # Shoulda::Macros.autoload_macros(File.dirname(__FILE__) + '/..') - # will load everything in - # - your_app/test/shoulda_macros - # - # To load vendored macros as well: - # Shoulda::Macros.autoload_macros(APP_ROOT, 'vendor/*') - # will load everything in - # - APP_ROOT/vendor/*/shoulda_macros - # - APP_ROOT/test/shoulda_macros - # - # To load macros in an app with a vendor directory laid out like Rails': - # Shoulda::Macros.autoload_macros(APP_ROOT, 'vendor/{plugins,gems}/*') - # or - # Shoulda::Macros.autoload_macros(APP_ROOT, 'vendor/plugins/*', 'vendor/gems/*') - # will load everything in - # - APP_ROOT/vendor/plugins/*/shoulda_macros - # - APP_ROOT/vendor/gems/*/shoulda_macros - # - APP_ROOT/test/shoulda_macros - # - # If you prefer to stick testing dependencies away from your production dependencies: - # Shoulda::Macros.autoload_macros(APP_ROOT, 'vendor/*', 'test/vendor/*') - # will load everything in - # - APP_ROOT/vendor/*/shoulda_macros - # - APP_ROOT/test/vendor/*/shoulda_macros - # - APP_ROOT/test/shoulda_macros - def self.autoload_macros(root, *dirs) - dirs << File.join('test') - complete_dirs = dirs.map{|d| File.join(root, d, 'shoulda_macros')} - all_files = complete_dirs.inject([]){ |files, dir| files + Dir[File.join(dir, '*.rb')] } - all_files.each do |file| - require file - end + # Call autoload_macros when you want to load test macros automatically in a non-Rails + # project (it's done automatically for Rails projects). + # You don't need to specify ROOT/test/shoulda_macros explicitly. Your custom macros + # are loaded automatically when you call autoload_macros. + # + # The first argument is the path to you application's root directory. + # All following arguments are directories relative to your root, which contain + # shoulda_macros subdirectories. These directories support the same kinds of globs as the + # Dir class. + # + # Basic usage (from a test_helper): + # Shoulda.autoload_macros(File.dirname(__FILE__) + '/..') + # will load everything in + # - your_app/test/shoulda_macros + # + # To load vendored macros as well: + # Shoulda.autoload_macros(APP_ROOT, 'vendor/*') + # will load everything in + # - APP_ROOT/vendor/*/shoulda_macros + # - APP_ROOT/test/shoulda_macros + # + # To load macros in an app with a vendor directory laid out like Rails': + # Shoulda.autoload_macros(APP_ROOT, 'vendor/{plugins,gems}/*') + # or + # Shoulda.autoload_macros(APP_ROOT, 'vendor/plugins/*', 'vendor/gems/*') + # will load everything in + # - APP_ROOT/vendor/plugins/*/shoulda_macros + # - APP_ROOT/vendor/gems/*/shoulda_macros + # - APP_ROOT/test/shoulda_macros + # + # If you prefer to stick testing dependencies away from your production dependencies: + # Shoulda.autoload_macros(APP_ROOT, 'vendor/*', 'test/vendor/*') + # will load everything in + # - APP_ROOT/vendor/*/shoulda_macros + # - APP_ROOT/test/vendor/*/shoulda_macros + # - APP_ROOT/test/shoulda_macros + def self.autoload_macros(root, *dirs) + dirs << File.join('test') + complete_dirs = dirs.map{|d| File.join(root, d, 'shoulda_macros')} + all_files = complete_dirs.inject([]){ |files, dir| files + Dir[File.join(dir, '*.rb')] } + all_files.each do |file| + require file end end end lib/shoulda/autoload_macros.rb @@ -8,5 +8,5 @@ require 'shoulda/action_mailer' if defined? ActionMailer::Base if defined?(RAILS_ROOT) # load in the 3rd party macros from vendorized plugins and gems - Shoulda::Macros.autoload_macros RAILS_ROOT, File.join("vendor", "{plugins,gems}", "*") + Shoulda.autoload_macros RAILS_ROOT, File.join("vendor", "{plugins,gems}", "*") end lib/shoulda/rails.rb e23f4e117d90f698da841b79b01d8a9c26d7bfad Mathieu Martin webmat@gmail.com http://github.com/thoughtbot/shoulda/commit/5edb7b85b80e4231c265b95207e3d45b180b8a9b 5edb7b85b80e4231c265b95207e3d45b180b8a9b 2009-01-16T12:48:15-08:00 2009-01-16T12:47:14-08:00 Moved autoload_macros from the Macros module to the Shoulda module 3964f6e12b5b82ec35ed89d5ca0f094fb3c18567 Mathieu Martin webmat@gmail.com