marty 2.5.2 → 2.5.4

data/app/components/marty/scripting.rb

@@ -1,31 +1,30 @@
 class Marty::Scripting < Netzke::Base
-
   def configure(c)
     super
 
     c.items =
       [
-       :script_form,
-       {
-         xtype: "tabpanel",
-         active_tab: 0,
-         region: :center,
-         split: true,
-         items: [
-                 {
-                   title: I18n.t("script.selection"),
-                   layout: {
-                     type: :vbox,
-                     align: :stretch,
-                   },
-                   items: [
-                           :tag_grid,
-                           :script_grid,
-                          ],
-                 },
-                 :script_tester,
-                ],
-       },
+        :script_form,
+        {
+          xtype: 'tabpanel',
+          active_tab: 0,
+          region: :center,
+          split: true,
+          items: [
+            {
+              title: I18n.t('script.selection'),
+              layout: {
+                type: :vbox,
+                align: :stretch,
+              },
+              items: [
+                :tag_grid,
+                :script_grid,
+              ],
+            },
+            :script_tester,
+          ],
+        },
       ]
   end
 
@@ -49,19 +48,19 @@ class Marty::Scripting < Netzke::Base
     c.width            = 400
     c.height           = 300
     c.load_inline_data = false
-    c.title            = I18n.t("script.selection_history")
+    c.title            = I18n.t('script.selection_history')
   end
 
   component :script_grid do |c|
     c.width            = 400
     c.klass            = Marty::ScriptGrid
-    c.title            = I18n.t("script.selection_list")
+    c.title            = I18n.t('script.selection_list')
     c.flex             = 1
   end
 
   component :script_form do |c|
     c.klass            = Marty::ScriptForm
-    c.title            = I18n.t("script.detail")
+    c.title            = I18n.t('script.detail')
     c.flex             = 1
     c.split            = true
     c.region           = :west
@@ -69,10 +68,9 @@ class Marty::Scripting < Netzke::Base
 
   component :script_tester do |c|
     c.klass            = Marty::ScriptTester
-    c.title            = I18n.t("script.tester")
+    c.title            = I18n.t('script.tester')
     c.flex             = 1
   end
-
 end
 
 Scripting = Marty::Scripting

data/app/components/marty/simple_app.rb

@@ -6,13 +6,23 @@
 # * AJAX activity indicator
 #
 # == Extending SimpleApp
-# You may want to extend SimpleApp to provide a custom layout. Make sure you create three regions with predefined itemId's that will be used by SimpleApp. You can use the following methods defined by SimpleApp: main_panel_config, status_bar_config, and menu_bar_config, e.g.:
+# You may want to extend SimpleApp to provide a custom layout.
+# Make sure you create three regions with predefined itemId's
+# that will be used by SimpleApp.
+# You can use the following methods defined by SimpleApp:
+# main_panel_config, status_bar_config, and menu_bar_config,
+# e.g.:
 #
 #     class MySimpleApp < Netzke::Basepack::SimpleApp
 #
 #       def configuration
 #         super.merge(
-#           :items => [my_custom_navigation_config, main_panel_config, menu_bar_config, status_bar_config]
+#           :items => [
+#             my_custom_navigation_config,
+#             main_panel_config,
+#             menu_bar_config,
+#             status_bar_config
+#           ]
 #         )
 #       end
 #
@@ -27,12 +37,17 @@
 #       ...
 #     end
 #
-# The JS side of the component will have those regions referenced as this.mainPanel, this.statusBar, and this.menuBar.
+# The JS side of the component will have those regions referenced as
+# this.mainPanel, this.statusBar, and this.menuBar.
 class Marty::SimpleApp < Netzke::Base
   client_class do |c|
-    c.extend = "Ext.container.Viewport"
+    c.extend = 'Ext.container.Viewport'
     c.layout = :border
-    c.require Netzke::Core.ext_path.join("packages/ux/classic/src/statusbar/StatusBar.js"), :statusbar_ext
+    c.require(
+      Netzke::Core.ext_path.join('packages/ux/classic/src/statusbar/StatusBar.js'),
+      :statusbar_ext
+    )
+
     c.include :simple_app
   end
 
@@ -43,7 +58,7 @@ class Marty::SimpleApp < Netzke::Base
 
   # In Ext 4.1 calling `render` on a viewport causes an error
   def js_component_render
-    ""
+    ''
   end
 
   # Override for custom menu
@@ -68,8 +83,8 @@ class Marty::SimpleApp < Netzke::Base
       :region => 'south',
       :statusAlign => 'right',
       :busyText => 'Busy...',
-      :default_text => "Ready",
-      :default_icon_cls => ""
+      :default_text => 'Ready',
+      :default_icon_cls => ''
     }.merge(overrides)
   end
 
@@ -77,7 +92,7 @@ class Marty::SimpleApp < Netzke::Base
   def menu_bar_config(overrides = {})
     {
       :itemId => 'menu_bar',
-      :layout => {overflow_handler: 'Menu'},
+      :layout => { overflow_handler: 'Menu' },
       :xtype => 'toolbar',
       :region => 'north',
       :items => menu

data/app/components/marty/tag_grid.rb

@@ -1,30 +1,30 @@
 class Marty::TagGrid < Marty::Grid
   has_marty_permissions \
-  read:   :any,
-  create: :dev
+    read:   :any,
+    create: :dev
 
   def configure(c)
     super
 
     c.header       = false
-    c.model        = "Marty::Tag"
+    c.model        = 'Marty::Tag'
     c.multi_select = false
 
     c.attributes ||= [:name, :created_dt, :user__name, :comment]
 
-    c.store_config.merge!({sorters: [{property: :created_dt,
-                                      direction: 'DESC'}]})
+    c.store_config.merge!(sorters: [{ property: :created_dt,
+                                      direction: 'DESC' }])
   end
 
   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]
 
     # FIXME: disallow tag creation when no script has been modified?
 
-    tag = Marty::Tag.do_create(nil, data["comment"])
+    tag = Marty::Tag.do_create(nil, data['comment'])
 
     if tag.valid?
       client.success = true
@@ -36,9 +36,9 @@ class Marty::TagGrid < Marty::Grid
   end
 
   action :add_in_form do |a|
-    a.text     = I18n.t("tag_grid.new")
-    a.tooltip  = I18n.t("tag_grid.new")
-    a.icon_cls = "fa fa-clock glyph"
+    a.text     = I18n.t('tag_grid.new')
+    a.tooltip  = I18n.t('tag_grid.new')
+    a.icon_cls = 'fa fa-clock glyph'
     a.disabled = !config[:permissions][:create]
   end
 
@@ -58,8 +58,8 @@ class Marty::TagGrid < 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
 
@@ -71,7 +71,6 @@ class Marty::TagGrid < Marty::Grid
     c.width  = 100
     c.flex   = 1
   end
-
 end
 
 TagGrid = Marty::TagGrid

data/app/components/marty/user_view.rb

@@ -7,11 +7,11 @@ module Marty; class UserView < Marty::Grid
   # list of columns to be displayed in the grid view
   def self.user_columns
     [
-     :login,
-     :firstname,
-     :lastname,
-     :active,
-     :roles,
+      :login,
+      :firstname,
+      :lastname,
+      :active,
+      :roles,
     ]
   end
 
@@ -19,12 +19,12 @@ module Marty; class UserView < Marty::Grid
     super
 
     c.attributes   ||= self.class.user_columns
-    c.title        ||= I18n.t('users', default: "Users")
-    c.model          = "Marty::User"
+    c.title        ||= I18n.t('users', default: 'Users')
+    c.model          = 'Marty::User'
     c.editing        = :in_form
     c.paging         = :pagination
     c.multi_select   = false
-    c.store_config.merge!(sorters: [{property: :login,
+    c.store_config.merge!(sorters: [{ property: :login,
                                      direction: 'ASC',
                                     }]) if c.attributes.include?(:login)
     c.scope = ->(arel) { arel.includes(:roles) }
@@ -39,22 +39,22 @@ module Marty; class UserView < Marty::Grid
     end
 
     # set new roles
-    user.roles = Role.select {
-      |r| roles.include? I18n.t("roles.#{r.name}")
+    user.roles = Role.select { |r|
+                   roles.include? I18n.t("roles.#{r.name}")
     }
   end
 
   def self.create_edit_user(data)
     # Creates initial place-holder user object and validate
-    user = data["id"].nil? ? User.new : User.find(data["id"])
+    user = data['id'].nil? ? User.new : User.find(data['id'])
 
-    self.user_columns.each {
-      |c| user.send("#{c}=", data[c.to_s]) unless c == :roles
-    }
+    user_columns.each do |c|
+      user.send("#{c}=", data[c.to_s]) unless c == :roles
+    end
 
     if user.valid?
       user.save
-      set_roles(data["roles"], user)
+      set_roles(data['roles'], user)
     end
 
     user
@@ -66,10 +66,10 @@ module Marty; class UserView < Marty::Grid
   endpoint :add_window__add_form__submit do |params|
     data = ActiveSupport::JSON.decode(params[:data])
 
-    data["id"] = nil
+    data['id'] = nil
 
     unless self.class.can_perform_action?(:create)
-      client.netzke_notify "Permission Denied"
+      client.netzke_notify 'Permission Denied'
       return
     end
 
@@ -85,7 +85,7 @@ module Marty; class UserView < Marty::Grid
   endpoint :edit_window__edit_form__submit do |params|
     data = ActiveSupport::JSON.decode(params[:data])
     unless self.class.can_perform_action?(:update)
-      client.netzke_notify "Permission Denied"
+      client.netzke_notify 'Permission Denied'
       return
     end
 
@@ -100,19 +100,19 @@ module Marty; class UserView < Marty::Grid
 
   action :add do |a|
     super(a)
-    a.text     = I18n.t("user_grid.new")
-    a.tooltip  = I18n.t("user_grid.new")
-    a.icon_cls = "fa fa-user-plus glyph"
+    a.text     = I18n.t('user_grid.new')
+    a.tooltip  = I18n.t('user_grid.new')
+    a.icon_cls = 'fa fa-user-plus glyph'
   end
 
   action :edit do |a|
     super(a)
-    a.icon_cls = "fa fa-user-cog glyph"
+    a.icon_cls = 'fa fa-user-cog glyph'
   end
 
   action :delete do |a|
     super(a)
-    a.icon_cls = "fa fa-user-minus glyph"
+    a.icon_cls = 'fa fa-user-minus glyph'
   end
 
   def default_context_menu
@@ -121,46 +121,46 @@ module Marty; class UserView < Marty::Grid
 
   attribute :login do |c|
     c.width   = 100
-    c.label   = I18n.t("user_grid.login")
+    c.label   = I18n.t('user_grid.login')
   end
 
   attribute :firstname do |c|
     c.width   = 100
-    c.label   = I18n.t("user_grid.firstname")
+    c.label   = I18n.t('user_grid.firstname')
   end
 
   attribute :lastname do |c|
     c.width   = 100
-    c.label   = I18n.t("user_grid.lastname")
+    c.label   = I18n.t('user_grid.lastname')
   end
 
   attribute :active do |c|
     c.width   = 60
-    c.label   = I18n.t("user_grid.active")
+    c.label   = I18n.t('user_grid.active')
   end
 
   attribute :roles do |c|
     c.width   = 100
     c.flex    = 1
-    c.label   = I18n.t("user_grid.roles")
+    c.label   = I18n.t('user_grid.roles')
     c.type    = :string,
 
-    c.getter = lambda do |r|
-      r.roles.map { |ur| I18n.t("roles.#{ur.name}") }.sort
-    end
+                c.getter = lambda do |r|
+                  r.roles.map { |ur| I18n.t("roles.#{ur.name}") }.sort
+                end
 
     c.editor_config = {
       multi_select: true,
-      empty_text:   I18n.t("user_grid.select_roles"),
-      store:        Role.pluck(:name).map {|n| I18n.t("roles.#{n}")}.sort,
+      empty_text:   I18n.t('user_grid.select_roles'),
+      store:        Role.pluck(:name).map { |n| I18n.t("roles.#{n}") }.sort,
       type:         :string,
       xtype:        :combo,
     }
   end
 
   attribute :created_dt do |c|
-    c.label     = I18n.t("user_grid.created_dt")
-    c.format    = "Y-m-d H:i"
+    c.label     = I18n.t('user_grid.created_dt')
+    c.format    = 'Y-m-d H:i'
     c.read_only = true
   end
 end; end

data/app/controllers/marty/application_controller.rb

@@ -12,7 +12,7 @@ class Marty::ApplicationController < ActionController::Base
   end
 
   before_action :session_expiration,
-  :user_setup
+                :user_setup
 
   def get_conf
     Rails.configuration.marty
@@ -101,7 +101,7 @@ class Marty::ApplicationController < ActionController::Base
       cookies.delete :autologin
       Marty::Token.where(user_id: Marty::User.current.id).delete_all unless
         Marty::Util.db_in_recovery?
-      self.set_user(nil)
+      set_user(nil)
     end
   end
 
@@ -120,7 +120,6 @@ class Marty::ApplicationController < ActionController::Base
   def successful_authentication(user)
     logger.info("Successful authentication for '#{user.login}' " +
                 "from #{request.remote_ip} at #{Time.now.utc}")
-    self.set_user(user)
+    set_user(user)
   end
-
 end

data/app/controllers/marty/components_controller.rb

@@ -8,7 +8,7 @@ class Marty::ComponentsController < Marty::ApplicationController
 
     return redirect_to root_path unless component
 
-    cname = component.gsub("::", "_").underscore
+    cname = component.gsub('::', '_').underscore
     render layout: true,
     inline: "<%= netzke :#{cname}, class_name: '#{component}', height: 650 %>"
   end

data/app/controllers/marty/delayed_job_controller.rb

@@ -8,6 +8,7 @@ class Marty::DelayedJobController < ActionController::Base
 
   def delayed_job
     return unless params['id'].present?
+
     @delayed_job ||= ::Delayed::Job.find_by(id: params['id'])
   end
 

data/app/controllers/marty/diagnostic/controller.rb

@@ -6,16 +6,14 @@ module Marty::Diagnostic; class Controller < ActionController::Base
   end
 
   def op
-    begin
       @result = Reporter.run(request)
-    rescue NameError
+  rescue NameError
       render file: 'public/400', formats: [:html], status: 400, layout: false
-    else
+  else
       respond_to do |format|
-        format.html {@result = display_parameters}
-        format.json {render json: process_result_for_api}
+        format.html { @result = display_parameters }
+        format.json { render json: process_result_for_api }
       end
-    end
   end
 
   def process_result_for_api