marty 2.5.2 → 2.5.4

data/app/components/marty/data_grid_view.rb

@@ -10,7 +10,7 @@ module Marty; class DataGridView < McflyGridPanel
   # handles so they can be used by various other components
   # FIXME: add the ability to pull specific functions
   # from other component javascripts or add a base to pull from
-  def self.show_grid_js(options={})
+  def self.show_grid_js(options = {})
     dg        = options[:data_grid] || 'data_grid'
     title_str = options[:title_str] || 'Data Grid'
 
@@ -71,18 +71,18 @@ module Marty; class DataGridView < McflyGridPanel
     super
 
     c.title   = I18n.t('data_grid')
-    c.model   = "Marty::DataGrid"
+    c.model   = 'Marty::DataGrid'
     c.attributes =
       [
-       :name,
-       :vcols,
-       :hcols,
-       :lenient,
-       :data_type,
-       :created_dt,
+        :name,
+        :vcols,
+        :hcols,
+        :lenient,
+        :data_type,
+        :created_dt,
       ]
 
-    c.store_config.merge!({sorters:  [{property: :name, direction: 'ASC'}]})
+    c.store_config.merge!(sorters:  [{ property: :name, direction: 'ASC' }])
     c.editing      = :in_form
     c.paging       = :pagination
     c.multi_select = false
@@ -91,14 +91,14 @@ module Marty; class DataGridView < McflyGridPanel
   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]
 
     begin
-      DataGrid.create_from_import(data["name"], data["export"])
+      DataGrid.create_from_import(data['name'], data['export'])
       client.success = true
       client.netzke_on_submit_success
-    rescue => exc
+    rescue StandardError => exc
       client.netzke_notify(exc.to_s)
     end
   end
@@ -106,20 +106,20 @@ module Marty; class DataGridView < McflyGridPanel
   endpoint :edit_window__edit_form__submit do |params|
     data = ActiveSupport::JSON.decode(params[:data])
 
-    dg = DataGrid.find_by_id(data["id"])
+    dg = DataGrid.find_by_id(data['id'])
 
     begin
-      dg.update_from_import(data["name"], data["export"])
+      dg.update_from_import(data['name'], data['export'])
       client.success = true
       client.netzke_on_submit_success
-    rescue => exc
+    rescue StandardError => exc
       client.netzke_notify(exc.to_s)
     end
   end
 
   action :show_grid do |a|
-    a.text     = "Show Grid"
-    a.icon_cls = "fa fa-th-large glyph"
+    a.text     = 'Show Grid'
+    a.icon_cls = 'fa fa-th-large glyph'
     a.handler  = :netzke_show_grid
   end
 
@@ -128,7 +128,7 @@ module Marty; class DataGridView < McflyGridPanel
 
     dg = DataGrid.find_by_id(record_id)
 
-    return client.netzke_notify("No data grid.") unless dg
+    return client.netzke_notify('No data grid.') unless dg
 
     meta_rows_raw, h_key_rows, data_rows = dg.export_array
     meta_rows = meta_rows_raw.map do |row|
@@ -153,8 +153,8 @@ module Marty; class DataGridView < McflyGridPanel
 
   def default_form_items
     [
-     :name,
-     textarea_field(:export, height: 300, hide_label: true),
+      :name,
+      textarea_field(:export, height: 300, hide_label: true),
     ]
   end
 
@@ -173,18 +173,18 @@ module Marty; class DataGridView < McflyGridPanel
   end
 
   attribute :hcols do |c|
-    c.label  = "Horizontal Attrs"
+    c.label  = 'Horizontal Attrs'
     c.width  = 200
     c.getter = lambda { |r|
-      r.dir_infos("h").map {|inf| inf["attr"]}.join(', ')
+      r.dir_infos('h').map { |inf| inf['attr'] }.join(', ')
     }
   end
 
   attribute :vcols do |c|
-    c.label  = "Vertical Attrs"
+    c.label  = 'Vertical Attrs'
     c.width  = 200
     c.getter = lambda { |r|
-      r.dir_infos("v").map {|inf| inf["attr"]}.join(', ')
+      r.dir_infos('v').map { |inf| inf['attr'] }.join(', ')
     }
   end
 
@@ -193,13 +193,13 @@ module Marty; class DataGridView < McflyGridPanel
   end
 
   attribute :data_type do |c|
-    c.label  = "Data Type"
+    c.label  = 'Data Type'
     c.width  = 200
   end
 
   attribute :created_dt do |c|
     c.label     = I18n.t('updated_at')
-    c.format    = "Y-m-d H:i"
+    c.format    = 'Y-m-d H:i'
     c.read_only = true
   end
 end; end

data/app/components/marty/delorean_rule_view.rb

@@ -22,5 +22,4 @@ class Marty::DeloreanRuleView < Marty::BaseRuleView
   attribute :rule_type do |c|
     c.width = 200
   end
-
 end

data/app/components/marty/event_view.rb

@@ -1,14 +1,14 @@
 class Marty::EventView < Marty::Grid
   has_marty_permissions \
-  read: :any,
-  update: [:admin],
-  delete: [:admin]
+    read: :any,
+    update: [:admin],
+    delete: [:admin]
 
   def configure(c)
     super
 
-    c.title ||= I18n.t('events', default: "Events")
-    c.model                  = "Marty::Event"
+    c.title ||= I18n.t('events', default: 'Events')
+    c.model                  = 'Marty::Event'
     c.paging                 = :buffered
     c.editing                = :in_form
     c.attributes             = [
@@ -27,9 +27,9 @@ class Marty::EventView < Marty::Grid
       :comment,
     ]
 
-    c.store_config.merge!({sorters: [{property: :id,
+    c.store_config.merge!(sorters: [{ property: :id,
                                  direction: 'DESC',
-                                     }]})
+                                     }])
     Marty::Event.cleanup
   end
 
@@ -38,56 +38,56 @@ class Marty::EventView < Marty::Grid
   end
 
   attribute :klass do |c|
-    c.text     = I18n.t("event_grid.klass")
+    c.text = I18n.t('event_grid.klass')
     c.width = 100
     c.read_only = true
   end
 
   attribute :subject_id do |c|
-    c.text     = I18n.t("event_grid.subject_id")
+    c.text = I18n.t('event_grid.subject_id')
     c.width = 50
     c.read_only = true
   end
 
   attribute :enum_event_operation do |c|
-    c.text     = I18n.t("event_grid.enum_event_operation")
+    c.text = I18n.t('event_grid.enum_event_operation')
     c.width = 100
     c.read_only = true
   end
 
   attribute :start_dt_dt do |c|
-    c.text     = I18n.t("event_grid.start_dt")
-    c.format    = "Y-m-d H:i:s"
+    c.text = I18n.t('event_grid.start_dt')
+    c.format = 'Y-m-d H:i:s'
   end
 
   attribute :end_dt_dt do |c|
-    c.text     = I18n.t("event_grid.end_dt")
-    c.format    = "Y-m-d H:i:s"
+    c.text = I18n.t('event_grid.end_dt')
+    c.format = 'Y-m-d H:i:s'
   end
 
   attribute :error do |c|
     error_map = {
-      nil   => "",
-      true  => "Error",
-      false => "Success",
+      nil   => '',
+      true  => 'Error',
+      false => 'Success',
     }
     map_error = error_map.each_with_object({}) { |(k, v), h| h[v] = k }
     editor_config = {
       trigger_action: :all,
       xtype:          :combo,
-      store:          ["Success", "Error", ""],
+      store:          ['Success', 'Error', ''],
     }
     c.column_config = { editor: editor_config }
     c.field_config  = editor_config
-    c.text   = I18n.t("event_grid.error")
+    c.text   = I18n.t('event_grid.error')
     c.type   = :string
     c.width  = 150
-    c.getter = lambda {|r| error_map[r.error]}
-    c.setter = lambda {|r, v| r.error = map_error[v]}
+    c.getter = lambda { |r| error_map[r.error] }
+    c.setter = lambda { |r, v| r.error = map_error[v] }
   end
 
   attribute :comment do |c|
-    c.text     = I18n.t("event_grid.comment")
+    c.text = I18n.t('event_grid.comment')
     c.width = 400
   end
 
@@ -95,35 +95,35 @@ class Marty::EventView < Marty::Grid
     lambda { |r|
       return nil unless r.promise_id
       return nil unless p = Marty::Promise.where(id: r.promise_id).first
+
       p.send(field)
     }
   end
   attribute :promise_job_id do |c|
-    c.text     = I18n.t("event_grid.promise_job_id")
+    c.text = I18n.t('event_grid.promise_job_id')
     c.getter = promise_getter(:job_id)
     c.read_only = true
   end
 
   attribute :promise_start_dt do |c|
-    c.text     = I18n.t("event_grid.promise_start_dt")
+    c.text = I18n.t('event_grid.promise_start_dt')
     c.width = 150
     c.getter = promise_getter(:start_dt)
     c.read_only = true
   end
 
   attribute :promise_end_dt do |c|
-    c.text     = I18n.t("event_grid.promise_end_dt")
+    c.text = I18n.t('event_grid.promise_end_dt')
     c.width = 150
     c.getter = promise_getter(:end_dt)
     c.read_only = true
   end
 
   attribute :promise_status do |c|
-    c.text     = I18n.t("event_grid.promise_status")
+    c.text = I18n.t('event_grid.promise_status')
     c.getter = promise_getter(:status)
     c.read_only = true
   end
-
 end
 
 EventView = Marty::EventView

data/app/components/marty/extras/layout.rb

@@ -23,7 +23,7 @@ module Layout
                 )
   end
 
-  def dispfield(params={})
+  def dispfield(params = {})
     {
       attr_type: :displayfield,
       hide_label: !params[:field_label],
@@ -31,18 +31,18 @@ module Layout
     }.merge(params)
   end
 
-  def vspacer(params={})
-    vbox({flex: 1, border: false}.merge(params))
+  def vspacer(params = {})
+    vbox({ flex: 1, border: false }.merge(params))
   end
 
-  def hspacer(params={})
-    hbox({flex: 1, border: false}.merge(params))
+  def hspacer(params = {})
+    hbox({ flex: 1, border: false }.merge(params))
   end
 
-  def textarea_field(name, options={})
+  def textarea_field(name, options = {})
     {
       name:        name,
-      width:       "100%",
+      width:       '100%',
       height:      150,
       xtype:       :textareafield,
       auto_scroll: true,
@@ -54,10 +54,10 @@ module Layout
     } + options
   end
 
-  def jsonb_field(name, options={})
+  def jsonb_field(name, options = {})
     {
         name:        name,
-        width:       "100%",
+        width:       '100%',
         height:      150,
         xtype:       :textareafield,
         auto_scroll: true,
@@ -73,7 +73,7 @@ module Layout
   ######################################################################
   # PG ENUM field handling
 
-  def enum_column(c, class_or_array, col=nil)
+  def enum_column(c, class_or_array, col = nil)
     col ||= c.name.demodulize.tableize.singularize
     vals = class_or_array.is_a?(Array) ? class_or_array : class_or_array::VALUES
     editor_config = {
@@ -111,11 +111,11 @@ module Layout
   end
 
   def enum_setter(name)
-    lambda {|r, v| r.send("#{name}=", v.blank? || v == '---' ? nil : v)}
+    lambda { |r, v| r.send("#{name}=", v.blank? || v == '---' ? nil : v) }
   end
 
   def get_sorter(col)
-    lambda {|rel, dir| rel.order("#{col}::text #{dir.to_s}")}
+    lambda { |rel, dir| rel.order("#{col}::text #{dir.to_s}") }
   end
 
   ######################################################################
@@ -123,31 +123,31 @@ module Layout
   # Netzke 8.x.
 
   BOOL_MAP = {
-    nil   => "---",
-    true  => "True",
-    false => "False",
+    nil   => '---',
+    true  => 'True',
+    false => 'False',
   }
 
   MAP_BOOL = {
-    "---"   => nil,
-    ""      => nil,
-    "True"  => true,
-    "False" => false,
+    '---'   => nil,
+    ''      => nil,
+    'True'  => true,
+    'False' => false,
   }
 
   def bool_getter(name)
-    lambda {|r| BOOL_MAP[r.send(name)]}
+    lambda { |r| BOOL_MAP[r.send(name)] }
   end
 
   def bool_setter(name)
-    lambda {|r, v| r.send("#{name}=", MAP_BOOL[v])}
+    lambda { |r, v| r.send("#{name}=", MAP_BOOL[v]) }
   end
 
   def nullable_bool_column(name)
     editor_config = {
       trigger_action: :all,
       xtype:          :combo,
-      store:          ["True", "False", "---"],
+      store:          ['True', 'False', '---'],
     }
     {
       column_config: { editor: editor_config },
@@ -161,7 +161,7 @@ module Layout
   ######################################################################
   # make sure to validate range vals on the model (e.g. see rule.rb)
 
-  def range_getter(name, json_field=nil)
+  def range_getter(name, json_field = nil)
     if json_field
       lambda { |r| Marty::Util.pg_range_to_human(r.send(json_field)[name]) }
     else
@@ -169,13 +169,13 @@ module Layout
     end
   end
 
-  def range_setter(name, json_field=nil)
+  def range_setter(name, json_field = nil)
     if json_field
       lambda do |r, v|
         cookedv = v && v.present? && (Marty::Util.human_to_pg_range(v) rescue v)
-        h  = r.send(json_field)
+        h = r.send(json_field)
         if cookedv
-          r.send("#{json_field}=", h + {name=>cookedv})
+          r.send("#{json_field}=", h + { name => cookedv })
         else
           h.delete(name)
           r.send("#{json_field}=", h)

data/app/components/marty/extras/misc.rb

@@ -3,7 +3,7 @@ module Marty::Extras::Misc
     editor_config: {
       trigger_action: :all,
       xtype: :combo,
-      store: (1..12).map {|x| [x, "%02d" % x]},
+      store: (1..12).map { |x| [x, '%02d' % x] },
       # FIXME: for some reason, with Netzke 0.8.2, the label show
       # up in the grid editor.  This hack seems to fix the
       # problem.  However, the label in the add-in-form now looks
@@ -17,7 +17,7 @@ module Marty::Extras::Misc
   }
   def self.numberfield_cfg(decimal_places)
     {
-      format: "0." + "0"*decimal_places,
+      format: '0.' + '0' * decimal_places,
       xtype: 'numbercolumn',
       editor_config: { hide_trigger: true,
                        decimal_precision: decimal_places },

data/app/components/marty/grid.rb

@@ -6,7 +6,7 @@ class Marty::Grid < ::Netzke::Grid::Base
   # parent grid is the grid in which child/linked_components is defined
   # child  components are components dependent on the selected parent row
   # linked components will update whenever the parent is updated
-  def initialize args, kwargs=nil
+  def initialize args, kwargs = nil
     super(args, kwargs)
     client_config[:child_components]  = child_components  || []
     client_config[:linked_components] = linked_components || []
@@ -33,8 +33,8 @@ class Marty::Grid < ::Netzke::Grid::Base
     }
 
     c.editing      = :both
-    c.store_config = {page_size: 30}
-    c.view_config  = {preserve_scroll_on_reload: true}
+    c.store_config = { page_size: 30 }
+    c.view_config  = { preserve_scroll_on_reload: true }
 
     # disable buffered renderer plugin to avoid white space on reload
     c.buffered_renderer = false
@@ -45,8 +45,8 @@ class Marty::Grid < ::Netzke::Grid::Base
   end
 
   action :clear_filters do |a|
-    a.text    = "X"
-    a.tooltip = "Clear filters"
+    a.text    = 'X'
+    a.tooltip = 'Clear filters'
     a.handler = :clear_filters
   end
 
@@ -57,8 +57,8 @@ class Marty::Grid < ::Netzke::Grid::Base
   end
 
   action :clear_filters do |a|
-    a.text     = "X"
-    a.tooltip  = "Clear filters"
+    a.text     = 'X'
+    a.tooltip  = 'Clear filters'
     a.handler  = :clear_filters
   end
 
@@ -67,37 +67,37 @@ class Marty::Grid < ::Netzke::Grid::Base
   action :add do |a|
     super(a)
     a.icon     = nil
-    a.icon_cls = "fa fa-plus glyph"
+    a.icon_cls = 'fa fa-plus glyph'
   end
 
   action :add_in_form do |a|
     super(a)
     a.icon     = nil
-    a.icon_cls = "fa fa-plus-square glyph"
+    a.icon_cls = 'fa fa-plus-square glyph'
   end
 
   action :edit do |a|
     super(a)
     a.icon     = nil
-    a.icon_cls = "fa fa-edit glyph"
+    a.icon_cls = 'fa fa-edit glyph'
   end
 
   action :edit_in_form do |a|
     super(a)
     a.icon     = nil
-    a.icon_cls = "fa fa-pen-square glyph"
+    a.icon_cls = 'fa fa-pen-square glyph'
   end
 
   action :delete do |a|
     super(a)
     a.icon     = nil
-    a.icon_cls = "fa fa-trash glyph"
+    a.icon_cls = 'fa fa-trash glyph'
   end
 
   action :apply do |a|
     super(a)
     a.icon     = nil
-    a.icon_cls = "fa fa-check glyph"
+    a.icon_cls = 'fa fa-check glyph'
   end
 
   def child_components