rocketjob_mission_control 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0fc7d7f01085056b9d1af261538c850e8c4b4ff411dded87e14377e044aa16d
-  data.tar.gz: 7590d6292211b76a93e5e124962df812078c7b667a913f3f3eb6eea70a89822b
+  metadata.gz: 1a7a9ef0aac59fd6cb345b13c503922ea80232f0eedb8d4eb29ea1d535e04c8a
+  data.tar.gz: 360b3994feec93243b9b4cfadf8fa89416538aafb0fbc927b2db31399cc850e4
 SHA512:
-  metadata.gz: '018bb4433eb59fe6d5485c66512273c7d999a791e0fb6f1fe0934745b0878cab546d6e90f6ad160f16dfa8a0b19a28ebc4e199145684e56c98e7c6c5b0211e96'
-  data.tar.gz: e0dc83543d7ce751e3e66c47fc6055ca6867b8cc9fbbc9b72ab81693279d19a65e6d07c78c99a999804d13f41a73b4f55b6ebf000f122b27494b78b4f076b058
+  metadata.gz: c8782d8a249ee6de70705f806386d1f6fb3afbea4f33451ef7e0337641e87c3b88f0cbc804de35131ef46da8f85e3121a694cd79f4171a912809b0330d5e4e6d
+  data.tar.gz: f051ec5acb746f52c71924d757e35c955715838dfc994c82eb6d2cfaa630bb9b50d8b26c2d8fe7a34d392e06084cf9121906591f8951a0b7feae372093021d0b

data/Rakefile

@@ -3,8 +3,7 @@ require "rubygems"
 require "bundler/setup"
 
 require "rails/version"
-rakefile     = Rails.version.to_f >= 5.2 ? "../rjmc/Rakefile" : "../rjmc4/Rakefile"
-APP_RAKEFILE = File.expand_path(rakefile, __FILE__)
+APP_RAKEFILE = File.expand_path("../rjmc/Rakefile", __FILE__)
 load "rails/tasks/engine.rake"
 
 require "rake/testtask"

data/app/controllers/rocket_job_mission_control/application_controller.rb

@@ -20,7 +20,7 @@ module RocketJobMissionControl
           else
             {roles: %i[admin]}
           end
-        AccessPolicy.new(Authorization.new(@args))
+        AccessPolicy.new(Authorization.new(**@args))
       end
     end
 

data/lib/rocket_job_mission_control/version.rb

@@ -1,3 +1,3 @@
 module RocketJobMissionControl
-  VERSION = "5.0.0".freeze
+  VERSION = "5.0.1".freeze
 end

data/test/controllers/rocket_job_mission_control/application_controller_test.rb

@@ -13,22 +13,14 @@ module RocketJobMissionControl
     describe TestController do
       describe "#with_time_zone" do
         it "uses correct timezone with session and time_zone set" do
-          if Rails.version.to_i >= 5
-            session["time_zone"] = "America/Los_Angeles"
-            get :index
-          else
-            get :index, {}, {"time_zone" => "America/Los_Angeles"}
-          end
+          session["time_zone"] = "America/Los_Angeles"
+          get :index
           assert_equal "America/Los_Angeles", assigns(:time_zone).name
         end
 
         it "uses correct timezone with session, but no time_zone set" do
-          if Rails.version.to_i >= 5
-            session["user_id"] = "42"
-            get :index
-          else
-            get :index, {}, {"user_id" => "42"}
-          end
+          session["user_id"] = "42"
+          get :index
           assert_equal "UTC", assigns(:time_zone).name
         end
 

data/test/controllers/rocket_job_mission_control/dirmon_entries_controller_test.rb

@@ -37,9 +37,7 @@ module RocketJobMissionControl
       describe "PATCH #enable" do
         describe "when transition is allowed" do
           before do
-            params = {id: existing_dirmon_entry.id}
-            params = {params: params} if Rails.version.to_i >= 5
-            patch :enable, params
+            patch :enable, params: {id: existing_dirmon_entry.id}
           end
 
           it do
@@ -54,9 +52,7 @@ module RocketJobMissionControl
         describe "when transition is not allowed" do
           before do
             existing_dirmon_entry.enable!
-            params = {id: existing_dirmon_entry.id}
-            params = {params: params} if Rails.version.to_i >= 5
-            patch :enable, params
+            patch :enable, params: {id: existing_dirmon_entry.id}
           end
 
           it "succeeds" do
@@ -73,9 +69,7 @@ module RocketJobMissionControl
         describe "when transition is allowed" do
           before do
             existing_dirmon_entry.enable!
-            params = {id: existing_dirmon_entry.id}
-            params = {params: params} if Rails.version.to_i >= 5
-            patch :disable, params
+            patch :disable, params: {id: existing_dirmon_entry.id}
           end
 
           it do
@@ -89,9 +83,7 @@ module RocketJobMissionControl
 
         describe "when transition is not allowed" do
           before do
-            params = {id: existing_dirmon_entry.id}
-            params = {params: params} if Rails.version.to_i >= 5
-            patch :disable, params
+            patch :disable, params: {id: existing_dirmon_entry.id}
           end
 
           it "succeeds" do
@@ -108,9 +100,7 @@ module RocketJobMissionControl
         let(:entry_params) { {} }
 
         before do
-          params = entry_params
-          params = {params: entry_params} if Rails.version.to_i >= 5
-          get :new, params
+          get :new, params: entry_params
         end
 
         it "succeeds" do
@@ -163,8 +153,7 @@ module RocketJobMissionControl
         describe "with valid parameters" do
           before do
             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
+            patch :update, params: params
           end
 
           it "redirects to the updated entry" do
@@ -179,8 +168,7 @@ module RocketJobMissionControl
         describe "with invalid parameters" do
           before do
             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
+            patch :update, params: params
           end
 
           it "renders the edit template" do
@@ -209,9 +197,7 @@ module RocketJobMissionControl
           end
 
           before do
-            params = {rocket_job_dirmon_entry: dirmon_params}
-            params = {params: params} if Rails.version.to_i >= 5
-            post :create, params
+            post :create, params: {rocket_job_dirmon_entry: dirmon_params}
           end
 
           it "creates the entry" do
@@ -250,9 +236,7 @@ module RocketJobMissionControl
           end
 
           before do
-            params = {rocket_job_dirmon_entry: dirmon_params}
-            params = {params: params} if Rails.version.to_i >= 5
-            post :create, params
+            post :create, params: {rocket_job_dirmon_entry: dirmon_params}
           end
 
           describe "on model attributes" do
@@ -270,9 +254,7 @@ module RocketJobMissionControl
 
       describe "GET #edit" do
         before do
-          params = {id: existing_dirmon_entry.id}
-          params = {params: params} if Rails.version.to_i >= 5
-          get :edit, params
+          get :edit, params: {id: existing_dirmon_entry.id}
         end
 
         it "succeeds" do
@@ -287,9 +269,7 @@ module RocketJobMissionControl
       describe "GET #show" do
         describe "with an invalid id" do
           before do
-            params = {id: 42}
-            params = {params: params} if Rails.version.to_i >= 5
-            get :show, params
+            get :show, params: {id: 42}
           end
 
           it "redirects" do
@@ -303,9 +283,7 @@ module RocketJobMissionControl
 
         describe "with a valid id" do
           before do
-            params = {id: existing_dirmon_entry.id}
-            params = {params: params} if Rails.version.to_i >= 5
-            get :show, params
+            get :show, params: {id: existing_dirmon_entry.id}
           end
 
           it "succeeds" do
@@ -321,9 +299,7 @@ module RocketJobMissionControl
       describe "DELETE #destroy" do
         describe "with a valid id" do
           before do
-            params = {id: existing_dirmon_entry.id}
-            params = {params: params} if Rails.version.to_i >= 5
-            delete :destroy, params
+            delete :destroy, params: {id: existing_dirmon_entry.id}
           end
 
           it "redirects to index" do
@@ -464,9 +440,7 @@ module RocketJobMissionControl
             %i[admin editor operator manager dirmon].each do |role|
               it "allows role #{role} to access #{method}" do
                 set_role(role)
-                params = {id: existing_dirmon_entry.id}
-                params = {params: params} if Rails.version.to_i >= 5
-                patch :enable, params
+                patch :enable, params: {id: existing_dirmon_entry.id}
 
                 assert_response(:redirect)
               end
@@ -478,9 +452,7 @@ module RocketJobMissionControl
         %i[admin editor operator manager dirmon].each do |role|
           it "creates dirmon entry" do
             set_role(role)
-            params = {rocket_job_dirmon_entry: dirmon_params}
-            params = {params: params} if Rails.version.to_i >= 5
-            post :create, params
+            post :create, params: {rocket_job_dirmon_entry: dirmon_params}
 
             assert_response(:redirect)
           end
@@ -488,9 +460,7 @@ module RocketJobMissionControl
 
         it "deletes dirmon entry" do
           set_role(:admin)
-          params = {id: existing_dirmon_entry.id}
-          params = {params: params} if Rails.version.to_i >= 5
-          delete :destroy, params
+          delete :destroy, params: {id: existing_dirmon_entry.id}
 
           assert_response(:redirect)
         end
@@ -499,9 +469,7 @@ module RocketJobMissionControl
           it "raises authentication error for #{role}" do
             set_role(role)
             assert_raises AccessGranted::AccessDenied do
-              params = {id: existing_dirmon_entry.id}
-              params = {params: params} if Rails.version.to_i >= 5
-              delete :destroy, params
+              delete :destroy, params: {id: existing_dirmon_entry.id}
             end
           end
         end

data/test/controllers/rocket_job_mission_control/jobs_controller_test.rb

@@ -56,9 +56,7 @@ module RocketJobMissionControl
         describe "PATCH ##{state}" do
           describe "with an invalid job id" do
             before do
-              params = {id: 42, job: {id: 42, priority: 12}}
-              params = {params: params} if Rails.version.to_i >= 5
-              patch state, params
+              patch state, params: {id: 42, job: {id: 42, priority: 12}}
             end
 
             it "redirects" do
@@ -81,8 +79,7 @@ module RocketJobMissionControl
                 pausable_job.fail!
               end
               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
+              patch state, params: params
             end
 
             it "redirects to the job" do
@@ -100,9 +97,7 @@ module RocketJobMissionControl
         let(:scheduled_job) { RocketJob::Jobs::SimpleJob.create!(run_at: 2.days.from_now) }
 
         before do
-          params = {id: scheduled_job.id}
-          params = {params: params} if Rails.version.to_i >= 5
-          patch :run_now, params
+          patch :run_now, params: {id: scheduled_job.id}
         end
 
         it "redirects to the job path" do
@@ -117,9 +112,7 @@ module RocketJobMissionControl
       describe "PATCH #update" do
         describe "with an invalid job id" do
           before do
-            params = {id: 42, job: {id: 42, priority: 12}}
-            params = {params: params} if Rails.version.to_i >= 5
-            patch :update, params
+            patch :update, params: {id: 42, job: {id: 42, priority: 12}}
           end
 
           it "redirects" do
@@ -134,8 +127,7 @@ module RocketJobMissionControl
         describe "with a valid job id" do
           before do
             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
+            patch :update, params: params
           end
 
           it "redirects to the job" do
@@ -158,9 +150,7 @@ module RocketJobMissionControl
       describe "GET #show" do
         describe "with an invalid job id" do
           before do
-            params = {id: 42}
-            params = {params: params} if Rails.version.to_i >= 5
-            get :show, params
+            get :show, params: {id: 42}
           end
 
           it "redirects" do
@@ -174,9 +164,7 @@ module RocketJobMissionControl
 
         describe "with a valid job id" do
           before do
-            params = {id: job.id}
-            params = {params: params} if Rails.version.to_i >= 5
-            get :show, params
+            get :show, params: {id: job.id}
           end
 
           it "succeeds" do
@@ -192,9 +180,7 @@ module RocketJobMissionControl
       describe "GET #exception" do
         describe "with an invalid job id" do
           before do
-            params = {id: 42}
-            params = {params: params} if Rails.version.to_i >= 5
-            get :exception, params
+            get :exception, params: {id: 42}
           end
 
           it "redirects" do
@@ -209,9 +195,7 @@ module RocketJobMissionControl
         describe "with a valid job id" do
           describe "without an exception" do
             before do
-              params = {id: failed_job.id, error_type: "Blah"}
-              params = {params: params} if Rails.version.to_i >= 5
-              get :exception, params
+              get :exception, params: {id: failed_job.id, error_type: "Blah"}
             end
 
             it "redirects to job path" do
@@ -225,9 +209,7 @@ module RocketJobMissionControl
 
           describe "with exception" do
             before do
-              params = {id: failed_job.id, error_type: "ArgumentError"}
-              params = {params: params} if Rails.version.to_i >= 5
-              get :exception, params
+              get :exception, params: {id: failed_job.id, error_type: "ArgumentError"}
             end
 
             it "succeeds" do
@@ -404,13 +386,12 @@ module RocketJobMissionControl
               end
 
               @params = {id: pausable_job.id, job: {id: pausable_job.id, priority: pausable_job.priority}}
-              @params = {params: @params} if Rails.version.to_i >= 5
             end
 
             %i[admin editor operator manager].each do |role|
               it "redirects with #{method} method and role #{role}" do
                 set_role(role)
-                patch method, @params
+                patch method, params: @params
                 assert_response(:redirect)
               end
             end
@@ -419,7 +400,7 @@ module RocketJobMissionControl
               it "raises authentication error for #{role}" do
                 set_role(role)
                 assert_raises AccessGranted::AccessDenied do
-                  patch method, @params
+                  patch method, params: @params
                 end
               end
             end
@@ -431,8 +412,7 @@ module RocketJobMissionControl
         describe "with a failed slice" do
           it "access ##{method}" do
             params = {:error_type => "ArgumentError", "record_number" => "9", "id" => failed_job.id}
-            params = {params: params} if Rails.version.to_i >= 5
-            get method, params
+            get method, params: params
             assert_response :success
           end
         end
@@ -441,8 +421,7 @@ module RocketJobMissionControl
       describe "#update slice" do
         before do
           params = {"job" => {"records" => %w[1 2 3]}, "error_type" => "CSV::MalformedCSVError", "offset" => "1", "id" => failed_job.id.to_s}
-          params = {params: params} if Rails.version.to_i >= 5
-          post :update_slice, params
+          post :update_slice, params: params
         end
 
         it "redirects" do

data/test/models/rocket_job_mission_control/job_sanitizer_test.rb

@@ -72,9 +72,15 @@ class JobSanitizerTest < Minitest::Test
         }
         cleansed = RocketJobMissionControl::JobSanitizer.sanitize(properties, @job.class, @job, false)
         assert_equal 1, @job.errors.count
-        assert first = @job.errors.first
-        assert_equal first.first, :properties
-        assert first.second.include?("unexpected token"), first
+        if Rails.version.to_f >= 6.1
+          assert error = @job.errors.first
+          assert_equal error.attribute, :properties
+          assert error.message.include?("unexpected token"), error
+        else
+          assert error = @job.errors.first
+          assert_equal error.first, :properties
+          assert error.second.include?("unexpected token"), error
+        end
         assert_equal({hash_field: "{ bad json }", string: "hello"}, cleansed)
       end
 

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 ENV["RAILS_ENV"] ||= "test"
 
 require "yaml"
-require "awesome_print"
+require "amazing_print"
 require "rails/version"
 if Rails.version.to_f >= 5.2
   require_relative "../rjmc/config/environment"

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob_mission_control
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Michael Cloutier
 - Chris Lamb
 - Jonathan Whittington
 - Reid Morrison
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: access-granted
@@ -86,7 +86,6 @@ dependencies:
 description: Rocket Job Mission Control is the Web user interface to manage Rocket
   Job.
 email:
-- support@rocketjob.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -202,11 +201,11 @@ files:
 - vendor/assets/stylesheets/fontawesome-all.min.css.erb
 - vendor/assets/stylesheets/selectize.bootstrap3.css
 - vendor/assets/stylesheets/selectize.css
-homepage: http://rocketjob.io
+homepage: https://rocketjob.io
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -221,21 +220,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Ruby's missing batch system.
 test_files:
-- test/models/rocket_job_mission_control/job_sanitizer_test.rb
-- test/models/rocket_job_mission_control/query_test.rb
 - test/compare_hashes.rb
-- test/test_helper.rb
-- test/controllers/rocket_job_mission_control/jobs_controller_test.rb
+- test/controllers/rocket_job_mission_control/application_controller_test.rb
 - test/controllers/rocket_job_mission_control/dirmon_entries_controller_test.rb
+- test/controllers/rocket_job_mission_control/jobs_controller_test.rb
 - test/controllers/rocket_job_mission_control/servers_controller_test.rb
-- test/controllers/rocket_job_mission_control/application_controller_test.rb
 - test/helpers/rocket_job_mission_control/application_helper_test.rb
-- test/helpers/rocket_job_mission_control/servers_helper_test.rb
 - test/helpers/rocket_job_mission_control/jobs_helper_test.rb
-- test/helpers/rocket_job_mission_control/slices_helper_test.rb
 - test/helpers/rocket_job_mission_control/pagination_helper_test.rb
+- test/helpers/rocket_job_mission_control/servers_helper_test.rb
+- test/helpers/rocket_job_mission_control/slices_helper_test.rb
+- test/models/rocket_job_mission_control/job_sanitizer_test.rb
+- test/models/rocket_job_mission_control/query_test.rb
+- test/test_helper.rb