marty 4.0.0.rc2 → 5.1.0

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = '4.0.0.rc2'
+  VERSION = '5.1.0'
 end

data/make-app.mk

@@ -19,7 +19,7 @@ app-bash:
 	docker-compose --file=docker-compose.dummy.yml run --rm app bash
 
 app-console:
-	docker-compose --file=docker-compose.dummy.yml run --rm app /bin/bash -c "cd spec/dummy && bin/rails c"
+	docker-compose --file=docker-compose.dummy.yml run --rm app /bin/bash -c "cd spec/dummy && rails c"
 
 app-initialise-docker:
 	touch .bash_history.docker

data/marty.gemspec

@@ -26,26 +26,21 @@ Gem::Specification.new do |s|
     'Marty is a framework for viewing and reporting on versioned data.'
   s.files       = `git ls-files`.split($\)
   s.licenses    = ['MIT']
-
-  s.add_dependency 'pg', '~> 0.21'
-
-  s.add_dependency 'netzke', '6.5.0.0'
-
+  # used for signing aws ec2 requests
+  s.add_dependency 'aws-sigv4'
+  # Only pinning this because there's no other way around it for Axlsx.
+  # DO NOT unpin this.
   s.add_dependency 'axlsx', '3.0.0pre'
-
-  s.add_dependency 'delorean_lang', '~> 1.0'
-  s.add_dependency 'mcfly', '~> 0.0.20'
-
   s.add_dependency 'coderay'
-  s.add_dependency 'json-schema'
-  s.add_dependency 'net-ldap', '~> 0.16.1'
-  s.add_dependency 'rubyzip'
-  s.add_dependency 'sqlite3'
-
-  # used for signing aws ec2 requests
-  s.add_dependency 'aws-sigv4', '~> 1.0', '>= 1.0.2'
-
-  s.add_dependency 'daemons', '~> 1.3.1'
+  s.add_dependency 'daemons'
   s.add_dependency 'delayed_cron_job'
   s.add_dependency 'delayed_job_active_record'
+  s.add_dependency 'delorean_lang'
+  s.add_dependency 'json-schema'
+  s.add_dependency 'mcfly'
+  s.add_dependency 'net-ldap'
+  s.add_dependency 'netzke'
+  s.add_dependency 'pg'
+  s.add_dependency 'rubyzip'
+  s.add_dependency 'zip-zip'
 end

data/other/marty/diagnostic/aws/ec2_instance.rb

@@ -35,15 +35,30 @@ class Marty::Diagnostic::Aws::Ec2Instance < Marty::Aws::Request
 
   def ec2_request action, params = {}
     resp = request({ action: action }, params)
-    Hash.from_xml(resp)["#{action}Response"]
+    parsed = Hash.from_xml(resp)
+
+    # check AWS response for errors
+    error = parsed.dig('Response', 'Errors', 'Error')
+    raise Marty::Diagnostic::Aws::Error.new(action, error) if error
+
+    action_resp = parsed["#{action}Response"]
+    raise Marty::Diagnostic::Aws::Error.new(action, parsed) unless action_resp
+
+    action_resp
   end
 
   def get_tag
+    action = 'DescribeTags'
     params = { 'Filter.1.Name' => 'resource-id',
               'Filter.1.Value.1' => get_instance_id,
               'Filter.2.Name'    => 'key',
               'Filter.2.Value.1' => 'Name' }
-    ec2_request('DescribeTags', params)['tagSet']['item']['value']
+
+    action_resp = ec2_request(action, params)
+    tag = action_resp.dig('tagSet', 'item', 'value')
+    raise Marty::Diagnostic::Aws::Error.new(action, action_resp) unless tag
+
+    tag
   end
 
   def get_instances

data/other/marty/diagnostic/aws/error.rb

@@ -0,0 +1,8 @@
+class Marty::Diagnostic::Aws::Error < StandardError
+  attr_accessor :object
+
+  def initialize(action, object = nil)
+    super("#{action}: #{object.try(:[], 'Message') || 'Unexpected Response'}")
+    self.object = object
+  end
+end

data/other/marty/diagnostic/database.rb

@@ -20,9 +20,9 @@ module Marty::Diagnostic::Database
   end
 
   def self.db_schema
-    current = ActiveRecord::Migrator.current_version
+    current = ActiveRecord::Migration.current_version
     raise "Migration is needed.\nCurrent Version: #{current}" if
-      ActiveRecord::Migrator.needs_migration?
+      ActiveRecord::Base.connection.migration_context.needs_migration?
 
     current.to_s
   end

data/other/marty/diagnostic/delayed_job_version.rb

@@ -31,7 +31,6 @@ module Marty::Diagnostic; class DelayedJobVersion < Base
       hash[r[0]] ||= []
       hash[r[0]] << r[1]
     end.map do |node, result|
-
       versions = result.uniq
       status = versions.count == 1 && versions[0] == ENV['DELAYED_VER']
 

data/spec/dummy/app/components/gemini/my_rule_view.rb

@@ -32,15 +32,41 @@ class Gemini::MyRuleView < Marty::DeloreanRuleView
                  setter: jsonb_simple_setter(:computed_guards),
                  height: 50)]
   end
+
   def default_form_items
     [
       hbox(
-        vbox(*form_items_attrs +
-             form_items_guards +
-             form_items_grids,
-             border: false,
-             width: "40%",
-        ),
+        vbox(
+          hbox(
+            vbox(
+              *form_items_attrs,
+              width: '100%',
+              border: false
+            ),
+            width: '100%',
+            border: false
+          ),
+          hbox(
+            vbox(
+              *default_form_items_guards,
+              width: '100%',
+              border: false
+            ),
+            width: '100%',
+            border: false
+          ),
+          hbox(
+            vbox(
+              *form_items_grids,
+              width: '100%',
+              border: false
+            ),
+            width: '100%',
+            border: false
+          ),
+          width: '40%',
+          border: false
+        ), 
         vbox(width: '2%', border: false),
         vbox(
              width: '55%', border: false),

data/spec/dummy/app/models/gemini/fannie_bup.rb

@@ -29,70 +29,63 @@ module Gemini
     gen_mcfly_lookup :lookup, {
                        entity: true,
                        note_rate: false
-                     }, to_hash: true
-
+                     }
     gen_mcfly_lookup :lookup_p, {
                        entity: true,
                        note_rate: false
-                     }, to_hash: false
-
+                     }, private: true
     gen_mcfly_lookup :clookup, {
                        entity: true,
                        note_rate: false
-                     }, cache: true, to_hash: true
-
+                     }, cache: true
     gen_mcfly_lookup :clookup_p, {
                        entity: true,
                        note_rate: false
-                     }, cache: true, to_hash: false
-
+                     }, cache: true, private: true
     gen_mcfly_lookup :lookupn, {
                        entity: true,
                        note_rate: false
-                     }, mode: nil, to_hash: true
-
+                     }, mode: nil
     gen_mcfly_lookup :lookupn_p, {
                        entity: true,
                        note_rate: false
-                     }, to_hash: false, mode: nil
-
+                     }, private: true, mode: nil
     gen_mcfly_lookup :clookupn, {
                        entity: true,
                        note_rate: false
-                     }, cache: true, mode: nil, to_hash: true
-
+                     }, cache: true, mode: nil
     gen_mcfly_lookup :clookupn_p, {
                        entity: true,
                        note_rate: false
-                     }, cache: true, to_hash: false, mode: nil
+                     }, cache: true, private: true, mode: nil
 
-    mcfly_lookup :a_func, sig: 3, to_hash: true do
+    mcfly_lookup :a_func, sig: 3 do
       |pt, e_id, bc_id|
       where(entity_id: e_id, bud_category_id: bc_id).
         order(:settlement_mm)
     end
 
-    mcfly_lookup :b_func, sig: [3, 4], to_hash: true do
+    mcfly_lookup :b_func, sig: [3, 4] do
       |pt, e_id, bc_id, mm = nil|
       q = where(entity_id: e_id, bud_category_id: bc_id)
       q = q.where(settlement_mm: mm) if mm
       q.order(:settlement_mm).first
     end
 
-    mcfly_lookup :a_func_p, sig: 3, to_hash: false do
+    mcfly_lookup :a_func_p, sig: 3, private: true do
       |pt, e_id, bc_id|
       where(entity_id: e_id, bud_category_id: bc_id).
         order(:settlement_mm)
     end
 
-    mcfly_lookup :b_func_p, sig: [3, 4], to_hash: false do
+    mcfly_lookup :b_func_p, sig: [3, 4], private: true do
       |pt, e_id, bc_id, mm = nil|
       q = where(entity_id: e_id, bud_category_id: bc_id)
       q = q.where(settlement_mm: mm) if mm
       q.order(:settlement_mm)
     end
 
-    cached_mcfly_lookup :ca_func, sig: 3, to_hash: true do
+    cached_mcfly_lookup :ca_func, sig: 3 do
       |pt, e_id, bc_id|
       where(entity_id: e_id, bud_category_id: bc_id).
         order(:settlement_mm)

data/spec/dummy/app/models/gemini/my_rule.rb

@@ -16,17 +16,21 @@ class Gemini::MyRule < Marty::DeloreanRule
     super + {"g_array" => { multi: true, type: :string,
                             enum: Gemini::GuardOne,},
              "g_single" => { type: :string,
+                             allow_not: false,
                              enum: Gemini::GuardTwo,
                              width: 100},
              "g_string" => { type: :string,
                              values: ["Hi Mom", "abc", "def", "zzz"],
                              width: 100},
              "g_bool" => { type: :boolean,
+                           allow_not: true,
                            width: 100,
                            null: false},
              "g_nullbool" => { type: :boolean,
+                           allow_not: false,
                            width: 100},
              "g_range" => { type: :range,
+                            allow_not: true,
                             width: 100},
              "g_integer" => { type: :integer,
                               width: 100},

data/spec/dummy/app/models/gemini/xyz_rule.rb

@@ -16,7 +16,9 @@ class Gemini::XyzRule < Marty::DeloreanRule
     'RULEOPTS_XYZ'
   end
   def self.guard_info
-    super + {"flavors" => { multi: true, type: :string,
+    super + {"flavors" => { multi: true,
+                            type: :string,
+                            allow_not: false,
                             enum: Gemini::XyzEnum,
                             width: 150},
              "guard_two" => { type: :string,

data/spec/dummy/config/application.rb

@@ -79,6 +79,7 @@ module Dummy
                           :dev,
                           :viewer,
                           :user_manager,
+                          :data_grid_editor,
                          ]
     #config.marty.default_posting_type = 'BASE'
     config.secret_key_base = "SECRET_KEY_BASE"

data/spec/dummy/config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = 'a087c113817a728e1552d63682abbd7f19fd7481ea3e24154889af53ab56d114f8901f63909a5e8310260c7187f6fd203cddc8743f6486fead0a4043cd7976c2'
+Dummy::Application.config.secret_key_base = 'a087c113817a728e1552d63682abbd7f19fd7481ea3e24154889af53ab56d114f8901f63909a5e8310260c7187f6fd203cddc8743f6486fead0a4043cd7976c2'

data/spec/dummy/db/migrate/20190702115241_add_simple_guards_options_to_rules.rb

@@ -0,0 +1,37 @@
+class AddSimpleGuardsOptionsToRules < ActiveRecord::Migration[5.1]
+  def change
+    add_column :gemini_my_rules, :simple_guards_options, :jsonb, null: false, default: {}
+    add_column :gemini_xyz_rules, :simple_guards_options, :jsonb, null: false, default: {}
+
+    reversible do |dir|
+      dir.up { create_indexes }
+    end
+  end
+
+  def create_indexes
+    ['gemini_my_rules',  'g_array',    :array,
+     'gemini_my_rules',  'g_single',   :scalar,
+     'gemini_my_rules',  'g_string',   :scalar,
+     'gemini_my_rules',  'g_bool',     :scalar,
+     'gemini_my_rules',  'g_integer',  :scalar,
+     'gemini_my_rules',  'g_range',    :range,
+     'gemini_xyz_rules', 'flavors',    :array,
+     'gemini_xyz_rules', 'guard_two',  :scalar,
+     'gemini_xyz_rules', 'g_date',     :scalar,
+     'gemini_xyz_rules', 'g_datetime', :scalar,
+     'gemini_xyz_rules', 'g_bool',     :scalar,
+     'gemini_xyz_rules', 'g_integer',  :scalar,
+     'gemini_xyz_rules', 'g_range1',   :range,
+     'gemini_xyz_rules', 'g_range2',   :range,
+    ].in_groups_of(3).each do |table, field, type|
+
+      col = "(simple_guards_options -> '#{field}' -> 'not')"
+      sql = <<-SQL
+        CREATE INDEX idx_#{table}_#{field}_not ON #{table} USING BTREE
+        (#{col});
+      SQL
+
+      execute sql
+    end
+  end
+end

data/spec/features/data_grid_spec.rb

@@ -1,7 +1,10 @@
 require 'spec_helper'
-require 'marty_rspec'
 
 feature 'data grid view', js: true do
+  before(:all) do
+    self.use_transactional_tests = true
+  end
+
   before(:each) do
     marty_whodunnit
     Marty::Script.load_scripts
@@ -11,12 +14,22 @@ feature 'data grid view', js: true do
       n = File.basename(path, '.txt').camelize
       Marty::DataGrid.create_from_import(n, File.read(path), dt)
     end
+    u = Marty::User.create!(login: 'grid_user',
+                            firstname: 'grid',
+                            lastname: 'user',
+                            active: true)
+    Marty::UserRole.create!(user_id: u.id, role: 'data_grid_editor')
+    @no_perm = { 'view' => [],
+                 'edit_data' => [],
+                 'edit_all' => [] }
   end
 
-  def go_to_data_grids
+  def go_to_data_grids(admin: true)
+    log_in_as(admin ? 'marty' : 'grid_user')
     press('Applications')
-    press('Data Grids')
-    expect(page).to have_content 'Data Grids'
+    dest = 'Data Grids' + (admin ? ' Admin' : '')
+    press(dest)
+    expect(page).to have_content dest
   end
 
   # setup the info for the ext grid
@@ -24,7 +37,7 @@ feature 'data grid view', js: true do
     widths, rows = get_grid_info
     @grid = page.all(:xpath,
                      ".//div[contains(@class, 'x-grid-item-container')]").
-              reject { |e| e.text.include?('2016-12-31') }.first
+              reject { |e| e.text.include?('DataGrid1') }.first
     @gridx = @grid.native.rect.x
     @gridy = @grid.native.rect.y
     height = @grid.native.size.height
@@ -278,18 +291,96 @@ feature 'data grid view', js: true do
     expect(grid_meta).to eq(exp_meta)
   end
 
-  it 'dg editor' do
+  it 'dg perms' do
+    log_in_as('marty')
+    go_to_data_grids
+    dgv = netzke_find('data_grid_view')
+    grids = dgv.get_col_vals('name', 5)
+    set_one = lambda do |grid, perms|
+      pos = grids.index(grid) + 1
+      dgv.select_row(pos)
+      press('Edit')
+      wait_for_ajax
+      view_combo = netzke_find('Can View', 'combobox')
+      edit_data_combo = netzke_find('Can Edit Data', 'combobox')
+      edit_all_combo = netzke_find('Can Edit All', 'combobox')
+      view_combo.select_values(perms['view'].join(', '))
+      edit_data_combo.select_values(perms['edit_data'].join(', '))
+      edit_all_combo.select_values(perms['edit_all'].join(', '))
+      press('OK')
+      wait_for_ajax
+    end
+    dg1p = { 'view' => ['Data Grid Editor'],
+             'edit_data' => ['Data Grid Editor'],
+             'edit_all' => ['Admin'] }
+    dg2p = { 'view' => ['Data Grid Editor', 'User Manager'],
+             'edit_data' => ['Data Grid Editor', 'User Manager'],
+            'edit_all' => ['Data Grid Editor', 'Admin'] }
+    set_one.call('DataGrid1', dg1p)
+    set_one.call('DataGrid2', dg2p)
+    dg1 = Marty::DataGrid.mcfly_pt('infinity').find_by(name: 'DataGrid1')
+    dg2 = Marty::DataGrid.mcfly_pt('infinity').find_by(name: 'DataGrid2')
+    fixexp = lambda do |orig_h|
+      orig_h.each_with_object({}) do |(k, v), h|
+        h[k] = v.map do |vals|
+          vals.split(' ').map(&:downcase).join('_')
+        end.sort
+      end
+    end
+    exp1 = fixexp.call(dg1p)
+    exp2 = fixexp.call(dg2p)
+    fixgot = ->(orig_h) { Hash[orig_h.map { |k, v| [k, v.sort] }] }
+    got1 = fixgot.call(dg1.permissions)
+    got2 = fixgot.call(dg2.permissions)
+    cmp1 = struct_compare(got1, exp1)
+    cmp2 = struct_compare(got2, exp2)
+    expect(cmp1).to be_falsey
+    expect(cmp2).to be_falsey
+
+    set_one.call('DataGrid1', @no_perm)
+    set_one.call('DataGrid2', @no_perm)
+    dg1 = Marty::DataGrid.mcfly_pt('infinity').find_by(name: 'DataGrid1')
+    dg2 = Marty::DataGrid.mcfly_pt('infinity').find_by(name: 'DataGrid2')
+    expect(dg1.permissions).to eq(@no_perm)
+    expect(dg2.permissions).to eq(@no_perm)
+  end
+
+  it 'show grid' do
     log_in_as('marty')
     go_to_data_grids
     dgv = netzke_find('data_grid_view')
     grids = dgv.get_col_vals('name', 5)
-    context_test_all = ENV['DG_FEATURE_QUICK'] != 'true'
-    [['edit_all', context_test_all],
+    pos = grids.index('DataGrid1') + 1
+    dgv.select_row(pos)
+    press('Show Grid')
+    expect(page).to have_content('Antwerp')
+  end
+
+  def set_perm(perm)
+    p = @no_perm + (perm ? { perm => ['data_grid_editor'] } : {})
+    Marty::DataGrid.mcfly_pt('infinity').each do |dg|
+      dg.permissions = p
+      dg.save!
+    end
+  end
+
+  it 'dg context menus' do
+    log_in_as('grid_user')
+    go_to_data_grids(admin: false)
+    dgv = netzke_find('data_grid_user_view')
+    context_test_all = ENV['DG_FEATURE_FULL'] == 'true'
+    [[nil, nil],
+     ['edit_all', context_test_all],
      ['edit_data', false],
      ['view', false]].each do |perm, all_cells|
+      set_perm(perm)
+      press('Refresh')
+      grids = dgv.get_col_vals('name', 5)
+      if perm.nil?
+        expect(grids).to be_nil
+        next
+      end
       grids.each do |grid|
-        Marty::Config['grid_edit_edit_perm'] = perm
-        Marty::Config['grid_edit_save_perm'] = perm
         pos = grids.index(grid) + 1
         dgv.select_row(pos)
         press('Edit Grid')
@@ -300,8 +391,14 @@ feature 'data grid view', js: true do
         wait_for_ajax
       end
     end
-    Marty::Config['grid_edit_edit_perm'] = 'edit_all'
-    Marty::Config['grid_edit_save_perm'] = 'edit_all'
+  end
+
+  it 'dg editor' do
+    set_perm('edit_all')
+    log_in_as('grid_user')
+    go_to_data_grids(admin: false)
+    dgv = netzke_find('data_grid_user_view')
+    grids = dgv.get_col_vals('name', 5)
 
     # now test some editing, saving, and cancel logic
     get_latest = lambda do
@@ -460,40 +557,5 @@ feature 'data grid view', js: true do
     press('Save')
     sleep 1
     validate_grid('1')
-
-    Marty::Config['grid_edit_save_perm'] = 'view'
-    pos = grids.index('DataGrid5') + 1
-    dgv.select_row(pos)
-    count = 1
-    begin
-      press('Edit Grid')
-      wait_for_ajax
-      grid_setup
-      cell_edit(2, 3, '123.456')
-    rescue StandardError => e
-      if count > 0
-        sleep 1
-        retry
-      end
-      count -= 1
-    end
-    press('Save')
-    errexp = 'error: save_grid: entered with view permissions'
-    expect(page).to have_content(errexp)
-    press('OK')
-    wait_for_ajax
-    context_click(2, 4, 4, click: true)
-    Marty::Config['grid_edit_save_perm'] = 'edit_data'
-    press('Save')
-    errexp = 'error: save_grid: grid modification not allowed'
-    expect(page).to have_content(errexp)
-    exp_log = JSON.parse(File.read('spec/fixtures/misc/grid_log_errs.json'))
-    got = Marty::Log.all.select(:message, :details).attributes.map do |l|
-      newl = l.except('id')
-      newl['details'].delete('rec_id')
-      newl
-    end
-    cmp = struct_compare(got, exp_log)
-    expect(cmp).to be_falsey
   end
 end