resque 1.18.5 → 1.18.6

data/HISTORY.md

@@ -1,3 +1,7 @@
+## 1.18.6 (2011-08-30)
+
+* Bugfix: Use Rails 3 eager loading for resque:preload
+
 ## 1.18.5 (2011-08-24)
 
 * Added support for Travis CI

data/README.markdown

@@ -469,6 +469,14 @@ run Rack::URLMap.new \
 Check `examples/demo/config.ru` for a functional example (including
 HTTP basic auth).
 
+### Rails 3
+
+You can also easily mount Resque on a subpath in your existing Rails 3 app by adding this to your `routes.rb`:
+
+``` ruby
+mount Resque::Server.new, :at => "/resque"
+```
+
 
 Resque vs DelayedJob
 --------------------

data/lib/resque/tasks.rb

@@ -42,10 +42,13 @@ namespace :resque do
 
   # Preload app files if this is Rails
   task :preload => :setup do
-    if defined?(Rails) && Rails.env == 'production'
-      Dir["#{Rails.root}/app/**/*.rb"].each do |file|
-        require file
-      end
+    if defined?(Rails) && Rails.respond_to?(:application)
+      # Rails 3
+      Rails.application.eager_load!
+    elsif defined?(Rails::Initializer)
+      # Rails 2.3
+      $rails_rake_task = false
+      Rails::Initializer.run :load_application_classes
     end
   end
 end

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = VERSION = '1.18.5'
+  Version = VERSION = '1.18.6'
 end

data/lib/tasks/resque.rake

@@ -1,2 +1,2 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../../lib'
 require 'resque/tasks'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque
 version: !ruby/object:Gem::Version 
-  hash: 85
+  hash: 83
   prerelease: 
   segments: 
   - 1
   - 18
-  - 5
-  version: 1.18.5
+  - 6
+  version: 1.18.6
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 -07:00
+date: 2011-08-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency