spec/fixtures/job_fu_without_default_priority.yml @@ -3,6 +3,7 @@ development: app_name: <%= app_name %> force_kill_wait: 30 + default_priority: 0 workers: - name: job-fu-worker # Setup worker for specific priority levels @@ -19,11 +20,13 @@ development: test: app_name: <%= app_name %> force_kill_wait: 30 + default_priority: 0 workers: - name: job-fu-worker production: app_name: <%= app_name %> force_kill_wait: 30 + default_priority: 0 workers: - name: job-fu-worker \ No newline at end of file generators/job_fu/templates/job_fu.yml.erb @@ -4,7 +4,6 @@ module JobFu def request(object, method, *args) opt = args.extract_options! priority, process_at = opt[:priority], opt[:at] - priority ||= JobFu::Config['default_priority'] Job.enqueue ProcessableMethod.new(object, method, *args), priority, process_at end end lib/job_fu/backgrounded.rb @@ -27,8 +27,8 @@ module JobFu all(:order => 'priority DESC').each { |job| job.process! } end - def self.add(processable_object, priority = 0, process_at = nil) - create!(:processable => processable_object, :priority => priority, :process_at => process_at) + def self.add(processable_object, priority = nil, process_at = nil) + create!(:processable => processable_object, :priority => priority || JobFu::Config['default_priority'], :process_at => process_at) end class << self alias enqueue add lib/job_fu/job.rb @@ -18,6 +18,9 @@ module RSS end describe Job do + before do + JobFu::Config.stubs(:config_file_path).returns(Pathname.new(__FILE__).dirname.join('..', 'fixtures', 'job_fu_without_default_priority.yml').expand_path.to_s) + end after(:each) do Job.delete_all @@ -185,7 +188,7 @@ describe Job do Job.should respond_to(:min_priority) Job.should respond_to(:max_priority) end - + it "should have priorities" do Job.min_priority = 1 Job.should be_priority @@ -210,25 +213,25 @@ describe Job do Job.add ProcessableClass, 5 Job.next.should be_present end - + it "should not find job when outside scope" do Job.min_priority = 1 Job.add ProcessableClass, 0 Job.next.should be_nil end - + it "should not find job when outside scope" do Job.max_priority = 1 Job.add ProcessableClass, 2 Job.next.should be_nil end - + it "should find job when inside scope" do Job.max_priority = 5 Job.add ProcessableClass, 2 Job.next.should be_present end - + end spec/job_fu/job_spec.rb d713eb21cb17556c496e2fcb3bed026e475f8af9 Jon Stenqvist jon.stenqvist@gmail.com http://github.com/jnstq/job_fu/commit/559ba47aa593dfb3990a78efef257039278af1cb 559ba47aa593dfb3990a78efef257039278af1cb 2009-09-21T02:54:18-07:00 2009-09-21T02:54:18-07:00 Moved default priority to Job-model ad72e5cc436ecb081696c5a1bb2e3b9a87e44b1d Jon Stenqvist jon.stenqvist@gmail.com