actionable 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b187586cc793a33104a2f5c1710daefae5d25023
-  data.tar.gz: 77797479469c0474aa59cc8c545160086ba50033
+  metadata.gz: c16c458ffbb1eb2bbbfde2247d0d86fbfe298bad
+  data.tar.gz: 8b991e118cc9296f7e5a672a50f099b67bb64778
 SHA512:
-  metadata.gz: 535ef546df907bbdc4eb4b1564bf8272185cd8724842394f216f25c98f0dd77c65111add75475a412ebc88f945453f2e4a11d39659da394d3b144472a7479ec1
-  data.tar.gz: dd8b4beee3770047d760f8f126907358407931d072e9eca60825b2cc43d177e5c229ca2d7ab90b50e6e5a40eca5e7ac481f1cc388f17b4e9f9aa0e9b5c15ddcb
+  metadata.gz: ea836f60b3bf4e816216e2134110d9682042793e7f3ea3a90745ddd43c0ec40191e1808ece4a67c793757c05a1ca6c97b2d4d278559f29d4bad1aadd195c3b41
+  data.tar.gz: 79f948b69c68e3c3e9b3a85ab57048d33755a3d323d378ba9707cf315c8ca8a279221f570519cf43f079a7487430c7d686370d30cf70329ee989ea0b381766cf

data/Rakefile

@@ -4,19 +4,22 @@ require 'resque/tasks'
 require 'rspec/core/rake_task'
 
 task "resque:setup" do
-  puts File.expand_path('../spec/support/*.rb', __FILE__)
-  Dir[File.expand_path('../spec/support/*.rb', __FILE__)].each do |f| 
-    puts f
+
+  Dir[File.expand_path('../spec/support/*.rb', __FILE__)].each do |f|
     require f
   end
 
-  puts TestJob.class.to_s
   Mongoid.configure do |config|
     config.connect_to('actionable_test')
   end
+
 end
 
 
-RSpec::Core::RakeTask.new(:spec)
+task :spec do
+  Dir['spec/*_spec.rb'] .each do |f|
+    system("rspec #{f}")
+  end
+end
 
-task :default => :spec
+task :default => :spec

data/lib/actionable/job.rb

@@ -1,22 +1,49 @@
 module Actionable
   class Job
-  
+
     attr_reader :actionable, :target, :payload
 
+    def self.logger
+      defined?(Rails) ? Rails.logger : Resque.logger
+    end
+
+    def logger
+      self.class.logger
+    end
+
     def self.queue
       @queue ||= 'actionable'
     end
 
-    # def self.after_enqueue(id)
-    #   actionable = Actionable::Action.find(id)
-    #   actionable.update_attributes(status: :enqueued)
-    # end
+    def self.before_enqueue(id)
+      actionable = Actionable::Action.find(id)
+      actionable.update_attributes(status: :enqueued)
+      true
+    end
+
+    def self.on_failure(err,id)
+      begin
+        actionable = Actionable::Action.find(id)
+        actionable.update_attributes({
+          status: :failed,
+          exception_message: err.message,
+          exception_backtrace: err.backtrace
+        })
+        job = new(actionable.target,actionable.payload,actionable)
+        job.on_failure(err) if job.respond_to?(:on_failure)
+      rescue => e
+        puts "Error in 'on_failure' handler: #{e.message}"
+        logger.error("Error in 'on_failure' handler: #{e.message}")
+      end
+    end
 
     def self.perform(id)
       actionable = Actionable::Action.find(id)
       actionable.update_attributes(status: :working)
-      new(actionable.target,actionable.payload,actionable).perform
+      job = new(actionable.target,actionable.payload,actionable)
+      job.perform
       actionable.update_attributes(status: :complete)
+      job.on_success if job.respond_to?(:on_success)
     end
 
     def initialize(target,payload={},actionable=nil)
@@ -24,6 +51,6 @@ module Actionable
       @actionable = actionable
       @payload = HashWithIndifferentAccess.new(payload)
     end
-    
+
   end
-end
+end

data/lib/actionable/mongoid_store/action.rb

@@ -9,15 +9,17 @@ module Actionable
       store_in(collection: 'actionables')
 
       after_initialize :flag_late
-   
+
       field :execution_time,    type: Time
       field :payload,           type: Hash
       field :job_class_name,    type: String
       field :status,            type: Symbol,     default: :new
       field :target_id,         type: Moped::BSON::ObjectId
       field :target_class_name, type: String
+      field :exception_message,   type: String
+      field :exception_backtrace, type: Array
 
-      scope :scheduled_for_between, ->(from,to){ 
+      scope :scheduled_for_between, ->(from,to){
         between(execution_time:[from,to])
       }
       scope :scheduled_for_before, ->(to){ where(:execution_time.lt => to) }

data/lib/actionable/version.rb

@@ -1,3 +1,3 @@
 module Actionable
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/failure_spec.rb

@@ -0,0 +1,86 @@
+require "spec_helper"
+
+class TestWorker
+
+  attr_accessor :pid
+
+  def spawn
+    @pid = Kernel.spawn('bundle exec rake resque:work QUEUES=actionable,actionable_sweep')
+  end
+
+  def kill
+    system("killall resque-1.24.1: Waiting for actionable,actionable_sweep")
+  end
+
+end
+
+def run_test_worker(id)
+  w = TestWorker.new
+  w.spawn
+  poll_for_finished(id)
+  w.kill
+end
+
+def poll_for_finished(id)
+  until TestModel.find(id).actionables.first.reload.status == :failed
+    sleep(1)
+  end
+end
+
+describe "Failing Actionable::Job" do
+
+  before do
+    system('killall resque-1.24.1: Waiting for actionable,actionable_sweep')
+  end
+
+  after do
+    system('killall resque-1.24.1: Waiting for actionable,actionable_sweep')
+  end
+
+
+  context "scheduled for one minute ago" do
+
+    it "should be executed by a worker manually" do
+      Resque.inline = true
+      target = TestModel.create({
+        color:'blue',
+        shape:'square',
+        number:3
+      })
+      target.schedule_actionable(1.minute.ago,TestFailureJob,{number:2})
+      id = target.id
+      expect(TestFailureJob).to receive(:on_fail)
+      # expect(Resque::Failure).to receive(:create)
+      expect {
+        Actionable::Sweep.perform
+      }.to raise_error(StandardError)
+      expect(TestModel.find(id).number).to_not eq(6)
+      expect(TestModel.find(id).name).to_not eq('blue square')
+      expect(Actionable::Action.last.status).to eq(:failed)
+      expect(Actionable::Action.last.exception_message).to eq('This is my error')
+      Resque.inline = false
+    end
+
+    it "should be executed by a worker in another processes", :no do
+      target = TestModel.create({
+        color:'blue',
+        shape:'square',
+        number:3
+      })
+      target.schedule_actionable(1.minute.ago,TestFailureJob,{number:2})
+      id = target.id
+      run_test_worker(id)
+      expect(TestModel.find(id).number).to_not eq(6)
+      expect(TestModel.find(id).name).to_not eq('blue square')
+      expect(Actionable::Action.last.status).to eq(:failed)
+      expect(Actionable::Action.last.exception_message).to eq('This is my error')
+
+      error_json = Redis.new.rpop('resque:failed')
+      error_hash = JSON.load(error_json)
+      expect(error_hash.fetch('error')).to eq("This is my error")
+      expect(error_hash.fetch('payload').fetch('args').first.to_s).to eq(Actionable::Action.last.id.to_s)
+    end
+
+  end
+
+end

data/spec/job_spec.rb

@@ -9,7 +9,7 @@ class TestWorker
   end
 
   def kill
-    system("kill -9 #{pid}")
+    system('killall resque-1.24.1: Waiting for actionable,actionable_sweep')
   end
 
 end
@@ -29,34 +29,53 @@ end
 
 describe Actionable::Job do
 
+  before do
+    system('killall resque-1.24.1: Waiting for actionable,actionable_sweep')
+  end
+
+  after do
+    system('killall resque-1.24.1: Waiting for actionable,actionable_sweep')
+  end
+
   context "scheduled for one minute ago" do
 
-    let(:target) {
-      TestModel.create({
+    it "should be executed by a worker manually" do
+      DOUBLE = double()
+      expect(DOUBLE).to receive(:success)
+
+      def TestJob.on_success(s)
+        DOUBLE.success
+      end
+
+      Resque.inline = true
+      target = TestModel.create({
         color:'blue',
         shape:'square',
         number:3
       })
-    }
-
-    before do
-     target.schedule_actionable(1.minute.ago,TestJob,{number:2})
-    end
-
-    it "should be executed by a worker manually" do
-      Resque.inline = true
+      target.schedule_actionable(1.minute.ago,TestJob,{number:2})
       id = target.id
+
       Actionable::Sweep.perform
       expect(TestModel.find(id).number).to eq(6)
       expect(TestModel.find(id).name).to eq('blue square')
+      expect(Actionable::Action.last.status).to eq(:complete)
       Resque.inline = false
     end
 
     it "should be executed by a worker in another processes", :no do
+      target = TestModel.create({
+        color:'blue',
+        shape:'square',
+        number:3
+      })
+      target.schedule_actionable(1.minute.ago,TestJob,{number:2})
       id = target.id
       run_test_worker(id)
       expect(TestModel.find(id).number).to eq(6)
       expect(TestModel.find(id).name).to eq('blue square')
+
+
     end
 
   end

data/spec/spec_helper.rb

@@ -1,26 +1,34 @@
 require "bundler"
 Bundler.require(:default,:development)
-  
+
 Dir[File.expand_path('../support/*.rb', __FILE__)].each {|f| require f}
 
 Mongoid.configure do |config|
   config.connect_to('actionable_test')
 end
 
-Resque.redis = Redis.new
-Resque.redis.namespace = "resque:actionable_test:"
-
 module Resque
   def self.purge!
     self.redis.keys('*')
     self.redis.del(*keys) unless keys.count == 0
   end
+  # def failure_count
+  #   Resque.redis = Redis.new
+  #   count = Resque::Failure.count
+  #   Resque.redis.namespace = "resque:actionable_test:"
+  #   count
+  # end
 end
 
 RSpec.configure do |config|
 
   config.treat_symbols_as_metadata_keys_with_true_values = true
 
+  config.before(:each) do
+    Resque.redis = Redis.new
+    Resque.redis.namespace = "resque:actionable_test:"
+  end
+
   config.after(:each) do
     Resque.purge!
     Mongoid.purge!

data/spec/support/test_failure_job.rb

@@ -0,0 +1,15 @@
+class TestFailureJob < Actionable::Job
+
+  def perform
+    target.name = target.say_something
+    raise StandardError.new('This is my error')
+    target.number = target.number * payload[:number]
+    target.save
+  end
+
+  def on_failure(err)
+    self.class.on_fail
+  end
+
+
+end

data/spec/support/test_job.rb

@@ -6,5 +6,8 @@ class TestJob < Actionable::Job
     target.save
   end
 
+  def on_success
+    self.class.on_success(self)
+  end
 
-end
+end

data/spec/support/test_model.rb

@@ -8,8 +8,8 @@ class TestModel
   field :shape
   field :number
 
-  def say_something
+  def say_something(arg = nil)
     return "#{color} #{shape}"
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionable
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Daniel Luxemburg
@@ -205,10 +205,12 @@ files:
 - lib/actionable/tasks.rb
 - lib/actionable/version.rb
 - spec/action_spec.rb
+- spec/failure_spec.rb
 - spec/job_spec.rb
 - spec/recurrence_spec.rb
 - spec/spec_helper.rb
 - spec/support/recurring_test_job.rb
+- spec/support/test_failure_job.rb
 - spec/support/test_job.rb
 - spec/support/test_model.rb
 - spec/sweep_spec.rb
@@ -240,10 +242,12 @@ summary: Store stuff in Mongo, keep track of it in Redis, log lots of stuff, inc
   test help
 test_files:
 - spec/action_spec.rb
+- spec/failure_spec.rb
 - spec/job_spec.rb
 - spec/recurrence_spec.rb
 - spec/spec_helper.rb
 - spec/support/recurring_test_job.rb
+- spec/support/test_failure_job.rb
 - spec/support/test_job.rb
 - spec/support/test_model.rb
 - spec/sweep_spec.rb