marty 2.5.2 → 2.5.4

data/app/components/marty/main_auth_app/client/main_auth_app.js

@@ -79,7 +79,7 @@
       prompt: true,
       fn: function (btn, value) {
         if (btn == "ok" && value == "STOP") {
-          me.showLoadmask('Stopping delayed job...');
+          me.showLoadMask('Stopping delayed job...');
           me.server.bgStop({});
         }
       }
@@ -96,7 +96,7 @@
       prompt: true,
       fn: function (btn, value) {
         if (btn == "ok" && value == "RESTART") {
-          me.showLoadmask('Restarting delayed job...');
+          me.showLoadMask('Restarting delayed job...');
           me.server.bgRestart({});
         }
       }
@@ -104,7 +104,7 @@
   },
 
   netzkeOnBgStatus: function () {
-    this.showLoadmask('Checking delayed job status...');
+    this.showLoadMask('Checking delayed job status...');
     this.server.bgStatus({});
   },
 

data/app/components/marty/mcfly_grid_panel.rb

@@ -4,14 +4,14 @@ class Marty::McflyGridPanel < Marty::Grid
 
     warped = Marty::Util.warped?
 
-    c.editing  = !warped && c.editing || :none
+    c.editing = !warped && c.editing || :none
 
     [:update, :delete, :create].each do |perm|
       c.permissions[perm] = false if warped
     end
 
     # default sort all Mcfly grids with id
-    c.store_config.merge!({sorters: [{property: :id, direction: 'ASC'}]})
+    c.store_config.merge!(sorters: [{ property: :id, direction: 'ASC' }])
   end
 
   def get_records(params)
@@ -19,9 +19,9 @@ class Marty::McflyGridPanel < Marty::Grid
    tb = model.table_name
 
    model.where("#{tb}.obsoleted_dt >= ? AND #{tb}.created_dt < ?",
-                     ts, ts).scoping do
+               ts, ts).scoping do
       super
-    end
+   end
   end
 
   ######################################################################
@@ -34,7 +34,7 @@ class Marty::McflyGridPanel < Marty::Grid
       assoc_name, assoc_method = c[:name].split('__')
       begin
         aklass = model.reflect_on_association(assoc_name.to_sym).klass
-      rescue
+      rescue StandardError
         raise "trouble finding #{assoc_name} assoc class on #{model}"
       end
       c[:scope] = Mcfly.has_mcfly?(aklass) ?
@@ -49,14 +49,13 @@ class Marty::McflyGridPanel < Marty::Grid
 
   action :dup_in_form do |a|
     a.hidden   = !config[:permissions][:create]
-    a.icon_cls = "fa fa-copy glyph"
+    a.icon_cls = 'fa fa-copy glyph'
     a.disabled = true
   end
 
   # edit-in-form submit with dup support
   endpoint :edit_window__edit_form__submit do |params|
-
-    if params["dup"]
+    if params['dup']
       # FIXME: copied from basepack grid endpoint
       # :add_window__add_form__netzke_submit
 
@@ -80,11 +79,12 @@ class Marty::McflyGridPanel < Marty::Grid
     end
   end
 
-private
+  private
+
   def self.mcfly_scope(sort_column)
     lambda { |r|
       ts = Mcfly.normalize_infinity(Marty::Util.get_posting_time)
-      r.where("obsoleted_dt >= ? AND created_dt < ?", ts, ts).
+      r.where('obsoleted_dt >= ? AND created_dt < ?', ts, ts).
       order(sort_column.to_sym)
     }
   end

data/app/components/marty/new_posting_form.rb

@@ -9,8 +9,8 @@ class Marty::NewPostingForm < Marty::Form
   end
 
   action :apply do |a|
-    a.text     = I18n.t("create_posting")
-    a.tooltip  = I18n.t("create_posting")
+    a.text     = I18n.t('create_posting')
+    a.tooltip  = I18n.t('create_posting')
     a.icon_cls = 'fa fa-clock glyph'
   end
 
@@ -25,16 +25,16 @@ class Marty::NewPostingForm < Marty::Form
   def configure(c)
     super
 
-    c.model = "Marty::Posting"
+    c.model = 'Marty::Posting'
     c.items = [
-               {
-                 name: :posting_type__name,
-                 scope: lambda { |r|
-                   r.where(name: Marty::NewPostingForm.can_perform_actions)
-                 },
-               },
-               :comment,
-              ]
+      {
+        name: :posting_type__name,
+        scope: lambda { |r|
+          r.where(name: Marty::NewPostingForm.can_perform_actions)
+        },
+      },
+      :comment,
+    ]
   end
 end
 

data/app/components/marty/new_posting_window.rb

@@ -14,7 +14,6 @@ class Marty::NewPostingWindow < Netzke::Window::Base
   component :new_posting_form do |c|
     c.header = false
   end
-
 end
 
 NewPostingWindow = Marty::NewPostingWindow

data/app/components/marty/posting_grid.rb

@@ -6,11 +6,11 @@ class Marty::PostingGrid < Marty::Grid
     super
 
     c.header             = false
-    c.model              = "Marty::Posting"
-    c.attributes            = [:name, :created_dt, :user__name, :comment]
-    c.multi_select       = false
-    c.store_config.merge!({sorters: [{property: :created_dt, direction: 'DESC'}],
-                           page_size: 12})
+    c.model              = 'Marty::Posting'
+    c.attributes = [:name, :created_dt, :user__name, :comment]
+    c.multi_select = false
+    c.store_config.merge!(sorters: [{ property: :created_dt, direction: 'DESC' }],
+                           page_size: 12)
   end
 
   client_class do |c|
@@ -19,9 +19,9 @@ class Marty::PostingGrid < Marty::Grid
 
   # hijacking delete button
   action :delete do |a|
-    a.text      = "Select"
-    a.tooltip   = "Select"
-    a.icon_cls  = "fa fa-clock glyph"
+    a.text      = 'Select'
+    a.tooltip   = 'Select'
+    a.icon_cls  = 'fa fa-clock glyph'
     a.disabled  = true
   end
 
@@ -30,8 +30,8 @@ class Marty::PostingGrid < Marty::Grid
   end
 
   action :detail do |a|
-    a.text      = "Detail"
-    a.icon_cls  = "fa fa-th-large glyph"
+    a.text      = 'Detail'
+    a.icon_cls  = 'fa fa-th-large glyph'
     a.handler   = :detail
     a.disabled  = true
   end
@@ -61,8 +61,8 @@ class Marty::PostingGrid < Marty::Grid
   end
 
   attribute :created_dt do |c|
-    c.text      = "Date/Time"
-    c.format    = "Y-m-d H:i"
+    c.text      = 'Date/Time'
+    c.format    = 'Y-m-d H:i'
     c.hidden    = true
   end
 
@@ -73,7 +73,6 @@ class Marty::PostingGrid < Marty::Grid
   attribute :comment do |c|
     c.width     = 100
   end
-
 end
 
 PostingGrid = Marty::PostingGrid

data/app/components/marty/promise_view.rb

@@ -17,10 +17,10 @@ class Marty::PromiseView < Netzke::Tree::Base
 
   def configure(config)
     super
-    config.title = I18n.t("jobs.promise_view")
-    config.model = "Marty::VwPromise"
+    config.title = I18n.t('jobs.promise_view')
+    config.model = 'Marty::VwPromise'
     config.attributes = [
-      {name: :title, xtype: :treecolumn},
+      { name: :title, xtype: :treecolumn },
       :user__login,
       :job_id,
       :start_dt,
@@ -48,20 +48,20 @@ class Marty::PromiseView < Netzke::Tree::Base
   action :clear do |a|
     a.text     = a.tooltip = 'Clear'
     a.disabled = false
-    a.icon_cls = "fa fa-minus glyph"
+    a.icon_cls = 'fa fa-minus glyph'
     a.hidden   = !self.class.has_admin_perm?
   end
 
   action :download do |a|
     a.text     = a.tooltip = 'Download'
     a.disabled = true
-    a.icon_cls = "fa fa-download glyph"
+    a.icon_cls = 'fa fa-download glyph'
   end
 
   action :refresh do |a|
     a.text     = a.tooltip = 'Refresh'
     a.disabled = false
-    a.icon_cls = "fa fa-sync-alt glyph"
+    a.icon_cls = 'fa fa-sync-alt glyph'
   end
 
   endpoint :clear do |params|

data/app/components/marty/report_form.rb

@@ -1,22 +1,21 @@
 class Marty::ReportForm < Marty::Form
-
   # override apply for background generation
   action :apply do |a|
-    a.text     = a.tooltip = I18n.t("reporting.background")
+    a.text     = a.tooltip = I18n.t('reporting.background')
     a.handler  = :netzke_on_apply
-    a.icon_cls = "fa fa-cloud glyph"
+    a.icon_cls = 'fa fa-cloud glyph'
     a.disabled = false
   end
 
   action :foreground do |a|
-    a.text     = a.tooltip = I18n.t("reporting.generate")
-    a.icon_cls = "fa fa-download glyph"
+    a.text     = a.tooltip = I18n.t('reporting.generate')
+    a.icon_cls = 'fa fa-download glyph'
     a.disabled = false
   end
 
   action :link do |a|
-    a.text     = a.tooltip = I18n.t("reporting.link")
-    a.icon_cls = "fa fa-link glyph"
+    a.text     = a.tooltip = I18n.t('reporting.link')
+    a.icon_cls = 'fa fa-link glyph'
     a.disabled = false
   end
 
@@ -31,25 +30,25 @@ class Marty::ReportForm < Marty::Form
   ######################################################################
 
   def self.get_report_engine(params)
-    d_params = ActiveSupport::JSON.decode(params[:data] || "{}")
-    d_params.each_pair do |k,v|
-      d_params[k] = nil if v.blank? || v == "null"
+    d_params = ActiveSupport::JSON.decode(params[:data] || '{}')
+    d_params.each_pair do |k, v|
+      d_params[k] = nil if v.blank? || v == 'null'
     end
 
-    tag_id      = d_params.delete("selected_tag_id")
-    script_name = d_params.delete("selected_script_name")
-    node        = d_params.delete("selected_node")
+    tag_id      = d_params.delete('selected_tag_id')
+    script_name = d_params.delete('selected_script_name')
+    node        = d_params.delete('selected_node')
 
     engine = Marty::ScriptSet.new(tag_id).get_engine(script_name)
 
-    roles = engine.evaluate(node, "roles", {}) rescue nil
+    roles = engine.evaluate(node, 'roles', {}) rescue nil
 
-    if roles && !roles.any?{ |r| Marty::User.has_role(r) }
+    if roles && !roles.any? { |r| Marty::User.has_role(r) }
       # insufficient permissions
       return []
     end
 
-    d_params["p_title"] ||= engine.evaluate(node, "title", {}).to_s
+    d_params['p_title'] ||= engine.evaluate(node, 'title', {}).to_s
 
     [engine, d_params, node]
   end
@@ -57,17 +56,17 @@ class Marty::ReportForm < Marty::Form
   def self.run_eval(params)
     engine, d_params, node = get_report_engine(params)
 
-    raise "Insufficient permissions" unless engine
-    raise "no selected report node" unless String === node
+    raise 'Insufficient permissions' unless engine
+    raise 'no selected report node' unless String === node
 
     begin
-      engine.evaluate(node, "result", d_params)
-    rescue => exc
+      engine.evaluate(node, 'result', d_params)
+    rescue StandardError => exc
       Marty::Util.logger.error "run_eval failed: #{exc.backtrace}"
 
       res = Delorean::Engine.grok_runtime_exception(exc)
-      res["backtrace"] =
-        res["backtrace"].map {|m, line, fn| "#{m}:#{line} #{fn}"}.join('\n')
+      res['backtrace'] =
+        res['backtrace'].map { |m, line, fn| "#{m}:#{line} #{fn}" }.join('\n')
       res
     end
   end
@@ -77,16 +76,16 @@ class Marty::ReportForm < Marty::Form
 
     engine, d_params, node = self.class.get_report_engine(params)
 
-    return client.netzke_notify "Insufficient permissions to run report!" unless
+    return client.netzke_notify 'Insufficient permissions to run report!' unless
       engine
 
     # start background promise to get report result
     engine.background_eval(node,
                            d_params,
-                           ["result", "title", "format"],
-                           )
+                           ['result', 'title', 'format'],
+                          )
 
-    client.netzke_notify "Report can be accessed from the Jobs Dashboard ..."
+    client.netzke_notify 'Report can be accessed from the Jobs Dashboard ...'
   end
 
   ######################################################################
@@ -94,9 +93,9 @@ class Marty::ReportForm < Marty::Form
   client_class do |c|
     # Find the mount path for the Marty engine. FIXME: this is likely
     # very brittle.
-    @@mount_path = Rails.application.routes.routes.detect {
-      |r| r.app.app == Marty::Engine
-    }.format({})
+    @@mount_path = Rails.application.routes.routes.detect do |r|
+                     r.app.app == Marty::Engine
+    end.format({})
 
     c.mount_path = l(<<-JS)
     function() {
@@ -113,11 +112,11 @@ class Marty::ReportForm < Marty::Form
   def eval_form_items(engine, items)
     case items
     when Array
-      items.map {|x| eval_form_items(engine, x)}
+      items.map { |x| eval_form_items(engine, x) }
     when Hash
-      items.each_with_object({}) { |(key, value), result|
+      items.each_with_object({}) do |(key, value), result|
         result[key] = eval_form_items(engine, value)
-      }
+      end
     when String
       items.starts_with?(':') ? items[1..-1].to_sym : items
     when Class
@@ -138,7 +137,7 @@ class Marty::ReportForm < Marty::Form
     super
 
     unless root_sess[:selected_script_name] && root_sess[:selected_node]
-      c.title = "No Report selected."
+      c.title = 'No Report selected.'
       return
     end
 
@@ -150,35 +149,34 @@ class Marty::ReportForm < Marty::Form
 
       items, title, format = engine.
         evaluate(root_sess[:selected_node],
-                       ["form", "title", "format"],
-                       {},
-                       )
+                 ['form', 'title', 'format'],
+                 {},
+                )
 
-      raise "bad form items" unless items.is_a?(Array)
-      raise "bad format" unless
+      raise 'bad form items' unless items.is_a?(Array)
+      raise 'bad format' unless
         Marty::ContentHandler::GEN_FORMATS.member?(format)
-
-    rescue => exc
-      c.title = "ERROR"
+    rescue StandardError => exc
+      c.title = 'ERROR'
       c.items =
         [
-         {
-           field_label: 'Exception',
-           xtype:       :displayfield,
-           name:        'displayfield1',
-           value:       "<span style=\"color:red;\">#{exc}</span>"
-         },
+          {
+            field_label: 'Exception',
+            xtype:       :displayfield,
+            name:        'displayfield1',
+            value:       "<span style=\"color:red;\">#{exc}</span>"
+          },
         ]
       return
     end
 
     # if there's a background_only flag, we disable the foreground submit
     background_only =
-      engine.evaluate(root_sess[:selected_node], "background_only") rescue nil
+      engine.evaluate(root_sess[:selected_node], 'background_only') rescue nil
 
     items = Marty::Xl.symbolize_keys(eval_form_items(engine, items), ':')
 
-    items = [{html: "<br><b>No input is needed for this report.</b>"}] if
+    items = [{ html: '<br><b>No input is needed for this report.</b>' }] if
       items.empty?
 
     # add hidden fields for selected tag/script/node
@@ -186,15 +184,14 @@ class Marty::ReportForm < Marty::Form
               :selected_script_name,
               :selected_node,
               # just for testing
-              :selected_testing,
-             ].map { |f|
+              :selected_testing,].map do |f|
       {
         name:   f,
         xtype:  :textfield,
         hidden: true,
         value:  root_sess[f],
       }
-    }
+    end
 
     c.items              = items
     c.repformat          = format
@@ -202,7 +199,7 @@ class Marty::ReportForm < Marty::Form
     c.reptitle           = title
     c.authenticity_token = controller.send(:form_authenticity_token)
 
-    [:foreground, :link].each{|a| actions[a].disabled = !!background_only}
+    [:foreground, :link].each { |a| actions[a].disabled = !!background_only }
   end
 end