rocketjob_mission_control 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ff7099675d3802372152b41b82769566fcf3df6
-  data.tar.gz: d17f574159a6131d1d04205a95f18a489f73807d
+  metadata.gz: bf3f175879f9c5c41ad2605e8eb0aadf7b8d421f
+  data.tar.gz: b174ffaaea347559f3861637f8d12a0f8f036e67
 SHA512:
-  metadata.gz: c33b38c9d1af21c2b95ef9bd07bdb44d214184d35e2e090e13644e805dd1790e5ae31e26d3cf75f26c01ae838af846872fec4f055ee912cc6b6be4fd0839b847
-  data.tar.gz: ab1f2c52cca08f82134525b78197485a210b863005600ac62542c8ebc8d158ca297263e8e632dfea1ed71f6e80fdf4eda81f2a173d0e132a53dd6a07701464ea
+  metadata.gz: 0d3b9d611da368ba9cf1ae20d8f88dcf75bc6ca81e436d53a7de164e7ea7b893bf7d58f11d9c1920b5fd8fe1678481251ba8b811eebfd80e60cc24a5a91ad71a
+  data.tar.gz: 8162e76e4b9c41833cc848d68496156ad7128587754acbdb0eb778d6df7cb5532f221d1914fbbfa3aa747942e724d8fd566e34ecd239ef00578f8ba281cd4fae

data/app/assets/javascripts/rocket_job_mission_control/dirmon_entries.js.coffee

@@ -8,8 +8,7 @@ $(document).on 'ready', ->
 
   if $('#properties').length
     $('#properties').on 'click', ->
-      job_class_name  = $('#rocket_job_dirmon_entry_job_class_name').val()
-      perform_method  = $('#rocket_job_dirmon_entry_perform_method').val()
-      new_dirmon_path = $('#properties').data('url') + "?job_class_name=#{job_class_name}&perform_method=#{perform_method}"
+      params = $('#new_rocket_job_dirmon_entry').serialize()
+      new_dirmon_path = $('#properties').data('url') + "?#{params}"
       window.location = new_dirmon_path
 

data/app/controllers/rocket_job_mission_control/dirmon_entries_controller.rb

@@ -12,12 +12,11 @@ module RocketJobMissionControl
     end
 
     def new
-      job_class_name            = params[:job_class_name]
-      perform_method            = params[:perform_method] || :perform
-      @dirmon_entry             = RocketJob::DirmonEntry.new(arguments: nil, job_class_name: job_class_name, perform: perform_method)
+      dirmon_params.reverse_merge!(perform_method: :perform)
+      @dirmon_entry             = RocketJob::DirmonEntry.new(dirmon_params)
       @previous_job_class_names = RocketJob::DirmonEntry.distinct(:job_class_name)
 
-      if job_class_name && !@dirmon_entry.job_class
+      if dirmon_params[:job_class_name] && !@dirmon_entry.job_class
         @dirmon_entry.errors.add(:job_class_name, 'Invalid Job Class')
       end
     end
@@ -163,9 +162,9 @@ module RocketJobMissionControl
 
     def dirmon_params
       params
-        .require(:rocket_job_dirmon_entry)
+        .fetch(:rocket_job_dirmon_entry, {})
         .permit(:name, :archive_directory, :pattern, :job_class_name, :perform_method).tap do |whitelist|
-        whitelist[:properties] = params[:rocket_job_dirmon_entry][:properties] if params[:rocket_job_dirmon_entry][:properties]
+        whitelist[:properties] = params[:rocket_job_dirmon_entry][:properties] if params.fetch(:rocket_job_dirmon_entry, {})[:properties]
       end
     end
 

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

@@ -4,7 +4,7 @@
     Menu
 
 
-  = link_to main_app.root_path, class: 'btn btn-default btn-blank last' do
+  = link_to '..', class: 'btn btn-default btn-blank last' do
     %i.fa.fa-reply
     Back Home
 

data/app/views/rocket_job_mission_control/jobs/running.html.haml

@@ -14,7 +14,7 @@
           .info
             .progress
               .progress-bar{ style: "width: #{job.percent_complete}%; min-width: 1em;", title: "#{job.percent_complete}% percent complete."}
-          - if job.kind_of?(RocketJob::SlicedJob)
+          - if defined?(RocketJob::SlicedJob) && job.kind_of?(RocketJob::SlicedJob)
             .slice_count
               %label Slices Running:
               = job.input.find_all { |s| s.state == :running }.count
@@ -24,7 +24,7 @@
               = job.worker_name
 
           = render partial: 'status', locals: { job: job }
-        - if job.kind_of?(RocketJob::SlicedJob)
+        - if defined?(RocketJob::SlicedJob) && job.kind_of?(RocketJob::SlicedJob)
           %table.table
             %tr
               %th worker

data/app/views/rocket_job_mission_control/jobs/show.html.haml

@@ -46,7 +46,7 @@
         - if valid_events.include?(:retry)
           = job_action_link('retry', rocket_job_mission_control.retry_job_path(@job), :patch)
 
-        - if @job.failed? && @job.kind_of?(RocketJob::SlicedJob) && @job.input.failed_count > 0
+        - if @job.failed? && defined?(RocketJob::SlicedJob) && @job.kind_of?(RocketJob::SlicedJob) && @job.input.failed_count > 0
           = link_to("view errors", job_failures_path(@job), class: 'btn btn-default')
 
       .clearfix

data/lib/rocket_job_mission_control/version.rb

@@ -1,3 +1,3 @@
 module RocketJobMissionControl
-  VERSION = '1.2.3'
+  VERSION = '1.2.4'
 end

data/spec/controllers/dirmon_entries_controller_spec.rb

@@ -108,27 +108,39 @@ module RocketJobMissionControl
         expect(assigns(:dirmon_entry)).to_not be_persisted
       end
 
-      context 'with a valid job_class_name' do
-        let(:entry_params) { { job_class_name: 'FakeButGoodJob' } }
+      context 'with form params' do
+        let(:entry_params) { { rocket_job_dirmon_entry: { name: 'new entry' } } }
 
         it { expect(response.status).to eq(200) }
 
-        it 'assigns the job class' do
+        it 'assigns the params to new entry' do
           expect(assigns(:dirmon_entry)).to be_present
-          expect(assigns(:dirmon_entry).job_class).to eq(FakeButGoodJob)
+          expect(assigns(:dirmon_entry).name).to eq('new entry')
         end
-      end
 
-      context 'with an invalid job_class_name' do
-        let(:entry_params) { { job_class_name: 'BadJob' } }
+        context 'with a valid job_class_name' do
+          let(:entry_params) { { rocket_job_dirmon_entry: { job_class_name: 'FakeButGoodJob' } } }
 
-        it { expect(response.status).to eq(200) }
+          it { expect(response.status).to eq(200) }
 
-        it 'adds an error' do
-          expect(assigns(:dirmon_entry)).to be_present
-          expect(assigns(:dirmon_entry).errors[:job_class_name]).to be_present
+          it 'assigns the job class' do
+            expect(assigns(:dirmon_entry)).to be_present
+            expect(assigns(:dirmon_entry).job_class).to eq(FakeButGoodJob)
+          end
+        end
+
+        context 'with an invalid job_class_name' do
+          let(:entry_params) { { rocket_job_dirmon_entry: { job_class_name: 'BadJob' } } }
+
+          it { expect(response.status).to eq(200) }
+
+          it 'adds an error' do
+            expect(assigns(:dirmon_entry)).to be_present
+            expect(assigns(:dirmon_entry).errors[:job_class_name]).to be_present
+          end
         end
       end
+
     end
 
     describe 'PATCH #update' do

data/spec/dummy/log/development.log

@@ -1,4 +0,0 @@
-MONGODB [DEBUG] Logging level is currently :debug which could negatively impact client-side performance. You should set your logging level no lower than :info in production.
-MONGODB (0.5ms) admin['$cmd'].find({:isMaster=>1}).limit(-1)
-MONGODB [DEBUG] Logging level is currently :debug which could negatively impact client-side performance. You should set your logging level no lower than :info in production.
-MONGODB (0.4ms) admin['$cmd'].find({:isMaster=>1}).limit(-1)