operationable 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f604843ce9dfd14fa65505a764ca64ba7db621f8
-  data.tar.gz: 11f4bd95302fc3b8580d333e17d56fdf2f1ad45c
+  metadata.gz: 242b22f9a25dc80a803e755e3ffbf896ad38f40f
+  data.tar.gz: d4b942448bd5aa78bd8e538ba600501ca94ffb22
 SHA512:
-  metadata.gz: f7822dde3a5d044b8c5c7844a8dc22242a32e4487102f53a9856cb0a772293de771f46056eff144221f92f25bc03626be3a97f268f2e1c59e7dd6a366b8104ec
-  data.tar.gz: 08118da4160440c14b731ec32a6683077cb271fbcf1f0838b248fa7e1dd1af82e4effda3c492c264bc33d1a13a23110410a582e2f6de48b30f9e56da994541aa
+  metadata.gz: 3ff60383e608ac86b63f6dc5a857ab3c06aa8397495f9abd531b712add4670ed4f6aa8d2788eb22e6d3a26b73e2bc280bde4ebab6b7f9649ad217e4bb1a71dbf
+  data.tar.gz: 1d4fae19b8ac1ee54049b5a60254de7550dff48aa8f47964e2f52e378077d5a6c433d06a717e51495dd8ce5a4bf7dd3834fec17cf6cbef50583c5da9bf32ac15

data/README.md

@@ -113,28 +113,6 @@ Class that contain callback methods, that will called after model saved in runti
 #Validators
 TODO: describe validators
 
-#Persistence and guaranteed delivery
-
-First add table to store operations and track their execution in pair with resque-status
-
-```
-class CreateOperationCallbacks < ActiveRecord::Migration[5.0]
-  def change
-    create_table :operation_callbacks do |t|
-      t.string :status
-      t.text :message
-      t.string :uuid
-      t.json :q_options
-      t.json :props
-
-      t.timestamps
-    end
-  end
-end
-```
-
-After that all operations by default will populate database with status of execution.
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/jobs/operation_job.rb

@@ -1,22 +1,9 @@
 # frozen_string_literal: true
 class OperationJob < ActiveJob::Base
-  include Operationable::Persisters::Base
-  include Operationable::Persisters::Memory
-  include Operationable::Persisters::Database
-
   queue_as do
     arguments.first[:q_options][:queue]
   end
 
-  after_enqueue do |job|
-    create_status_hash
-    notify_database
-  end
-
-  around_perform do |job, block|
-    safe_perform(job, block)
-  end
-
   after_perform :clear_runtime
 
   def perform(q_options:, props:)

data/lib/operationable.rb

@@ -13,10 +13,6 @@ require 'operationable/operation'
 require 'operationable/serializer'
 require 'operationable/specification'
 
-require 'operationable/persisters/base'
-require 'operationable/persisters/database'
-require 'operationable/persisters/memory'
-
 require 'operationable/runners/base'
 require 'operationable/runners/serial'
 require 'operationable/runners/separate'

data/lib/operationable/version.rb

@@ -1,3 +1,3 @@
 module Operationable
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: operationable
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Kirill Suhodolov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-12 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -118,9 +118,6 @@ files:
 - lib/operationable/builder.rb
 - lib/operationable/callback.rb
 - lib/operationable/operation.rb
-- lib/operationable/persisters/base.rb
-- lib/operationable/persisters/database.rb
-- lib/operationable/persisters/memory.rb
 - lib/operationable/runners/base.rb
 - lib/operationable/runners/separate.rb
 - lib/operationable/runners/serial.rb

data/lib/operationable/persisters/base.rb

@@ -1,107 +0,0 @@
-module Operationable
-  module Persisters
-    module Base
-      STATUS_INIT = 'init'
-      STATUS_QUEUED = 'queued'
-      STATUS_WORKING = 'working'
-      STATUS_COMPLETED = 'completed'
-      STATUS_FAILED = 'failed'
-      STATUS_KILLED = 'killed'
-      STATUSES = [
-        STATUS_INIT,
-        STATUS_QUEUED,
-        STATUS_WORKING,
-        STATUS_COMPLETED,
-        STATUS_FAILED,
-        STATUS_KILLED
-      ].freeze
-
-      extend Forwardable
-      extend ActiveSupport::Concern
-
-      class Killed < RuntimeError; end
-      class NotANumber < RuntimeError; end
-
-      # attr_reader :uuid, :options
-
-      def uuid
-        self.job_id
-      end
-
-      def options
-        arguments.first
-      end
-
-      # Run by the Resque::Worker when processing this job. It wraps the <tt>perform</tt>
-      # method ensuring that the final status of the job is set regardless of error.
-      # If an error occurs within the job's work, it will set the status as failed and
-      # re-raise the error.
-      def safe_perform(job, block)
-        working
-        block.call
-        if status && status.failed?
-          on_failure(status.message) if respond_to?(:on_failure)
-          return
-        elsif status && !status.completed?
-          completed
-        end
-        on_success if respond_to?(:on_success)
-      rescue Killed
-        Resque::Plugins::Status::Hash.killed(uuid)
-        on_killed if respond_to?(:on_killed)
-      rescue => e
-        failed("The task failed because of an error: #{e}")
-        if respond_to?(:on_failure)
-          on_failure(e)
-        else
-          raise e
-        end
-      end
-
-      def name
-        "#{self.class.name}(#{callback_class_name} #{callback_method_name})"
-      end
-
-      def callback_class_name
-        arguments.first[:q_options][:callback_class_name]
-      end
-
-      def callback_method_name
-        arguments.first[:q_options][:callback_method_name]
-      end
-
-      def working
-        set_status({'status' => Operationable::Persisters::Base::STATUS_WORKING, attempts: 1})
-      end
-
-      # set the status to 'failed' passing along any additional messages
-      def failed(*messages)
-        set_status({'status' => Operationable::Persisters::Base::STATUS_FAILED}, *messages)
-      end
-
-      # set the status to 'completed' passing along any addional messages
-      def completed(*messages)
-        set_status({
-          'status' => Operationable::Persisters::Base::STATUS_COMPLETED,
-          'message' => "Completed at #{Time.now}"
-        }, *messages)
-      end
-
-      # kill the current job, setting the status to 'killed' and raising <tt>Killed</tt>
-      def kill!
-        set_status({
-          'status' => Operationable::Persisters::Base::STATUS_KILLED,
-          'message' => "Killed at #{Time.now}"
-        })
-        raise Killed
-      end
-
-      private
-
-      def set_status(*args)
-        self.database_status = args
-        self.status = [status, {'name'  => name}, args].flatten
-      end
-    end
-  end
-end

data/lib/operationable/persisters/database.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-module Operationable
-  module Persisters
-    module Database
-      def self.create(q_options, props)
-        date = Time.zone.now.to_date
-
-        ::OperationCallback.create(
-          q_options: q_options,
-          props: props,
-          attempts: 0,
-          week: props[:week] || date.cweek,
-          year: props[:year] || date.year,
-          status: Operationable::Persisters::Base::STATUS_INIT
-        )
-      end
-
-      def notify_database
-        self.database_status = [{status: Operationable::Persisters::Base::STATUS_QUEUED}]
-      end
-
-      def op_cb_id
-        arguments.first[:q_options][:op_cb_id]
-      end
-
-      def database_status
-        ::OperationCallback.find(op_cb_id)
-      end
-
-      def database_status=(new_status)
-        ::OperationCallback.find(op_cb_id).update(
-          new_status.reduce({uuid: uuid}){ |acc, o| acc.merge(o) }
-        )
-      end
-    end
-  end
-end

data/lib/operationable/persisters/memory.rb

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-# codebase has been taken from abandoned resque-status gem, that not compatible with ActiveJob and Rails now
-module Operationable
-  module Persisters
-    module Memory
-      autoload :Hash, 'resque/plugins/status/hash'
-
-      def create_status_hash
-        Resque::Plugins::Status::Hash.create(uuid, options)
-      end
-
-      # Set the jobs status. Can take an array of strings or hashes that are merged
-      # (in order) into a final status hash.
-      def status=(new_status)
-        Resque::Plugins::Status::Hash.set(uuid, *new_status)
-      end
-
-      # get the Resque::Plugins::Status::Hash object for the current uuid
-      def status
-        Resque::Plugins::Status::Hash.get(uuid)
-      end
-
-      # Checks against the kill list if this specific job instance should be killed
-      # on the next iteration
-      def should_kill?
-        Resque::Plugins::Status::Hash.should_kill?(uuid)
-      end
-
-      # set the status of the job for the current itteration. <tt>num</tt> and
-      # <tt>total</tt> are passed to the status as well as any messages.
-      # This will kill the job if it has been added to the kill list with
-      # <tt>Resque::Plugins::Status::Hash.kill()</tt>
-      def at(num, total, *messages)
-        if total.to_f <= 0.0
-          raise(NotANumber, "Called at() with total=#{total} which is not a number")
-        end
-        tick({
-          'num' => num,
-          'total' => total
-        }, *messages)
-      end
-
-      # sets the status of the job for the current itteration. You should use
-      # the <tt>at</tt> method if you have actual numbers to track the iteration count.
-      # This will kill the job if it has been added to the kill list with
-      # <tt>Resque::Plugins::Status::Hash.kill()</tt>
-      def tick(*messages)
-        kill! if should_kill?
-        set_status({'status' => Operationable::Persisters::Base::STATUS_WORKING}, *messages)
-      end
-
-    end
-  end
-end