marty 3.1.0 → 4.0.0.rc2

data/spec/features/reporting_spec.rb

@@ -206,8 +206,8 @@ DELOREAN
     end
 
     wait_for_element do
-      expect(page).to have_content("XYZ1,XYZ2,XYZ3,XYZ4\n1,2,3,4\n2,4,6,8\n" +
-                                   "3,6,9,12\n4,8,12,16")
+      expect(page).to have_content('XYZ1,XYZ2,XYZ3,XYZ4 1,2,3,4 2,4,6,8 ' +
+                                   '3,6,9,12 4,8,12,16')
     end
   end
 
@@ -263,8 +263,8 @@ DELOREAN
     url = generate_rep_url(format: 'txt') + URI.encode('&disposition=inline')
     visit url
     wait_for_element do
-      expect(page).to have_content("XYZ1,XYZ2,XYZ3,XYZ4\n1,2,3,4\n2,4,6,8\n" +
-                                   "3,6,9,12\n4,8,12,16")
+      expect(page).to have_content('XYZ1,XYZ2,XYZ3,XYZ4 1,2,3,4 2,4,6,8 ' +
+                                   '3,6,9,12 4,8,12,16')
     end
   end
 

data/spec/features/rule_spec.rb

@@ -419,7 +419,7 @@ EOL
                                                    %Q({"grid1":"DataGrid1"}),
                                                    %Q({"grid1":"DataGrid1"})])
     press('Applications')
-    press('Data Grids Admin')
+    press('Data Grids')
     dgv = netzke_find('data_grid_view')
     cvs = dgv.get_col_vals(:name, 4, 0)
     ind1 = cvs.index('DataGrid1') + 1

data/spec/features/scripting_spec.rb

@@ -221,7 +221,7 @@ feature 'under Applications menu, Scripting workflows', js: true do
 
     and_by 'form displays correct body' do
       wait_for_ajax
-      expect(page).to have_content "1\n#5\n2\n#1\n3\n#2\n4\n#3"
+      expect(page).to have_content '1 #5 2 #1 3 #2 4 #3'
     end
 
     and_by 'select different tag' do
@@ -235,7 +235,7 @@ feature 'under Applications menu, Scripting workflows', js: true do
 
     and_by 'form displays updated body' do
       wait_for_ajax
-      expect(page).to have_content "1\n#5\n2\n#1"
+      expect(page).to have_content '1 #5 2 #1'
     end
   end
 
@@ -288,7 +288,7 @@ feature 'under Applications menu, Scripting workflows', js: true do
       tag_grid.select_row(2)
       wait_for_ajax
       script_grid.select_row(5)
-      expect(page).to have_content "1\n#123\n2\n#456"
+      expect(page).to have_content '1 #123 2 #456'
       expect(tag_grid.get_row_vals(2)).to netzke_include(comment: 'ABCD')
     end
   end

data/spec/features/user_view_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'under System menu, User Management worflows', js: true do
+feature 'under Sytem menu, User Management worflows', js: true do
   def go_to_user_view
     press('System')
     press('User Management')
@@ -8,7 +8,7 @@ feature 'under System menu, User Management worflows', js: true do
   end
 
   def go_to_user_view_backdoor
-    sys_btn = first(:btn, 'System') rescue nil
+    sys_btn = first(:btn, 'System')
     if sys_btn
       sys_btn.click
       expect(page).not_to have_content 'User Management'
@@ -77,7 +77,6 @@ feature 'under System menu, User Management worflows', js: true do
 
     and_by 'check row got edited' do
       wait_for_ajax
-      r2 = user_view.get_row_vals(2)
       expect(user_view.get_row_vals(2)).to netzke_include(
         login: 'new_login',
         firstname: 'new_fname',
@@ -115,9 +114,6 @@ feature 'under System menu, User Management worflows', js: true do
       by 'check buttons' do
         find(:btn, 'New User', match: :first)
         user_view.select_row(1)
-        expect { find(:btn, 'New User') }.not_to raise_error
-        expect { find(:btn, 'Edit') }.not_to raise_error
-        expect { find(:btn, 'Delete') }.not_to raise_error
         expect(btn_disabled?('New User')).to be_falsy
         expect(btn_disabled?('Edit')).to be_falsy
         expect(btn_disabled?('Delete')).to be_falsy
@@ -131,9 +127,6 @@ feature 'under System menu, User Management worflows', js: true do
       by 'check buttons' do
         find(:btn, 'New User', match: :first)
         user_view.select_row(1)
-        expect { find(:btn, 'New User') }.not_to raise_error
-        expect { find(:btn, 'Edit') }.not_to raise_error
-        expect { find(:btn, 'Delete') }.not_to raise_error
         expect(btn_disabled?('New User')).to be_falsy
         expect(btn_disabled?('Edit')).to be_falsy
         expect(btn_disabled?('Delete')).to be_falsy
@@ -147,10 +140,9 @@ feature 'under System menu, User Management worflows', js: true do
       user_view = netzke_find('user_view')
       by 'check buttons' do
         user_view.select_row(1)
-        err = /Unable to find btn/
-        ['New User', 'Edit', 'Delete'].each do |btn_name|
-          expect { find(:btn, btn_name) }.to raise_error(err)
-        end
+        expect(page).not_to have_content('New User')
+        expect(page).not_to have_content('Edit')
+        expect(page).not_to have_content('Delete')
       end
     end
 
@@ -161,10 +153,9 @@ feature 'under System menu, User Management worflows', js: true do
       user_view = netzke_find('user_view')
       by 'check buttons' do
         user_view.select_row(1)
-        err = /Unable to find btn/
-        ['New User', 'Edit', 'Delete'].each do |btn_name|
-          expect { find(:btn, btn_name) }.to raise_error(err)
-        end
+        expect(page).not_to have_content('New User')
+        expect(page).not_to have_content('Edit')
+        expect(page).not_to have_content('Delete')
       end
     end
   end

data/spec/lib/data_importer_spec.rb

@@ -349,8 +349,8 @@ describe DataImporter do
 
     begin
       Marty::DataImporter.do_import_summary(Gemini::FannieBup, fannie_bup4)
-    rescue Marty::DataImporter::Error => e
-      e.lines.should == [0]
+    rescue Marty::DataImporter::Error => exc
+      exc.lines.should == [0]
     else
       raise 'should have had an exception'
     end
@@ -390,9 +390,9 @@ describe DataImporter do
 
     begin
       Marty::DataImporter.do_import_summary(Gemini::FannieBup, fannie_bup5)
-    rescue Marty::DataImporter::Error => e
-      e.lines.should == [1]
-      e.message.should =~ /Conv Fixed XX/
+    rescue Marty::DataImporter::Error => exc
+      exc.lines.should == [1]
+      exc.message.should =~ /Conv Fixed XX/
     else
       raise 'should have had an exception'
     end
@@ -409,9 +409,9 @@ describe DataImporter do
     begin
       res = Marty::DataImporter.
         do_import_summary(Gemini::FannieBup, fannie_bup6)
-    rescue Marty::DataImporter::Error => e
-      e.lines.should == [1]
-      e.message.should =~ /bad float/
+    rescue Marty::DataImporter::Error => exc
+      exc.lines.should == [1]
+      exc.message.should =~ /bad float/
     else
       raise 'should have had an exception'
     end

data/spec/lib/mcfly_model_spec.rb

@@ -113,16 +113,16 @@ describe 'McflyModel' do
     a1 = @engine.evaluate('A', 'lookup', params)
     a2 = @engine.evaluate('A', 'clookup', params)
     expect(a1).to eq(a2)                            # cache/non return same
-    expect(a1.class).to eq(OpenStruct)              # mode default so return OS
-    expect(a2.class).to eq(OpenStruct)
+    expect(a1.class).to eq(Hash)              # mode default so return hash
+    expect(a2.class).to eq(Hash)
 
     # check that keys are non mcfly non uniqueness
-    expect(a1.to_h.keys.to_set).to eq(Set[:buy_up, :buy_down])
+    expect(a1.to_h.keys.to_set).to eq(Set['buy_up', 'buy_down'])
   end
 
   it 'lookup non generated' do
     # a1 will be AR Relations
-    # b1 will be OpenStructs because the b fns return #first
+    # b1 will be hash because the b fns return #first
     e_id = Gemini::Entity.where(name: 'PLS').first.id
     bc_id = Gemini::BudCategory.where(name: 'Conv Fixed 20').first.id
     p = { 'e_id' => e_id, 'bc_id' => bc_id }
@@ -141,10 +141,10 @@ describe 'McflyModel' do
     # a1 is AR but still missing the FK entity_id so will raise
     expect { a1.first.entity }.to raise_error(/missing attribute: entity_id/)
 
-    expect(b1.class).to eq(OpenStruct)
+    expect(b1.class).to eq(Hash)
 
     # make sure b1 has correct keys
-    expect(b1.to_h.keys.to_set).to eq(Set[:buy_up, :buy_down])
+    expect(b1.to_h.keys.to_set).to eq(Set['buy_up', 'buy_down'])
   end
 
   it 'lookup mode nil' do

data/spec/models/data_grid_spec.rb

@@ -814,8 +814,7 @@ EOS
       # rubocop:disable Style/NestedTernaryOperator
       type_str = type == 'float' ? (explicit_float ? 'float' : nil) : type
       # rubocop:enable Style/NestedTernaryOperator
-      con_part = constraint.present? ? "\t" + constraint : ''
-      top = [lenient_str, type_str].compact.join(' ') + con_part + "\n"
+      top = [lenient_str, type_str].compact.join(' ') + "\t" + constraint + "\n"
       (top =~ /\A\s*\z/ ? '' : top) +
         <<~EOS
           b\tboolean\tv
@@ -837,8 +836,8 @@ EOS
         tests = JSON.parse(File.read('spec/fixtures/json/data_grid.json'))
         aggregate_failures do
           tests.each do |test|
-            keys = %w[id type constraint values error line1]
-            id, type, constraint, values, error, line1 = test.values_at(*keys)
+            keys = %w[id type constraint values error]
+            id, type, constraint, values, error = test.values_at(*keys)
             err_re = Regexp.new(error) if error
             # for float, do both ex- and implicit declaration
             exfls = type == 'float' ? [true, false] : [true]
@@ -849,21 +848,7 @@ EOS
                 got = nil
                 tnam = "Test #{id} lenient=#{lenient} exfl=#{exfl}"
                 begin
-                  dg = dg_from_import(tnam, grid)
-
-                  # make sure export of line1  works correctly
-                  # when dg is lenient and/or has constraint and/or
-                  # not float
-                  next unless lenient || constraint.present? ||
-                              type != 'float'
-
-                  # also skip grids where we included float explicitly
-                  # because export will convert back to implicit
-                  next if type == 'float' && exfl
-
-                  dga = dg.export_array
-                  line1 = dga.first.first.join("\t") + "\n"
-                  expect(line1).to eq(grid.lines.first)
+                  dg_from_import(tnam, grid)
                 rescue StandardError => e
                   got = e.message
                 end

data/spec/spec_helper.rb

@@ -11,8 +11,8 @@ require "#{support}/shared_connection"
 
 Dummy::Application.initialize! unless Dummy::Application.initialized?
 
-ActiveRecord::Migration.migrate File.expand_path('../../db/migrate/', __FILE__)
-ActiveRecord::Migration.migrate File.expand_path('../dummy/db/migrate/', __FILE__)
+ActiveRecord::Migrator.migrate File.expand_path('../../db/migrate/', __FILE__)
+ActiveRecord::Migrator.migrate File.expand_path('../dummy/db/migrate/', __FILE__)
 
 require 'rspec/retry'
 

data/spec/support/netzke.rb

@@ -18,7 +18,7 @@ module Marty; module RSpec; module Netzke
   end
 
   def log_in(username, password)
-    wait_for_ready(25)
+    wait_for_ready(10)
 
     begin
       if first("a[data-qtip='Current user']")
@@ -52,9 +52,8 @@ module Marty; module RSpec; module Netzke
   def press button_name, index_of = 0
     wait_for_element do
       begin
-        cmp = first("a[data-qtip='#{button_name}']") rescue nil
-        cmp ||= all(:xpath, './/a', text: button_name.to_s).
-                  detect { |c| c.text == button_name.to_s } rescue nil
+        cmp = first("a[data-qtip='#{button_name}']")
+        cmp ||= first(:xpath, './/a', text: button_name.to_s)
         cmp ||= find(:btn, button_name, match: :first)
         cmp.click
         true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.0.0.rc2
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,80 +14,80 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-12 00:00:00.000000000 Z
+date: 2019-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sigv4
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
-  name: axlsx
+  name: netzke
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0pre
+        version: 6.5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0pre
+        version: 6.5.0.0
 - !ruby/object:Gem::Dependency
-  name: coderay
+  name: axlsx
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0pre
 - !ruby/object:Gem::Dependency
-  name: daemons
+  name: delorean_lang
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: delayed_cron_job
+  name: mcfly
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.20
 - !ruby/object:Gem::Dependency
-  name: delayed_job_active_record
+  name: coderay
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,7 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: delorean_lang
+  name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,21 +115,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json-schema
+  name: net-ldap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
-  name: mcfly
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,7 +143,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-ldap
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -157,35 +157,41 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: netzke
+  name: aws-sigv4
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: daemons
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: delayed_cron_job
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -199,7 +205,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: zip-zip
+  name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -224,10 +230,10 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".ssh-docker/.keep"
 - ".travis.yml"
 - Dockerfile.dummy
 - Gemfile
+- Gemfile.lock
 - INDEPENDENCE_ISSUES.md
 - MIT-LICENSE
 - Makefile
@@ -250,7 +256,6 @@ files:
 - app/components/marty/auth_app/client/auth_app.js
 - app/components/marty/base_rule_view.rb
 - app/components/marty/config_view.rb
-- app/components/marty/data_grid_user_view.rb
 - app/components/marty/data_grid_view.rb
 - app/components/marty/data_grid_view/client/data_grid_edit.js
 - app/components/marty/delorean_rule_view.rb
@@ -389,7 +394,6 @@ files:
 - db/migrate/105_create_marty_grid_index_booleans.rb
 - db/migrate/106_make_grid_indexes_nullable.rb
 - db/migrate/107_add_data_grid_constraint.rb
-- db/migrate/108_add_data_grid_perms.rb
 - db/migrate/200_create_marty_event_operation_enum.rb
 - db/migrate/201_create_marty_events.rb
 - db/migrate/202_add_completion_status_to_event.rb
@@ -458,7 +462,6 @@ files:
 - marty.gemspec
 - other/marty/api/base.rb
 - other/marty/diagnostic/aws/ec2_instance.rb
-- other/marty/diagnostic/aws/error.rb
 - other/marty/diagnostic/base.rb
 - other/marty/diagnostic/collection.rb
 - other/marty/diagnostic/connections.rb
@@ -1685,9 +1688,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.8