rocketjob_mission_control 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95c31dad97c24947bcd03965186d8e2e3a18d9e6
-  data.tar.gz: '064995269a737889937e84659e86160d8b0a7c26'
+  metadata.gz: 21d26a16d5a42afc84e40b409b784dc9114a0964
+  data.tar.gz: ba1b5b6abdee92bd07e235365edeba6b4d5be340
 SHA512:
-  metadata.gz: 0a5a5b0ce3cae2cd1964deef79a70f2d35fabe7348e4e8f01e86fe22059d0c2dad02ffd82a32bd4442cbce9d2b149b62d088b4851393d818225030ec72bdfe4d
-  data.tar.gz: 4fda4abf731c3c5487d7bcf2601d4b528d2ff6f887a91cb9ce059860f0802ae617ffcde72f0ec07f605ede8e6326c1cd3015f8a78e50c3e58ed3675d54f3fbb2
+  metadata.gz: 603390cc09d91dc638e1014b1121125a2c7438b14e3c360edf1cb666faa434211bcea7aa230d10b9ae934fa62dad0fd03823289b0db9a1ec693e6316fefe43eb
+  data.tar.gz: 51cd9a8828ec473401f1b95dc23c2e0fe56e419d3cb7a965cf86a350ee43d466e55f75bc4ee74d784229e1d8a7bd5ece904072c91d8ac92adfa1d75f06b2505c

data/README.md

@@ -1,7 +1,7 @@
-# rocketjob mission control
-[![Gem Version](https://badge.fury.io/rb/rocketjob_mission_control.svg)](http://badge.fury.io/rb/rocketjob_mission_control) [![Build Status](https://secure.travis-ci.org/rocketjob/rocketjob_mission_control.png?branch=master)](http://travis-ci.org/rocketjob/rocketjob_mission_control) ![](http://ruby-gem-downloads-badge.herokuapp.com/rocketjob_mission_control)
+# Rocket Job Mission Control
+[![Gem Version](https://badge.fury.io/rb/rocketjob_mission_control.svg)](http://badge.fury.io/rb/rocketjob_mission_control) [![Build Status](https://secure.travis-ci.org/rocketjob/rocketjob_mission_control.png?branch=master)](http://travis-ci.org/rocketjob/rocketjob_mission_control)
 
-Web based management interface for [rocketjob][0].
+Web based management interface for [Rocket Job][0].
 
 ![Screen shot](http://rocketjob.io/images/rjmc_running.png)
 
@@ -10,24 +10,24 @@ Web based management interface for [rocketjob][0].
 Production Ready
 
 Already in use in production processing large files with millions
-of records, as well as large jobs to walk though large databases.
+of records, as well as large jobs to walk through large databases.
 
 ## Features
 
 Job Management
 
-* View all queued, running, failed, and running jobs
-* View all completed jobs where `destroy_on_complete == false`
-* Pause any running jobs
-* Resume paused jobs
-* Retry failed jobs
-* Abort, or fail queued or running jobs
-* Destroy a completed or aborted job
+* View all queued, running, failed, and running jobs.
+* View all completed jobs where `destroy_on_complete` is `false`.
+* Pause any running jobs.
+* Resume paused jobs.
+* Retry failed jobs.
+* Abort, or fail queued or running jobs.
+* Destroy a completed or aborted job.
 
 Server Management
 
-* View running servers
-* Stop servers
+* View running servers.
+* Stop servers.
 
 Running Jobs
 
@@ -35,31 +35,30 @@ Running Jobs
 
 Directory Monitor Management
 
-* Create, update, enable, disable directory monitoring entries
+* Create, update, enable, disable directory monitoring entries.
 
 ## Documentation
 
 * [Guide](http://rocketjob.io/mission_control)
 
-## Rails 4 Installation
+## Rails Installation
 
 This gem is a Rails Engine and can be installed directly into existing Rails 4
-applications.
+or 5 applications.
 
-Add the dependency to your Gemfile
+Add to Gemfile:
 
 ```ruby
 gem 'rocketjob_mission_control'
 ```
 
-Install it...
+Install:
 
 ```ruby
 bundle
 ```
 
-Add the following route to your application for accessing the interface,
-and retrying failed jobs.
+Add the following route to `config/routes.rb`:
 
 ```ruby
 mount RocketJobMissionControl::Engine => 'rocketjob'
@@ -74,9 +73,6 @@ This project uses [Semantic Versioning](http://semver.org/).
 * [Michael Cloutier][1]
 * [Chris Lamb][2]
 * [Jonathan Whittington][4]
-
-## Contributors
-
 * [Reid Morrison][3] :: @reidmorrison
 
 [0]: http://rocketjob.io

data/app/assets/javascripts/rocket_job_mission_control/application.js

@@ -15,6 +15,7 @@
 //= require dataTables/jquery.dataTables
 //= require dataTables/extras/dataTables.responsive
 //= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
+//= require bootstrap-sprockets
 //
 // Selectize is used by Array builder in application_helper#editable_field_html
 //= require microplugin

data/app/assets/stylesheets/rocket_job_mission_control/base.scss

@@ -257,9 +257,13 @@ table.dataTable thead > tr > th {
       left: 50%;
       margin-left: -96px !important;
       display: block;
+
       img {
         display: inline;
         height: 40px;
+        position: relative;
+        bottom: 3px;
+        left: 8px;
       }
   }
 
@@ -267,10 +271,10 @@ table.dataTable thead > tr > th {
   .last { right: 15px; }
 
   a.navbar-brand.brand {
-    font-size: 36px;
+    font-size: 23px;
     color: white;
     font-weight: bold;
-    margin-top: -10px;
+    top: -5px;
 
     span {
       display: inline-block;

data/app/controllers/rocket_job_mission_control/dirmon_entries_controller.rb

@@ -1,7 +1,12 @@
 module RocketJobMissionControl
   class DirmonEntriesController < RocketJobMissionControl::ApplicationController
-    before_filter :find_entry_or_redirect, except: [:index, :disabled, :enabled, :failed, :pending, :new, :create]
-    before_filter :show_sidebar
+    if Rails.version.to_i < 5
+      before_filter :find_entry_or_redirect, except: [:index, :disabled, :enabled, :failed, :pending, :new, :create]
+      before_filter :show_sidebar
+    else
+      before_action :find_entry_or_redirect, except: [:index, :disabled, :enabled, :failed, :pending, :new, :create]
+      before_action :show_sidebar
+    end
 
     def index
       @data_table_url = dirmon_entries_url(format: 'json')
@@ -65,8 +70,7 @@ module RocketJobMissionControl
       if properties = params[:rocket_job_dirmon_entry][:properties]
         @dirmon_entry.properties = JobSanitizer.sanitize(properties, @dirmon_entry.job_class, @dirmon_entry, false)
       end
-
-      if @dirmon_entry.errors.empty? && @dirmon_entry.valid? && @dirmon_entry.save
+      if @dirmon_entry.errors.empty? && @dirmon_entry.valid? && @dirmon_entry.update_attributes(dirmon_params)
         redirect_to(rocket_job_mission_control.dirmon_entry_path(@dirmon_entry))
       else
         render :edit

data/app/controllers/rocket_job_mission_control/jobs_controller.rb

@@ -1,7 +1,12 @@
 module RocketJobMissionControl
   class JobsController < RocketJobMissionControl::ApplicationController
-    before_filter :find_job_or_redirect, except: [:index, :aborted, :completed, :failed, :paused, :queued, :running, :scheduled]
-    before_filter :show_sidebar
+    if Rails.version.to_i < 5
+      before_filter :find_job_or_redirect, except: [:index, :aborted, :completed, :failed, :paused, :queued, :running, :scheduled]
+      before_filter :show_sidebar
+    else
+      before_action :find_job_or_redirect, except: [:index, :aborted, :completed, :failed, :paused, :queued, :running, :scheduled]
+      before_action :show_sidebar
+    end
     rescue_from StandardError, with: :error_occurred
 
     def index

data/app/controllers/rocket_job_mission_control/servers_controller.rb

@@ -1,7 +1,12 @@
 module RocketJobMissionControl
   class ServersController < RocketJobMissionControl::ApplicationController
-    before_filter :find_server_or_redirect, only: [:stop, :pause, :resume, :destroy]
-    before_filter :show_sidebar
+    if Rails.version.to_i < 5
+      before_filter :find_server_or_redirect, only: [:stop, :pause, :resume, :destroy]
+      before_filter :show_sidebar
+    else
+      before_action :find_server_or_redirect, only: [:stop, :pause, :resume, :destroy]
+      before_action :show_sidebar
+    end
 
     def index
       @data_table_url = servers_url(format: 'json')

data/app/datatables/rocket_job_mission_control/abstract_datatable.rb

@@ -16,7 +16,7 @@ module RocketJobMissionControl
         draw:            params[:draw].to_i,
         recordsTotal:    query.unfiltered_count,
         recordsFiltered: query.count,
-        data:            query.query.collect{|record| map(record)}
+        data:            query.query.collect { |record| map(record) }
       }
     end
 

data/app/datatables/rocket_job_mission_control/jobs_datatable.rb

@@ -1,28 +1,28 @@
 module RocketJobMissionControl
   class JobsDatatable < AbstractDatatable
     delegate :job_path, :job_icon, :edit_job_path,
-      :abort_job_path, :job_path, :fail_job_path, :run_now_job_path, :pause_job_path,
-      :resume_job_path, :retry_job_path, :exception_job_path, :job_action_link, :exceptions_job_path, to: :@view
+             :abort_job_path, :job_path, :fail_job_path, :run_now_job_path, :pause_job_path,
+             :resume_job_path, :retry_job_path, :exception_job_path, :job_action_link, :exceptions_job_path, to: :@view
 
     COMMON_FIELDS = [:id, :_type, :description, :completed_at, :created_at, :started_at, :state].freeze
 
-    ABORTED_COLUMNS             = [
+    ABORTED_COLUMNS = [
       {display: 'Class', value: :class_with_link, field: '_type', width: '30%'},
       {display: 'Description', value: :description, field: 'description', width: '30%'},
       {display: 'Aborted', value: :completed_ago, field: 'completed_at'},
       {display: 'Actions', value: :action_buttons, orderable: false}
     ]
 
-    ALL_COLUMNS                 = [
+    ALL_COLUMNS = [
       {display: 'Class', value: :class_with_link, field: '_type'},
       {display: 'Description', value: :description, field: 'description'},
       {display: 'Created', value: :created_at, field: 'created_at'},
       {display: 'Duration', value: :duration, field: 'duration', orderable: false},
       {display: 'Actions', value: :action_buttons, orderable: false}
     ]
-    ALL_FIELDS                  = COMMON_FIELDS + [:run_at].freeze
+    ALL_FIELDS  = COMMON_FIELDS + [:run_at].freeze
 
-    COMPLETED_COLUMNS           = [
+    COMPLETED_COLUMNS = [
       {display: 'Class', value: :class_with_link, field: '_type', width: '30%'},
       {display: 'Description', value: :description, field: 'description', width: '30%'},
       {display: 'Duration', value: :duration, field: 'duration', orderable: false},
@@ -36,16 +36,16 @@ module RocketJobMissionControl
     PAUSED_COLUMNS              = ABORTED_COLUMNS.deep_dup
     PAUSED_COLUMNS[2][:display] = 'Paused'
 
-    QUEUED_COLUMNS              = [
+    QUEUED_COLUMNS = [
       {display: 'Class', value: :class_with_link, field: '_type'},
       {display: 'Description', value: :description, field: 'description'},
       {display: 'Priority', value: :priority, field: 'priority'},
       {display: 'Queued For', value: :duration, field: 'duration', orderable: false},
       {display: 'Actions', value: :action_buttons, orderable: false}
     ]
-    QUEUED_FIELDS               = COMMON_FIELDS + [:run_at, :priority].freeze
+    QUEUED_FIELDS  = COMMON_FIELDS + [:run_at, :priority].freeze
 
-    RUNNING_COLUMNS             = [
+    RUNNING_COLUMNS = [
       {display: 'Class', value: :class_with_link, field: '_type'},
       {display: 'Description', value: :description, field: 'description'},
       {display: 'Progress', value: :progress, field: 'percent_complete', orderable: false},
@@ -53,16 +53,16 @@ module RocketJobMissionControl
       {display: 'Started', value: :started, field: 'started_at'},
       {display: 'Actions', value: :action_buttons, orderable: false}
     ]
-    RUNNING_FIELDS              = COMMON_FIELDS + [:record_count, :collect_output, :input_categories, :output_categories, :encrypt, :compress, :slice_size, :priority, :sub_state, :percent_complete].freeze
+    RUNNING_FIELDS  = COMMON_FIELDS + [:record_count, :collect_output, :input_categories, :output_categories, :encrypt, :compress, :slice_size, :priority, :sub_state, :percent_complete].freeze
 
-    SCHEDULED_COLUMNS           = [
+    SCHEDULED_COLUMNS = [
       {display: 'Class', value: :class_with_link, field: '_type'},
       {display: 'Description', value: :description, field: 'description'},
       {display: 'Runs in', value: :time_till_run, field: 'run_at'},
       {display: 'Cron Schedule', value: :cron_schedule, field: 'cron_schedule'},
       {display: 'Actions', value: :action_buttons, orderable: false}
     ]
-    SCHEDULED_FIELDS            = COMMON_FIELDS + [:run_at, :cron_schedule].freeze
+    SCHEDULED_FIELDS  = COMMON_FIELDS + [:run_at, :cron_schedule].freeze
 
     def initialize(view, query, columns)
       @columns = columns
@@ -78,10 +78,10 @@ module RocketJobMissionControl
     # Map the values for each column
     def map(job)
       index = 0
-      h = {}
+      h     = {}
       @columns.each do |column|
         h[index.to_s] = send(column[:value], job)
-        index += 1
+        index         += 1
       end
       h['DT_RowClass'] = "card callout callout-#{job.state}"
       h

data/app/models/rocket_job_mission_control/query.rb

@@ -2,7 +2,7 @@ module RocketJobMissionControl
   class Query
     attr_reader :scope
     attr_accessor :search_term, :order_by, :start, :page_size,
-      :search_columns, :display_columns
+                  :search_columns, :display_columns
 
     def initialize(scope, order_by = nil)
       @scope           = scope

data/app/views/layouts/rocket_job_mission_control/partials/_flash.html.erb

@@ -12,7 +12,7 @@
             <% end %>
           </ul>
         <% else %>
-          <%= msg.html_safe %>
+          <%= msg.to_s.html_safe %>
         <% end %>
       </div>
     <% end %>

data/app/views/layouts/rocket_job_mission_control/partials/_header.html.erb

@@ -8,7 +8,7 @@
         <span class="icon-bar"></span>
       </button>
       <a class="navbar-brand brand" href="http://rocketjob.io" target="_blank">
-        <img src="/assets/rocket_job_mission_control/rocket-icon-64x64.png" alt="Rocket icon 64x64">
+        <%= image_tag('rocket_job_mission_control/rocket-icon-64x64.png') %>
         Rocket Job
       </a>
     </div>

data/app/views/rocket_job_mission_control/jobs/_status.html.erb

@@ -1,23 +1,23 @@
 <% status = job.status(Time.zone) %>
-<div class="id"><label>ID:</label><%= status.delete('_id') %></div>
+<div class="id"><label>ID:</label> <%= status.delete('_id') %></div>
 
 <% if description = status.delete('description') %>
-  <div class="status-message"><label>Description:</label><%= description %></div>
+  <div class="status-message"><label>Description:</label> <%= description %></div>
 <% end %>
 <% if duration = status.delete('duration') %>
-  <div class="status-message"><label>Duration:</label><%= duration %></div>
+  <div class="status-message"><label>Duration:</label> <%= duration %></div>
 <% end %>
 <% if record_count = status.delete('record_count') %>
-  <div class="status-message"><label>Record Count:</label><%= record_count %></div>
+  <div class="status-message"><label>Record Count:</label> <%= record_count %></div>
 <% end %>
 
-<div class="created_at"><label>Created At:</label><%= status.delete('created_at') %></div>
+<div class="created_at"><label>Created At:</label> <%= status.delete('created_at') %></div>
 
 <% if started_at = status.delete('started_at') %>
-  <div class="status-message"><label>Started At:</label><%= started_at %></div>
+  <div class="status-message"><label>Started At:</label> <%= started_at %></div>
 <% end %>
 <% if percent_complete = status.delete('percent_complete') %>
-  <div class="status-message"><label>% Complete:</label><%= percent_complete %></div>
+  <div class="status-message"><label>% Complete:</label> <%= percent_complete %></div>
 <% end %>
 
 <%
@@ -29,7 +29,7 @@
       next
     end
 %>
-  <div class="status-message"><label><%= key.to_s.titleize %>:</label><%= value %></div>
+  <div class="status-message"><label><%= key.to_s.titleize %>:</label> <%= value %></div>
 <% end %>
 
 <div class="clearfix"></div>

data/config/routes.rb

@@ -1,3 +1,4 @@
+#@formatter:off
 RocketJobMissionControl::Engine.routes.draw do
 
   resources :jobs, only: [:index, :show, :update, :destroy, :edit] do

data/lib/rocket_job_mission_control/version.rb

@@ -1,3 +1,3 @@
 module RocketJobMissionControl
-  VERSION = '3.0.1'
+  VERSION = '3.0.2'
 end

data/test/controllers/rocket_job_mission_control/dirmon_entries_controller_test.rb

@@ -37,11 +37,9 @@ module RocketJobMissionControl
       describe 'PATCH #enable' do
         describe 'when transition is allowed' do
           before do
-            if Rails.version.to_i >= 5
-              patch :enable, params: {id: existing_dirmon_entry.id}
-            else
-              patch :enable, id: existing_dirmon_entry.id
-            end
+            params = {id: existing_dirmon_entry.id}
+            params = {params: params} if Rails.version.to_i >= 5
+            patch :enable, params
           end
 
           it do
@@ -56,11 +54,9 @@ module RocketJobMissionControl
         describe 'when transition is not allowed' do
           before do
             existing_dirmon_entry.enable!
-            if Rails.version.to_i >= 5
-              patch :enable, params: {id: existing_dirmon_entry.id}
-            else
-              patch :enable, id: existing_dirmon_entry.id
-            end
+            params = {id: existing_dirmon_entry.id}
+            params = {params: params} if Rails.version.to_i >= 5
+            patch :enable, params
           end
 
           it 'succeeds' do
@@ -77,11 +73,9 @@ module RocketJobMissionControl
         describe 'when transition is allowed' do
           before do
             existing_dirmon_entry.enable!
-            if Rails.version.to_i >= 5
-              patch :disable, params: {id: existing_dirmon_entry.id}
-            else
-              patch :disable, id: existing_dirmon_entry.id
-            end
+            params = {id: existing_dirmon_entry.id}
+            params = {params: params} if Rails.version.to_i >= 5
+            patch :disable, params
           end
 
           it do
@@ -95,11 +89,9 @@ module RocketJobMissionControl
 
         describe 'when transition is not allowed' do
           before do
-            if Rails.version.to_i >= 5
-              patch :disable, params: {id: existing_dirmon_entry.id}
-            else
-              patch :disable, id: existing_dirmon_entry.id
-            end
+            params = {id: existing_dirmon_entry.id}
+            params = {params: params} if Rails.version.to_i >= 5
+            patch :disable, params
           end
 
           it 'succeeds' do
@@ -116,11 +108,9 @@ module RocketJobMissionControl
         let(:entry_params) { {} }
 
         before do
-          if Rails.version.to_i >= 5
-            get :new, params: entry_params
-          else
-            get :new, entry_params
-          end
+          params = entry_params
+          params = {params: entry_params} if Rails.version.to_i >= 5
+          get :new, params
         end
 
         it 'succeeds' do
@@ -173,11 +163,9 @@ module RocketJobMissionControl
       describe 'PATCH #update' do
         describe 'with valid parameters' do
           before do
-            if Rails.version.to_i >= 5
-              patch :update, params: {id: existing_dirmon_entry.id, rocket_job_dirmon_entry: {pattern: 'the_path2', job_class_name: job_class_name}}
-            else
-              patch :update, id: existing_dirmon_entry.id, rocket_job_dirmon_entry: {pattern: 'the_path2', job_class_name: job_class_name}
-            end
+            params = {id: existing_dirmon_entry.id, rocket_job_dirmon_entry: {pattern: 'the_path2', job_class_name: job_class_name}}
+            params = {params: params} if Rails.version.to_i >= 5
+            patch :update, params
           end
 
           it 'redirects to the updated entry' do
@@ -185,27 +173,23 @@ module RocketJobMissionControl
           end
 
           it 'updates the entry' do
-            #follow_redirect!
-            #assert_equal 'the_path2', existing_dirmon_entry.reload.pattern
+            assert_equal 'the_path2', existing_dirmon_entry.reload.pattern
           end
         end
 
         describe 'with invalid parameters' do
           before do
-            if Rails.version.to_i >= 5
-              patch :update, params: {id: existing_dirmon_entry.id, rocket_job_dirmon_entry: {job_class_name: 'FakeAndBadJob'}}
-            else
-              patch :update, id: existing_dirmon_entry.id, rocket_job_dirmon_entry: {job_class_name: 'FakeAndBadJob'}
-            end
+            params = {id: existing_dirmon_entry.id, rocket_job_dirmon_entry: {job_class_name: 'FakeAndBadJob'}}
+            params = {params: params} if Rails.version.to_i >= 5
+            patch :update, params
           end
 
           it 'renders the edit template' do
-            assert_redirected_to dirmon_entry_path(existing_dirmon_entry)
+            assert_response :success
           end
 
           it 'alerts the user' do
-            #follow_redirect!
-            #assert_select 'div.message', "job_class_name: #{I18n.t(:failure, scope: [:dirmon_entry, :disable])}"
+            assert_select 'div.message', "job_class_name: [\"job_class_name must be defined and must be derived from RocketJob::Job\"]"
           end
         end
       end
@@ -222,11 +206,9 @@ module RocketJobMissionControl
           end
 
           before do
-            if Rails.version.to_i >= 5
-              post :create, params: {rocket_job_dirmon_entry: dirmon_params}
-            else
-              post :create, rocket_job_dirmon_entry: dirmon_params
-            end
+            params = {rocket_job_dirmon_entry: dirmon_params}
+            params = {params: params} if Rails.version.to_i >= 5
+            post :create, params
           end
 
           it 'creates the entry' do
@@ -265,11 +247,9 @@ module RocketJobMissionControl
           end
 
           before do
-            if Rails.version.to_i >= 5
-              post :create, params: {rocket_job_dirmon_entry: dirmon_params}
-            else
-              post :create, rocket_job_dirmon_entry: dirmon_params
-            end
+            params = {rocket_job_dirmon_entry: dirmon_params}
+            params = {params: params} if Rails.version.to_i >= 5
+            post :create, params
           end
 
           describe 'on model attributes' do
@@ -287,11 +267,9 @@ module RocketJobMissionControl
 
       describe 'GET #edit' do
         before do
-          if Rails.version.to_i >= 5
-            get :edit, params: {id: existing_dirmon_entry.id}
-          else
-            get :edit, id: existing_dirmon_entry.id
-          end
+          params = {id: existing_dirmon_entry.id}
+          params = {params: params} if Rails.version.to_i >= 5
+          get :edit, params
         end
 
         it 'succeeds' do
@@ -306,11 +284,9 @@ module RocketJobMissionControl
       describe 'GET #show' do
         describe 'with an invalid id' do
           before do
-            if Rails.version.to_i >= 5
-              get :show, params: {id: 42}
-            else
-              get :show, id: 42
-            end
+            params = {id: 42}
+            params = {params: params} if Rails.version.to_i >= 5
+            get :show, params
           end
 
           it 'redirects' do
@@ -324,11 +300,9 @@ module RocketJobMissionControl
 
         describe 'with a valid id' do
           before do
-            if Rails.version.to_i >= 5
-              get :show, params: {id: existing_dirmon_entry.id}
-            else
-              get :show, id: existing_dirmon_entry.id
-            end
+            params = {id: existing_dirmon_entry.id}
+            params = {params: params} if Rails.version.to_i >= 5
+            get :show, params
           end
 
           it 'succeeds' do
@@ -344,11 +318,9 @@ module RocketJobMissionControl
       describe 'DELETE #destroy' do
         describe 'with a valid id' do
           before do
-            if Rails.version.to_i >= 5
-              delete :destroy, params: {id: existing_dirmon_entry.id}
-            else
-              delete :destroy, id: existing_dirmon_entry.id
-            end
+            params = {id: existing_dirmon_entry.id}
+            params = {params: params} if Rails.version.to_i >= 5
+            delete :destroy, params
           end
 
           it 'redirects to index' do

data/test/controllers/rocket_job_mission_control/jobs_controller_test.rb

@@ -3,6 +3,15 @@ require_relative '../../compare_hashes'
 
 module RocketJobMissionControl
   class JobsControllerTest < ActionController::TestCase
+
+    class PausableJob < RocketJob::Job
+      self.pausable = true
+
+      def perform
+        21
+      end
+    end
+
     describe JobsController do
       before do
         RocketJob::Job.delete_all
@@ -12,6 +21,10 @@ module RocketJobMissionControl
         RocketJob::Jobs::SimpleJob.create!
       end
 
+      let :pausable_job do
+        PausableJob.create!
+      end
+
       let :failed_job do
         job = KaboomBatchJob.new(slice_size: 1)
         job.upload do |stream|
@@ -44,7 +57,9 @@ module RocketJobMissionControl
         describe "PATCH ##{state}" do
           describe 'with an invalid job id' do
             before do
-              patch state, id: 42, job: {id: 42, priority: 12}
+              params = {id: 42, job: {id: 42, priority: 12}}
+              params = {params: params} if Rails.version.to_i >= 5
+              patch state, params
             end
 
             it 'redirects' do
@@ -60,21 +75,23 @@ module RocketJobMissionControl
             before do
               case state
               when :pause, :fail, :abort
-                job.start!
+                pausable_job.start!
               when :resume
-                job.pause!
+                pausable_job.pause!
               when :retry
-                job.fail!
+                pausable_job.fail!
               end
-              patch state, id: job.id, job: {id: job.id, priority: job.priority}
+              params = {id: pausable_job.id, job: {id: pausable_job.id, priority: pausable_job.priority}}
+              params = {params: params} if Rails.version.to_i >= 5
+              patch state, params
             end
 
             it 'redirects to the job' do
-              assert_redirected_to job_path(job.id)
+              assert_redirected_to job_path(pausable_job.id)
             end
 
             it 'transitions the job' do
-              refute_equal state, job.state
+              refute_equal state, pausable_job.state
             end
           end
         end
@@ -84,7 +101,9 @@ module RocketJobMissionControl
         let(:scheduled_job) { RocketJob::Jobs::SimpleJob.create!(run_at: 2.days.from_now) }
 
         before do
-          patch :run_now, id: scheduled_job.id
+          params = {id: scheduled_job.id}
+          params = {params: params} if Rails.version.to_i >= 5
+          patch :run_now, params
         end
 
         it 'redirects to the job path' do
@@ -100,7 +119,9 @@ module RocketJobMissionControl
       describe "PATCH #update" do
         describe 'with an invalid job id' do
           before do
-            patch :update, id: 42, job: {id: 42, priority: 12}
+            params = {id: 42, job: {id: 42, priority: 12}}
+            params = {params: params} if Rails.version.to_i >= 5
+            patch :update, params
           end
 
           it 'redirects' do
@@ -114,7 +135,9 @@ module RocketJobMissionControl
 
         describe "with a valid job id" do
           before do
-            patch :update, id: job.id, job: {id: job.id, priority: 12, blah: 23, description: '', log_level: '', state: 'failed'}
+            params = {id: job.id, job: {id: job.id, priority: 12, blah: 23, description: '', log_level: '', state: 'failed'}}
+            params = {params: params} if Rails.version.to_i >= 5
+            patch :update, params
           end
 
           it 'redirects to the job' do
@@ -137,7 +160,9 @@ module RocketJobMissionControl
       describe 'GET #show' do
         describe 'with an invalid job id' do
           before do
-            get :show, id: 42
+            params = {id: 42}
+            params = {params: params} if Rails.version.to_i >= 5
+            get :show, params
           end
 
           it 'redirects' do
@@ -151,7 +176,9 @@ module RocketJobMissionControl
 
         describe "with a valid job id" do
           before do
-            get :show, id: job.id
+            params = {id: job.id}
+            params = {params: params} if Rails.version.to_i >= 5
+            get :show, params
           end
 
           it 'succeeds' do
@@ -167,7 +194,9 @@ module RocketJobMissionControl
       describe 'GET #exception' do
         describe 'with an invalid job id' do
           before do
-            get :exception, id: 42
+            params = {id: 42}
+            params = {params: params} if Rails.version.to_i >= 5
+            get :exception, params
           end
 
           it 'redirects' do
@@ -181,13 +210,14 @@ module RocketJobMissionControl
 
         describe 'with a valid job id' do
           before do
-            skip 'Only tested with Rocket Job Pro' unless defined?(RocketJob::Plugins::Batch)
-            get :exception, id: failed_job.id, error_type: 'Blah'
+            skip('Only tested with Rocket Job Pro') unless defined?(RocketJob::Plugins::Batch)
           end
 
           describe 'without an exception' do
             before do
-              get :exception, id: failed_job.id, error_type: 'Blah'
+              params = {id: failed_job.id, error_type: 'Blah'}
+              params = {params: params} if Rails.version.to_i >= 5
+              get :exception, params
             end
 
             it 'redirects to job path' do
@@ -201,7 +231,9 @@ module RocketJobMissionControl
 
           describe 'with exception' do
             before do
-              get :exception, id: failed_job.id, error_type: 'ArgumentError'
+              params = {id: failed_job.id, error_type: 'ArgumentError'}
+              params = {params: params} if Rails.version.to_i >= 5
+              get :exception, params
             end
 
             it 'succeeds' do

data/test/controllers/rocket_job_mission_control/servers_controller_test.rb

@@ -31,7 +31,9 @@ module RocketJobMissionControl
           describe 'with a valid server id' do
             before do
               server.pause! if server_action == :resume
-              patch server_action, id: server.id
+              params = {id: server.id}
+              params = {params: params} if Rails.version.to_i >= 5
+              patch server_action, params
             end
 
             it 'redirects to servers' do
@@ -48,7 +50,9 @@ module RocketJobMissionControl
             before do
               server.pause! if server_action == :pause
               server.stop! if server_action == :stop
-              patch server_action, id: server.id
+              params = {id: server.id}
+              params = {params: params} if Rails.version.to_i >= 5
+              patch server_action, params
             end
 
             it 'redirects to servers' do
@@ -66,7 +70,9 @@ module RocketJobMissionControl
         RocketJobMissionControl::ServersController::VALID_ACTIONS.each do |server_action, action_message|
           describe "with '#{server_action}' as the server_action param" do
             before do
-              patch :update_all, server_action: server_action
+              params = {server_action: server_action}
+              params = {params: params} if Rails.version.to_i >= 5
+              patch :update_all, params
             end
 
             it 'redirects to servers' do
@@ -81,7 +87,9 @@ module RocketJobMissionControl
 
         describe 'with an invalid server_action param' do
           before do
-            patch :update_all, server_action: :bad_server_action
+            params = {server_action: :bad_server_action}
+            params = {params: params} if Rails.version.to_i >= 5
+            patch :update_all, params
           end
 
           it 'redirects to servers' do
@@ -101,7 +109,9 @@ module RocketJobMissionControl
       describe 'DELETE #destroy' do
         describe 'with a valid server id' do
           before do
-            delete :destroy, id: server.id
+            params = {id: server.id}
+            params = {params: params} if Rails.version.to_i >= 5
+            delete :destroy, params
           end
 
           it 'redirects to servers' do
@@ -119,7 +129,9 @@ module RocketJobMissionControl
 
         describe 'when the server is not found' do
           before do
-            delete :destroy, id: 999999
+            params = {id: 999999}
+            params = {params: params} if Rails.version.to_i >= 5
+            delete :destroy, params
           end
 
           it 'redirects to servers' do
@@ -192,7 +204,7 @@ module RocketJobMissionControl
 
               it 'succeeds' do
                 assert_response :success
-                json = JSON.parse(response.body)
+                json          = JSON.parse(response.body)
                 expected_data = {
                   starting: {
                     "0"           => /#{RocketJob::Server.starting.first.name}/,

data/test/helpers/rocket_job_mission_control/slices_helper_test.rb

@@ -16,11 +16,11 @@ module RocketJobMissionControl
 
         describe 'when not encrypted' do
           it "does not return 'encrypted'" do
-            refute_equal 'encrypted', display_slice_info([1,2], false)
+            refute_equal 'encrypted', display_slice_info([1, 2], false)
           end
 
           it "displays the slice info" do
-            assert_equal "[<br />  1,<br />  2<br />]", display_slice_info([1,2], false)
+            assert_equal "[<br />  1,<br />  2<br />]", display_slice_info([1, 2], false)
           end
         end
 

data/test/models/rocket_job_mission_control/job_sanitizer_test.rb

@@ -21,15 +21,15 @@ class JobSanitizerTest < Minitest::Test
         cleansed   = RocketJobMissionControl::JobSanitizer.sanitize(properties, @job.class, @job, false)
         assert_equal 0, @job.errors.count
         assert_equal 3, cleansed.count
-        assert_equal({:string=>"hello", :integer=>"12", :symbol=>"name"}, cleansed)
+        assert_equal({:string => "hello", :integer => "12", :symbol => "name"}, cleansed)
       end
 
       it 'strips blank values' do
         properties = {
-          string:  '',
-          integer: '',
-          symbol:  '',
-          secure:  'Not permissible',
+          string:    '',
+          integer:   '',
+          symbol:    '',
+          secure:    'Not permissible',
           log_level: ''
         }
         cleansed   = RocketJobMissionControl::JobSanitizer.sanitize(properties, @job.class, @job, false)
@@ -39,11 +39,11 @@ class JobSanitizerTest < Minitest::Test
 
       it 'nils blank values' do
         properties = {
-          string:  '',
-          integer: '',
-          symbol:  '',
-          hash:    '',
-          secure:  'Not permissible',
+          string:    '',
+          integer:   '',
+          symbol:    '',
+          hash:      '',
+          secure:    'Not permissible',
           log_level: ''
         }
         cleansed   = RocketJobMissionControl::JobSanitizer.sanitize(properties, @job.class, @job, true)
@@ -54,9 +54,9 @@ class JobSanitizerTest < Minitest::Test
 
       it 'parses JSON' do
         properties = {
-          string:  '',
-          secure:  'Not permissible',
-          hash:    '{"state":"FL"}'
+          string: '',
+          secure: 'Not permissible',
+          hash:   '{"state":"FL"}'
         }
         cleansed   = RocketJobMissionControl::JobSanitizer.sanitize(properties, @job.class, @job, false)
         assert_equal 0, @job.errors.count
@@ -66,9 +66,9 @@ class JobSanitizerTest < Minitest::Test
 
       it 'sets the error for invalid JSON' do
         properties = {
-          string:  'hello',
-          secure:  'Not permissible',
-          hash:    '{ bad json }'
+          string: 'hello',
+          secure: 'Not permissible',
+          hash:   '{ bad json }'
         }
         cleansed   = RocketJobMissionControl::JobSanitizer.sanitize(properties, @job.class, @job, false)
         assert_equal 1, @job.errors.count
@@ -80,7 +80,7 @@ class JobSanitizerTest < Minitest::Test
 
       it 'Keeps empty JSON Hash' do
         properties = {
-          hash:    '{ }'
+          hash: '{ }'
         }
         cleansed   = RocketJobMissionControl::JobSanitizer.sanitize(properties, @job.class, @job, false)
         assert_equal 0, @job.errors.count

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob_mission_control
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Michael Cloutier
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Enterprise Batch Processing System for Ruby.