navvy 0.1.2 → 0.2.0

data/README.textile

@@ -1,12 +1,12 @@
 h1. Navvy
 
-Navvy is a simple background job processor inspired by "delayed_job":http://github.com/tobi/delayed_job, but aiming for database agnosticism. Currently Navvy supports ActiveRecord, MongoMapper and Sequel but it's extremely easy to write an adapter for your favorite ORM. Also, It completely supports Rails Edge.
+Navvy is a simple Ruby background job processor inspired by "delayed_job":http://github.com/tobi/delayed_job, but aiming for database agnosticism. Currently Navvy supports ActiveRecord, MongoMapper, Sequel and DataMapper but it's extremely easy to write an adapter for your favorite ORM. Besides plain Ruby (1.8 & 1.9) it completely supports Rails Edge.
 
 ??“Navvy is a shorter form of navigator (UK) or navigational engineer (USA) and is particularly applied to describe the manual labourers working on major civil engineering projects. The term was coined in the late 18th century in Britain when numerous canals were being built, which were also sometimes known as "navigations". Canal navvies typically worked with shovels, pickaxes and barrows.”?? - "Wikipedia":http://en.wikipedia.org/wiki/Navvy
 
 h2. Using Navvy
 
-There's an "Installation Guide":http://wiki.github.com/jeffkreeftmeijer/navvy/installation (also for "Rails 3":http://wiki.github.com/jeffkreeftmeijer/navvy/installation-on-rails-edge) and a "Getting Started Guide":http://wiki.github.com/jeffkreeftmeijer/navvy/getting-started to put you on the right track. Any questions? Don't hesitate to "ask":http://github.com/inbox/new/jeffkreeftmeijer.
+There are some "Installation Guide":http://wiki.github.com/jeffkreeftmeijer/navvy/installation (even for "Rails 3":http://wiki.github.com/jeffkreeftmeijer/navvy/installation-on-rails-edge) and a "Getting Started Guide":http://wiki.github.com/jeffkreeftmeijer/navvy/getting-started to put you on the right track. Any questions? Don't hesitate to "ask":http://github.com/inbox/new/jeffkreeftmeijer.
 
 h2. Contributing
 

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/generators/navvy/templates/migration.rb

@@ -4,8 +4,10 @@ class CreateJobs < ActiveRecord::Migration
       t.string    :object
       t.string    :method_name
       t.text      :arguments
+      t.integer   :priority, :default => 0
       t.string    :return
       t.string    :exception
+      t.integer   :parent_id
       t.datetime  :created_at
       t.datetime  :run_at
       t.datetime  :started_at
@@ -13,7 +15,7 @@ class CreateJobs < ActiveRecord::Migration
       t.datetime  :failed_at
     end
   end
- 
+
   def self.down
     drop_table :jobs
   end

data/lib/navvy/configuration.rb

@@ -0,0 +1,15 @@
+module Navvy
+  class Configuration
+    attr_accessor :job_limit, :keep_jobs, :logger, :quiet, :sleep_time,
+      :max_attempts
+    
+    def initialize
+      @job_limit =    100
+      @keep_jobs =    false
+      @logger =       nil
+      @quiet =        false
+      @sleep_time =   5
+      @max_attempts = 25
+    end
+  end
+end

data/lib/navvy/job/active_record.rb

@@ -4,17 +4,34 @@ require 'active_record'
 module Navvy
   class Job < ActiveRecord::Base
     class << self
-      attr_writer :limit
-      attr_accessor :keep
+      attr_writer :limit, :keep, :max_attempts
     end
 
     ##
-    # Default limit of jobs to be fetched
+    # Default limit of jobs to be fetched.
     #
     # @return [Integer] limit
 
     def self.limit
-      @limit || 100
+      @limit || Navvy.configuration.job_limit
+    end
+
+    ##
+    # If and how long the jobs should be kept.
+    #
+    # @return [Fixnum, true, false] keep
+
+    def self.keep
+      @keep || Navvy.configuration.keep_jobs
+    end
+
+    ##
+    # How often should a job be retried?
+    #
+    # @return [Fixnum] max_attempts
+
+    def self.max_attempts
+      @max_attempts || Navvy.configuration.max_attempts
     end
 
     ##
@@ -23,7 +40,7 @@ module Navvy
     # @return [true, false] keep
 
     def self.keep?
-      keep = (@keep || false)
+      keep = (self.keep || false)
       return keep.from_now >= Time.now if keep.is_a? Fixnum
       keep
     end
@@ -38,11 +55,19 @@ module Navvy
     # @return [true, false]
 
     def self.enqueue(object, method_name, *args)
+      options = {}
+      if args.last.is_a?(Hash)
+        options = args.last.delete(:job_options) || {}
+         args.pop if args.last.empty?
+      end
+
       create(
         :object =>      object.to_s,
         :method_name => method_name.to_s,
         :arguments =>   args,
-        :run_at =>      Time.now,
+        :priority =>    options[:priority] || 0,
+        :parent_id =>   options[:parent_id],
+        :run_at =>      options[:run_at] || Time.now,
         :created_at =>  Time.now
       )
     end
@@ -65,7 +90,7 @@ module Navvy
           Time.now
         ],
         :limit =>         limit,
-        :order =>         'created_at'
+        :order =>         'priority desc, created_at'
       )
     end
 
@@ -135,7 +160,8 @@ module Navvy
 
     ##
     # Mark the job as failed. Will set failed_at to the current time and
-    # optionally add the exception message if provided.
+    # optionally add the exception message if provided. Also, it will retry
+    # the job unless max_attempts has been reached.
     #
     # @param [String] exception the exception message you want to store.
     #
@@ -143,10 +169,44 @@ module Navvy
     # update_attributes call
 
     def failed(message = nil)
-      update_attributes({
+      self.retry unless times_failed >= self.class.max_attempts
+      update_attributes(
         :failed_at => Time.now,
         :exception => message
-      })
+      )
+    end
+
+    ##
+    # Retry the current job. Will add self to the queue again, giving the clone
+    # a parend_id equal to self.id.
+    #
+    # @return [true, false]
+
+    def retry
+      self.class.enqueue(
+        object,
+        method_name,
+        *(args << {
+          :job_options => {
+            :parent_id => parent_id || id,
+            :run_at => Time.now + times_failed ** 4,
+            :priority => priority
+          }
+        })
+      )
+    end
+
+    ##
+    # Check how many times the job has failed. Will try to find jobs with a
+    # parent_id that's the same as self.id and count them
+    #
+    # @return [Integer] count the amount of times the job has failed
+
+    def times_failed
+      i = parent_id || id
+      self.class.count(
+        :conditions => "(`id` = '#{i}' OR `parent_id` = '#{i}') AND `failed_at` IS NOT NULL"
+      )
     end
 
     ##
@@ -194,6 +254,17 @@ module Navvy
       arguments.is_a?(Array) ? arguments : YAML.load(arguments)
     end
 
+    ##
+    # Get the job status
+    #
+    # @return [:pending, :completed, :failed] status
+
+    def status
+      return :completed if completed?
+      return :failed if failed?
+      :pending
+    end
+
     alias_method :completed?, :completed_at?
     alias_method :failed?,    :failed_at?
   end

data/lib/navvy/job/data_mapper.rb

@@ -4,10 +4,8 @@ require 'dm-core'
 module Navvy
   class Job
     include DataMapper::Resource
-
     class << self
-      attr_writer :limit
-      attr_accessor :keep
+      attr_writer :limit, :keep, :max_attempts
     end
 
     property :id,            Serial
@@ -17,6 +15,7 @@ module Navvy
     property :priority,      Integer, :default => 0
     property :return,        String
     property :exception,     String
+    property :parent_id,     Integer
     property :created_at,    Time
     property :run_at,        Time
     property :started_at,    Time
@@ -24,12 +23,30 @@ module Navvy
     property :failed_at,     Time
 
     ##
-    # Default limit of jobs to be fetched
+    # Default limit of jobs to be fetched.
     #
     # @return [Integer] limit
 
     def self.limit
-      @limit || 100
+      @limit || Navvy.configuration.job_limit
+    end
+
+    ##
+    # If and how long the jobs should be kept.
+    #
+    # @return [Fixnum, true, false] keep
+
+    def self.keep
+      @keep || Navvy.configuration.keep_jobs
+    end
+
+    ##
+    # How often should a job be retried?
+    #
+    # @return [Fixnum] max_attempts
+
+    def self.max_attempts
+      @max_attempts || Navvy.configuration.max_attempts
     end
 
     ##
@@ -38,7 +55,7 @@ module Navvy
     # @return [true, false] keep
 
     def self.keep?
-      keep = (@keep || false)
+      keep = (self.keep || false)
       return (Time.now + keep) >= Time.now if keep.is_a? Fixnum
       keep
     end
@@ -54,12 +71,20 @@ module Navvy
     # @return [true, false]
 
     def self.enqueue(object, method_name, *args)
+      options = {}
+      if args.last.is_a?(Hash)
+        options = args.last.delete(:job_options) || {}
+        args.pop if args.last.empty?
+      end
+
       new_job = self.new
       new_job.attributes = {
         :object =>      object.to_s,
         :method_name => method_name.to_s,
         :arguments =>   args.to_yaml,
-        :run_at =>      Time.now,
+        :priority =>    options[:priority] || 0,
+        :parent_id =>   options[:parent_id],
+        :run_at =>      options[:run_at] || Time.now,
         :created_at =>  Time.now
       }
       new_job.save
@@ -81,13 +106,13 @@ module Navvy
       all(
         :failed_at =>     nil,
         :completed_at =>  nil,
-        :run_at.lte =>     Time.now,
+        :run_at.lte =>    Time.now,
         :order =>         [ :priority.desc, :created_at.asc ],
         :limit =>         limit
       )
     end
 
-    ##
+    ##                     
     # Clean up jobs that we don't need to keep anymore. If Navvy::Job.keep is
     # false it'll delete every completed job, if it's a timestamp it'll only
     # delete completed jobs that have passed their keeptime.
@@ -96,9 +121,9 @@ module Navvy
 
     def self.cleanup
       if keep.is_a? Fixnum
-        all( :completed_at.lte => (Time.now - keep)).destroy
+        all(:completed_at.lte => (Time.now - keep)).destroy
       else
-        all( :completed_at.not => nil ).destroy unless keep?
+        all(:completed_at.not => nil ).destroy unless keep?
       end
     end
 
@@ -149,6 +174,8 @@ module Navvy
     ##
     # Mark the job as failed. Will set failed_at to the current time and
     # optionally add the exception message if provided.
+    # optionally add the exception message if provided. Also, it will retry
+    # the job unless max_attempts has been reached.
     #
     # @param [String] exception the exception message you want to store.
     #
@@ -156,12 +183,46 @@ module Navvy
     # update_attributes call
 
     def failed(message = nil)
+      self.retry unless times_failed >= self.class.max_attempts
       update(
         :failed_at => Time.now,
         :exception => message
       )
     end
 
+    ##
+    # Retry the current job. Will add self to the queue again, giving the clone
+    # a parend_id equal to self.id.
+    #
+    # @return [true, false]
+
+    def retry
+      self.class.enqueue(
+        object,
+        method_name,
+        *(args << {
+          :job_options => {
+            :parent_id => parent_id || id,
+            :run_at => Time.now + times_failed ** 4,
+            :priority => priority
+          }
+        })
+      )
+    end
+
+    ##
+    # Check how many times the job has failed. Will try to find jobs with a
+    # parent_id that's the same as self.id and count them
+    #
+    # @return [Integer] count the amount of times the job has failed
+
+    def times_failed
+      i = parent_id || id
+      self.class.all(
+        :conditions => ["(`id` = ? OR `parent_id` = ?) AND `failed_at` IS NOT NULL", i, i]
+      ).count
+    end
+
     ##
     # Check if the job has been run.
     #
@@ -207,6 +268,17 @@ module Navvy
       arguments.is_a?(Array) ? arguments : YAML.load(arguments)
     end
 
+    ##
+    # Get the job status
+    #
+    # @return [:pending, :completed, :failed] status
+
+    def status
+      return :completed if completed?
+      return :failed if failed?
+      :pending
+    end
+
     alias_method :completed?, :completed_at?
     alias_method :failed?,    :failed_at?
   end

data/lib/navvy/job/mongo_mapper.rb

@@ -5,15 +5,16 @@ module Navvy
   class Job
     include MongoMapper::Document
     class << self
-      attr_writer :limit
-      attr_accessor :keep
+      attr_writer :limit, :keep, :max_attempts
     end
 
     key :object,        String
     key :method_name,   Symbol
-    key :arguments,     Array
+    key :arguments,     String
+    key :priority,      Integer, :default => 0
     key :return,        String
     key :exception,     String
+    key :parent_id,     ObjectId
     key :created_at,    Time
     key :run_at,        Time
     key :started_at,    Time
@@ -21,12 +22,30 @@ module Navvy
     key :failed_at,     Time
 
     ##
-    # Default limit of jobs to be fetched
+    # Default limit of jobs to be fetched.
     #
     # @return [Integer] limit
 
     def self.limit
-      @limit || 100
+      @limit || Navvy.configuration.job_limit
+    end
+
+    ##
+    # If and how long the jobs should be kept.
+    #
+    # @return [Fixnum, true, false] keep
+
+    def self.keep
+      @keep || Navvy.configuration.keep_jobs
+    end
+
+    ##
+    # How often should a job be retried?
+    #
+    # @return [Fixnum] max_attempts
+
+    def self.max_attempts
+      @max_attempts || Navvy.configuration.max_attempts
     end
 
     ##
@@ -35,7 +54,7 @@ module Navvy
     # @return [true, false] keep
 
     def self.keep?
-      keep = (@keep || false)
+      keep = (self.keep || false)
       return keep.from_now >= Time.now if keep.is_a? Fixnum
       keep
     end
@@ -51,11 +70,19 @@ module Navvy
     # @return [true, false]
 
     def self.enqueue(object, method_name, *args)
+      options = {}
+      if args.last.is_a?(Hash)
+        options = args.last.delete(:job_options) || {}
+        args.pop if args.last.empty?
+      end
+
       create(
         :object =>      object.to_s,
         :method_name => method_name.to_sym,
-        :arguments =>   args,
-        :run_at =>      Time.now,
+        :arguments =>   args.to_yaml,
+        :priority =>    options[:priority] || 0,
+        :parent_id =>   options[:parent_id],
+        :run_at =>      options[:run_at] || Time.now,
         :created_at =>  Time.now
       )
     end
@@ -76,8 +103,8 @@ module Navvy
         :failed_at =>     nil,
         :completed_at =>  nil,
         :run_at =>        {'$lte' => Time.now},
-        :limit =>         limit,
-        :order =>         'created_at'
+        :order =>         'priority desc, created_at asc',
+        :limit =>         limit
       )
     end
 
@@ -146,7 +173,8 @@ module Navvy
 
     ##
     # Mark the job as failed. Will set failed_at to the current time and
-    # optionally add the exception message if provided.
+    # optionally add the exception message if provided. Also, it will retry
+    # the job unless max_attempts has been reached.
     #
     # @param [String] exception the exception message you want to store.
     #
@@ -154,10 +182,45 @@ module Navvy
     # update_attributes call
 
     def failed(message = nil)
-      update_attributes({
+      self.retry unless times_failed >= self.class.max_attempts
+      update_attributes(
         :failed_at => Time.now,
         :exception => message
-      })
+      )
+    end
+
+    ##
+    # Retry the current job. Will add self to the queue again, giving the clone
+    # a parend_id equal to self.id.
+    #
+    # @return [true, false]
+
+    def retry
+      self.class.enqueue(
+        object,
+        method_name,
+        *(args << {
+          :job_options => {
+            :parent_id => parent_id || id,
+            :run_at => Time.now + times_failed ** 4,
+            :priority => priority
+          }
+        })
+      )
+    end
+
+    ##
+    # Check how many times the job has failed. Will try to find jobs with a
+    # parent_id that's the same as self.id and count them
+    #
+    # @return [Integer] count the amount of times the job has failed
+
+    def times_failed
+      i = parent_id || id
+      self.class.count(
+        :failed_at => {'$ne' => nil},
+        '$where' => "this._id == '#{i}' || this.parent_id == '#{i}'"
+      )
     end
 
     ##
@@ -187,6 +250,17 @@ module Navvy
       arguments.is_a?(Array) ? arguments : YAML.load(arguments)
     end
 
+    ##
+    # Get the job status
+    #
+    # @return [:pending, :completed, :failed] status
+
+    def status
+      return :completed if completed?
+      return :failed if failed?
+      :pending
+    end
+
     alias_method :completed?, :completed_at?
     alias_method :failed?,    :failed_at?
   end

data/lib/navvy/job/sequel.rb

@@ -5,17 +5,34 @@ require 'yaml'
 module Navvy
   class Job < Sequel::Model
     class << self
-      attr_writer :limit
-      attr_accessor :keep
+      attr_writer :limit, :keep, :max_attempts
     end
 
     ##
-    # Default limit of jobs to be fetched
+    # Default limit of jobs to be fetched.
     #
     # @return [Integer] limit
 
     def self.limit
-      @limit || 100
+      @limit || Navvy.configuration.job_limit
+    end
+
+    ##
+    # If and how long the jobs should be kept.
+    #
+    # @return [Fixnum, true, false] keep
+
+    def self.keep
+      @keep || Navvy.configuration.keep_jobs
+    end
+
+    ##
+    # How often should a job be retried?
+    #
+    # @return [Fixnum] max_attempts
+
+    def self.max_attempts
+      @max_attempts || Navvy.configuration.max_attempts
     end
 
     ##
@@ -24,7 +41,7 @@ module Navvy
     # @return [true, false] keep
 
     def self.keep?
-      keep = (@keep || false)
+      keep = (self.keep || false)
       return (Time.now + keep) >= Time.now if keep.is_a? Fixnum
       keep
     end
@@ -40,11 +57,19 @@ module Navvy
     # @return [true, false]
 
     def self.enqueue(object, method_name, *args)
+      options = {}
+      if args.last.is_a?(Hash)
+        options = args.last.delete(:job_options) || {}
+        args.pop if args.last.empty?
+      end
+
       create(
         :object =>      object.to_s,
         :method_name => method_name.to_s,
         :arguments =>   args.to_yaml,
-        :run_at =>      Time.now,
+        :priority =>    options[:priority] || 0,
+        :parent_id =>   options[:parent_id],
+        :run_at =>      options[:run_at] || Time.now,
         :created_at =>  Time.now
       )
     end
@@ -64,7 +89,7 @@ module Navvy
       filter(
         '`failed_at` IS NULL AND `completed_at` IS NULL AND `run_at` <= ?',
         Time.now
-      ).order(:created_at).first(limit)
+      ).order(:priority.desc, :created_at).first(limit)
     end
 
     ##
@@ -124,7 +149,8 @@ module Navvy
 
     ##
     # Mark the job as failed. Will set failed_at to the current time and
-    # optionally add the exception message if provided.
+    # optionally add the exception message if provided. Also, it will retry
+    # the job unless max_attempts has been reached.
     #
     # @param [String] exception the exception message you want to store.
     #
@@ -132,10 +158,44 @@ module Navvy
     # update_attributes call
 
     def failed(message = nil)
-      update({
+      self.retry unless times_failed >= self.class.max_attempts
+      update(
         :failed_at => Time.now,
         :exception => message
-      })
+      )
+    end
+
+    ##
+    # Retry the current job. Will add self to the queue again, giving the clone
+    # a parend_id equal to self.id.
+    #
+    # @return [true, false]
+
+    def retry
+      self.class.enqueue(
+        object,
+        method_name,
+        *(args << {
+          :job_options => {
+            :parent_id => parent_id || id,
+            :run_at => Time.now + times_failed ** 4,
+            :priority => priority
+          }
+        })
+      )
+    end
+
+    ##
+    # Check how many times the job has failed. Will try to find jobs with a
+    # parent_id that's the same as self.id and count them
+    #
+    # @return [Integer] count the amount of times the job has failed
+
+    def times_failed
+      i = parent_id || id
+      self.class.filter(
+        "(`id` == '#{i}' OR `parent_id` == '#{i}') AND `failed_at` IS NOT NULL"
+      ).count
     end
 
     ##
@@ -183,6 +243,17 @@ module Navvy
       arguments.is_a?(Array) ? arguments : YAML.load(arguments)
     end
 
+    ##
+    # Get the job status
+    #
+    # @return [:pending, :completed, :failed] status
+
+    def status
+      return :completed if completed?
+      return :failed if failed?
+      :pending
+    end
+
     alias_method :completed?, :completed_at?
     alias_method :failed?,    :failed_at?
   end

data/lib/navvy/log.rb

@@ -7,8 +7,22 @@ module Navvy
     
     class LoggerNotFound < StandardError; end
 
+    ##
+    # Default logger
+    #
+    # @return [Symbol, nil] logger
+
     def self.logger
-      @logger
+      @logger || Navvy.configuration.logger
+    end
+
+    ##
+    # Be quiet?
+    #
+    # @return [true, false] quiet
+
+    def self.quiet
+      @quiet || Navvy.configuration.quiet
     end
 
     ##

data/lib/navvy/worker.rb

@@ -1,6 +1,18 @@
 module Navvy
   class Worker
+    class << self
+      attr_writer :sleep_time
+    end
+
+    ##
+    # Sleep time of the worker.
+    #
+    # @return [Integer] sleep
 
+    def self.sleep_time
+      @sleep_time || Navvy.configuration.sleep_time
+    end
+    
     ##
     # Start the worker.
 
@@ -17,7 +29,7 @@ module Navvy
           Navvy::Job.cleanup
           break
         end
-        sleep 5
+        sleep sleep_time
       end
     end
 

data/lib/navvy.rb

@@ -1,2 +1,17 @@
 require File.expand_path(File.dirname(__FILE__) + '/navvy/worker')
 require File.expand_path(File.dirname(__FILE__) + '/navvy/log')
+require File.expand_path(File.dirname(__FILE__) + '/navvy/configuration')
+
+module Navvy
+  class << self
+    attr_writer :configuration
+  end
+  
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+    
+  def self.configure
+    yield(self.configuration)
+  end
+end

data/navvy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{navvy}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Kreeftmeijer"]
-  s.date = %q{2010-01-26}
+  s.date = %q{2010-02-08}
   s.description = %q{Simple background job processor inspired by delayed_job, but aiming for database agnosticism.}
   s.email = %q{jeff@kreeftmeijer.nl}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
      "generators/navvy/templates/migration.rb",
      "lib/generators/navvy_generator.rb",
      "lib/navvy.rb",
+     "lib/navvy/configuration.rb",
      "lib/navvy/job/active_record.rb",
      "lib/navvy/job/data_mapper.rb",
      "lib/navvy/job/mongo_mapper.rb",
@@ -35,6 +36,7 @@ Gem::Specification.new do |s|
      "lib/navvy/tasks.rb",
      "lib/navvy/worker.rb",
      "navvy.gemspec",
+     "spec/configuration_spec.rb",
      "spec/job_spec.rb",
      "spec/log_spec.rb",
      "spec/setup/active_record.rb",
@@ -52,7 +54,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Simple background job processor inspired by delayed_job, but aiming for database agnosticism.}
   s.test_files = [
-    "spec/job_spec.rb",
+    "spec/configuration_spec.rb",
+     "spec/job_spec.rb",
      "spec/log_spec.rb",
      "spec/setup/active_record.rb",
      "spec/setup/data_mapper.rb",

data/spec/configuration_spec.rb

@@ -0,0 +1,85 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Navvy::Configuration do
+  after do
+    Navvy.configure do |config|
+      config.job_limit =  100
+      config.keep_jobs =  false
+      config.logger =     nil
+      config.quiet =      true
+      config.sleep_time = 5
+    end
+  end
+  
+  it 'should have a job limit of 100 by default' do
+    Navvy::Job.limit.should == 100
+  end
+  
+  it 'should set the job limit' do
+    Navvy.configure do |config|
+      config.job_limit = 10
+    end
+    
+    Navvy::Job.limit.should == 10
+  end
+  
+  it 'should have keep_jobs off by default' do
+    Navvy::Job.keep.should == false
+  end
+  
+  it 'should set keep_jobs' do
+    Navvy.configure do |config|
+      config.keep_jobs = 10
+    end
+    
+    Navvy::Job.keep.should == 10
+  end
+  
+  it 'should not have a logger by default' do
+    Navvy::Log.logger.should == nil
+  end
+  
+  it 'should set the keep_jobs' do
+    Navvy.configure do |config|
+      config.logger = :rails
+    end
+    
+    Navvy::Log.logger.should == :rails
+  end
+  
+  it 'should be quiet in the specs' do
+    Navvy::Log.quiet.should == true
+  end
+  
+  it 'should turn quiet off' do
+    Navvy.configure do |config|
+      config.quiet = false
+    end
+    
+    Navvy::Log.quiet.should == false
+  end
+  
+  it 'should have a default sleep time of 5' do
+    Navvy::Worker.sleep_time.should == 5
+  end
+  
+  it 'should turn quiet off' do
+    Navvy.configure do |config|
+      config.sleep_time = 10
+    end
+    
+    Navvy::Worker.sleep_time.should == 10
+  end
+  
+  it 'should have a default max_attempts of 25' do
+    Navvy::Job.max_attempts.should == 25
+  end
+  
+  it 'should set max_attempts to 15' do
+    Navvy.configure do |config|
+      config.max_attempts = 15
+    end                       
+    
+    Navvy::Job.max_attempts.should == 15
+  end
+end

data/spec/job_spec.rb

@@ -1,6 +1,44 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe 'Navvy::Job' do
+  
+  describe '.keep?' do
+    after(:each) do
+      Navvy::Job.keep = false
+      Navvy.configure do |config|
+        config.keep_jobs = false
+      end
+    end
+    
+    describe 'when configured using Navvy::Job.keep=' do
+      it 'should return false' do
+        Navvy::Job.keep = false
+        Navvy::Job.keep?.should == false
+      end 
+
+      it 'should return true' do
+        Navvy::Job.keep = true
+        Navvy::Job.keep?.should == true
+      end
+    end  
+    
+    describe 'when configured with Navvy.configure' do
+      it 'should return false' do
+        Navvy.configure do |config|
+          config.keep_jobs = false
+        end
+        Navvy::Job.keep?.should == false
+      end 
+
+      it 'should return true' do
+        Navvy.configure do |config|
+          config.keep_jobs = true
+        end
+        Navvy::Job.keep?.should == true
+      end
+    end
+  end
+  
   describe '.enqueue' do
     before(:each) do
       delete_all_jobs
@@ -197,7 +235,6 @@ describe 'Navvy::Job' do
       it 'should store the exception and current time' do
         jobs = Navvy::Job.next
         jobs.first.run
-        job_count.should == 1
         jobs.first.exception.should == 'this method is broken'
         jobs.first.started_at.should be_instance_of Time
         jobs.first.failed_at.should be_instance_of Time
@@ -241,6 +278,137 @@ describe 'Navvy::Job' do
       jobs.first.failed('broken')
       jobs.first.exception.should == 'broken'
     end
+
+    it 'should retry' do
+      jobs = Navvy::Job.next
+      jobs.first.should_receive(:retry)
+      jobs.first.failed('broken')
+    end
+
+    it 'should not retry when the job has failed 25 times already' do
+      jobs = Navvy::Job.next
+      jobs.first.stub!(:times_failed).and_return 25
+      jobs.first.should_not_receive(:retry)
+      jobs.first.failed('broken')
+    end
+
+    it 'should not retry when the job has failed 10 times' do
+      Navvy::Job.max_attempts = 10
+      jobs = Navvy::Job.next
+      jobs.first.stub!(:times_failed).and_return 10
+      jobs.first.should_not_receive(:retry)
+      jobs.first.failed('broken')
+    end
+  end
+
+  describe '#retry' do
+    before(:each) do
+      delete_all_jobs
+    end
+
+    it 'should enqueue a child for the failed job' do
+      failed_job = Navvy::Job.enqueue(Cow, :speak, true, false)
+      job = failed_job.retry
+      job.object.should ==            'Cow'
+      job.method_name.to_s.should ==  'speak'
+      job.args.should ==              [true, false]
+      job.parent_id.should ==         failed_job.id
+    end
+
+    it 'should handle hashes correctly' do
+      failed_job = Navvy::Job.enqueue(Cow, :speak, 'name' => 'Betsy')
+      job = failed_job.retry
+      job.args.should ==      [{'name' => 'Betsy'}]
+      job.parent_id.should == failed_job.id
+    end
+
+    it 'should set the priority' do
+      failed_job = Navvy::Job.enqueue(
+        Cow,
+        :speak,
+        'name' => 'Betsy',
+        :job_options => {
+          :priority => 2
+        }
+      )
+      job = failed_job.retry
+      job.priority.should == 2
+    end
+
+    it 'should set the run_at date to about 16 seconds from now' do
+      failed_job = Navvy::Job.enqueue(Cow, :speak, 'name' => 'Betsy')
+      failed_job.stub!(:times_failed).and_return 2
+      now = Time.now
+      job = failed_job.retry
+      job.run_at.to_i.should == (now + 16).to_i
+    end
+
+    it 'should set the run_at date to about 256 seconds from now' do
+      failed_job = Navvy::Job.enqueue(Cow, :speak, 'name' => 'Betsy')
+      failed_job.stub!(:times_failed).and_return 4
+      now = Time.now
+      job = failed_job.retry
+      job.run_at.to_i.should == (now + 256).to_i
+    end
+
+    it 'should set the run_at date to about 4096 seconds from now' do
+      failed_job = Navvy::Job.enqueue(Cow, :speak, 'name' => 'Betsy')
+      failed_job.stub!(:times_failed).and_return 8
+      now = Time.now
+      job = failed_job.retry
+      job.run_at.to_i.should == (now + 4096).to_i
+    end
+
+    it 'should set the parent_id to the master job id' do
+      failed_job = Navvy::Job.enqueue(Cow, :speak, 'name' => 'Betsy')
+      failed_child = failed_job.retry
+      failed_child.retry.parent_id.should == failed_job.id
+    end
+  end
+
+  describe '#times_failed' do
+    before(:each) do
+      delete_all_jobs
+      @failed_job = Navvy::Job.create(
+        :failed_at => Time.now
+      )
+    end
+
+    it 'should return 1' do
+      @failed_job.times_failed.should == 1
+    end
+
+    it 'should return 3 when having 2 failed children' do
+      2.times do
+        Navvy::Job.create(
+          :failed_at => Time.now,
+          :parent_id => @failed_job.id
+        )
+      end
+
+      @failed_job.times_failed.should == 3
+    end
+    
+     it 'should return 2 when having 1 failed and one pending child' do
+        Navvy::Job.create(
+          :failed_at => Time.now,
+          :parent_id => @failed_job.id
+        )
+        
+        Navvy::Job.create(
+          :parent_id => @failed_job.id
+        )
+        
+        @failed_job.times_failed.should == 2
+      end
+
+    it 'should return 2 when having failed and having a failed parent' do
+      failed_child =  Navvy::Job.create(
+        :failed_at => Time.now,
+        :parent_id => @failed_job.id
+      )
+      failed_child.times_failed.should == 2
+    end
   end
 
   describe '#ran?' do

data/spec/setup/active_record.rb

@@ -8,8 +8,10 @@ ActiveRecord::Schema.define do
     table.string    :object
     table.string    :method_name
     table.text      :arguments
+    table.integer   :priority, :default => 0
     table.string    :return
     table.string    :exception
+    table.integer   :parent_id
     table.datetime  :created_at
     table.datetime  :run_at
     table.datetime  :started_at

data/spec/setup/sequel.rb

@@ -8,8 +8,10 @@ Sequel::DATABASES[0].create_table!(:jobs) do
   String    :object
   String    :method_name
   String    :arguments, :text => true
+  Integer   :priority, :default => 0
   String    :return
   String    :exception
+  Integer   :parent_id
   DateTime  :created_at
   DateTime  :run_at
   DateTime  :started_at

data/spec/spec_helper.rb

@@ -39,4 +39,6 @@ class Cow
   end
 end
 
-Navvy::Log.quiet = true
+Navvy.configure do |config|
+  config.quiet = true
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: navvy
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jeff Kreeftmeijer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-26 00:00:00 +01:00
+date: 2010-02-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,7 @@ files:
 - generators/navvy/templates/migration.rb
 - lib/generators/navvy_generator.rb
 - lib/navvy.rb
+- lib/navvy/configuration.rb
 - lib/navvy/job/active_record.rb
 - lib/navvy/job/data_mapper.rb
 - lib/navvy/job/mongo_mapper.rb
@@ -90,6 +91,7 @@ files:
 - lib/navvy/tasks.rb
 - lib/navvy/worker.rb
 - navvy.gemspec
+- spec/configuration_spec.rb
 - spec/job_spec.rb
 - spec/log_spec.rb
 - spec/setup/active_record.rb
@@ -129,6 +131,7 @@ signing_key:
 specification_version: 3
 summary: Simple background job processor inspired by delayed_job, but aiming for database agnosticism.
 test_files: 
+- spec/configuration_spec.rb
 - spec/job_spec.rb
 - spec/log_spec.rb
 - spec/setup/active_record.rb