navvy 0.0.0 → 0.1.0

data/spec/log_spec.rb

@@ -0,0 +1,71 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+class LoggerNotFound < StandardError; end
+
+describe Navvy::Log do
+  describe '.info' do
+    describe 'when using the rails default logger' do
+      before do
+        Navvy::Log.logger = :rails
+      end
+      
+      it 'should raise an error when the logger can not be found' do
+        lambda { Navvy::Log.info('123') }.should raise_error
+      end
+      
+      it 'should pass the log to RAILS_DEFAULT_LOGGER' do
+        class RailsLogger
+          def self.info(text);end
+        end
+
+        RAILS_DEFAULT_LOGGER = RailsLogger
+        
+        RAILS_DEFAULT_LOGGER.should_receive(:info).with('123')
+        Navvy::Log.info('123')
+      end
+    end
+
+    describe 'when using justlogging' do
+      before do
+        Navvy::Log.logger = :justlogging
+      end
+      
+      it 'should raise an error when the logger can not be found' do
+        lambda { Navvy::Log.info('123') }.should raise_error
+      end
+      
+      it 'should pass the log to justlogging' do
+        class Justlogging
+          def self.log(text);end
+        end
+        
+        Justlogging.should_receive(:log).with('123')
+        Navvy::Log.info('123')
+      end
+    end
+
+    describe 'when using both the rails default logger and justlogging' do
+      before do
+        Navvy::Log.logger = [:rails, :justlogging]
+      end
+
+      it 'should pass the log to justlogging' do
+        RAILS_DEFAULT_LOGGER.should_receive(:info).with('123')
+        Justlogging.should_receive(:log).with('123')
+        Navvy::Log.info('123')
+      end
+    end
+    
+    describe 'when not using any logger' do
+      before do
+        Navvy::Log.logger = nil
+      end
+      
+      it 'should not log' do
+        RAILS_DEFAULT_LOGGER.should_not_receive(:info)
+        Justlogging.should_not_receive(:log)
+        Navvy::Log.info('123')
+      end
+    end
+  end
+end

data/spec/setup/active_record.rb

@@ -0,0 +1,20 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/navvy/job/active_record')
+require 'rubygems'
+require 'yaml'
+
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => '/tmp/navvy_test.sqlite')
+
+ActiveRecord::Schema.define do
+  create_table :jobs, :force => true do |table|
+    table.string    :object
+    table.string    :method_name
+    table.text      :arguments
+    table.string    :return
+    table.string    :exception
+    table.datetime  :created_at
+    table.datetime  :run_at
+    table.datetime  :started_at
+    table.datetime  :completed_at
+    table.datetime  :failed_at
+  end
+end

data/spec/setup/sequel.rb

@@ -0,0 +1,21 @@
+require 'rubygems'
+require 'sequel'
+require 'yaml'
+
+Sequel.sqlite('/tmp/navvy_test_s.sqlite')
+
+Sequel::DATABASES[0].create_table!(:jobs) do
+    primary_key :id, :type=>Integer
+    String    :object
+    String    :method_name
+    String    :arguments, :text => true
+    String    :return
+    String    :exception
+    DateTime  :created_at
+    DateTime  :run_at
+    DateTime  :started_at
+    DateTime  :completed_at
+    DateTime  :failed_at
+end
+
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/navvy/job/sequel')

data/spec/spec_helper.rb

@@ -16,3 +16,5 @@ class Cow
     raise 'this method is broken'
   end
 end
+
+Navvy::Log.quiet = true

data/spec/worker_spec.rb

@@ -8,15 +8,15 @@ describe Navvy::Worker do
         Navvy::Job.enqueue(Cow, :speak),
         Navvy::Job.enqueue(Cow, :speak)
       ]
-      
+
       Navvy::Job.stub!(:next).and_return(@jobs)
-    end    
-    
+    end
+
     it 'should fetch jobs' do
       Navvy::Job.should_receive(:next).and_return(@jobs)
       Navvy::Worker.fetch_and_run_jobs
     end
-    
+
     it 'should run three jobs' do
       @jobs.each do |job|
         job.should_receive(:run)
@@ -24,4 +24,4 @@ describe Navvy::Worker do
       Navvy::Worker.fetch_and_run_jobs
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: navvy
 version: !ruby/object:Gem::Version 
-  version: 0.0.0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Jeff Kreeftmeijer
@@ -9,19 +9,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 +01:00
+date: 2010-01-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: mongo_mapper
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.6.10
-    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   type: :development
@@ -62,6 +52,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.6
     version: 
+- !ruby/object:Gem::Dependency 
+  name: mongo_mapper
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.6.10
+    version: 
 - !ruby/object:Gem::Dependency 
   name: machinist_mongomapper
   type: :development
@@ -72,6 +72,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.7
     version: 
+- !ruby/object:Gem::Dependency 
+  name: sequel
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 3.8.0
+    version: 
 description: Simple background job processor inspired by delayed_job, but aiming for database agnosticism.
 email: jeff@kreeftmeijer.nl
 executables: []
@@ -88,14 +98,24 @@ files:
 - README.textile
 - Rakefile
 - VERSION
-- lib/job/mongo_mapper.rb
+- generators/navvy/navvy_generator.rb
+- generators/navvy/templates/migration.rb
+- lib/generators/navvy_generator.rb
 - lib/navvy.rb
-- lib/navvy/job.rb
+- lib/navvy/job/active_record.rb
 - lib/navvy/job/mongo_mapper.rb
+- lib/navvy/job/sequel.rb
+- lib/navvy/log.rb
+- lib/navvy/tasks.rb
 - lib/navvy/worker.rb
 - navvy.gemspec
+- spec/job/active_record_spec.rb
 - spec/job/mongo_mapper_spec.rb
+- spec/job/sequel_spec.rb
+- spec/log_spec.rb
+- spec/setup/active_record.rb
 - spec/setup/mongo_mapper.rb
+- spec/setup/sequel.rb
 - spec/spec_helper.rb
 - spec/worker_spec.rb
 has_rdoc: true
@@ -127,7 +147,12 @@ signing_key:
 specification_version: 3
 summary: Simple background job processor inspired by delayed_job, but aiming for database agnosticism.
 test_files: 
+- spec/job/active_record_spec.rb
 - spec/job/mongo_mapper_spec.rb
+- spec/job/sequel_spec.rb
+- spec/log_spec.rb
+- spec/setup/active_record.rb
 - spec/setup/mongo_mapper.rb
+- spec/setup/sequel.rb
 - spec/spec_helper.rb
 - spec/worker_spec.rb

data/lib/job/mongo_mapper.rb

@@ -1,74 +0,0 @@
-require 'rubygems'
-require 'mongo_mapper'
-
-module Navvy
-  class Job
-    include MongoMapper::Document
-
-    key :object,    String
-    key :method,    Symbol
-    key :arguments, Array
-    key :exception, String
-    key :run_at,    Time
-    key :failed_at, Time
-
-    ##
-    # Add a job to the job queue.
-    #
-    # @param [Object] object the object you want to run a method from
-    # @param [Symbol, String] method the name of the method you want to run
-    # @param [*] arguments optional arguments you want to pass to the method
-    #
-    # @return [true, false]
-
-    def self.enqueue(object, method, *args)
-      create(
-        :object =>    object.name,
-        :method =>    method.to_sym,
-        :run_at =>    Time.now,
-        :arguments => args
-      )
-    end
-
-    ##
-    # Find the next available job in the queue. This will not include failed
-    # jobs (where :failed_at is not nil) and jobs that should run in the future
-    # (where :run_at is greater than the current time).
-    # 
-    #
-    # @return [Navvy::Job, nil] the next available job or nil if no jobs
-    # were found
-
-    def self.next
-      first(
-        :failed_at => nil,
-        :run_at => {'$lte', Time.now}
-      )
-    end
-
-    ##
-    # Run the job. Will delete the Navvy::Job record and return its return
-    # value if it runs successfully. If a job fails, it'll update the
-    # Navvy::Job record to include the exception message it sent back and set
-    # the :failed_at date. Failed jobs don't get deleted.
-    #
-    # @example
-    #   job = Navvy::Job.next # finds the next available job in the queue
-    #   job.run               # runs the job and returns the job's return value
-    #
-    # @return [String] return value of the called method
-
-    def run
-      begin
-        result = object.constantize.send(method)
-        destroy
-        result
-      rescue Exception => exception
-        update_attributes({
-          :exception => exception.message,
-          :failed_at => Time.now
-        })
-      end
-    end
-  end
-end

data/lib/navvy/job.rb

@@ -1,16 +0,0 @@
-module Navvy
-  class Job
-    class << self
-      attr_accessor :limit
-    end
-    
-    ##
-    # Default limit of jobs to be fetched
-    #
-    # @return [Integer] limit
-    
-    def self.limit
-      10
-    end
-  end
-end