say_when 1.0.0 → 2.0.0

data/test/say_when/storage/memory_strategy_test.rb

@@ -0,0 +1,96 @@
+# encoding: utf-8
+
+require 'minitest_helper'
+require 'say_when/storage/memory_strategy'
+
+describe SayWhen::Storage::MemoryStrategy do
+
+  let(:valid_attributes) {
+    {
+      trigger_strategy: :cron,
+      trigger_options: { expression: '0 0 12 ? * * *', time_zone: 'Pacific Time (US & Canada)' },
+      :name       => 'Memory::Job::Test',
+      :group      => 'Test',
+      :data       => { foo: 'bar', result: 1 },
+      :job_class  => 'SayWhen::Test::TestTask',
+      :job_method => 'execute'
+    }
+  }
+
+  let(:strategy) { SayWhen::Storage::MemoryStrategy }
+
+  let(:job) { strategy.create(valid_attributes) }
+
+  it 'job can be created' do
+    j = strategy.create(valid_attributes)
+    j.wont_be_nil
+  end
+
+  it 'can execute the task for the job' do
+    job.execute_job( { result: 1 } ).must_equal 1
+  end
+
+  it 'can execute the job' do
+    j = strategy.create(valid_attributes)
+    j.execute.must_equal 1
+  end
+
+  it 'can serialize' do
+    j = strategy.create(valid_attributes)
+    j.to_hash[:job_class].must_equal 'SayWhen::Test::TestTask'
+  end
+
+  it 'can acquire and release the next job' do
+    j = strategy.create(valid_attributes)
+    j.wont_be_nil
+    next_job  = strategy.acquire_next(2.days.since)
+    next_job.wont_be_nil
+    next_job.status.must_equal "acquired"
+    strategy.release(next_job)
+    next_job.status.must_equal "waiting"
+  end
+
+  it 'can reset acquired jobs' do
+    j = strategy.create(valid_attributes)
+    j.status = 'acquired'
+    j.updated_at = 2.hours.ago
+    strategy.reset_acquired(3600)
+    j.status.must_equal 'waiting'
+  end
+
+  it 'can be fired' do
+    opts = valid_attributes[:trigger_options]
+    ce = SayWhen::CronExpression.new(opts[:expression], opts[:time_zone])
+    j = strategy.create(valid_attributes)
+    nfa = ce.last_fire_at(j.updated_at - 1.second)
+    lfa = ce.last_fire_at(nfa - 1.second)
+    j.next_fire_at = nfa
+    j.last_fire_at = lfa
+
+    now = Time.now
+    Time.stub(:now, now) do
+      strategy.fired(j, now)
+      j.next_fire_at.must_equal ce.next_fire_at(now)
+      j.last_fire_at.must_equal now
+      j.status.must_equal SayWhen::Storage::BaseJob::STATE_WAITING
+    end
+  end
+
+  it "can be serialized to a hash" do
+    j = strategy.create(valid_attributes)
+    strategy.serialize(j).class.must_equal Hash
+  end
+
+  it "can be deserialized from a hash" do
+    j = strategy.deserialize(valid_attributes)
+    j.class.must_equal SayWhen::Storage::MemoryStrategy::Job
+  end
+
+  it "can reset acquired jobs" do
+    j = strategy.create(valid_attributes)
+    j.status = 'acquired'
+    j.updated_at = 2.hours.ago
+    SayWhen::Storage::MemoryStrategy::Job.reset_acquired(3600)
+    j.status.must_equal 'waiting'
+  end
+end

data/test/say_when/triggers/cron_strategy_test.rb

@@ -0,0 +1,11 @@
+# encoding: utf-8
+
+require 'minitest_helper'
+require 'say_when/triggers/cron_strategy'
+
+describe SayWhen::Triggers::CronStrategy do
+  it 'should be constucted with a cron expression' do
+    t = SayWhen::Triggers::CronStrategy.new(expression: '0 0 * ? * * *', job: {})
+    t.wont_be_nil
+  end
+end

data/test/say_when/triggers/instance_strategy_test.rb

@@ -0,0 +1,13 @@
+# encoding: utf-8
+
+require 'minitest_helper'
+require 'say_when/triggers/instance_strategy'
+
+describe SayWhen::Triggers::InstanceStrategy do
+  it 'should be constucted with next_at_method option' do
+    job = Minitest::Mock.new
+    job.expect(:scheduled, true)
+    t = SayWhen::Triggers::InstanceStrategy.new(next_at_method: 'test_next_at_method', job: job)
+    t.wont_be_nil
+  end
+end

data/test/say_when/triggers/once_strategy_test.rb

@@ -7,14 +7,14 @@ describe SayWhen::Triggers::OnceStrategy do
 
   it 'should be constucted with at option' do
     time_at = 1.second.ago
-    o = SayWhen::Triggers::OnceStrategy.new({:at=>time_at})
+    o = SayWhen::Triggers::OnceStrategy.new(at: time_at, job: {})
     o.wont_be_nil
     o.once_at.must_equal time_at
   end
 
   it 'should return once at only once' do
     time_at = 1.second.ago
-    o = SayWhen::Triggers::OnceStrategy.new({:at=>time_at})
+    o = SayWhen::Triggers::OnceStrategy.new(at: time_at, job: {})
     o.wont_be_nil
     o.next_fire_at.must_equal time_at
     o.next_fire_at(time_at + 10.second).must_be_nil

data/test/say_when_test.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+
+require 'minitest_helper'
+
+describe SayWhen do
+
+  it 'provides a default logger' do
+    SayWhen.logger.wont_be_nil
+  end
+
+  it 'can set a new logger' do
+    l = Logger.new('/dev/null')
+    SayWhen.logger = l
+    l.must_equal l
+  end
+
+  it 'provides the scheduler' do
+    SayWhen.scheduler.wont_be_nil
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: say_when
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Andrew Kuklewicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoryuken
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activemessaging
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,21 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -136,6 +136,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: celluloid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activejob
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Scheduling system for programmatically defined and stored jobs.
 email:
 - andrew@beginsinwonder.com
@@ -144,7 +200,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -152,38 +210,47 @@ files:
 - lib/generators/say_when/migration/migration_generator.rb
 - lib/generators/say_when/migration/templates/migration.rb
 - lib/say_when.rb
-- lib/say_when/base_job.rb
+- lib/say_when/configuration.rb
 - lib/say_when/cron_expression.rb
-- lib/say_when/processor/active_messaging.rb
-- lib/say_when/processor/base.rb
-- lib/say_when/processor/shoryuken.rb
-- lib/say_when/processor/simple.rb
+- lib/say_when/poller/base_poller.rb
+- lib/say_when/poller/celluloid_poller.rb
+- lib/say_when/poller/concurrent_poller.rb
+- lib/say_when/poller/simple_poller.rb
+- lib/say_when/processor/active_job_strategy.rb
+- lib/say_when/processor/simple_strategy.rb
+- lib/say_when/processor/test_strategy.rb
 - lib/say_when/railtie.rb
 - lib/say_when/scheduler.rb
-- lib/say_when/storage/active_record/acts.rb
-- lib/say_when/storage/active_record/job.rb
-- lib/say_when/storage/active_record/job_execution.rb
-- lib/say_when/storage/memory/base.rb
-- lib/say_when/storage/memory/job.rb
+- lib/say_when/storage/active_record_strategy.rb
+- lib/say_when/storage/base_job.rb
+- lib/say_when/storage/memory_strategy.rb
 - lib/say_when/tasks.rb
 - lib/say_when/triggers/base.rb
 - lib/say_when/triggers/cron_strategy.rb
 - lib/say_when/triggers/instance_strategy.rb
 - lib/say_when/triggers/once_strategy.rb
+- lib/say_when/utils.rb
 - lib/say_when/version.rb
 - lib/tasks/say_when.rake
 - say_when.gemspec
 - test/active_record_helper.rb
 - test/db/schema.rb
 - test/minitest_helper.rb
-- test/say_when/cron_expression_spec.rb
-- test/say_when/processor/active_messaging_test.rb
+- test/say_when/configuration_test.rb
+- test/say_when/cron_expression_test.rb
+- test/say_when/poller/base_poller_test.rb
+- test/say_when/poller/celluloid_poller_test.rb
+- test/say_when/poller/concurrent_poller_test.rb
+- test/say_when/poller/simple_poller_test.rb
+- test/say_when/processor/active_job_strategy_test.rb
+- test/say_when/processor/simple_strategy_test.rb
 - test/say_when/scheduler_test.rb
-- test/say_when/storage/active_record/job_test.rb
-- test/say_when/storage/memory/job_test.rb
-- test/say_when/storage/memory/trigger_test.rb
+- test/say_when/storage/active_record_strategy_test.rb
+- test/say_when/storage/memory_strategy_test.rb
+- test/say_when/triggers/cron_strategy_test.rb
+- test/say_when/triggers/instance_strategy_test.rb
 - test/say_when/triggers/once_strategy_test.rb
-- test/support/models.rb
+- test/say_when_test.rb
 homepage: https://github.com/kookster/say_when
 licenses:
 - MIT
@@ -204,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Scheduling system for programmatically defined and stored jobs.
@@ -212,11 +279,18 @@ test_files:
 - test/active_record_helper.rb
 - test/db/schema.rb
 - test/minitest_helper.rb
-- test/say_when/cron_expression_spec.rb
-- test/say_when/processor/active_messaging_test.rb
+- test/say_when/configuration_test.rb
+- test/say_when/cron_expression_test.rb
+- test/say_when/poller/base_poller_test.rb
+- test/say_when/poller/celluloid_poller_test.rb
+- test/say_when/poller/concurrent_poller_test.rb
+- test/say_when/poller/simple_poller_test.rb
+- test/say_when/processor/active_job_strategy_test.rb
+- test/say_when/processor/simple_strategy_test.rb
 - test/say_when/scheduler_test.rb
-- test/say_when/storage/active_record/job_test.rb
-- test/say_when/storage/memory/job_test.rb
-- test/say_when/storage/memory/trigger_test.rb
+- test/say_when/storage/active_record_strategy_test.rb
+- test/say_when/storage/memory_strategy_test.rb
+- test/say_when/triggers/cron_strategy_test.rb
+- test/say_when/triggers/instance_strategy_test.rb
 - test/say_when/triggers/once_strategy_test.rb
-- test/support/models.rb
+- test/say_when_test.rb

data/lib/say_when/base_job.rb

@@ -1,96 +0,0 @@
-# encoding: utf-8
-
-module SayWhen
-  module BaseJob
-
-    # ready to be run, just waiting for its turn
-    STATE_WAITING = 'waiting'
-
-    # has been acquired b/c it is time to be triggered
-    STATE_ACQUIRED = 'acquired'
-
-    # # related job for the trigger is executing
-    # STATE_EXECUTING = 'executing'
-
-    # "Complete" means the trigger has no remaining fire times
-    STATE_COMPLETE = 'complete'
-
-    # A Trigger arrives at the error state when the scheduler
-    # attempts to fire it, but cannot due to an error creating and executing
-    # its related job.
-    STATE_ERROR = 'error'
-
-    def lock
-      @_lock ||= Mutex.new
-    end
-
-    def trigger
-      @trigger ||= load_trigger
-    end
-
-    def fired(fired_at=Time.now)
-      self.lock.synchronize {
-        self.last_fire_at = fired_at
-        self.next_fire_at = trigger.next_fire_at(last_fire_at + 1.second) rescue nil
-
-        if next_fire_at.nil?
-          self.status = STATE_COMPLETE
-        else
-          self.status = STATE_WAITING
-        end
-      }
-    end
-
-    def release
-      self.lock.synchronize {
-        if self.status == STATE_ACQUIRED
-          self.status = STATE_WAITING
-        end
-      }
-    end
-
-    def execute
-      execute_job(data)
-    end
-
-    def load_trigger
-      strategy = trigger_strategy || :once
-      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 || {}).merge(:job=>self))
-    end
-
-    def execute_job(options)
-      task_method = (job_method || 'execute').to_s
-      task = get_task(task_method)
-      task.send(task_method, options)
-    end
-
-    def get_task(task_method)
-      task = nil
-
-      if job_class
-        tc = job_class.constantize
-        if tc.respond_to?(task_method)
-          task = tc
-        else
-          to = tc.new
-          if to.respond_to?(task_method)
-            task = to
-          else
-            raise "Neither '#{job_class}' class nor instance respond to '#{task_method}'"
-          end
-        end
-      elsif scheduled
-        if scheduled.respond_to?(task_method)
-          task = scheduled
-        else
-          raise "Scheduled '#{scheduled.inspect}' does not respond to '#{task_method}'"
-        end
-      end
-      task
-    end
-
-  end
-end