marty 2.5.2 → 2.5.4

data/app/components/marty/grid_append_only.rb

@@ -6,5 +6,4 @@ class Marty::GridAppendOnly < Marty::McflyGridPanel
     c.editing                = :in_form
     c.permissions[:update]   = false
   end
-
 end

data/app/components/marty/import_type_view.rb

@@ -1,25 +1,25 @@
 class Marty::ImportTypeView < Marty::Grid
   has_marty_permissions \
-  create: :admin,
-  read: :any,
-  update: :admin,
-  delete: :admin
+    create: :admin,
+    read: :any,
+    update: :admin,
+    delete: :admin
 
   def configure(c)
     super
 
-    c.title   = I18n.t('import_type', default: "ImportType")
-    c.model   = "Marty::ImportType"
+    c.title   = I18n.t('import_type', default: 'ImportType')
+    c.model   = 'Marty::ImportType'
     c.attributes =
       [
-       :name,
-       :role__name,
-       :db_model_name,
-       :cleaner_function,
-       :validation_function,
-       :preprocess_function,
+        :name,
+        :role__name,
+        :db_model_name,
+        :cleaner_function,
+        :validation_function,
+        :preprocess_function,
       ]
-    c.store_config.merge!({sorters: [{property: :name, direction: 'ASC'}]})
+    c.store_config.merge!(sorters: [{ property: :name, direction: 'ASC' }])
   end
 
   attribute :name do |c|

data/app/components/marty/import_view.rb

@@ -2,13 +2,15 @@ class Marty::ImportView < Marty::Form
   include Marty::Extras::Layout
 
   action :apply do |a|
-    a.text    = I18n.t("data_import_view.import")
-    a.tooltip = I18n.t("data_import_view.import")
+    a.text    = I18n.t('data_import_view.import')
+    a.tooltip = I18n.t('data_import_view.import')
     a.icon_cls = 'fa fa-database glyph'
   end
 
   def parent_model; end
+
   def import_model; end
+
   def model_view;   end
 
   def initialize args, kwargs
@@ -26,7 +28,7 @@ class Marty::ImportView < Marty::Form
   ######################################################################
 
   def validate
-    return client.netzke_notify("Must provide import data.") if
+    return client.netzke_notify('Must provide import data.') if
       @import_data.empty?
   end
 
@@ -58,16 +60,16 @@ class Marty::ImportView < Marty::Form
   end
 
   endpoint :submit do |params|
-    return client.netzke_notify "No Model View defined" unless @model_view
+    return client.netzke_notify 'No Model View defined' unless @model_view
 
-    return client.netzke_notify "Permission denied" unless
+    return client.netzke_notify 'Permission denied' unless
       @model_view.can_perform_action?(:update)
 
     return client.netzke_notify "Can't import when time-warped" if
       Marty::Util.warped?
 
     @data        = ActiveSupport::JSON.decode(params[:data])
-    @import_data = @data["import_data"] || ""
+    @import_data = @data['import_data'] || ''
     @record      = @parent_model.try(:find_by_id, client_config['parent_id'])
 
     validate                  and return
@@ -76,21 +78,20 @@ class Marty::ImportView < Marty::Form
     begin
       processed = process_import_data
       res       = import(processed)
-      result    = res.map{|k,v| format_message(k,v)}
+      result    = res.map { |k, v| format_message(k, v) }
 
       messages  = post_import
       result << messages if messages
 
-      client.set_result result.join("<br/>")
-
+      client.set_result result.join('<br/>')
     rescue Marty::DataImporter::Error => exc
       result = [
-                "Import failed on line(s): #{exc.lines.join(', ')}",
-                "Error: #{exc.to_s}",
-               ]
+        "Import failed on line(s): #{exc.lines.join(', ')}",
+        "Error: #{exc.to_s}",
+      ]
 
-      client.set_result '<font color="red">' + result.join("<br/>") + "</font>"
-    rescue => e
+      client.set_result '<font color="red">' + result.join('<br/>') + '</font>'
+    rescue StandardError => e
       client.set_result e.message
     end
   end
@@ -111,8 +112,8 @@ class Marty::ImportView < Marty::Form
 
   component :result do |c|
     c.klass       = Marty::Panel
-    c.title       = I18n.t("data_import_view.results")
-    c.html        = ""
+    c.title       = I18n.t('data_import_view.results')
+    c.html        = ''
     c.flex        = 1
     c.min_height  = 150
     c.scrollable = true

data/app/components/marty/log_view.rb

@@ -6,8 +6,8 @@ class Marty::LogView < Marty::Grid
   def configure(c)
     super
 
-    c.title ||= I18n.t('log_viewer', default: "Log Viewer")
-    c.model      = "Marty::Log"
+    c.title ||= I18n.t('log_viewer', default: 'Log Viewer')
+    c.model      = 'Marty::Log'
     c.paging     = :pagination
     c.editing    = :in_form
     c.attributes = [
@@ -17,7 +17,7 @@ class Marty::LogView < Marty::Grid
       :details
     ]
 
-    c.store_config.merge!(sorters: [{property: :timestamp, direction: 'DESC'}])
+    c.store_config.merge!(sorters: [{ property: :timestamp, direction: 'DESC' }])
   end
 
   def default_context_menu
@@ -29,7 +29,7 @@ class Marty::LogView < Marty::Grid
       :timestamp_custom,
       :message_type,
       :message,
-      textarea_field(:details).merge!({height: 400})
+      textarea_field(:details).merge!(height: 400)
     ]
   end
 
@@ -39,13 +39,13 @@ class Marty::LogView < Marty::Grid
   end
 
   attribute :message_type do |c|
-    c.text         = I18n.t("log_grid.message_type")
+    c.text         = I18n.t('log_grid.message_type')
     c.width        = 100
     c.read_only    = true
   end
 
   attribute :message do |c|
-    c.text         = I18n.t("log_grid.message")
+    c.text         = I18n.t('log_grid.message')
     c.width        = 400
     c.read_only    = true
   end
@@ -54,7 +54,7 @@ class Marty::LogView < Marty::Grid
   # UI does not interact well with AR/PG and doesn't display fractional s
   # This work around requires explicit sorting/filtering
   attribute :timestamp_custom do |c|
-    c.text         = I18n.t("log_grid.timestamp")
+    c.text         = I18n.t('log_grid.timestamp')
     c.width        = 200
     c.read_only    = true
     c.filterable = true
@@ -64,26 +64,28 @@ class Marty::LogView < Marty::Grid
       xtype: :displayfield,
     }
     c.getter = lambda { |r| Time.at(r.timestamp) }
-    c.sorting_scope = lambda {|r, dir| r.order("timestamp " + dir.to_s)}
+    c.sorting_scope = lambda { |r, dir| r.order('timestamp ' + dir.to_s) }
 
     # FIXME?: The UI AR/PG DateTime workaround requires the timestamp to be cast
     # to text in order to compare filter input using the LIKE operator.
     # Otherwise it will fail. '<' and '>' functionality is missing.
-    c.filter_with = lambda {|r, v, op|
-      r.where("timestamp::text  #{op} '#{v}%'")}
+    c.filter_with = lambda { |r, v, op|
+      r.where("timestamp::text  #{op} '#{v}%'")
+    }
   end
 
   column :details do |c|
     c.getter = lambda { |r| CGI.escapeHTML(r.details.pretty_inspect) }
-    c.filter_with = lambda {|r, v, op|
-      r.where("details::text  #{op} '%#{v}%'")}
+    c.filter_with = lambda { |r, v, op|
+      r.where("details::text  #{op} '%#{v}%'")
+    }
   end
 
   attribute :details do |c|
-    c.text      = I18n.t("log_grid.details")
+    c.text      = I18n.t('log_grid.details')
     c.width     = 900
     c.read_only = true
-    c.getter    = lambda { |r| r.details.pretty_inspect}
+    c.getter    = lambda { |r| r.details.pretty_inspect }
   end
 end
 

data/app/components/marty/main_auth_app.rb

@@ -26,16 +26,16 @@ class Marty::MainAuthApp < Marty::AuthApp
   end
 
   def self.has_scripting_perm?
-    self.has_admin_perm?
+    has_admin_perm?
   end
 
   def posting_menu
     {
-      text:  warped ? "#{Marty::Util.get_posting.name}" : I18n.t("postings"),
-      name:  "posting",
-      tooltip: "Postings",
-      icon_cls: "fa fa-clock glyph",
-      style: (warped ? "background-color: lightGrey;" : ""),
+      text:  warped ? Marty::Util.get_posting.name.to_s : I18n.t('postings'),
+      name:  'posting',
+      tooltip: 'Postings',
+      icon_cls: 'fa fa-clock glyph',
+      style: (warped ? 'background-color: lightGrey;' : ''),
       menu:  [
         :new_posting,
         :select_posting,
@@ -48,7 +48,7 @@ class Marty::MainAuthApp < Marty::AuthApp
     [
       {
         text: 'Log Maintenance',
-        icon_cls: "fa fa-wrench glyph",
+        icon_cls: 'fa fa-wrench glyph',
         disabled: !self.class.has_admin_perm?,
         menu: [
           :log_view,
@@ -62,7 +62,7 @@ class Marty::MainAuthApp < Marty::AuthApp
     [
       {
         text: 'API Management',
-        icon_cls: "fa fa-fighter-jet glyph",
+        icon_cls: 'fa fa-fighter-jet glyph',
         disabled: !self.class.has_admin_perm?,
         menu: [
           :api_auth_view,
@@ -75,9 +75,9 @@ class Marty::MainAuthApp < Marty::AuthApp
 
   def system_menu
     {
-      text:  I18n.t("system"),
-      icon_cls: "fa fa-wrench glyph",
-      style: "",
+      text:  I18n.t('system'),
+      icon_cls: 'fa fa-wrench glyph',
+      style: '',
       menu:  [
         :import_type_view,
         :user_view,
@@ -91,8 +91,8 @@ class Marty::MainAuthApp < Marty::AuthApp
 
   def applications_menu
     {
-      text: I18n.t("applications"),
-        icon_cls: "fa fa-window-restore glyph",
+      text: I18n.t('applications'),
+        icon_cls: 'fa fa-window-restore glyph',
       menu: [
         :data_grid_view,
         :reporting,
@@ -106,7 +106,7 @@ class Marty::MainAuthApp < Marty::AuthApp
     [
       {
         text: 'Background Jobs',
-        icon_cls: "fa fa-user-clock glyph",
+        icon_cls: 'fa fa-user-clock glyph',
         disabled: !self.class.has_admin_perm?,
         menu: [
           :bg_status,
@@ -153,60 +153,60 @@ class Marty::MainAuthApp < Marty::AuthApp
        self.class.has_user_manager_perm? ? [system_menu, sep] : []) +
       data_menus +
       [
-       applications_menu, sep,
-       posting_menu, sep,
+        applications_menu, sep,
+        posting_menu, sep,
       ] + super
   end
 
   ######################################################################
 
   action :import_type_view do |a|
-    a.text      = I18n.t("import_type")
+    a.text      = I18n.t('import_type')
     a.handler   = :netzke_load_component_by_action
     a.disabled  = !self.class.has_admin_perm?
-    a.icon_cls   = "fa fa-file-import glyph"
+    a.icon_cls = 'fa fa-file-import glyph'
   end
 
   action :scripting do |a|
-    a.text      = I18n.t("scripting")
+    a.text      = I18n.t('scripting')
     a.handler   = :netzke_load_component_by_action
-    a.icon_cls   = "fa fa-code glyph"
+    a.icon_cls = 'fa fa-code glyph'
     a.disabled  = !self.class.has_any_perm?
   end
 
   action :reporting do |a|
-    a.text      = I18n.t("reports")
+    a.text      = I18n.t('reports')
     a.handler   = :netzke_load_component_by_action
-    a.icon_cls   = "fa fa-file-alt glyph"
+    a.icon_cls = 'fa fa-file-alt glyph'
     a.disabled  = !self.class.has_any_perm?
   end
 
   action :promise_view do |a|
-    a.text      = I18n.t("jobs.promise_view")
+    a.text      = I18n.t('jobs.promise_view')
     a.handler   = :netzke_load_component_by_action
-    a.icon_cls   = "fa fa-search glyph"
+    a.icon_cls = 'fa fa-search glyph'
     a.disabled  = !self.class.has_any_perm?
   end
 
   action :user_view do |a|
-    a.text      = I18n.t("user_view")
+    a.text      = I18n.t('user_view')
     a.handler   = :netzke_load_component_by_action
-    a.icon_cls   = "fa fa-users glyph"
+    a.icon_cls = 'fa fa-users glyph'
     a.disabled  = !self.class.has_admin_perm? &&
       !self.class.has_user_manager_perm?
   end
 
   action :event_view do |a|
-    a.text      = I18n.t("event_view")
+    a.text      = I18n.t('event_view')
     a.handler   = :netzke_load_component_by_action
-    a.icon_cls   = "fa fa-bolt glyph"
+    a.icon_cls = 'fa fa-bolt glyph'
     a.disabled  = !self.class.has_admin_perm?
   end
 
   action :config_view do |a|
-    a.text      = I18n.t("config_view")
+    a.text      = I18n.t('config_view')
     a.handler   = :netzke_load_component_by_action
-    a.icon_cls   = "fa fa-cog glyph"
+    a.icon_cls = 'fa fa-cog glyph'
     a.disabled  = !self.class.has_admin_perm? &&
       !self.class.has_user_manager_perm?
   end
@@ -214,15 +214,15 @@ class Marty::MainAuthApp < Marty::AuthApp
   action :api_auth_view do |a|
     a.text      = 'API Auth Management'
     a.handler   = :netzke_load_component_by_action
-    a.icon_cls   = "fa fa-key glyph"
-    a.disabled  = !self.class.has_admin_perm?
+    a.icon_cls = 'fa fa-key glyph'
+    a.disabled = !self.class.has_admin_perm?
   end
 
   action :api_config_view do |a|
     a.text     = 'API Config Management'
     a.tooltip  = 'Manage API behavior and settings'
     a.handler  = :netzke_load_component_by_action
-    a.icon_cls = "fa fa-sliders-h glyph"
+    a.icon_cls = 'fa fa-sliders-h glyph'
     a.disabled = !self.class.has_admin_perm?
   end
 
@@ -230,49 +230,49 @@ class Marty::MainAuthApp < Marty::AuthApp
     a.text     = 'API Log View'
     a.tooltip  = 'View API logs'
     a.handler  = :netzke_load_component_by_action
-    a.icon_cls = "fa fa-pencil-alt glyph"
+    a.icon_cls = 'fa fa-pencil-alt glyph'
     a.disabled = !self.class.has_admin_perm?
   end
 
   action :data_grid_view do |a|
-    a.text      = I18n.t("data_grid_view", default: "Data Grids")
+    a.text      = I18n.t('data_grid_view', default: 'Data Grids')
     a.handler   = :netzke_load_component_by_action
-    a.icon_cls   = "fa fa-table glyph"
-    a.disabled  = !self.class.has_any_perm?
+    a.icon_cls = 'fa fa-table glyph'
+    a.disabled = !self.class.has_any_perm?
   end
 
   action :reload_scripts do |a|
     a.text     = 'Reload Scripts'
     a.tooltip  = 'Reload and tag Delorean scripts'
-    a.icon_cls   = "fa fa-sync-alt glyph"
+    a.icon_cls = 'fa fa-sync-alt glyph'
     a.disabled = !self.class.has_admin_perm?
   end
 
   action :load_seed do |a|
     a.text     = 'Load Seeds'
     a.tooltip  = 'Load Seeds'
-    a.icon_cls   = "fa fa-retweet glyph"
+    a.icon_cls = 'fa fa-retweet glyph'
     a.disabled = !self.class.has_admin_perm?
   end
 
   action :bg_status do |a|
     a.text     = 'Show Delayed Jobs Status'
     a.tooltip  = 'Run delayed_job status script'
-    a.icon_cls   = "fa fa-desktop glyph"
+    a.icon_cls = 'fa fa-desktop glyph'
     a.disabled = !self.class.has_admin_perm?
   end
 
   action :bg_stop do |a|
     a.text     = 'Stop Delayed Jobs'
     a.tooltip  = 'Run delayed_job stop script'
-    a.icon_cls   = "fa fa-skull glyph"
+    a.icon_cls = 'fa fa-skull glyph'
     a.disabled = !self.class.has_admin_perm?
   end
 
   action :bg_restart do |a|
     a.text     = 'Restart Delayed Jobs'
     a.tooltip  = 'Run delayed_job restart script using DELAYED_JOB_PARAMS'
-    a.icon_cls   = "fa fa-power-off glyph"
+    a.icon_cls = 'fa fa-power-off glyph'
     a.disabled = !self.class.has_admin_perm?
   end
 
@@ -280,22 +280,22 @@ class Marty::MainAuthApp < Marty::AuthApp
     a.text     = 'View Log'
     a.tooltip  = 'View Log'
     a.handler  = :netzke_load_component_by_action
-    a.icon_cls   = "fa fa-cog glyph"
+    a.icon_cls = 'fa fa-cog glyph'
     a.disabled = !self.class.has_admin_perm?
   end
 
   action :log_cleanup do |a|
     a.text     = 'Cleanup Log Table'
     a.tooltip  = 'Delete old log records'
-    a.icon_cls   = "fa fa-cog glyph"
+    a.icon_cls = 'fa fa-cog glyph'
     a.disabled = !self.class.has_admin_perm?
   end
 
   ######################################################################
 
   def bg_command(param)
-    e, root, p = ENV['RAILS_ENV'], Rails.root, Marty::Config["RUBY_PATH"]
-    dj_path = Marty::Config["DELAYED_JOB_PATH"] || 'bin/delayed_job'
+    e, root, p = ENV['RAILS_ENV'], Rails.root, Marty::Config['RUBY_PATH']
+    dj_path = Marty::Config['DELAYED_JOB_PATH'] || 'bin/delayed_job'
     cmd = "export RAILS_ENV=#{e};"
     # FIXME: Environment looks to be setup incorrectly - this is a hack
     cmd += "export PATH=#{p}:$PATH;" if p
@@ -307,29 +307,29 @@ class Marty::MainAuthApp < Marty::AuthApp
   endpoint :bg_status do |params|
     cmd = bg_command('status')
     res = `#{cmd}`
-    client.show_detail res.html_safe.gsub("\n","<br/>"), 'Delayed Job Status'
+    client.show_detail res.html_safe.gsub("\n", '<br/>'), 'Delayed Job Status'
   end
 
   endpoint :bg_stop do |params|
-    cmd = bg_command("stop")
+    cmd = bg_command('stop')
     res = `#{cmd}`
-    res = "delayed_job: no instances running. Nothing to stop." if res.length==0
-    client.show_detail res.html_safe.gsub("\n","<br/>"), 'Delayed Job Stop'
+    res = 'delayed_job: no instances running. Nothing to stop.' if res.empty?
+    client.show_detail res.html_safe.gsub("\n", '<br/>'), 'Delayed Job Stop'
   end
 
   endpoint :bg_restart do |params|
-    params = Marty::Config["DELAYED_JOB_PARAMS"] || ""
+    params = Marty::Config['DELAYED_JOB_PARAMS'] || ''
     cmd = bg_command("restart #{params}")
     res = `#{cmd}`
-    client.show_detail res.html_safe.gsub("\n","<br/>"), 'Delayed Job Restart'
+    client.show_detail res.html_safe.gsub("\n", '<br/>'), 'Delayed Job Restart'
   end
 
   endpoint :log_cleanup do |params|
     begin
       Marty::Log.cleanup(params)
-    rescue => e
+    rescue StandardError => e
       res = e.message
-      client.show_detail res.html_safe.gsub("\n","<br/>"), 'Log Cleanup'
+      client.show_detail res.html_safe.gsub("\n", '<br/>'), 'Log Cleanup'
     end
   end
 
@@ -339,14 +339,14 @@ class Marty::MainAuthApp < Marty::AuthApp
   action :new_posting do |a|
     a.text      = I18n.t('new_posting')
     a.tooltip   = I18n.t('new_posting')
-    a.icon_cls   = "fa fa-plus glyph"
+    a.icon_cls = 'fa fa-plus glyph'
     a.disabled  = Marty::Util.warped? || !self.class.has_posting_perm?
   end
 
   action :select_posting do |a|
     a.text      = I18n.t('select_posting')
     a.tooltip   = I18n.t('select_posting')
-    a.icon_cls   = "fa fa-history glyph"
+    a.icon_cls = 'fa fa-history glyph'
   end
 
   endpoint :select_posting do |params|
@@ -359,9 +359,9 @@ class Marty::MainAuthApp < Marty::AuthApp
   end
 
   action :select_now do |a|
-    a.text      = I18n.t('go_to_now')
-    a.icon_cls   = "fa fa-globe glyph"
-    a.disabled  = Marty::Util.get_posting_time == Float::INFINITY
+    a.text = I18n.t('go_to_now')
+    a.icon_cls = 'fa fa-globe glyph'
+    a.disabled = Marty::Util.get_posting_time == Float::INFINITY
   end
 
   ######################################################################