job_boss 0.5.7 → 0.5.8

data/job_boss.gemspec

@@ -4,7 +4,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "job_boss"
-  s.version     = '0.5.7'
+  s.version     = '0.5.8'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Brian Underwood"]
   s.email       = ["ml+job_boss@semi-sentient.com"]

data/lib/job_boss/job.rb

@@ -199,21 +199,26 @@ private
         raise ArgumentError, "Invalid path (must have #)" unless path.match(/.#./)
         controller, action = path.split('#')
     
-        controller_object = begin
-          Kernel.const_get("#{controller.classify}Jobs").new
+        controller_objects = []
+        begin
+          controller_objects << Kernel.const_get("#{controller.classify}Jobs").new
         rescue NameError
-          begin
-            Kernel.const_get("#{controller.classify}")
-          rescue NameError
-            raise ArgumentError, "Invalid controller: #{controller}"
-          end
         end
-    
-        raise ArgumentError, "Invalid path action: #{action}" unless controller_object.respond_to?(action)
-    
+
+        begin
+          controller_objects << Kernel.const_get("#{controller.classify}")
+        rescue NameError
+        end
+
+        raise ArgumentError, "Invalid controller: #{controller}" if controller_objects.empty?
+
+        controller_object = controller_objects.detect {|controller_object| controller_object.respond_to?(action) }
+
+        raise ArgumentError, "Invalid path action: #{action}" if !controller_object
+
         controller_object.send(action, *args)
       end
-    
+
       def pending_paths
         self.pending.except(:order).select('DISTINCT path').collect(&:path)
       end

data/lib/job_boss/queuer.rb

@@ -6,10 +6,11 @@ module JobBoss
 
       method_name = method_id.id2name
 
-      if @class && @controller
+      if @classes && @controller
         # In here, we've already figured out the class, so assume the method_missing call is to the method
+        actionable_class = @classes.detect {|controller_class| controller_class.respond_to?(method_name) }
 
-        if @class.respond_to?(method_name)
+        if actionable_class
           require 'job_boss/job'
           path = "#{@controller}##{method_name}"
 
@@ -23,22 +24,21 @@ module JobBoss
         end
       else
         # Check to see if there's a class
+        @classes = []
         begin
-          # If we find a class that ends in "Jobs", we instanciate it and call an instance method
-          @class = Kernel.const_get("#{method_name.classify}Jobs").new
-
-          @controller = method_name
+          @classes << Kernel.const_get("#{method_name.classify}Jobs").new
         rescue NameError
-          begin
-            # If we don't find a class that ends in "Jobs", we're going to call a class method
-            @class = Kernel.const_get("#{method_name.classify}")
-
-            @controller = method_name
-          rescue
-            raise ArgumentError, "Invalid controller"
-          end
         end
 
+        begin
+          @classes << Kernel.const_get("#{method_name.classify}")
+        rescue
+        end
+
+        raise ArgumentError, "Invalid controller" if @classes.blank?
+
+        @controller = method_name
+
         self
       end
     end

data/test/app_root/app/models/sleep.rb

@@ -0,0 +1,7 @@
+class Sleep < ActiveRecord::Base
+  class << self
+    def add_snoozes(i,j)
+      i + j
+    end
+  end
+end

data/test/app_root/config/environment.rb

@@ -1,3 +1,4 @@
 require 'rubygems'
 require 'active_record'
 require File.expand_path('../../app/models/penguin', __FILE__)
+require File.expand_path('../../app/models/sleep', __FILE__)

data/test/unit/job_test.rb

@@ -91,6 +91,16 @@ class DaemonTest < ActiveSupport::TestCase
     assert_equal "I can't not do that, Dave.", error.message
     assert_equal Array, error.backtrace.class
 
+
+
+    # Test calling method where there is both a Sleep model and a SleepJobs class
+    job = Boss.queue.sleep.add_snoozes(2, 5)
+
+    Job.wait_for_jobs(job)
+
+    assert_equal 7, job.result
+
+
     stop_daemon
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 7
-  version: 0.5.7
+  - 8
+  version: 0.5.8
 platform: ruby
 authors: 
 - Brian Underwood
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-12 00:00:00 -05:00
+date: 2010-12-20 00:00:00 -05:00
 default_executable: job_boss
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -144,6 +144,7 @@ files:
 - test/app_root/app/jobs/sleep_jobs.rb
 - test/app_root/app/jobs/string_jobs.rb
 - test/app_root/app/models/penguin.rb
+- test/app_root/app/models/sleep.rb
 - test/app_root/config/database.yml
 - test/app_root/config/environment.rb
 - test/test_helper.rb
@@ -190,6 +191,7 @@ test_files:
 - test/app_root/app/jobs/sleep_jobs.rb
 - test/app_root/app/jobs/string_jobs.rb
 - test/app_root/app/models/penguin.rb
+- test/app_root/app/models/sleep.rb
 - test/app_root/config/database.yml
 - test/app_root/config/environment.rb
 - test/test_helper.rb