From 46e49c764d3c7c05cdbf5f9a6db9a7b9e7bffe9c Mon Sep 17 00:00:00 2001 From: Raphael Date: Thu, 2 Dec 2010 19:16:52 -0800 Subject: [PATCH] sorry --- lib/tasks/resque.rake | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/lib/tasks/resque.rake b/lib/tasks/resque.rake index 8bd95d372..5da255015 100644 --- a/lib/tasks/resque.rake +++ b/lib/tasks/resque.rake @@ -1,15 +1,21 @@ require 'resque/tasks' task "resque:setup" => :environment do Dir[File.join(Rails.root, 'app', 'uploaders', '*.rb')].each { |file| - classname = File.basename(file)[0..-4].camelize.constantize - unless defined?(classname) - require file + class_name = File.basename(file)[0..-4].camelize + begin + klass = Module.const_get(class_name) + klass.is_a?(Class) + rescue NameError + require file end } - Dir[File.join(Rails.root, 'app', 'models', '*.rb')].each { |file| - classname = File.basename(file)[0..-4].camelize.constantize - unless defined?(classname) - require file + Dir[File.join(Rails.root, 'app', 'models', '*.rb')].each { |file| + class_name = File.basename(file)[0..-4].camelize + begin + klass = Module.const_get(class_name) + klass.is_a?(Class) + rescue NameError + require file end } require File.join(Rails.root, 'app', 'controllers', 'application_controller.rb')