navvy 0.2.2 → 0.2.3

data/Rakefile

@@ -15,7 +15,7 @@ begin
     gem.add_development_dependency "yard",                  ">= 0.5.2"
     gem.add_development_dependency "sequel",                ">= 3.8.0"
     gem.add_development_dependency "sqlite3-ruby",          ">= 1.2.5"
-    gem.add_dependency             "daemons",               ">= 1.0.0"
+    gem.add_dependency             "daemons",               ">= 1.0.10"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/navvy/job/sequel.rb

@@ -22,7 +22,7 @@ module Navvy
         args.pop if args.last.empty?
       end
 
-      create(
+      insert(
         :object =>      object.to_s,
         :method_name => method_name.to_s,
         :arguments =>   args.to_yaml,
@@ -31,6 +31,7 @@ module Navvy
         :run_at =>      options[:run_at] || Time.now,
         :created_at =>  Time.now
       )
+      order(:id.desc).first
     end
 
     ##
@@ -46,8 +47,9 @@ module Navvy
 
     def self.next(limit = self.limit)
       filter(
-        '`failed_at` IS NULL AND `completed_at` IS NULL AND `run_at` <= ?',
-        Time.now
+            (:run_at <= Time.now),
+            {:failed_at    => nil, 
+             :completed_at => nil}
       ).order(:priority.desc, :created_at).first(limit)
     end
 
@@ -60,9 +62,9 @@ module Navvy
 
     def self.cleanup
       if keep.is_a? Fixnum
-        filter('`completed_at` <= ?', (Time.now - keep)).delete
+        filter(:completed_at <= (Time.now - keep)).delete
       else
-        filter('`completed_at` IS NOT NULL').delete unless keep?
+        filter(~{:completed_at => nil}).delete unless keep?
       end
     end
 
@@ -131,7 +133,7 @@ module Navvy
     def times_failed
       i = parent_id || id
       self.class.filter(
-        "(`id` == '#{i}' OR `parent_id` == '#{i}') AND `failed_at` IS NOT NULL"
+        ({:id => i} | {:parent_id => i}), ~{:failed_at => nil}
       ).count
     end
   end

data/navvy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{navvy}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Kreeftmeijer"]
-  s.date = %q{2010-02-23}
+  s.date = %q{2010-03-30}
   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 = [
@@ -78,19 +78,19 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<yard>, [">= 0.5.2"])
       s.add_development_dependency(%q<sequel>, [">= 3.8.0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
-      s.add_runtime_dependency(%q<daemons>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<daemons>, [">= 1.0.10"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<yard>, [">= 0.5.2"])
       s.add_dependency(%q<sequel>, [">= 3.8.0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
-      s.add_dependency(%q<daemons>, [">= 1.0.0"])
+      s.add_dependency(%q<daemons>, [">= 1.0.10"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<yard>, [">= 0.5.2"])
     s.add_dependency(%q<sequel>, [">= 3.8.0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
-    s.add_dependency(%q<daemons>, [">= 1.0.0"])
+    s.add_dependency(%q<daemons>, [">= 1.0.10"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: navvy
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Jeff Kreeftmeijer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 +01:00
+date: 2010-03-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: 1.0.10
     version: 
 description: Simple background job processor inspired by delayed_job, but aiming for database agnosticism.
 email: jeff@kreeftmeijer.nl