say_when 0.1.0 → 0.2.0

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 *.DS_Store
+.rvmrc

data/lib/generators/say_when/migration/migration_generator.rb

@@ -1,13 +1,18 @@
+require 'rails/generators'
+require 'rails/generators/migration'
+require 'rails/generators/active_record/migration'
+
 module SayWhen
-  class MigrationGenerator < Rails::Generator::Base
+  class MigrationGenerator < Rails::Generators::Base
+
+    include Rails::Generators::Migration
+    extend ActiveRecord::Generators::Migration
+
+    source_root File.expand_path('../templates', __FILE__)
+
     def manifest 
-      record do |m| 
-        m.migration_template 'migration.rb', 'db/migrate' 
-      end 
+      migration_template 'migration.rb', 'db/migrate/create_say_when_tables' 
     end
     
-    def file_name
-      "say_when_migration"
-    end
   end
-end
+end

data/lib/generators/say_when/migration/templates/migration.rb

@@ -1,4 +1,5 @@
-class SayWhenMigration < ActiveRecord::Migration
+class CreateSayWhenTables < ActiveRecord::Migration
+  
   def self.up
 
     create_table :say_when_jobs, :force => true do |t|

data/lib/say_when/base_job.rb

@@ -26,14 +26,12 @@ module SayWhen
       @trigger ||= load_trigger
     end
 
-    def fired
+    def fired(fired_at=Time.now)
       self.lock.synchronize {
-        fired = Time.now
-        next_fire = trigger.next_fire_at(fired) rescue nil
-        self.last_fire_at = fired
-        self.next_fire_at = next_fire
+        self.last_fire_at = fired_at
+        self.next_fire_at = trigger.next_fire_at(last_fire_at + 1.second) rescue nil
 
-        if next_fire.nil?
+        if next_fire_at.nil?
           self.status = STATE_COMPLETE
         else
           self.status = STATE_WAITING
@@ -50,7 +48,7 @@ module SayWhen
     end
 
     def execute
-      self.execute_job(data)
+      execute_job(data)
     end
 
     def load_trigger
@@ -58,11 +56,11 @@ module SayWhen
       require "say_when/triggers/#{strategy}_strategy"
       trigger_class_name = "SayWhen::Triggers::#{strategy.to_s.camelize}Strategy"
       trigger_class = trigger_class_name.constantize
-      trigger_class.new(trigger_options)
+      trigger_class.new((trigger_options || {}).merge(:job=>self))
     end
 
     def execute_job(options)
-      task_method = (self.job_method || 'execute').to_s
+      task_method = (job_method || 'execute').to_s
       task = get_task(task_method)
       task.send(task_method, options)
     end
@@ -70,8 +68,8 @@ module SayWhen
     def get_task(task_method)
       task = nil
 
-      if self.job_class
-        tc = self.job_class.constantize
+      if job_class
+        tc = job_class.constantize
         if tc.respond_to?(task_method)
           task = tc
         else
@@ -79,14 +77,14 @@ module SayWhen
           if to.respond_to?(task_method)
             task = to
           else
-            raise "Neither '#{self.job_class}' class nor instance respond to '#{task_method}'"
+            raise "Neither '#{job_class}' class nor instance respond to '#{task_method}'"
           end
         end
-      elsif self.scheduled
-        if self.scheduled.respond_to?(task_method)
-          task = self.scheduled
+      elsif scheduled
+        if scheduled.respond_to?(task_method)
+          task = scheduled
         else
-          raise "Scheduled '#{self.scheduled.inspect}' does not respond to '#{task_method}'"
+          raise "Scheduled '#{scheduled.inspect}' does not respond to '#{task_method}'"
         end
       end
       task

data/lib/say_when/processor/active_messaging.rb

@@ -13,9 +13,9 @@ module SayWhen
 
       # send the job to the other end, then in the a13g processor, call the execute method
       def process(job)
-        message = {:job_id=>job.id}.to_yaml
-        publish :say_when, message
+        publish(:say_when, {:job_id=>job.id}.to_yaml)
       end
+      
     end
 
   end

data/lib/say_when/scheduler.rb

@@ -59,10 +59,11 @@ module SayWhen
       logger.info "SayWhen::Scheduler starting"
 
       [$stdout, $stderr].each{|s| s.sync = true; s.flush}
+
       trap("TERM", "EXIT")
-      trap("QUIT") { stop }
 
       begin
+
         self.running = true
 
         logger.info "SayWhen::Scheduler running"
@@ -82,18 +83,20 @@ module SayWhen
               logger.debug "SayWhen:: job processed"
 
               # this should update next fire at, and put back in list of scheduled jobs
-              job.fired
+              job.fired(time_now)
               logger.debug "SayWhen:: job fired complete"
-
-            end
-          rescue Object=>ex
-            begin
-              job_msg = job && " job:'#{job.inspect}'"
-              logger.error "SayWhen:: Failure to process#{job_msg}: #{ex.message}\n\t#{ex.backtrace.join("\t\n")}"
-              job.release if job
-            rescue
-              puts ex
             end
+          rescue Interrupt
+            job_msg = job && " job:'#{job.inspect}'"
+            logger.error "\nSayWhen:: Interrupt! #{job_msg}"
+            exit
+          rescue StandardError=>ex
+            job_msg = job && " job:'#{job.inspect}'"
+            logger.error "SayWhen:: Failure to process#{job_msg}: #{ex.message}\n\t#{ex.backtrace.join("\t\n")}"
+            job.release if job
+          rescue Exception=>ex
+            logger.error "SayWhen:: Exception in process#{job_msg}: #{ex.message}\n\t#{ex.backtrace.join("\t\n")}"
+            exit
           end
         end
       end

data/lib/say_when/storage/active_record/acts.rb

@@ -17,6 +17,13 @@ module SayWhen #:nodoc:
     
         module InstanceMethods
 
+          def schedule_instance(next_at_method, job={})
+            options = job_options(job)
+            options[:trigger_strategy] = :scheduled
+            options[:trigger_options]  = {:next_at_method => next_at_method}
+            Scheduler.schedule(options)
+          end
+
           def schedule_cron(expression, time_zone, job={})
             options = job_options(job)
             options[:trigger_strategy] = :cron
@@ -27,14 +34,14 @@ module SayWhen #:nodoc:
           def schedule_once(time, job={})
             options = job_options(job)
             options[:trigger_strategy] = :once
-            options[:trigger_options]  = time
+            options[:trigger_options]  = {:at => time}
             Scheduler.schedule(options)
           end
 
           def schedule_in(after, job={})
             options = job_options(job)
             options[:trigger_strategy] = :once
-            options[:trigger_options]  = Time.now + after
+            options[:trigger_options]  = {:at => (Time.now + after)}
             Scheduler.schedule(options)
           end
 

data/lib/say_when/storage/active_record/job.rb

@@ -23,11 +23,11 @@ module SayWhen
          SayWhen::Storage::ActiveRecord::Job.transaction do
             # select and lock the next job that needs executin' (status waiting, and after no_later_than)
             next_job = find(:first,
-                                :lock       => true,
-                                :order      => 'next_fire_at ASC',
-                                :conditions => ['status = ? and ? >= next_fire_at', 
-                                                STATE_WAITING,
-                                                no_later_than.in_time_zone('UTC')])
+                            :lock       => true,
+                            :order      => 'next_fire_at ASC',
+                            :conditions => ['status = ? and ? >= next_fire_at', 
+                                            STATE_WAITING,
+                                            no_later_than.in_time_zone('UTC')])
 
             # make sure there is a job ready to run
             return nil if next_job.nil?
@@ -41,10 +41,11 @@ module SayWhen
 
         def before_create
           self.status = STATE_WAITING
-          self.next_fire_at = self.trigger.next_fire_at(Time.now)
+          self.next_fire_at = self.trigger.next_fire_at
         end
 
-        def fired
+
+        def fired(fired_at=Time.now)
           Job.transaction {
             super
             self.save!
@@ -58,7 +59,6 @@ module SayWhen
           }
         end
 
-
         # default impl with some error handling and result recording
         def execute
           result = nil

data/lib/say_when/storage/memory/job.rb

@@ -32,8 +32,8 @@ module SayWhen
 
         def initialize(options={})
           super
-          self.status = STATE_WAITING unless self.status          
-          self.next_fire_at = self.trigger.next_fire_at(Time.now)
+          self.status = STATE_WAITING unless self.status
+          self.next_fire_at = trigger.next_fire_at
           self.class.jobs << self
         end
 

data/lib/say_when/tasks.rb

@@ -1,22 +1,22 @@
 namespace :say_when do
-  task :setup
 
   desc "Start the SayWhen Scheduler"
-  task :start => [ :preload ] do
+  task :start => :environment do
     require 'say_when'
     SayWhen::Scheduler.start
   end
 
-  # Preload app files if this is Rails
-  # thanks resque
-  task :preload => :setup do
-    if defined?(Rails) && Rails.respond_to?(:application)
-      # Rails 3
-      Rails.application.eager_load!
-    elsif defined?(Rails::Initializer)
-      # Rails 2.3
-      $rails_rake_task = false
-      Rails::Initializer.run :load_application_classes
-    end
-  end
+  # # Preload app files if this is Rails
+  # # thanks resque
+  # task :preload => :setup do
+  #   if defined?(Rails) && Rails.respond_to?(:application)
+  #     # Rails 3
+  #     Rails.application.eager_load!
+  #   elsif defined?(Rails::Initializer)
+  #     # Rails 2.3
+  #     $rails_rake_task = false
+  #     Rails::Initializer.run :load_application_classes
+  #   end
+  # end
+
 end

data/lib/say_when/triggers/base.rb

@@ -2,7 +2,13 @@ module SayWhen
   module Triggers
     module Base
 
-      def next_fire_at(time=Time.now)
+      attr_accessor :job
+
+      def initialize(options={})
+        @job = options.delete(:job)
+      end
+
+      def next_fire_at(time=nil)
         raise NotImplementedError.new('You need to implement next_fire_at in your strategy')
       end
 

data/lib/say_when/triggers/cron_strategy.rb

@@ -10,11 +10,12 @@ module SayWhen
       attr_accessor :cron_expression
 
       def initialize(options={})
+        super
         @cron_expression = SayWhen::CronExpression.new(options)            
       end
 
-      def next_fire_at(time=Time.now)
-        cron_expression.next_fire_at(time)
+      def next_fire_at(time=nil)
+        cron_expression.next_fire_at(time || Time.now)
       end
 
     end

data/lib/say_when/triggers/once_strategy.rb

@@ -9,22 +9,16 @@ module SayWhen
       attr_accessor :once_at
 
       def initialize(options=nil)
-        options ||= Time.now
-        # if it's a hash, pull out the time
-        @once_at = if options.is_a?(Time) || options.acts_like_time?
-          options
-        elsif options.is_a?(Hash) && options[:at]
-          options[:at]
-        else
-          Time.now
-        end
-      
+        super
+        @once_at = options[:at] || Time.now
       end
 
-      def next_fire_at(time=Time.now)
-        once_at if once_at >= time
+      def next_fire_at(time=nil)
+        nfa = once_at if (!time || (time <= once_at))
+        puts "OnceStrategy: next_fire_at: #{nfa}, once_at: #{once_at}, time: #{time}"
+        return nfa
       end
       
     end
   end
-end
+end

data/lib/say_when/triggers/scheduled_strategy.rb

@@ -0,0 +1,22 @@
+require 'say_when/triggers/base'
+
+module SayWhen
+  module Triggers
+    class ScheduledStrategy
+
+      include SayWhen::Triggers::Base
+
+      attr_accessor :scheduled, :next_at_method
+
+      def initialize(options={})
+        @scheduled       = @job.scheduled
+        @next_at_method  = options[:next_at_method] || 'next_fire_at'
+      end
+
+      def next_fire_at(time=Time.now)
+        scheduled.send(next_at_method, time)
+      end
+
+    end
+  end
+end

data/lib/say_when/version.rb

@@ -1,3 +1,3 @@
 module SayWhen
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/say_when/processor/active_messaging_spec.rb

@@ -0,0 +1,38 @@
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../lib/say_when/processor/active_messaging'
+require File.dirname(__FILE__) + '/../../../lib/say_when/storage/active_record/job'
+
+def destination(destination_name)
+  d = ActiveMessaging::Gateway.find_destination(destination_name).value
+  ActiveMessaging::Gateway.connection('default').find_destination d
+end
+
+describe SayWhen::Processor::ActiveMessaging do
+
+  before do
+
+    require 'activemessaging'
+
+    ActiveMessaging::Gateway.stub!(:load_connection_configuration).and_return({:adapter=>:test})
+
+    ActiveMessaging::Gateway.define do |s|    
+      s.destination :say_when, '/queue/SayWhen'
+    end
+
+    SayWhen::Scheduler.configure do |scheduler|
+      scheduler.storage_strategy = :active_record
+      scheduler.processor_class  = SayWhen::Processor::ActiveMessaging
+    end
+    @processor = SayWhen::Processor::ActiveMessaging.new(SayWhen::Scheduler.scheduler)
+  end
+
+  it "process a job by sending a message" do
+    @job = mock('SayWhen::Storage::ActiveRecord::Job')
+    @job.should_receive(:id).and_return(100)
+    @processor.process(@job)
+    destination(:say_when).messages.size.should == 1
+    YAML::load(destination(:say_when).messages.first.body)[:job_id].should == 100
+  end
+
+end

data/spec/say_when/scheduler_spec.rb

@@ -28,7 +28,7 @@ describe SayWhen::Scheduler do
 
       job = SayWhen::Scheduler.schedule(
         :trigger_strategy => 'once',
-        :trigger_options  => 10.second.since,
+        :trigger_options  => {:at => 10.second.since},
         :job_class        => 'SayWhen::Test::TestTask',
         :job_method       => 'execute'
       )

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: say_when
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Andrew Kuklewicz
@@ -15,11 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-06 00:00:00 Z
+date: 2012-08-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activemessaging
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,11 +32,11 @@ dependencies:
         - 0
         version: 0.9.0
   type: :development
-  prerelease: false
-  requirement: *id001
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,11 +48,11 @@ dependencies:
         - 14
         version: 2.3.14
   type: :development
-  prerelease: false
-  requirement: *id002
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,11 +64,11 @@ dependencies:
         - 14
         version: 2.3.14
   type: :development
-  prerelease: false
-  requirement: *id003
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mongoid
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,11 +80,11 @@ dependencies:
         - 5
         version: 1.9.5
   type: :development
-  prerelease: false
-  requirement: *id004
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -94,11 +95,11 @@ dependencies:
         - 3
         version: "1.3"
   type: :development
-  prerelease: false
-  requirement: *id005
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: sqlite3
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -108,11 +109,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
-  requirement: *id006
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rake
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -122,8 +123,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
-  requirement: *id007
+  version_requirements: *id007
 description: 
 email: 
 - andrew@prx.org
@@ -159,6 +159,7 @@ files:
 - lib/say_when/triggers/base.rb
 - lib/say_when/triggers/cron_strategy.rb
 - lib/say_when/triggers/once_strategy.rb
+- lib/say_when/triggers/scheduled_strategy.rb
 - lib/say_when/version.rb
 - lib/tasks/say_when.rake
 - say_when.gemspec
@@ -167,6 +168,7 @@ files:
 - spec/db/test.db
 - spec/mongoid_spec_helper.rb
 - spec/say_when/cron_expression_spec.rb
+- spec/say_when/processor/active_messaging_spec.rb
 - spec/say_when/scheduler_spec.rb
 - spec/say_when/storage/active_record/job_spec.rb
 - spec/say_when/storage/memory/job_spec.rb
@@ -214,6 +216,7 @@ test_files:
 - spec/db/test.db
 - spec/mongoid_spec_helper.rb
 - spec/say_when/cron_expression_spec.rb
+- spec/say_when/processor/active_messaging_spec.rb
 - spec/say_when/scheduler_spec.rb
 - spec/say_when/storage/active_record/job_spec.rb
 - spec/say_when/storage/memory/job_spec.rb