marty 3.1.0 → 4.0.0.rc2

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.map(&:to_s) - db_values
+    ex_values = klass::VALUES - 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 => e
-      raise "non-serializable parameters: #{params} #{e}"
+    rescue StandardError => exc
+      raise "non-serializable parameters: #{params} #{exc}"
     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 => e
-      res = Delorean::Engine.grok_runtime_exception(e)
-      # log "ERR- #{Process.pid} #{promise.id} #{Time.now.to_f} #{e}"
+    rescue StandardError => exc
+      res = Delorean::Engine.grok_runtime_exception(exc)
+      # log "ERR- #{Process.pid} #{promise.id} #{Time.now.to_f} #{exc}"
     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 => e
-      Marty::Util.logger.error "promise hook failed: #{e}"
+  rescue StandardError => exc
+      Marty::Util.logger.error "promise hook failed: #{exc}"
   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 => e
-            @result = ::Delorean::Engine.grok_runtime_exception(e)
+          rescue ::Exception => exc
+            @result = ::Delorean::Engine.grok_runtime_exception(exc)
           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 => e
-      res = ::Marty::Promise.exception_to_result(promise: promise, exception: e)
+    rescue StandardError => exc
+      res = ::Marty::Promise.exception_to_result(promise: promise, exception: exc)
     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 => e
-    Marty::Util.logger.error "promise hook failed: #{e}"
+  rescue StandardError => exc
+    Marty::Util.logger.error "promise hook failed: #{exc}"
   end
 
   def max_attempts

data/lib/marty/version.rb

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

data/marty.gemspec

@@ -26,21 +26,26 @@ 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']
-  # 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 'pg', '~> 0.21'
+
+  s.add_dependency 'netzke', '6.5.0.0'
+
   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 '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 'net-ldap', '~> 0.16.1'
   s.add_dependency 'rubyzip'
-  s.add_dependency 'zip-zip'
+  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 'delayed_cron_job'
+  s.add_dependency 'delayed_job_active_record'
 end

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

@@ -35,30 +35,15 @@ class Marty::Diagnostic::Aws::Ec2Instance < Marty::Aws::Request
 
   def ec2_request action, params = {}
     resp = request({ action: action }, params)
-    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
+    Hash.from_xml(resp)["#{action}Response"]
   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' }
-
-    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
+    ec2_request('DescribeTags', params)['tagSet']['item']['value']
   end
 
   def get_instances

data/other/marty/diagnostic/database.rb

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

data/other/marty/diagnostic/delayed_job_version.rb

@@ -31,6 +31,7 @@ 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/models/gemini/fannie_bup.rb

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

data/spec/dummy/config/application.rb

@@ -79,7 +79,6 @@ 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_key_base = 'a087c113817a728e1552d63682abbd7f19fd7481ea3e24154889af53ab56d114f8901f63909a5e8310260c7187f6fd203cddc8743f6486fead0a4043cd7976c2'
+Dummy::Application.config.secret_token = 'a087c113817a728e1552d63682abbd7f19fd7481ea3e24154889af53ab56d114f8901f63909a5e8310260c7187f6fd203cddc8743f6486fead0a4043cd7976c2'

data/spec/features/data_grid_spec.rb

@@ -2,10 +2,6 @@ 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
@@ -15,22 +11,12 @@ 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(admin: true)
-    log_in_as(admin ? 'marty' : 'grid_user')
+  def go_to_data_grids
     press('Applications')
-    dest = 'Data Grids' + (admin ? ' Admin' : '')
-    press(dest)
-    expect(page).to have_content dest
+    press('Data Grids')
+    expect(page).to have_content 'Data Grids'
   end
 
   # setup the info for the ext grid
@@ -38,7 +24,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?('DataGrid1') }.first
+              reject { |e| e.text.include?('2016-12-31') }.first
     @gridx = @grid.native.rect.x
     @gridy = @grid.native.rect.y
     height = @grid.native.size.height
@@ -292,96 +278,18 @@ feature 'data grid view', js: true do
     expect(grid_meta).to eq(exp_meta)
   end
 
-  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
+  it 'dg editor' do
     log_in_as('marty')
     go_to_data_grids
     dgv = netzke_find('data_grid_view')
     grids = dgv.get_col_vals('name', 5)
-    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],
+    context_test_all = ENV['DG_FEATURE_QUICK'] != 'true'
+    [['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')
@@ -392,14 +300,8 @@ feature 'data grid view', js: true do
         wait_for_ajax
       end
     end
-  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)
+    Marty::Config['grid_edit_edit_perm'] = 'edit_all'
+    Marty::Config['grid_edit_save_perm'] = 'edit_all'
 
     # now test some editing, saving, and cancel logic
     get_latest = lambda do
@@ -558,5 +460,40 @@ 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