rocketjob_mission_control 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21d26a16d5a42afc84e40b409b784dc9114a0964
-  data.tar.gz: ba1b5b6abdee92bd07e235365edeba6b4d5be340
+  metadata.gz: 1e2dea4081f4b8564cf39e794ebb61274972e1ae
+  data.tar.gz: 9c4f65f8aacdd61122de54aeab93bde9df128ab2
 SHA512:
-  metadata.gz: 603390cc09d91dc638e1014b1121125a2c7438b14e3c360edf1cb666faa434211bcea7aa230d10b9ae934fa62dad0fd03823289b0db9a1ec693e6316fefe43eb
-  data.tar.gz: 51cd9a8828ec473401f1b95dc23c2e0fe56e419d3cb7a965cf86a350ee43d466e55f75bc4ee74d784229e1d8a7bd5ece904072c91d8ac92adfa1d75f06b2505c
+  metadata.gz: 761d5a8c319993ae227fbd42e0730c4d73317ce73126eb5532de3d581f16d5d4167af80d7acdcc502c97c05263482aae2e4f3d6618a1145d266286e86826b30a
+  data.tar.gz: 2ac37a6e727677ff33f4f4d36013b614c818d7c8e25c30fc577806592660934d666efbd9efe2560983f02f81680fad1b5765822eff92c950ef85fc9b101e2f1b

data/app/helpers/rocket_job_mission_control/application_helper.rb

@@ -54,6 +54,8 @@ module RocketJobMissionControl
 
     # Returns the editable field as html for use in editing dynamic fields from a Job class.
     def editable_field_html(klass, field_name, value, f, include_nil_selectors = false)
+      # When editing a job the values are of the correct type.
+      # When editing a dirmon entry values are strings.
       field = klass.fields[field_name.to_s]
       return unless field && field.type
 
@@ -82,13 +84,18 @@ module RocketJobMissionControl
           f.select(field_name, options_for_select(options, options), {include_hidden: false}, {class: 'selectize', multiple: true})
       when 'Mongoid::Boolean'
         name = "#{field_name}_true".to_sym
+        value = value.to_s
         str  = '<div class="radio-buttons">'.html_safe
-        str << f.label(name, 'true')
         str << f.radio_button(field_name, 'true', checked: value == 'true')
-        str << f.label(name, 'false')
-        str << f.radio_button(field_name, 'false', checked: value == 'false')
-        str << f.label(name, 'none')
-        str << f.radio_button(field_name, '', checked: value.blank?)
+        str << ' '.html_safe + f.label(name, 'true')
+        str << ' '.html_safe + f.radio_button(field_name, 'false', checked: value == 'false')
+        str << ' '.html_safe + f.label(name, 'false')
+        # Allow this field to be unset (nil).
+        if include_nil_selectors
+          str << ' '.html_safe + f.radio_button(field_name, '', checked: value == '')
+          str << ' '.html_safe + f.label(name, 'nil')
+        end
+
         str << '</div>'.html_safe
       else
         "[#{field.type.name}]".html_safe +

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

@@ -23,7 +23,7 @@
 <%
   remaining = {}
   status.each_pair do |key, value|
-    next if value.blank? || ['state', '_type', 'sub_state'].include?(key)
+    next if ((value != false) && value.blank?) || ['state', '_type', 'sub_state'].include?(key)
     if value.kind_of?(Hash) || value.kind_of?(Array)
       remaining[key] = value
       next

data/lib/rocket_job_mission_control/version.rb

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

data/test/models/rocket_job_mission_control/job_sanitizer_test.rb

@@ -39,52 +39,52 @@ class JobSanitizerTest < Minitest::Test
 
       it 'nils blank values' do
         properties = {
-          string:    '',
-          integer:   '',
-          symbol:    '',
-          hash:      '',
-          secure:    'Not permissible',
-          log_level: ''
+          string:     '',
+          integer:    '',
+          symbol:     '',
+          hash_field: '',
+          secure:     'Not permissible',
+          log_level:  ''
         }
         cleansed   = RocketJobMissionControl::JobSanitizer.sanitize(properties, @job.class, @job, true)
         assert_equal 0, @job.errors.count, @job.errors
         assert_equal 5, cleansed.count
-        assert_equal({log_level: nil, hash: nil, integer: nil, string: nil, symbol: nil}, cleansed)
+        assert_equal({log_level: nil, hash_field: nil, integer: nil, string: nil, symbol: nil}, cleansed)
       end
 
       it 'parses JSON' do
         properties = {
-          string: '',
-          secure: 'Not permissible',
-          hash:   '{"state":"FL"}'
+          string:     '',
+          secure:     'Not permissible',
+          hash_field: '{"state":"FL"}'
         }
         cleansed   = RocketJobMissionControl::JobSanitizer.sanitize(properties, @job.class, @job, false)
         assert_equal 0, @job.errors.count
         assert_equal 1, cleansed.count
-        assert_equal({'state' => 'FL'}, cleansed[:hash])
+        assert_equal({'state' => 'FL'}, cleansed[:hash_field])
       end
 
       it 'sets the error for invalid JSON' do
         properties = {
-          string: 'hello',
-          secure: 'Not permissible',
-          hash:   '{ bad json }'
+          string:     'hello',
+          secure:     'Not permissible',
+          hash_field: '{ bad json }'
         }
         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
-        assert_equal({hash: "{ bad json }", string: 'hello'}, cleansed)
+        assert_equal({hash_field: "{ bad json }", string: 'hello'}, cleansed)
       end
 
       it 'Keeps empty JSON Hash' do
         properties = {
-          hash: '{ }'
+          hash_field: '{ }'
         }
         cleansed   = RocketJobMissionControl::JobSanitizer.sanitize(properties, @job.class, @job, false)
         assert_equal 0, @job.errors.count
-        assert_equal({hash: {}}, cleansed)
+        assert_equal({hash_field: {}}, cleansed)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob_mission_control
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Michael Cloutier
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails