delay_henka 0.3.3 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cbdcde775e9289dbb082a616c1283ae3ff2f3f63
-  data.tar.gz: 4a809b9c2f32a7048ce78a39eb215a4e9d25bff4
+SHA256:
+  metadata.gz: e0c371d4bcae63640c6b5b2689d1340bf14654068a8e7eabd6085889ebd78d99
+  data.tar.gz: 0eada38daa2b68b70349ca3080809cdf590dc03bff10d2468c902dc229db3d23
 SHA512:
-  metadata.gz: 7f4e5997974490a3b7b809adef7b9728e6a6cc5a8ddc05e4f84723a608a653d2b22d573d7a4dd4244dd6b4c820e0ef54f98b77025c483213f014ecf3a3c6561c
-  data.tar.gz: 7a7fa29f2501a046e5bc85413b3f95d849ce0d0adefb0bfdbff56eddb07f8b642bdf26dbcdd3409c84d61991afd5b6f1138d93cff36dcee73b8b4a7360f28863
+  metadata.gz: c8f89a6353eb0099c36d97deff1abed8685554b824b4964dbb64c3b85a672b6a3e1978077a9ec49b9f72a6455d0f2fb466633367213393fd3740361a8337753d
+  data.tar.gz: 8b11d1fa0972838bc36f857b8c45f4b8a3e7fe07f633f881faa6542785ed42e88000408a88da65f00af6637daeae9d5c2f80b1c39ea31f993f3010dc89533a6f

data/app/controllers/delay_henka/web/admin/scheduled_actions_controller.rb

@@ -0,0 +1,26 @@
+module DelayHenka
+  module Web
+    module Admin
+      class ScheduledActionsController < DelayHenka.base_view_controller.constantize
+
+        before_action :set_scheduled_action, only: %i(destroy)
+
+        def index
+          @actions = ScheduledAction.order('created_at DESC')
+        end
+
+        def destroy
+          @action.destroy!
+          redirect_back fallback_location: web_admin_scheduled_actions_path, flash: { success: 'Destroy succeeded' }
+        end
+
+        private
+
+        def set_scheduled_action
+          @action = ScheduledAction.find(params[:id])
+        end
+
+      end
+    end
+  end
+end

data/app/models/delay_henka/scheduled_action.rb

@@ -0,0 +1,61 @@
+module DelayHenka
+  class ScheduledAction < ApplicationRecord
+
+    STATES = {
+      STAGED: 'staged',
+      COMPLETED: 'completed',
+      ERRORED: 'errored'
+    }
+
+    belongs_to :actionable, polymorphic: true
+
+    validates :submitted_by_id, :schedule_at, presence: true
+    validates :state, inclusion: { in: STATES.values }
+    after_initialize :set_initial_state, if: :new_record?
+
+    scope :staged, -> { where(state: STATES[:STAGED]) }
+
+    def self.schedule(record:, method_name:, argument: nil, by_id:, schedule_at: Time.current)
+      Keka.run do
+        begin
+          arity = record.method(method_name.to_sym).arity
+          Keka.err_unless! (arity == 0 && argument.nil?) || (arity == 1 && !argument.nil?), 'wrong arity'
+          DelayHenka::ScheduledAction.create(
+            actionable: record,
+            method_name: method_name,
+            argument: argument.to_json,
+            submitted_by_id: by_id,
+            schedule_at: schedule_at
+          )
+        rescue NameError => e
+          Keka.err_if! true, e.message
+        end
+      end
+    end
+
+    def apply_action
+      unless actionable
+        # Caution: model validations are bypassed
+        update_columns(state: STATES[:ERRORED], error_message: 'Target record cannot be found')
+        return
+      end
+
+      begin
+        output = actionable.method(method_name.to_sym).arity == 0 ?
+          actionable.send(method_name) :
+          actionable.send(method_name, JSON.parse(argument))
+        update!(state: STATES[:COMPLETED], return_value: output.to_json)
+      rescue => e
+        update!(state: STATES[:ERRORED], error_message: e.message)
+        raise e
+      end
+    end
+
+    private
+
+    def set_initial_state
+      self.state ||= STATES[:STAGED]
+    end
+
+  end
+end

data/app/models/delay_henka/scheduled_change.rb

@@ -49,12 +49,12 @@ module DelayHenka
     def apply_change
       if changeable
         if changeable.update(attribute_name => new_value)
-          update(state: STATES[:COMPLETED])
+          update!(state: STATES[:COMPLETED])
         else
-          update(state: STATES[:ERRORED], error_message: changeable.errors.full_messages.join(', '))
+          update!(state: STATES[:ERRORED], error_message: changeable.errors.full_messages.join(', '))
         end
       else
-        update(state: STATES[:ERRORED], error_message: 'Target record cannot be found')
+        update_columns(state: STATES[:ERRORED], error_message: 'Target record cannot be found')
       end
     end
 

data/app/views/delay_henka/web/admin/scheduled_actions/_summary_table.html.haml

@@ -0,0 +1,20 @@
+-# This partial is rendered by including application.
+-# Required local variables:
+-#  * scheduled_actions
+-# To render this partial:
+-#  = render 'delay_henka/web/admin/scheduled_actions/summary_table', scheduled_actions: @actions
+
+%table.table.table-bordered.table-responsive
+  %thead
+    %tr
+      %th Action
+      %th Arguments
+      %th Schedule At
+      %th Action
+  %tbody
+    - scheduled_actions.each do |action|
+      %tr
+        %td= action.method_name
+        %td= action.argument
+        %td= action.schedule_at
+        %td= link_to 'Delete', delay_henka.web_admin_scheduled_action_path(action), method: :delete

data/app/views/delay_henka/web/admin/scheduled_actions/index.html.haml

@@ -0,0 +1,23 @@
+%h1 Scheduled Actions
+%table.table
+  %thead
+    %tr
+      %th Type
+      %th Id
+      %th Method
+      %th Argument
+      %th State
+      %th Return Value
+      %th Schedule At
+      %th Submitted By
+  %tbody
+    - @actions.each do |action|
+      %tr
+        %td= action.actionable_type
+        %td= action.actionable_id
+        %td= action.method_name
+        %td= action.argument
+        %td= action.state
+        %td= action.return_value
+        %td= action.schedule_at
+        %td= action.submitted_by_id

data/app/workers/delay_henka/apply_actions_worker.rb

@@ -0,0 +1,14 @@
+module DelayHenka
+  class ApplyActionsWorker
+
+    include Sidekiq::Worker
+
+    def perform
+      ScheduledAction.staged
+        .where('schedule_at <= ?', Time.current)
+        .includes(:actionable)
+        .find_each(&:apply_action)
+    end
+
+  end
+end

data/config/routes.rb

@@ -1,6 +1,7 @@
 DelayHenka::Engine.routes.draw do
   namespace :web do
     namespace :admin do
+      resources :scheduled_actions, only: %i(index destroy)
       resources :scheduled_changes, only: %i(index destroy)
     end
   end

data/db/migrate/20190408130947_create_delay_henka_scheduled_actions.rb

@@ -0,0 +1,15 @@
+class CreateDelayHenkaScheduledActions < ActiveRecord::Migration[5.2]
+  def change
+    create_table :delay_henka_scheduled_actions do |t|
+      t.references :actionable, polymorphic: true, null: false, index: { name: 'actionable_index' }
+      t.string :method_name, null: false
+      t.string :state, null: false, index: true
+      t.string :error_message
+      t.integer :submitted_by_id, null: false
+      t.datetime :schedule_at, index: true, null: false
+      t.jsonb :argument
+      t.jsonb :return_value
+      t.timestamps
+    end
+  end
+end

data/lib/delay_henka.rb

@@ -10,6 +10,11 @@ module DelayHenka
         ->{ staged.order('created_at DESC') },
         class_name: 'DelayHenka::ScheduledChange',
         as: :changeable
+
+      has_many :upcoming_actions,
+        ->{ staged.order('created_at DESC') },
+        class_name: 'DelayHenka::ScheduledAction',
+        as: :actionable
     end
   end
 

data/lib/delay_henka/version.rb

@@ -1,3 +1,3 @@
 module DelayHenka
-  VERSION = '0.3.3'
+  VERSION = '0.5.3'
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: delay_henka
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.5.3
 platform: ruby
 authors:
 - zino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-31 00:00:00.000000000 Z
+date: 2020-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '5.2'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: keka
   requirement: !ruby/object:Gem::Requirement
@@ -122,18 +122,24 @@ files:
 - app/assets/javascripts/delay_henka/application.js
 - app/assets/stylesheets/delay_henka/application.css
 - app/controllers/delay_henka/application_controller.rb
+- app/controllers/delay_henka/web/admin/scheduled_actions_controller.rb
 - app/controllers/delay_henka/web/admin/scheduled_changes_controller.rb
 - app/helpers/delay_henka/application_helper.rb
 - app/models/delay_henka/application_record.rb
+- app/models/delay_henka/scheduled_action.rb
 - app/models/delay_henka/scheduled_change.rb
 - app/services/delay_henka/whether_schedule.rb
+- app/views/delay_henka/web/admin/scheduled_actions/_summary_table.html.haml
+- app/views/delay_henka/web/admin/scheduled_actions/index.html.haml
 - app/views/delay_henka/web/admin/scheduled_changes/_summary_table.html.haml
 - app/views/delay_henka/web/admin/scheduled_changes/index.html.haml
 - app/views/layouts/delay_henka/application.html.erb
+- app/workers/delay_henka/apply_actions_worker.rb
 - app/workers/delay_henka/apply_changes_worker.rb
 - config/routes.rb
 - db/migrate/20181228205218_create_delay_henka_scheduled_changes.rb
 - db/migrate/20190225140848_add_schedule_at.rb
+- db/migrate/20190408130947_create_delay_henka_scheduled_actions.rb
 - lib/delay_henka.rb
 - lib/delay_henka/engine.rb
 - lib/delay_henka/version.rb
@@ -157,8 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Rails engine for scheduled changes