tasks_scheduler 0.8.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ac4a6905744856629c046c2cbca58290b37c32c1da3f4ef7558927247893ec2
-  data.tar.gz: 1cab19fa0a8be070731efa12f59c2d76cd1a293851b2d132324a60bf1c7d9fa0
+  metadata.gz: 443da32d0d876da0ac443ebef1a2e2395ba2bdb2090ebd8e407e79c1f53ac9f9
+  data.tar.gz: af598a93f9221379d1917263141e7182ec62e82be58d7a77d96b21728f3de663
 SHA512:
-  metadata.gz: 5028f905d36a4239fdcd137cc8fde66b2af61da61008871983a4f4bd0923063d904e1ece4f033037bbf29c697a7ce2a1ef44fd83b7f1e78125c590801408377f
-  data.tar.gz: 249dd1417fc904f03c6ae6a81fe17c8a7d6afb941c1ed09924ecfc71e926cc0e679f287d02bf62b7062279059bcc0915f263624320ffdec2deb67a1c01ea3c75
+  metadata.gz: 5a7f15ed45a4908bccf6d79a3092d25a2e2821ad1022631435191548e8fbf4060ebb84460594235deeab0d50c5229fc59e6edd1a0b87edf153e64c50abddbcae
+  data.tar.gz: 6f8a9a8c388b4bdb91e32c6d6bf7a0421d29870cd4f1a6e199fa8e9f076801d521fd9171fc0d8d74c57c84c572a9fb0c7c2898e99bc2e6d5bd762556c9811aba

data/app/controllers/scheduled_task_statuses_controller.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class ScheduledTaskStatusesController < ApplicationController
+  def log
+    record = find_if_allowed(params[:id], :read)
+    @log_file = record.log_file(params[:identifier])
+  end
+
+  def index; end
+
+  def status_content
+    @scheduled_tasks = ::ScheduledTask.order(task: :asc, scheduling: :asc)
+    render layout: false
+  end
+end

data/app/controllers/scheduled_tasks_controller.rb

@@ -9,6 +9,8 @@ class ScheduledTasksController < ApplicationController
     end
   end
 
+  before_action :localize_active_scaffold
+
   active_scaffold :scheduled_task do |conf|
     %i[create update list].each do |action|
       conf.send(action).columns.exclude(:next_run, :last_fail_status, :last_run_start,
@@ -19,22 +21,10 @@ class ScheduledTasksController < ApplicationController
     conf.columns[:task].form_ui = :select
     conf.columns[:task].options ||= {}
     conf.columns[:task].options[:options] = task_column_options
-    conf.action_links.add :run_now, label: I18n.t(:run_now), type: :member,
+    conf.action_links.add :run_now, label: :run_now, type: :member,
                                     crud_type: :update, method: :put, position: false
   end
 
-  def log
-    record = find_if_allowed(params[:id], :read)
-    @log_file = record.log_file(params[:identifier])
-  end
-
-  def status; end
-
-  def status_content
-    @scheduled_tasks = ::ScheduledTask.order(task: :asc, scheduling: :asc)
-    render layout: false
-  end
-
   def run_now
     process_action_link_action do |record|
       record.update!(next_run: Time.zone.now)
@@ -42,4 +32,10 @@ class ScheduledTasksController < ApplicationController
       flash.now[:info] = "Next run adjusted to #{record.next_run}"
     end
   end
+
+  private
+
+  def localize_active_scaffold
+    active_scaffold_config.action_links[:run_now].label = ::I18n.t(:run_now)
+  end
 end

data/app/helpers/scheduled_tasks_helper.rb

@@ -11,7 +11,8 @@ module ScheduledTasksHelper
 
   def scheduled_tasks_log(scheduled_task, log_identifier)
     if File.exist?(scheduled_task.log_file(log_identifier))
-      link_to I18n.t(:log), log_scheduled_task_path(scheduled_task, identifier: log_identifier)
+      link_to I18n.t(:log),
+              log_scheduled_task_status_path(scheduled_task, identifier: log_identifier)
     else
       '-'
     end

data/app/views/{scheduled_tasks/status.html.erb → scheduled_task_statuses/index.html.erb}

@@ -4,5 +4,5 @@
 <div id="TaskScheduler_Status_Content">
 </div>
 <script>
-  TasksScheduler.Status.init('<%= status_content_scheduled_tasks_path %>', 5);
+  TasksScheduler.Status.init('<%= status_content_scheduled_task_statuses_path %>', 5);
 </script>

data/config/initializers/menus.rb

@@ -5,5 +5,5 @@ require 'eac_rails_utils/patches/application'
 Rails.application.root_menu.group(:admin).group(:tasks_scheduler).within do |g|
   g.action :tasks_scheduler_daemon
   g.action :scheduled_tasks
-  g.action :status_scheduled_tasks
+  g.action :scheduled_task_statuses
 end

data/config/locales/en.yml

@@ -12,7 +12,7 @@ en:
             __self: Tasks scheduler
             main_app_tasks_scheduler_daemon: Daemon
             main_app_scheduled_tasks: Tasks
-            main_app_status_scheduled_tasks: Status
+            main_app_scheduled_task_statuses: Status
   helpers:
       label:
         scheduled_task:

data/config/locales/pt-BR.yml

@@ -12,7 +12,7 @@ pt-BR:
             __self: 'Agendador de tarefas'
             main_app_tasks_scheduler_daemon: Daemon
             main_app_scheduled_tasks: Tarefas
-            main_app_status_scheduled_tasks: Situação
+            main_app_scheduled_task_statuses: Situação
   helpers:
       label:
         scheduled_task:

data/config/routes.rb

@@ -1,13 +1,16 @@
 # frozen_string_literal: true
 
 Rails.application.routes.draw do
-  resources(:scheduled_tasks, concerns: active_scaffold) do
+  resources(:scheduled_task_statuses, only: [:index]) do
     collection do
-      get :status
       get :status_content
     end
     member do
       get :log
+    end
+  end
+  resources(:scheduled_tasks, concerns: active_scaffold) do
+    member do
       put :run_now
     end
   end

data/lib/tasks_scheduler/engine.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_active_scaffold'
+require 'eac_active_scaffold/engine'
 require 'eac_rails_utils/engine'
 require 'eac_rails_utils/engine_helper'
 

data/lib/tasks_scheduler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TasksScheduler
-  VERSION = '0.8.0'
+  VERSION = '0.9.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tasks_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-18 00:00:00.000000000 Z
+date: 2024-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-eac_ruby_base1
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.31'
+        version: '0.33'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.31.2
+        version: 0.33.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.31'
+        version: '0.33'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.31.2
+        version: 0.33.1
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
@@ -56,54 +56,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: eac_rails_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.23'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.23.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.23'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.23.4
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.119'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.119.2
+        version: '0.121'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.119'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.119.2
+        version: '0.121'
 - !ruby/object:Gem::Dependency
   name: parse-cron
   requirement: !ruby/object:Gem::Requirement
@@ -124,34 +118,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.4
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.11
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.11
 - !ruby/object:Gem::Dependency
   name: eac_rails_gem_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.1
 description: 
 email:
 - eduardobogoni@gmail.com
@@ -169,6 +155,7 @@ files:
 - app/assets/javascripts/tasks_scheduler/status.js
 - app/assets/stylesheets/tasks_scheduler.scss
 - app/assets/stylesheets/tasks_scheduler/alert.scss
+- app/controllers/scheduled_task_statuses_controller.rb
 - app/controllers/scheduled_tasks_controller.rb
 - app/controllers/tasks_scheduler_daemon_controller.rb
 - app/controllers/tasks_scheduler_daemon_controller/_download_log.rb
@@ -178,9 +165,9 @@ files:
 - app/models/scheduled_task/log.rb
 - app/models/scheduled_task/runner.rb
 - app/models/scheduled_task/status.rb
-- app/views/scheduled_tasks/log.html.erb
-- app/views/scheduled_tasks/status.html.erb
-- app/views/scheduled_tasks/status_content.html.erb
+- app/views/scheduled_task_statuses/index.html.erb
+- app/views/scheduled_task_statuses/log.html.erb
+- app/views/scheduled_task_statuses/status_content.html.erb
 - app/views/tasks_scheduler/_alert.html.erb
 - app/views/tasks_scheduler_daemon/_daemon.html.erb
 - app/views/tasks_scheduler_daemon/_logs.html.erb