marty 4.0.0.rc2 → 5.1.0

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 => exc
-      Marty::Util.logger.error("event GC error: #{exc}")
+  rescue StandardError => e
+      Marty::Util.logger.error("event GC error: #{e}")
   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 => exc
+          rescue StandardError => e
             # log "OFFERR #{exc}"
-            error = exception_to_result(exc)
+            error = exception_to_result(e)
             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 => exc
-        Marty::Util.logger.error("promise GC error: #{exc}")
+    rescue StandardError => e
+        Marty::Util.logger.error("promise GC error: #{e}")
     end
 
     def exception_to_result(promise:, exception:)

data/app/models/marty/role_type.rb

@@ -5,6 +5,19 @@ class Marty::RoleType < Marty::Base
     'admin',
     'user_manager',
     'dev',
-    'viewer'
+    'viewer',
+    'data_grid_editor'
   ]
+
+  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,8 +15,9 @@ 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'
@@ -24,7 +25,6 @@ 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 => exc
+          rescue StandardError => e
             # log "CALLERR #{exc}"
-            res = ::Delorean::Engine.grok_runtime_exception(exc)
+            res = ::Delorean::Engine.grok_runtime_exception(e)
             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 => exc
-            res = { 'error' => exc.message }
+          rescue StandardError => e
+            res = { 'error' => e.message }
             promise.set_start
             promise.set_result(res)
             raise

data/config/locales/en.yml

@@ -18,8 +18,10 @@ en:
   create_posting: Create
   api_auth: API Authorization
   event_view: Event View
-  data_grid_view: Data Grids
-  data_grid: Data Grids
+  data_grid_view: Data Grids Admin
+  data_grid: Data Grids Admin
+  data_grid_user: Data Grids
+  data_grid_user_view: Data Grids
 
   data_import_view:
     import: Import
@@ -30,6 +32,7 @@ en:
     admin: Admin
     dev: Developer
     user_manager: User Manager
+    data_grid_editor: Data Grid Editor
 
   posting_types:
     BASE: BASE
@@ -176,3 +179,9 @@ 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/db/migrate/108_add_data_grid_perms.rb

@@ -0,0 +1,16 @@
+class AddDataGridPerms < ActiveRecord::Migration[4.2]
+  def self.up
+    default = {
+      view: [],
+      edit_data: [],
+      edit_all: []
+    }
+    table = :marty_data_grids
+    add_column table, :permissions, :jsonb, null: false, default: default
+    add_index table, "(permissions->'view')", using: "GIN",
+              name: :marty_data_grids_perm_idx
+  end
+  def self.down
+    remove_column :marty_data_grids, :permissions
+  end
+end

data/db/migrate/508_add_not_to_data_grids_tables.rb

@@ -0,0 +1,18 @@
+class AddNotToDataGridsTables < ActiveRecord::Migration[5.1]
+  include Marty::Migrations
+
+  TABLES = {
+    marty_grid_index_booleans: :btree,
+    marty_grid_index_int4ranges: :gist,
+    marty_grid_index_integers: :gin,
+    marty_grid_index_numranges: :gist,
+    marty_grid_index_strings: :gin
+  }
+
+  def change
+    TABLES.each do |table, index_type|
+      add_column table, :not, :boolean, null: false, default: false
+      add_index table, [:not, :key]
+    end
+  end
+end

data/db/migrate/509_update_dg_plpgsql_v1_fns.rb

@@ -0,0 +1,13 @@
+class UpdateDgPlpgsqlV1Fns < ActiveRecord::Migration[4.2]
+  def up
+    marty_path = Gem.loaded_specs["marty"].full_gem_path
+    Dir.glob("#{marty_path}/db/sql/*_v1.sql") do |f|
+      connection.execute(File.read(f))
+    end
+  end
+
+  def down
+    # Load functions once again
+    up
+  end
+end

data/db/sql/query_grid_dir_v1.sql

@@ -24,11 +24,17 @@ DECLARE
   sql_scripts_arr_intersect text;
   sql_filter text;
 
+  includes_nots boolean;
+
 BEGIN
   FOR i IN 1 .. COALESCE(array_upper(infos, 1), 0)
     LOOP
       attr_type := infos[i] ->> 'type';
       attr_name := infos[i] ->> 'attr';
+
+      -- Use not condition only if given type indexes has rows with 'not' = true
+      includes_nots = COALESCE(infos[i] -> 'nots', '[]'::JSONB)  @> 'true';
+
       attr_value := h ->> attr_name;
       h_key_exists := h ? attr_name;
 
@@ -50,7 +56,7 @@ BEGIN
       END CASE;
 
       sql_script = 'SELECT DISTINCT index from ' || table_name ||
-        -- Convertion to FLOAT is neeed to make numbers like 2005.0 work
+        -- Convertion to FLOAT is needed to make numbers like 2005.0 work
         ' WHERE data_grid_id = ($1 ->> ' || sqlidx || ')::FLOAT::INTEGER' ||
         ' AND created_dt = ($1 ->> ' || (sqlidx + 1) || ')::TIMESTAMP' ||
         ' AND attr = $1 ->> ' || (sqlidx + 2) || ' ';
@@ -83,7 +89,15 @@ BEGIN
         args := args || attr_value;
       END IF;
 
-      sql_script := sql_script || ' AND (' || sql_filter || 'key is NULL) ';
+
+      -- Use not condition only if given type indexes has rows with 'not' = true
+      IF includes_nots THEN
+        sql_script := sql_script || ' AND CASE WHEN ' || table_name ||'.not '
+          'THEN NOT (' || sql_filter || 'key IS NULL) '
+          'ELSE (' || sql_filter || 'key IS NULL) END';
+      ELSE
+        sql_script := sql_script || ' AND (' || sql_filter || 'key is NULL) ';
+      END IF;
 
       sql_scripts_arr := sql_scripts_arr || sql_script;
     END LOOP;

data/docker-compose.dummy.yml

@@ -24,6 +24,7 @@ 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 => exc
+    rescue StandardError => e
       res, format =
-        { error: "Failed conversion #{format}: #{exc}" }.to_json, 'json'
+        { error: "Failed conversion #{format}: #{e}" }.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 => exc
+      rescue StandardError => e
         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 = /^-?\d+(\.\d+)?$/
+  FLOAT_PAT = /\A-?\d+(\.?\d+)?([eE][-+]?[0-9]+)?\z/
 
   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 => exc
+      rescue StandardError => e
         raise "date conversion failed for #{v.inspect}}"
       end
     when :datetime
       begin
         Mcfly.is_infinity(v) ? 'infinity' : v.to_datetime
-      rescue StandardError => exc
+      rescue StandardError => e
         raise "datetime conversion failed for #{v.inspect}}"
       end
     when :numrange, :int4range, :int8range
@@ -98,7 +98,6 @@ 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 => exc
+        rescue StandardError => e
           # to find problems with the importer, comment out the rescue block
-          raise Error.new(exc.to_s, [eline])
+          raise Error.new(e.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 => exc
-          raise Error.new(exc.to_s, [])
+        rescue StandardError => e
+          raise Error.new(e.to_s, [])
         end
 
         remainder_ids = cleaner_ids - ids.keys

data/lib/marty/mcfly_model.rb

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

data/lib/marty/migrations.rb

@@ -41,7 +41,7 @@ module Marty::Migrations
     SQL
 
     db_values = res.first['enum_range'].gsub(/[{"}]/, '').split(',')
-    ex_values = klass::VALUES - db_values
+    ex_values = klass::VALUES.map(&:to_s) - db_values
 
     return if ex_values.empty?
 

data/lib/marty/monkey.rb

@@ -54,8 +54,8 @@ class Delorean::BaseModule::NodeCall
     begin
       # make sure params is serialzable before starting a Job
       JSON.dump(params)
-    rescue StandardError => exc
-      raise "non-serializable parameters: #{params} #{exc}"
+    rescue StandardError => e
+      raise "non-serializable parameters: #{params} #{e}"
     end
 
     Marty::Promises::Delorean::Create.call(

data/lib/marty/promise_job.rb

@@ -41,9 +41,9 @@ class Marty::PromiseJob < Struct.new(:promise,
       end
 
       # log "DONE #{Process.pid} #{promise.id} #{Time.now.to_f} #{res}"
-    rescue StandardError => exc
-      res = Delorean::Engine.grok_runtime_exception(exc)
-      # log "ERR- #{Process.pid} #{promise.id} #{Time.now.to_f} #{exc}"
+    rescue StandardError => e
+      res = Delorean::Engine.grok_runtime_exception(e)
+      # log "ERR- #{Process.pid} #{promise.id} #{Time.now.to_f} #{e}"
     end
     promise.set_result(res)
     process_hook(res)
@@ -53,8 +53,8 @@ class Marty::PromiseJob < Struct.new(:promise,
       return unless hook
 
       hook.run(params: params, result: res)
-  rescue StandardError => exc
-      Marty::Util.logger.error "promise hook failed: #{exc}"
+  rescue StandardError => e
+      Marty::Util.logger.error "promise hook failed: #{e}"
   end
 
   def max_attempts

data/lib/marty/promise_proxy.rb

@@ -55,8 +55,8 @@ class Marty::PromiseProxy < BasicObject
           begin
             @result = @promise.wait_for_result(@timeout)
             @result = @result[@attr] if @attr && !@result['error']
-          rescue ::Exception => exc
-            @result = ::Delorean::Engine.grok_runtime_exception(exc)
+          rescue ::Exception => e
+            @result = ::Delorean::Engine.grok_runtime_exception(e)
           end
         end
       end

data/lib/marty/promise_ruby_job.rb

@@ -25,8 +25,8 @@ class Marty::PromiseRubyJob < Struct.new(:promise,
 
       mod = module_name.constantize
       res = { 'result' => mod.send(method_name, *method_args) }
-    rescue StandardError => exc
-      res = ::Marty::Promise.exception_to_result(promise: promise, exception: exc)
+    rescue StandardError => e
+      res = ::Marty::Promise.exception_to_result(promise: promise, exception: e)
     end
 
     promise.set_result(res)
@@ -37,8 +37,8 @@ class Marty::PromiseRubyJob < Struct.new(:promise,
     return unless hook
 
     hook.run(params: method_args, result: res)
-  rescue StandardError => exc
-    Marty::Util.logger.error "promise hook failed: #{exc}"
+  rescue StandardError => e
+    Marty::Util.logger.error "promise hook failed: #{e}"
   end
 
   def max_attempts