marty 2.5.2 → 2.5.4

data/app/components/marty/report_select.rb

@@ -5,18 +5,18 @@ class Marty::ReportSelect < Marty::Form
     c.klass            = Marty::TagGrid
     c.height           = 200
     c.load_inline_data = false
-    c.title            = I18n.t("script.selection_history")
-    c.attributes          = [:name, :created_dt, :comment]
+    c.title            = I18n.t('script.selection_history')
+    c.attributes = [:name, :created_dt, :comment]
     c.bbar             = []
   end
 
   component :script_grid do |c|
     c.height           = 350
     c.klass            = Marty::ScriptGrid
-    c.title            = I18n.t("script.selection_list")
+    c.title            = I18n.t('script.selection_list')
     c.bbar             = []
-    c.attributes          = [:name, :tag]
-    c.scope            = lambda { |r|
+    c.attributes = [:name, :tag]
+    c.scope = lambda { |r|
       r.where("name like '%Report'")
     }
   end
@@ -28,18 +28,18 @@ class Marty::ReportSelect < Marty::Form
 
     c.items =
       [
-       :tag_grid,
-       :script_grid,
-       fieldset(I18n.t("reporting.report_select"),
-                {
-                  xtype:        :netzkeremotecombo,
-                  name:         "nodename",
-                  attr_type:    :string,
-                  virtual:      true,
-                  hide_label:   true,
-                  width:        200,
-                },
-                {},
+        :tag_grid,
+        :script_grid,
+        fieldset(I18n.t('reporting.report_select'),
+                 {
+                   xtype:        :netzkeremotecombo,
+                   name:         'nodename',
+                   attr_type:    :string,
+                   virtual:      true,
+                   hide_label:   true,
+                   width:        200,
+                 },
+                 {},
                 ),
       ]
     c.bbar = nil
@@ -51,7 +51,7 @@ class Marty::ReportSelect < Marty::Form
   end
 
   # FIXME: should be in a library
-  REPORT_ATTR_SET = Set["title", "form", "result", "format"]
+  REPORT_ATTR_SET = Set['title', 'form', 'result', 'format']
 
   def node_list
     sset = Marty::ScriptSet.new root_sess[:selected_tag_id]
@@ -59,26 +59,26 @@ class Marty::ReportSelect < Marty::Form
 
     return [] unless engine
 
-    nodes = engine.enumerate_nodes.select { |n|
+    nodes = engine.enumerate_nodes.select do |n|
       attrs = Set.new(engine.enumerate_attrs_by_node(n))
       attrs.superset? REPORT_ATTR_SET
-    }
+    end
 
-    nodes.map { |node|
-      roles = engine.evaluate(node, "roles") rescue nil
-      next if roles && !roles.any?{ |r| Marty::User.has_role(r) }
+    nodes.map do |node|
+      roles = engine.evaluate(node, 'roles') rescue nil
+      next if roles && !roles.any? { |r| Marty::User.has_role(r) }
 
       begin
-        title, format = engine.evaluate(node, ["title", "format"])
+        title, format = engine.evaluate(node, ['title', 'format'])
         format ? [node, "#{title} (#{format})"] : nil
-      rescue
+      rescue StandardError
         [node, node]
       end
-    }.compact.sort{ |a,b| a[1] <=> b[1]}
+    end.compact.sort { |a, b| a[1] <=> b[1] }
   end
 
   endpoint :get_combobox_options do |params|
-    client.data = node_list if params["attr"] == "nodename"
+    client.data = node_list if params['attr'] == 'nodename'
   end
 
   ######################################################################

data/app/components/marty/reporting.rb

@@ -2,15 +2,15 @@ class Marty::Reporting < Netzke::Base
   def configure(c)
     super
     c.items = [
-               :report_select,
-               :report_form,
-              ]
+      :report_select,
+      :report_form,
+    ]
   end
 
   client_class do |c|
     c.header   = false
     c.layout   = :border
-    c.defaults = {body_style: 'padding:0px'}
+    c.defaults = { body_style: 'padding:0px' }
 
     c.include :reporting
   end

data/app/components/marty/script_form.rb

@@ -8,8 +8,7 @@ class Marty::ScriptForm < Marty::Form
   ######################################################################
 
   endpoint :netzke_load do |params|
-
-    return client.netzke_notify("Permission Denied") unless
+    return client.netzke_notify('Permission Denied') unless
       self.class.has_any_perm?
 
     script_name = params[:script_name]
@@ -23,9 +22,9 @@ class Marty::ScriptForm < Marty::Form
 
     # create an empty record if no script
     js_data = @record ? js_record_data : {
-      "body" => "",
-      "id"   => -1,
-      "meta" => {},
+      'body' => '',
+      'id'   => -1,
+      'meta' => {},
     }
 
     client.netzke_set_form_values(js_data)
@@ -46,45 +45,44 @@ class Marty::ScriptForm < Marty::Form
   ######################################################################
 
   action :apply do |a|
-    a.text     = I18n.t("script_form.save")
-    a.tooltip  = I18n.t("script_form.save")
-    a.icon_cls = "fa fa-save glyph"
+    a.text     = I18n.t('script_form.save')
+    a.tooltip  = I18n.t('script_form.save')
+    a.icon_cls = 'fa fa-save glyph'
     a.disabled = true
   end
 
   endpoint :submit do |params|
-
-    return client.netzke_notify("Permission Denied") unless
+    return client.netzke_notify('Permission Denied') unless
       self.class.has_any_perm?
 
     # copied from corresponding method in form_panel.services
     data = ActiveSupport::JSON.decode(params[:data])
-    data.each_pair do |k,v|
-      data[k] = nil if v.blank? || v == "null"
+    data.each_pair do |k, v|
+      data[k] = nil if v.blank? || v == 'null'
     end
 
-    @record = script = Marty::Script.find_by_id(data["id"])
+    @record = script = Marty::Script.find_by_id(data['id'])
 
     unless script
-      client.netzke_notify "no record"
+      client.netzke_notify 'no record'
       return
     end
 
-    if script.body == data["body"]
-      client.netzke_notify "no save needed"
+    if script.body == data['body']
+      client.netzke_notify 'no save needed'
       # clear the error line if any
       client.set_line_error -1
       return
     end
 
     unless can_save?(script)
-      client.netzke_notify "Permission denied"
+      client.netzke_notify 'Permission denied'
       return
     end
 
     begin
-      dev = Marty::Tag.find_by_name("DEV")
-      Marty::ScriptSet.new(dev).parse_check(script.name, data["body"])
+      dev = Marty::Tag.find_by_name('DEV')
+      Marty::ScriptSet.new(dev).parse_check(script.name, data['body'])
     rescue Delorean::ParseError => exc
       client.netzke_notify exc.message
       client.netzke_apply_form_errors({})
@@ -92,7 +90,7 @@ class Marty::ScriptForm < Marty::Form
       return
     end
 
-    script.body = data["body"]
+    script.body = data['body']
 
     if script.save
       client.netzke_set_form_values(js_record_data)
@@ -105,12 +103,12 @@ class Marty::ScriptForm < Marty::Form
   end
 
   endpoint :do_print do |script_id|
-    return client.netzke_notify("Permission Denied") unless
+    return client.netzke_notify('Permission Denied') unless
       self.class.has_any_perm?
 
     script = Marty::Script.find_by_id(script_id)
 
-    return client.netzke_notify("bad script") unless script
+    return client.netzke_notify('bad script') unless script
 
     begin
       rep_params = {
@@ -118,11 +116,11 @@ class Marty::ScriptForm < Marty::Form
         title: script.name
       }
 
-      path = Marty::Util.gen_report_path("ScriptReport",
-                                         "PrettyScript",
+      path = Marty::Util.gen_report_path('ScriptReport',
+                                         'PrettyScript',
                                          rep_params)
       client.get_report(path)
-    rescue => exc
+    rescue StandardError => exc
       return client.netzke_notify "ERROR: #{exc}"
     end
   end
@@ -130,9 +128,9 @@ class Marty::ScriptForm < Marty::Form
   ######################################################################
 
   action :do_print do |a|
-    a.text     = I18n.t("script_form.print")
-    a.tooltip  = I18n.t("script_form.print")
-    a.icon_cls = "fa fa-print glyph"
+    a.text     = I18n.t('script_form.print')
+    a.tooltip  = I18n.t('script_form.print')
+    a.icon_cls = 'fa fa-print glyph'
   end
 
   ######################################################################
@@ -149,22 +147,22 @@ class Marty::ScriptForm < Marty::Form
   def configure(c)
     super
 
-    c.title = "Script Form"
-    c.model = "Marty::Script"
+    c.title = 'Script Form'
+    c.model = 'Marty::Script'
     c.items =
       [
-       {
-         line_numbers:   true,
-         indent_unit:    4,
-         tab_mode:       "shift",
-         match_brackets: true,
-         hide_label:     true,
-         xtype:          :codemirror,
-         mode:           "text/x-delorean",
-         name:           :body,
-         empty_text:     "No script selected.",
-         getter:         lambda { |r| r.body },
-       },
+        {
+          line_numbers:   true,
+          indent_unit:    4,
+          tab_mode:       'shift',
+          match_brackets: true,
+          hide_label:     true,
+          xtype:          :codemirror,
+          mode:           'text/x-delorean',
+          name:           :body,
+          empty_text:     'No script selected.',
+          getter:         lambda { |r| r.body },
+        },
       ]
   end
 end

data/app/components/marty/script_grid.rb

@@ -1,50 +1,50 @@
 class Marty::ScriptGrid < Marty::Grid
   has_marty_permissions \
-  create: [:dev],
-  read: :any,
-  update: [:dev],
-  delete: [:dev]
+    create: [:dev],
+    read: :any,
+    update: [:dev],
+    delete: [:dev]
 
   def configure(c)
     super
 
-    c.model                  = "Marty::Script"
+    c.model                  = 'Marty::Script'
     c.multi_select           = false
     c.attributes ||= [:name, :created_dt, :tag]
-    c.title   ||= I18n.t('scripts', default: "Scripts")
-    c.store_config.merge!({sorters: [{property: :name, direction: 'ASC'}]})
+    c.title ||= I18n.t('scripts', default: 'Scripts')
+    c.store_config.merge!(sorters: [{ property: :name, direction: 'ASC' }])
   end
 
   def get_records(params)
     begin
       ts = Marty::Tag.map_to_tag(root_sess[:selected_tag_id]).created_dt
       ts = Mcfly.normalize_infinity(ts)
-    rescue
+    rescue StandardError
       # if there are no non-DEV tags we get an exception above
       ts = 'infinity'
     end
 
     tb = model.table_name
     model.where("#{tb}.obsoleted_dt >= ? AND #{tb}.created_dt < ?",
-                     ts, ts).scoping do
+                ts, ts).scoping do
       super
     end
   end
 
   action :delete do |a|
-    a.text     = I18n.t("script_grid.delete")
-    a.tooltip  = I18n.t("script_grid.delete")
-    a.icon_cls = "fa fa-trash glyph"
+    a.text     = I18n.t('script_grid.delete')
+    a.tooltip  = I18n.t('script_grid.delete')
+    a.icon_cls = 'fa fa-trash glyph'
     a.disabled = config[:prohibit_delete]
   end
 
   endpoint :destroy do |params|
-    return client.netzke_notify("Permission Denied") if
+    return client.netzke_notify('Permission Denied') if
       !config[:permissions][:delete]
 
     tag = Marty::Tag.map_to_tag(root_sess[:selected_tag_id])
 
-    return client.netzke_notify("Can only delete in DEV tag") unless
+    return client.netzke_notify('Can only delete in DEV tag') unless
       tag && tag.isdev?
 
     super(params)
@@ -55,15 +55,15 @@ class Marty::ScriptGrid < Marty::Grid
   endpoint :add_window__add_form__submit do |params|
     data = ActiveSupport::JSON.decode(params[:data])
 
-    return client.netzke_notify("Permission Denied") if
+    return client.netzke_notify('Permission Denied') if
       !config[:permissions][:create]
 
     tag = Marty::Tag.map_to_tag(root_sess[:selected_tag_id])
 
-    return client.netzke_notify("Can only add in DEV tag") unless
+    return client.netzke_notify('Can only add in DEV tag') unless
       tag && tag.isdev?
 
-    name = data["name"]
+    name = data['name']
     script = Marty::Script.create_script(name, "# Script #{name}")
 
     if script.valid?
@@ -75,9 +75,9 @@ class Marty::ScriptGrid < Marty::Grid
   end
 
   action :add_in_form do |a|
-    a.text     = I18n.t("script_grid.new")
-    a.tooltip  = I18n.t("script_grid.new")
-    a.icon_cls = "fa fa-plus glyph"
+    a.text     = I18n.t('script_grid.new')
+    a.tooltip  = I18n.t('script_grid.new')
+    a.icon_cls = 'fa fa-plus glyph'
     a.disabled = !config[:permissions][:create]
   end
 
@@ -95,17 +95,17 @@ class Marty::ScriptGrid < Marty::Grid
 
   attribute :name do |c|
     c.flex      = 1
-    c.text      = I18n.t("script_grid.name")
+    c.text      = I18n.t('script_grid.name')
   end
 
   attribute :created_dt do |c|
-    c.text      = I18n.t("script_grid.created_dt")
-    c.format    = "Y-m-d H:i"
+    c.text      = I18n.t('script_grid.created_dt')
+    c.format    = 'Y-m-d H:i'
     c.read_only = true
   end
 
   attribute :tag do |c|
-    c.text      = I18n.t("script_grid.tag")
+    c.text      = I18n.t('script_grid.tag')
     c.flex      = 1
     c.getter    = lambda { |r| r.find_tag.try(:name) }
   end

data/app/components/marty/script_tester.rb

@@ -6,27 +6,27 @@ class Marty::ScriptTester < Marty::Form
 
     c.items =
       [
-       fieldset(I18n.t("script_tester.attributes"),
-                {
-                  name:         "attrs",
-                  xtype:        :textarea,
-                  value:        "",
-                  hide_label:   true,
-                  min_height:   125,
-                },
-                {},
+        fieldset(I18n.t('script_tester.attributes'),
+                 {
+                   name:         'attrs',
+                   xtype:        :textarea,
+                   value:        '',
+                   hide_label:   true,
+                   min_height:   125,
+                 },
+                 {},
                 ),
-       fieldset(I18n.t("script_tester.parameters"),
-                {
-                  name:         "params",
-                  xtype:        :textarea,
-                  value:        "",
-                  hide_label:   true,
-                  min_height:   125,
-                },
-                {},
+        fieldset(I18n.t('script_tester.parameters'),
+                 {
+                   name:         'params',
+                   xtype:        :textarea,
+                   value:        '',
+                   hide_label:   true,
+                   min_height:   125,
+                 },
+                 {},
                 ),
-       :result,
+        :result,
       ]
   end
 
@@ -44,65 +44,63 @@ class Marty::ScriptTester < Marty::Form
   endpoint :submit do |params|
     data = ActiveSupport::JSON.decode(params[:data])
 
-    attrs = data["attrs"].split(';').map(&:strip).reject(&:empty?)
+    attrs = data['attrs'].split(';').map(&:strip).reject(&:empty?)
 
-    pjson = data["params"].split("\n").map(&:strip).reject(&:empty?).map {
-      |s| s.sub(/^([a-z0-9_]*)\s*=/, '"\1": ')
-    }.join(',')
+    pjson = data['params'].split("\n").map(&:strip).reject(&:empty?).map do |s|
+              s.sub(/^([a-z0-9_]*)\s*=/, '"\1": ')
+    end.join(',')
 
     begin
       phash = ActiveSupport::JSON.decode("{ #{pjson} }")
     rescue MultiJson::DecodeError
-      client.netzke_notify "Malformed input parameters"
+      client.netzke_notify 'Malformed input parameters'
       return
     end
 
     engine = new_engine
 
     begin
-      result = attrs.map { |a|
+      result = attrs.map do |a|
         node, attr = a.split('.')
         raise "bad attribute: '#{a}'" if !attr
+
         # Need to clone phash since it's modified by eval.  It can
         # be reused for a given node but not across nodes.
         res = engine.evaluate(node, attr, phash.clone)
         q = CGI::escapeHTML(res.to_json)
         "#{a} = #{q}"
-      }
-
-      client.netzke_notify "done"
-      client.set_result result.join("<br/>")
+      end
 
+      client.netzke_notify 'done'
+      client.set_result result.join('<br/>')
     rescue SystemStackError
-      return client.netzke_notify "System Stack Error"
-
-    rescue => exc
+      return client.netzke_notify 'System Stack Error'
+    rescue StandardError => exc
       res = Delorean::Engine.grok_runtime_exception(exc)
 
-      result = ["Error: #{res['error']}", "Backtrace:"] +
-        res["backtrace"].map {|m, line, fn| "#{m}:#{line} #{fn}"}
+      result = ["Error: #{res['error']}", 'Backtrace:'] +
+        res['backtrace'].map { |m, line, fn| "#{m}:#{line} #{fn}" }
 
-      client.netzke_notify "failed"
-      client.set_result '<font color="red">' + result.join("<br/>") + "</font>"
+      client.netzke_notify 'failed'
+      client.set_result '<font color="red">' + result.join('<br/>') + '</font>'
     end
   end
 
   action :apply do |a|
-    a.text     = I18n.t("script_tester.compute")
-    a.tooltip  = I18n.t("script_tester.compute")
-    a.icon_cls = "fa fa-bug glyph"
+    a.text     = I18n.t('script_tester.compute')
+    a.tooltip  = I18n.t('script_tester.compute')
+    a.icon_cls = 'fa fa-bug glyph'
     a.disabled = false
   end
 
   component :result do |c|
     c.klass       = Marty::Panel
-    c.title       = I18n.t("script_tester.results")
-    c.html        = ""
+    c.title       = I18n.t('script_tester.results')
+    c.html        = ''
     c.flex        = 1
     c.min_height  = 250
     c.auto_scroll = true
   end
-
 end
 
 ScriptTester = Marty::ScriptTester