marty 3.1.0 → 4.0.0.rc2

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

@@ -115,7 +115,7 @@ module Layout
   end
 
   def get_sorter(col)
-    lambda { |rel, dir| rel.order(Arel.sql("#{col}::text #{dir}")) }
+    lambda { |rel, dir| rel.order("#{col}::text #{dir.to_s}") }
   end
 
   ######################################################################

data/app/components/marty/grid.rb

@@ -52,7 +52,7 @@ class Marty::Grid < ::Netzke::Grid::Base
 
   def get_json_sorter(json_col, field)
     lambda do |r, dir|
-      r.order(Arel.sql("#{json_col} ->> '#{field}' " + dir.to_s))
+      r.order("#{json_col} ->> '#{field}' " + dir.to_s)
     end
   end
 

data/app/components/marty/import_view.rb

@@ -84,10 +84,10 @@ class Marty::ImportView < Marty::Form
       result << messages if messages
 
       client.set_result result.join('<br/>')
-    rescue Marty::DataImporter::Error => e
+    rescue Marty::DataImporter::Error => exc
       result = [
-        "Import failed on line(s): #{e.lines.join(', ')}",
-        "Error: #{e.to_s}",
+        "Import failed on line(s): #{exc.lines.join(', ')}",
+        "Error: #{exc.to_s}",
       ]
 
       client.set_result '<font color="red">' + result.join('<br/>') + '</font>'

data/app/components/marty/main_auth_app.rb

@@ -4,7 +4,6 @@ require 'marty/api_log_view'
 require 'marty/config_view'
 require 'marty/data_grid_view'
 require 'marty/schedule_jobs_dashboard'
-require 'marty/data_grid_user_view'
 require 'marty/event_view'
 require 'marty/import_type_view'
 require 'marty/new_posting_window'
@@ -97,7 +96,6 @@ class Marty::MainAuthApp < Marty::AuthApp
         icon_cls: 'fa fa-window-restore glyph',
       menu: [
         :data_grid_view,
-        :data_grid_user_view,
         :reporting,
         :scripting,
         :promise_view,
@@ -239,14 +237,7 @@ class Marty::MainAuthApp < Marty::AuthApp
   end
 
   action :data_grid_view do |a|
-    a.text      = I18n.t('data_grid_view')
-    a.handler   = :netzke_load_component_by_action
-    a.icon_cls = 'fa fa-table glyph'
-    a.disabled = !self.class.has_any_perm?
-  end
-
-  action :data_grid_user_view do |a|
-    a.text      = I18n.t('data_grid_user_view')
+    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?
@@ -397,7 +388,6 @@ class Marty::MainAuthApp < Marty::AuthApp
   component :config_view
 
   component :data_grid_view
-  component :data_grid_user_view
 
   component :event_view
 

data/app/components/marty/report_form.rb

@@ -61,10 +61,10 @@ class Marty::ReportForm < Marty::Form
 
     begin
       engine.evaluate(node, 'result', d_params)
-    rescue StandardError => e
-      Marty::Util.logger.error "run_eval failed: #{e.backtrace}"
+    rescue StandardError => exc
+      Marty::Util.logger.error "run_eval failed: #{exc.backtrace}"
 
-      res = Delorean::Engine.grok_runtime_exception(e)
+      res = Delorean::Engine.grok_runtime_exception(exc)
       res['backtrace'] =
         res['backtrace'].map { |m, line, fn| "#{m}:#{line} #{fn}" }.join('\n')
       res
@@ -156,15 +156,15 @@ class Marty::ReportForm < Marty::Form
       raise 'bad form items' unless items.is_a?(Array)
       raise 'bad format' unless
         Marty::ContentHandler::GEN_FORMATS.member?(format)
-    rescue StandardError => e
+    rescue StandardError => exc
       c.title = 'ERROR'
       c.items =
         [
           {
-            field_label: 'exception',
+            field_label: 'Exception',
             xtype:       :displayfield,
             name:        'displayfield1',
-            value:       "<span style=\"color:red;\">#{e}</span>"
+            value:       "<span style=\"color:red;\">#{exc}</span>"
           },
         ]
       return

data/app/components/marty/script_form.rb

@@ -83,10 +83,10 @@ class Marty::ScriptForm < Marty::Form
     begin
       dev = Marty::Tag.find_by_name('DEV')
       Marty::ScriptSet.new(dev).parse_check(script.name, data['body'])
-    rescue Delorean::ParseError => e
-      client.netzke_notify e.message
+    rescue Delorean::ParseError => exc
+      client.netzke_notify exc.message
       client.netzke_apply_form_errors({})
-      client.set_line_error(e.line)
+      client.set_line_error(exc.line)
       return
     end
 
@@ -120,8 +120,8 @@ class Marty::ScriptForm < Marty::Form
                                          'PrettyScript',
                                          rep_params)
       client.get_report(path)
-    rescue StandardError => e
-      return client.netzke_notify "ERROR: #{e}"
+    rescue StandardError => exc
+      return client.netzke_notify "ERROR: #{exc}"
     end
   end
 

data/app/components/marty/script_tester.rb

@@ -75,8 +75,8 @@ class Marty::ScriptTester < Marty::Form
       client.set_result result.join('<br/>')
     rescue SystemStackError
       return client.netzke_notify 'System Stack Error'
-    rescue StandardError => e
-      res = Delorean::Engine.grok_runtime_exception(e)
+    rescue StandardError => exc
+      res = Delorean::Engine.grok_runtime_exception(exc)
 
       result = ["Error: #{res['error']}", 'Backtrace:'] +
         res['backtrace'].map { |m, line, fn| "#{m}:#{line} #{fn}" }

data/app/components/marty/user_view.rb

@@ -33,7 +33,9 @@ module Marty; class UserView < Marty::Grid
   def self.set_roles(roles, user)
     roles = [] unless roles.present?
 
-    roles = ::Marty::RoleType.from_nice_names(roles)
+    roles = Marty::RoleType.get_all.select do |role|
+      roles.include?(I18n.t("roles.#{role}", default: role))
+    end
 
     roles_in_user = user.user_roles.map(&:role)
     roles_to_delete = roles_in_user - roles
@@ -150,10 +152,14 @@ module Marty; class UserView < Marty::Grid
     c.type    = :string
 
     c.getter = lambda do |r|
-      Marty::RoleType.to_nice_names(r.user_roles.map(&:role))
+      r.user_roles.map do |ur|
+        I18n.t("roles.#{ur.role}", default: ur.role)
+      end
     end
 
-    store = ::Marty::RoleType.to_nice_names(::Marty::RoleType::VALUES.sort)
+    store = ::Marty::RoleType.get_all.sort.map do |role|
+      I18n.t("roles.#{role}", default: role)
+    end
 
     c.editor_config = {
       multi_select: true,

data/app/models/marty/data_grid.rb

@@ -253,7 +253,8 @@ class Marty::DataGrid < Marty::Base
 
   # private method used to cache lookup_grid_distinct_entry_h result
   delorean_fn :lookup_grid_h_priv,
-              private: true, cache: true, sig: 4 do |pt, dgh, h, distinct|
+              to_hash: false, private: true, cache: true, sig: 4 do |pt, dgh, h, distinct|
+
     lookup_grid_distinct_entry_h(
       pt, h, dgh, nil, true, false, distinct)['result']
   end
@@ -270,9 +271,9 @@ class Marty::DataGrid < Marty::Base
   end
 
   def self.lookup_grid_distinct_entry_h(
-    pt, h, dgh, visited = nil, follow = true,
-    return_grid_data = false, distinct = true
-  )
+        pt, h, dgh, visited = nil, follow = true,
+        return_grid_data = false, distinct = true
+      )
 
     # Perform grid lookup, if result is another data_grid, and follow is true,
     # then perform lookup on the resulting grid.  Allows grids to be nested
@@ -359,19 +360,13 @@ class Marty::DataGrid < Marty::Base
   def export_array
     # add data type metadata row if not default
     lenstr = 'lenient' if lenient
+    typestr = data_type unless [nil, DEFAULT_DATA_TYPE].member?(data_type) &&
+                               !constraint.present?
+
+    len_dt = [lenstr, typestr].compact.join(' ')
 
-    typestr = data_type unless [nil, DEFAULT_DATA_TYPE].member?(data_type)
-    len_type = [lenstr, typestr].compact.join(' ')
-
-    meta_rows = if (lenient || typestr) && constraint
-                  [[len_type, constraint]]
-                elsif lenient || typestr
-                  [[len_type]]
-                elsif constraint
-                  [['', constraint]]
-                else
-                  []
-                end
+    meta_rows = len_dt.present? || constraint.present? ?
+                  [[len_dt, constraint]] : []
 
     meta_rows += metadata.map do |inf|
       [inf['attr'], inf['type'], inf['dir'], inf['rs_keep'] || '']

data/app/models/marty/event.rb

@@ -311,7 +311,7 @@ SQL
 
   def self.cleanup
       where('start_dt < ?', Time.zone.now - 48.hours).delete_all
-  rescue StandardError => e
-      Marty::Util.logger.error("event GC error: #{e}")
+  rescue StandardError => exc
+      Marty::Util.logger.error("event GC error: #{exc}")
   end
 end

data/app/models/marty/promise.rb

@@ -132,9 +132,9 @@ class Marty::Promise < Marty::Base
           # log "OFF0 #{Process.pid} #{last}"
           begin
             work_off_job(job)
-          rescue StandardError => e
+          rescue StandardError => exc
             # log "OFFERR #{exc}"
-            error = exception_to_result(e)
+            error = exception_to_result(exc)
             last.set_result(error)
           end
           # log "OFF1 #{Process.pid} #{last}"
@@ -215,8 +215,8 @@ class Marty::Promise < Marty::Base
         'start_dt < ? AND parent_id IS NULL',
         DateTime.now - (all ? 0.hours : 4.hours)
       ).destroy_all
-    rescue StandardError => e
-        Marty::Util.logger.error("promise GC error: #{e}")
+    rescue StandardError => exc
+        Marty::Util.logger.error("promise GC error: #{exc}")
     end
 
     def exception_to_result(promise:, exception:)

data/app/models/marty/role_type.rb

@@ -5,19 +5,6 @@ class Marty::RoleType < Marty::Base
     'admin',
     'user_manager',
     'dev',
-    'viewer',
-    'data_grid_editor'
+    'viewer'
   ]
-
-  def self.from_nice_names(roles)
-    Marty::RoleType.get_all.select do |role|
-      roles.include?(I18n.t("roles.#{role}", default: role))
-    end
-  end
-
-  def self.to_nice_names(roles)
-    roles.map do |role|
-      I18n.t("roles.#{role}", default: role)
-    end
-  end
 end

data/app/services/marty/data_grid_view/save_grid.rb

@@ -15,9 +15,8 @@ module Marty
       end
 
       def self.call(params)
+        user_perm = Marty::DataGridView.get_edit_save_permission
         rec_id = params['record_id']
-        dg = Marty::DataGrid.mcfly_pt('infinity').find_by(group_id: rec_id)
-        user_perm = Marty::DataGridView.get_edit_permission(dg.permissions)
         data = params['data']
         raise GridError.new('entered with view permissions', data, rec_id) if
           user_perm == 'view'
@@ -25,6 +24,7 @@ module Marty
         data_as_array = data.map do |row|
           row.keys.map { |key| row[key] }
         end
+        dg = Marty::DataGrid.mcfly_pt('infinity').find_by(group_id: rec_id)
         vcnt = dg.metadata.select { |md| md['dir'] == 'v' }.count
         hcnt = dg.metadata.select { |md| md['dir'] == 'h' }.count
         cur_data_dim = [dg.data.length, dg.data[0].length]

data/app/services/marty/promises/delorean/create.rb

@@ -31,9 +31,9 @@ module Marty
             )
 
             job = Delayed::Job.enqueue(promise_job)
-          rescue StandardError => e
+          rescue StandardError => exc
             # log "CALLERR #{exc}"
-            res = ::Delorean::Engine.grok_runtime_exception(e)
+            res = ::Delorean::Engine.grok_runtime_exception(exc)
             promise.set_start
             promise.set_result(res)
             # log "CALLERRSET #{res}"

data/app/services/marty/promises/ruby/create.rb

@@ -29,8 +29,8 @@ module Marty
             )
 
             job = Delayed::Job.enqueue(promise_job)
-          rescue StandardError => e
-            res = { 'error' => e.message }
+          rescue StandardError => exc
+            res = { 'error' => exc.message }
             promise.set_start
             promise.set_result(res)
             raise

data/config/locales/en.yml

@@ -18,10 +18,8 @@ en:
   create_posting: Create
   api_auth: API Authorization
   event_view: Event View
-  data_grid_view: Data Grids Admin
-  data_grid: Data Grids Admin
-  data_grid_user: Data Grids
-  data_grid_user_view: Data Grids
+  data_grid_view: Data Grids
+  data_grid: Data Grids
 
   data_import_view:
     import: Import
@@ -32,7 +30,6 @@ en:
     admin: Admin
     dev: Developer
     user_manager: User Manager
-    data_grid_editor: Data Grid Editor
 
   posting_types:
     BASE: BASE
@@ -179,9 +176,3 @@ en:
     grid:
       base:
         view_record: "%{model} (Read-only)"
-
-  data_grid_view_perms:
-    perm_view: Can View
-    perm_edit_data: Can Edit Data
-    perm_edit_all: Can Edit All
-    

data/docker-compose.dummy.yml

@@ -24,7 +24,6 @@ services:
       - .:/opt/app:delegated
       - '.bash_history.docker:/root/.bash_history'
       - '.pry_history.docker:/root/.pry_history'
-      - '.ssh-docker:/root/.ssh'
       - bundle_box:/bundle_box
     tty: true
     stdin_open: true

data/lib/marty/content_handler.rb

@@ -34,9 +34,9 @@ module Marty::ContentHandler
       else
         res, format = { error: "Unknown format: #{format}" }.to_json, 'json'
       end
-    rescue StandardError => e
+    rescue StandardError => exc
       res, format =
-        { error: "Failed conversion #{format}: #{e}" }.to_json, 'json'
+        { error: "Failed conversion #{format}: #{exc}" }.to_json, 'json'
     end
 
     type, disposition = GEN_FORMATS[format]

data/lib/marty/data_change.rb

@@ -219,7 +219,7 @@ class Marty::DataChange
         # "different".
         conv =
           Marty::DataConversion.convert_row(klass, input, ts)
-      rescue StandardError => e
+      rescue StandardError => exc
         only_input << input
         next
       end

data/lib/marty/data_conversion.rb

@@ -1,7 +1,7 @@
 class Marty::DataConversion
   EXCEL_START_DATE = Date.parse('1/1/1900') - 2
 
-  FLOAT_PAT = /\A-?\d+(\.?\d+)?([eE][-+]?[0-9]+)?\z/
+  FLOAT_PAT = /^-?\d+(\.\d+)?$/
 
   PATS = {
     integer: /^-?\d+(\.0+)?$/,
@@ -58,13 +58,13 @@ class Marty::DataConversion
       begin
         v =~ FLOAT_PAT ? EXCEL_START_DATE + v.to_f :
           Mcfly.is_infinity(v) ? 'infinity' : v.to_date
-      rescue StandardError => e
+      rescue StandardError => exc
         raise "date conversion failed for #{v.inspect}}"
       end
     when :datetime
       begin
         Mcfly.is_infinity(v) ? 'infinity' : v.to_datetime
-      rescue StandardError => e
+      rescue StandardError => exc
         raise "datetime conversion failed for #{v.inspect}}"
       end
     when :numrange, :int4range, :int8range
@@ -98,6 +98,7 @@ class Marty::DataConversion
 
     @@associations[klass] ||= klass.reflect_on_all_associations.
       each_with_object({}) do |assoc, h|
+
       h[assoc.name.to_s] = {
         assoc_keys:  assoc_keys(assoc.klass),
         assoc_class: assoc.klass,

data/lib/marty/data_importer.rb

@@ -77,9 +77,9 @@ module Marty
 
             Marty::DataConversion.create_or_update(klass, row, dt)
           end
-        rescue StandardError => e
+        rescue StandardError => exc
           # to find problems with the importer, comment out the rescue block
-          raise Error.new(e.to_s, [eline])
+          raise Error.new(exc.to_s, [eline])
         end
 
         ids = {}
@@ -96,8 +96,8 @@ module Marty
           # Validate affected rows if necessary
           klass.send(validation_function.to_sym, ids.keys) if
             validation_function
-        rescue StandardError => e
-          raise Error.new(e.to_s, [])
+        rescue StandardError => exc
+          raise Error.new(exc.to_s, [])
         end
 
         remainder_ids = cleaner_ids - ids.keys

data/lib/marty/mcfly_model.rb

@@ -6,8 +6,10 @@ module Mcfly::Model
   end
 
   module ClassMethods
-    def hash_if_necessary(q, private)
-      !private && q.is_a?(ActiveRecord::Base) ? make_openstruct(q) : q
+    def hash_if_necessary(q, to_hash)
+      return make_hash(q) if to_hash && q.is_a?(ActiveRecord::Base)
+
+      q
     end
 
     def base_mcfly_lookup(name, options = {}, &block)
@@ -41,7 +43,7 @@ module Mcfly::Model
 
         q = q.first if q.respond_to?(:first) && options[:mode] == :first
 
-        hash_if_necessary(q, options[:private])
+        hash_if_necessary(q, options.fetch(:to_hash, false))
       end
     end
 
@@ -55,7 +57,7 @@ module Mcfly::Model
 
     def gen_mcfly_lookup(name, attrs, options = {})
       raise "bad options #{options.keys}" unless
-        (options.keys - [:mode, :cache, :private]).empty?
+      (options.keys - [:mode, :cache, :private, :to_hash]).empty?
 
       mode = options.fetch(:mode, :first)
 
@@ -86,6 +88,7 @@ module Mcfly::Model
 
       base_mcfly_lookup(name, options + { sig:  attrs.length + 1,
                                              mode: mode }) do |_t, *attr_list|
+
         attr_list_ids = attr_list.each_with_index.map do |_x, i|
           assoc.member?(attrs[i]) ?
             (attr_list[i] && attr_list[i].id) : attr_list[i]
@@ -134,7 +137,7 @@ module Mcfly::Model
 
       pc_name = "pc_#{name}".to_sym
 
-      gen_mcfly_lookup(pc_name, pc_attrs, options + { private: true })
+      gen_mcfly_lookup(pc_name, pc_attrs, options + { private: true, to_hash: false })
 
       lpi = attrs.keys.index rel_attr
 
@@ -142,7 +145,7 @@ module Mcfly::Model
       raise "need #{rel_attr} argument" unless lpi
 
       # cache if mode is not nil
-      priv = options[:private]
+      to_hash = options.fetch(:to_hash, false)
 
       # cache if mode is not explicitly set to nil or cache is true
       cache = options.fetch(:cache) { options.fetch(:mode, :first) }
@@ -165,7 +168,7 @@ module Mcfly::Model
                       send(cat_attr_id)
 
         q = send(pc_name, ts, *args)
-        hash_if_necessary(q, priv)
+        hash_if_necessary(q, to_hash)
       end
     end
   end