marty 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdb72d97f91a1f370754d64b41ca268addf4f001b061cc3e531f5993d7f5dae7
-  data.tar.gz: 1cefbf2a2e8d6e1176be63e876f7207fbc1fe8c07dd8b78b182ac4621e9f638b
+  metadata.gz: acc8f6db12c19c31f0689c9490ac58111dd10bb74f464a3dc911148646a71d0f
+  data.tar.gz: cc6ba69d0f2cdad1d64b81fc500b595ba3752ab357528efe28a9e78fa53c526f
 SHA512:
-  metadata.gz: c82561e607fcb7ffd5e154e85279c7afd1c992867d495cee261310282fa55912247b09db6bff1d88d773a3e49fac0fe5f361fc2048c4f8cd4ea5f70a3d70db2c
-  data.tar.gz: 540081cb0f2474a32ebb47a5fc42741cedc717d2dc71ebc7bb772af7a8c24c475db5c6812b403b29b2997b95c1123ba576997b95af5cc84f5b1afa9163bc7168
+  metadata.gz: 440d3cac5ac80a0664ccea8250c890fe9899dbc45f3850bf9e8ddf2f5f9c5025414ea7a0ff6e5a44aecde547c15bfbaba8786c6a855eaf8f84a289e2b037d721
+  data.tar.gz: 86e9790e0d676b7a05244332199c70b8176648abce3496a05d7652ce1b5493872c192d0dbf1753f8dcedc63f641d77d74810ce8e85cc4535f374026f566da2bf

data/.gitignore

@@ -36,3 +36,5 @@ spec/dummy/.sass-cache
 /.ssh-docker/*
 !/.ssh-docker/.keep
 
+# Ignore Gemfile.lock
+Gemfile.lock

data/.rubocop.yml

@@ -1,4 +1,5 @@
 inherit_from: .rubocop_todo.yml
+require: rubocop-performance
 
 AllCops:
   TargetRubyVersion: 2.3.3

data/.rubocop_todo.yml

@@ -48,7 +48,7 @@ Layout/ExtraSpacing:
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
-Layout/IndentHash:
+Layout/IndentFirstHashElement:
   Exclude:
     - 'app/components/marty/extras/layout.rb'
     - 'lib/marty/data_change.rb'
@@ -508,7 +508,7 @@ Performance/TimesMap:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-Performance/UnneededSort:
+Style/UnneededSort:
   Exclude:
     - 'app/models/marty/event.rb'
 
@@ -934,19 +934,6 @@ Style/Next:
 Style/NumericLiterals:
   MinDigits: 15
 
-# Offense count: 10
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
-# SupportedStyles: predicate, comparison
-Style/NumericPredicate:
-  Exclude:
-    - 'spec/**/*'
-    - 'app/components/marty/main_auth_app.rb'
-    - 'lib/marty/content_handler.rb'
-    - 'lib/marty/data_change.rb'
-    - 'lib/marty/data_importer.rb'
-    - 'lib/marty/xl.rb'
-
 # Offense count: 42
 # Cop supports --auto-correct.
 Style/ParallelAssignment:

data/Gemfile

@@ -5,33 +5,39 @@ source 'http://rubygems.org'
 # development dependencies will be added by default to the :development group.
 gemspec
 
-gem 'daemons'
-gem 'delayed_job_active_record'
-gem 'pg'
-gem 'rails', '~> 5.1.4'
-gem 'sqlite3'
+group :default do
+  gem 'daemons'
+  gem 'delayed_job_active_record'
+  gem 'pg'
+  gem 'rails'
+end
+
+group :default, :cmit do
+  gem 'delorean_lang'
+  gem 'marty_rspec'
+  gem 'mcfly'
+  # gem 'delorean_lang', path: File.expand_path('../../delorean', __FILE__)
+  # gem 'marty_rspec', path: File.expand_path('../../marty_rspec', __FILE__)
+  # gem 'mcfly', path: File.expand_path('../../mcfly', __FILE__)
+end
 
 group :development, :test do
-  gem 'capybara', '~> 2.18.0'
+  gem 'capybara'
   gem 'connection_pool'
   gem 'database_cleaner'
+  gem 'fuubar', require: false
+  gem 'netzke', '6.5.0.0'
   gem 'pry-byebug'
   gem 'pry-rails'
+  gem 'puma'
   gem 'rails-controller-testing'
   gem 'rspec-instafail', require: false
   gem 'rspec-rails'
   gem 'rspec-retry'
   gem 'rubocop', require: false
+  gem 'rubocop-performance', require: false
+  gem 'rubocop-rails', require: false
   gem 'selenium-webdriver'
   gem 'timecop'
   gem 'webdrivers'
-
-  # gem 'mcfly', path: File.expand_path('../../mcfly', __FILE__)
-  gem 'mcfly'
-  gem 'netzke', '6.5.0.0'
-
-  # gem 'delorean_lang', path: File.expand_path('../../delorean', __FILE__)
-
-  # gem 'marty_rspec', path: File.expand_path('../../marty_rspec', __FILE__)
-  gem 'marty_rspec'
 end

data/app/components/marty/data_grid_view.rb

@@ -134,8 +134,8 @@ module Marty; class DataGridView < McflyGridPanel
       set_perms(dg, data)
       client.success = true
       client.netzke_on_submit_success
-    rescue StandardError => exc
-      client.netzke_notify(exc.to_s)
+    rescue StandardError => e
+      client.netzke_notify(e.to_s)
     end
   end
 
@@ -149,8 +149,8 @@ module Marty; class DataGridView < McflyGridPanel
       set_perms(dg, data)
       client.success = true
       client.netzke_on_submit_success
-    rescue StandardError => exc
-      client.netzke_notify(exc.to_s)
+    rescue StandardError => e
+      client.netzke_notify(e.to_s)
     end
   end
 

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

@@ -115,7 +115,7 @@ module Layout
   end
 
   def get_sorter(col)
-    lambda { |rel, dir| rel.order("#{col}::text #{dir.to_s}") }
+    lambda { |rel, dir| rel.order(Arel.sql("#{col}::text #{dir}")) }
   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("#{json_col} ->> '#{field}' " + dir.to_s)
+      r.order(Arel.sql("#{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 => exc
+    rescue Marty::DataImporter::Error => e
       result = [
-        "Import failed on line(s): #{exc.lines.join(', ')}",
-        "Error: #{exc.to_s}",
+        "Import failed on line(s): #{e.lines.join(', ')}",
+        "Error: #{e.to_s}",
       ]
 
       client.set_result '<font color="red">' + result.join('<br/>') + '</font>'

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 => exc
-      Marty::Util.logger.error "run_eval failed: #{exc.backtrace}"
+    rescue StandardError => e
+      Marty::Util.logger.error "run_eval failed: #{e.backtrace}"
 
-      res = Delorean::Engine.grok_runtime_exception(exc)
+      res = Delorean::Engine.grok_runtime_exception(e)
       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 => exc
+    rescue StandardError => e
       c.title = 'ERROR'
       c.items =
         [
           {
-            field_label: 'Exception',
+            field_label: 'exception',
             xtype:       :displayfield,
             name:        'displayfield1',
-            value:       "<span style=\"color:red;\">#{exc}</span>"
+            value:       "<span style=\"color:red;\">#{e}</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 => exc
-      client.netzke_notify exc.message
+    rescue Delorean::ParseError => e
+      client.netzke_notify e.message
       client.netzke_apply_form_errors({})
-      client.set_line_error(exc.line)
+      client.set_line_error(e.line)
       return
     end
 
@@ -120,8 +120,8 @@ class Marty::ScriptForm < Marty::Form
                                          'PrettyScript',
                                          rep_params)
       client.get_report(path)
-    rescue StandardError => exc
-      return client.netzke_notify "ERROR: #{exc}"
+    rescue StandardError => e
+      return client.netzke_notify "ERROR: #{e}"
     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 => exc
-      res = Delorean::Engine.grok_runtime_exception(exc)
+    rescue StandardError => e
+      res = Delorean::Engine.grok_runtime_exception(e)
 
       result = ["Error: #{res['error']}", 'Backtrace:'] +
         res['backtrace'].map { |m, line, fn| "#{m}:#{line} #{fn}" }

data/app/models/marty/data_grid.rb

@@ -254,7 +254,6 @@ 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|
-
     lookup_grid_distinct_entry_h(
       pt, h, dgh, nil, true, false, distinct)['result']
   end
@@ -271,9 +270,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

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/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/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

@@ -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

@@ -86,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]

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

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = '3.0.1'
+  VERSION = '3.1.0'
 end

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/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/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/features/data_grid_spec.rb

@@ -374,7 +374,6 @@ feature 'data grid view', js: true do
      ['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)

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 1,2,3,4 2,4,6,8 ' +
-                                   '3,6,9,12 4,8,12,16')
+      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")
     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 1,2,3,4 2,4,6,8 ' +
-                                   '3,6,9,12 4,8,12,16')
+      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")
     end
   end
 

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 #5 2 #1 3 #2 4 #3'
+      expect(page).to have_content "1\n#5\n2\n#1\n3\n#2\n4\n#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 #5 2 #1'
+      expect(page).to have_content "1\n#5\n2\n#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 #123 2 #456'
+      expect(page).to have_content "1\n#123\n2\n#456"
       expect(tag_grid.get_row_vals(2)).to netzke_include(comment: 'ABCD')
     end
   end

data/spec/features/user_view_spec.rb

@@ -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')
+    sys_btn = first(:btn, 'System') rescue nil
     if sys_btn
       sys_btn.click
       expect(page).not_to have_content 'User Management'
@@ -147,10 +147,10 @@ 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 visible btn/
-        expect { find(:btn, 'New User') }.to raise_error(err)
-        expect { find(:btn, 'Edit') }.to raise_error(err)
-        expect { find(:btn, 'Delete') }.to raise_error(err)
+        err = /Unable to find btn/
+        ['New User', 'Edit', 'Delete'].each do |btn_name|
+          expect { find(:btn, btn_name) }.to raise_error(err)
+        end
       end
     end
 
@@ -161,10 +161,10 @@ 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 visible btn/
-        expect { find(:btn, 'New User') }.to raise_error(err)
-        expect { find(:btn, 'Edit') }.to raise_error(err)
-        expect { find(:btn, 'Delete') }.to raise_error(err)
+        err = /Unable to find btn/
+        ['New User', 'Edit', 'Delete'].each do |btn_name|
+          expect { find(:btn, btn_name) }.to raise_error(err)
+        end
       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 => exc
-      exc.lines.should == [0]
+    rescue Marty::DataImporter::Error => e
+      e.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 => exc
-      exc.lines.should == [1]
-      exc.message.should =~ /Conv Fixed XX/
+    rescue Marty::DataImporter::Error => e
+      e.lines.should == [1]
+      e.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 => exc
-      exc.lines.should == [1]
-      exc.message.should =~ /bad float/
+    rescue Marty::DataImporter::Error => e
+      e.lines.should == [1]
+      e.message.should =~ /bad float/
     else
       raise 'should have had an exception'
     end

data/spec/spec_helper.rb

@@ -11,8 +11,8 @@ require "#{support}/shared_connection"
 
 Dummy::Application.initialize! unless Dummy::Application.initialized?
 
-ActiveRecord::Migrator.migrate File.expand_path('../../db/migrate/', __FILE__)
-ActiveRecord::Migrator.migrate File.expand_path('../dummy/db/migrate/', __FILE__)
+ActiveRecord::Migration.migrate File.expand_path('../../db/migrate/', __FILE__)
+ActiveRecord::Migration.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(10)
+    wait_for_ready(25)
 
     begin
       if first("a[data-qtip='Current user']")
@@ -52,9 +52,9 @@ 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}']")
+        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 }
+                  detect { |c| c.text == button_name.to_s } rescue nil
         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.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,80 +14,80 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-05 00:00:00.000000000 Z
+date: 2019-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: aws-sigv4
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: netzke
+  name: axlsx
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.5.0.0
+        version: 3.0.0pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.5.0.0
+        version: 3.0.0pre
 - !ruby/object:Gem::Dependency
-  name: axlsx
+  name: coderay
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0pre
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0pre
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: delorean_lang
+  name: daemons
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mcfly
+  name: delayed_cron_job
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.20
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.20
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: coderay
+  name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,7 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json-schema
+  name: delorean_lang
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,21 +115,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-ldap
+  name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: mcfly
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,7 +143,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: net-ldap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -157,41 +157,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sigv4
+  name: netzke
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: daemons
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: delayed_cron_job
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -205,7 +199,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: delayed_job_active_record
+  name: zip-zip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -234,7 +228,6 @@ files:
 - ".travis.yml"
 - Dockerfile.dummy
 - Gemfile
-- Gemfile.lock
 - INDEPENDENCE_ISSUES.md
 - MIT-LICENSE
 - Makefile

data/Gemfile.lock

@@ -1,289 +0,0 @@
-PATH
-  remote: .
-  specs:
-    marty (3.0.0)
-      aws-sigv4 (~> 1.0, >= 1.0.2)
-      axlsx (= 3.0.0pre)
-      coderay
-      daemons (~> 1.3.1)
-      delayed_cron_job
-      delayed_job_active_record
-      delorean_lang (~> 1.0)
-      json-schema
-      mcfly (~> 0.0.20)
-      net-ldap (~> 0.16.1)
-      netzke (= 6.5.0.0)
-      pg (~> 0.21)
-      rubyzip
-      sqlite3
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actioncable (5.1.6.1)
-      actionpack (= 5.1.6.1)
-      nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.6.1)
-      actionpack (= 5.1.6.1)
-      actionview (= 5.1.6.1)
-      activejob (= 5.1.6.1)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.1.6.1)
-      actionview (= 5.1.6.1)
-      activesupport (= 5.1.6.1)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.6.1)
-      activesupport (= 5.1.6.1)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.6.1)
-      activesupport (= 5.1.6.1)
-      globalid (>= 0.3.6)
-    activemodel (5.1.6.1)
-      activesupport (= 5.1.6.1)
-    activerecord (5.1.6.1)
-      activemodel (= 5.1.6.1)
-      activesupport (= 5.1.6.1)
-      arel (~> 8.0)
-    activesupport (5.1.6.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    arel (8.0.0)
-    ast (2.4.0)
-    aws-eventstream (1.0.3)
-    aws-sigv4 (1.1.0)
-      aws-eventstream (~> 1.0, >= 1.0.2)
-    axlsx (3.0.0.pre)
-      htmlentities (~> 4.3, >= 4.3.4)
-      mimemagic (~> 0.3)
-      nokogiri (~> 1.8, >= 1.8.2)
-      rubyzip (~> 1.2, >= 1.2.1)
-    builder (3.2.3)
-    byebug (11.0.0)
-    capybara (2.18.0)
-      addressable
-      mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (>= 2.0, < 4.0)
-    childprocess (0.9.0)
-      ffi (~> 1.0, >= 1.0.11)
-    coderay (1.1.2)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.5)
-    connection_pool (2.2.2)
-    crass (1.0.4)
-    daemons (1.3.1)
-    database_cleaner (1.7.0)
-    delayed_cron_job (0.7.2)
-      delayed_job (>= 4.1)
-    delayed_job (4.1.5)
-      activesupport (>= 3.0, < 5.3)
-    delayed_job_active_record (4.1.3)
-      activerecord (>= 3.0, < 5.3)
-      delayed_job (>= 3.0, < 5)
-    delorean_lang (1.0.0)
-      activerecord
-      treetop
-    diff-lcs (1.3)
-    erubi (1.8.0)
-    execjs (2.7.0)
-    ffi (1.10.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    htmlentities (4.3.4)
-    i18n (1.6.0)
-      concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.2)
-    json-schema (2.8.1)
-      addressable (>= 2.4)
-    loofah (2.2.3)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marty_rspec (0.1)
-      rspec-by
-    mcfly (0.0.22)
-      delorean_lang
-      pg (~> 0.17)
-    method_source (0.9.2)
-    mime-types (2.99.3)
-    mimemagic (0.3.3)
-    mini_mime (1.0.1)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    net-ldap (0.16.1)
-    netzke (6.5.0.0)
-      netzke-basepack (= 6.5.0.0)
-      netzke-core (= 6.5.0.0)
-      netzke-testing (= 6.5.0.0)
-    netzke-basepack (6.5.0.0)
-    netzke-core (6.5.0.0)
-      execjs
-      mime-types (< 3)
-      uglifier
-    netzke-testing (6.5.0.0)
-      coffee-script
-    nio4r (2.3.1)
-    nokogiri (1.10.1)
-      mini_portile2 (~> 2.4.0)
-    parallel (1.13.0)
-    parser (2.6.0.0)
-      ast (~> 2.4.0)
-    pg (0.21.0)
-    polyglot (0.3.5)
-    powerpack (0.1.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.7.0)
-      byebug (~> 11.0)
-      pry (~> 0.10)
-    pry-rails (0.3.9)
-      pry (>= 0.10.4)
-    public_suffix (3.0.3)
-    rack (2.0.6)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (5.1.6.1)
-      actioncable (= 5.1.6.1)
-      actionmailer (= 5.1.6.1)
-      actionpack (= 5.1.6.1)
-      actionview (= 5.1.6.1)
-      activejob (= 5.1.6.1)
-      activemodel (= 5.1.6.1)
-      activerecord (= 5.1.6.1)
-      activesupport (= 5.1.6.1)
-      bundler (>= 1.3.0)
-      railties (= 5.1.6.1)
-      sprockets-rails (>= 2.0.0)
-    rails-controller-testing (1.0.4)
-      actionpack (>= 5.0.1.x)
-      actionview (>= 5.0.1.x)
-      activesupport (>= 5.0.1.x)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.1.6.1)
-      actionpack (= 5.1.6.1)
-      activesupport (= 5.1.6.1)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rainbow (3.0.0)
-    rake (12.3.2)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-by (0.0.7)
-      rspec-core (>= 3)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-instafail (1.0.0)
-      rspec
-    rspec-mocks (3.8.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-rails (3.8.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-retry (0.6.1)
-      rspec-core (> 3.3)
-    rspec-support (3.8.0)
-    rubocop (0.64.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
-    ruby-progressbar (1.10.0)
-    rubyzip (1.2.2)
-    selenium-webdriver (3.141.0)
-      childprocess (~> 0.5)
-      rubyzip (~> 1.2, >= 1.2.2)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.4.0)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    timecop (0.9.1)
-    treetop (1.6.10)
-      polyglot (~> 0.3)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    uglifier (4.1.20)
-      execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.4.1)
-    webdrivers (3.9.4)
-      nokogiri (~> 1.6)
-      rubyzip (~> 1.0)
-      selenium-webdriver (~> 3.0)
-    websocket-driver (0.6.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
-    xpath (3.2.0)
-      nokogiri (~> 1.8)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  capybara (~> 2.18.0)
-  connection_pool
-  daemons
-  database_cleaner
-  delayed_job_active_record
-  marty!
-  marty_rspec
-  mcfly
-  netzke (= 6.5.0.0)
-  pg
-  pry-byebug
-  pry-rails
-  rails (~> 5.1.4)
-  rails-controller-testing
-  rspec-instafail
-  rspec-rails
-  rspec-retry
-  rubocop
-  selenium-webdriver
-  sqlite3
-  timecop
-  webdrivers
-
-BUNDLED WITH
-   2.0.1