marty 2.4.0 → 2.4.1

data/spec/support/performance_helper.rb

@@ -0,0 +1,26 @@
+require Pathname.new(__FILE__).parent.to_s + '/post_run_logger'
+
+module Marty; module RSpec; module PerformanceHelper
+  include Marty::RSpec::PostRunLogger
+
+  def calculate_baseline iterations
+    Benchmark.measure {
+      ActiveRecord::Base.uncached {(0...iterations).each { yield }}
+    }
+  end
+
+  def compare_baseline baseline, timings, opts={}
+    result_time = timings.map{|t| t.total}.sum
+    factor      = result_time / baseline.total
+
+    lb = opts.delete(:lower_bound) || 1.5
+    ub = opts.delete(:upper_bound) || 5.0
+
+    post_run_log '  '+'-'*45,
+                 "   baseline: %.2f, result: %.2f, factor: %.2f" %
+                 [baseline.total, result_time, factor],
+                 '  '+'-'*45
+
+    expect(result_time).to be_between(baseline.total * lb, baseline.total * ub)
+  end
+end end end

data/spec/support/post_run_logger.rb

@@ -0,0 +1,32 @@
+module Marty; module RSpec; module PostRunLogger
+  class Storage
+    def self.data
+      @@data ||= []
+    end
+
+    def self.test_number
+      @@num ||= 0
+      @@num += 1
+    end
+
+    def self.store_data(name, line)
+      data << "  #{test_number}) #{name}"
+      data << Array(line).map { |string| "     #{string}" }
+      data << ""
+    end
+
+    def self.dump_data
+      unless data.empty?
+        puts "\n\nPost Run Logging:\n\n"
+        puts data
+      end
+    end
+
+  end
+
+  def post_run_log(*log_string)
+    Storage.store_data example.example_group.parent_groups.map(&:description).
+                         reverse.join(' ') + ' ' + example.description,
+                       log_string
+  end
+end end end

data/spec/support/{spec_setup.rb → setup.rb}

@@ -1,4 +1,9 @@
-module SpecSetup
+module Marty; module RSpec; module Setup
+
+  def marty_whodunnit
+    Mcfly.whodunnit = Marty::User.find_by_login('marty')
+  end
+
   def load_scripts(path, dt)
     Marty::Script.load_scripts(path, dt)
     Marty::ScriptSet.clear_cache
@@ -13,11 +18,19 @@ module SpecSetup
     Marty::DataGrid.create_from_import(*args)
   end
 
-  def marty_whodunnit
-    Mcfly.whodunnit = Marty::User.find_by_login('marty')
-  end
-
   def do_import_summary(*args)
     Marty::DataImporter.do_import_summary(*args)
   end
-end
+
+  def disable_triggers(table_name, &block)
+    begin
+      ActiveRecord::Base.connection.
+        execute("ALTER TABLE #{table_name} DISABLE TRIGGER USER;")
+
+      block.call
+    ensure
+      ActiveRecord::Base.connection.
+        execute("ALTER TABLE #{table_name} ENABLE TRIGGER USER;")
+    end
+  end
+end end end

data/spec/support/shared_connection.rb

@@ -0,0 +1,31 @@
+require Pathname.new(__FILE__).parent.to_s + '/shared_connection_db_helpers'
+
+module Marty; module RSpec; module SharedConnection
+  @@classes_to_exclude_from_shared = ['Marty::Log']
+  mattr_accessor :classes_to_exclude_from_shared
+
+  EXCL_LAMBDA = lambda { classes_to_exclude_from_shared }.freeze
+
+  class ActiveRecord::Base
+    mattr_accessor :shared_connection
+    class << self
+      alias_method :orig_connection, :connection
+    end
+    def self.clear_connection
+      @@shared_connection = nil
+    end
+
+    clear_connection
+
+    def self.connection
+      EXCL_LAMBDA.call.include?(model_name) ? orig_connection :
+        @@shared_connection ||
+        ConnectionPool::Wrapper.new(:size => 1) {retrieve_connection}
+    end
+
+    def self.reset_shared_connection
+      @@shared_connection = ConnectionPool::Wrapper.
+                              new(:size => 1) {retrieve_connection}
+    end
+  end
+end end end

data/spec/support/{clean_db_helpers.rb → shared_connection_db_helpers.rb}

@@ -1,4 +1,4 @@
-module CleanDbHelpers
+module Marty; module RSpec; module SharedConnectionDbHelpers
   def current_db
     ActiveRecord::Base.connection_config[:database]
   end
@@ -15,4 +15,4 @@ module CleanDbHelpers
     ActiveRecord::Base.reset_shared_connection
     self.use_transactional_tests = true
   end
-end
+end end end

data/spec/support/structure_compare.rb

@@ -0,0 +1,62 @@
+module Marty::RSpec::StructureCompare
+  def self.struct_compare_all(v1raw, v2raw, path=[], errs=[])
+    pathstr = path.map(&:to_s).join
+    v1,v2 = [v1raw, v2raw].map { |v| v.class == ActiveSupport::TimeWithZone ?
+                                   DateTime.parse(v.to_s) : v }
+
+    return errs + [v1["error"]] if
+      v1.class != v2.class && v1.class == Hash && v1["error"]
+
+    return errs + [v2["error"]] if
+      v1.class != v2.class && v2.class == Hash && v2["error"]
+
+    return errs + ["path=#{pathstr} class mismatch #{v1.class} #{v2.class}"] unless
+      v1.class == v2.class ||
+      [v1,v2].map(&:class).to_set == Set.new([Integer, Float])
+
+    case v1
+    when String
+      return errs + ["path=#{pathstr} #{v1} != #{v2}"] unless
+        v1 == v2 ||
+        Regexp.new('\A'+v1+'\z').match(v2) ||
+        Regexp.new('\A'+v2+'\z').match(v1)
+    when Integer, DateTime, TrueClass, FalseClass, NilClass
+      return errs + ["path=#{pathstr} #{v1} != #{v2}"] if v1 != v2
+    when Float
+      return errs + ["path=#{pathstr} #{v1} != #{v2}"] if v1.round(6) != v2.round(6)
+    when Hash
+      v1_v2, v2_v1 = v1.keys-v2.keys, v2.keys-v1.keys
+
+      errs.append("path=#{pathstr} hash extra keys #{v1_v2}") unless v1_v2.empty?
+      errs.append("path=#{pathstr} hash extra keys #{v2_v1}") unless v2_v1.empty?
+
+      return errs + v1.map do |childkey, childval|
+        struct_compare_all(childval, v2[childkey], path + [[childkey]], [])
+      end.flatten
+    when Array
+      errs.append("path=#{pathstr} array size mismatch #{v1.size} != #{v2.size}") if
+        v1.size != v2.size
+      return errs + v1.each_with_index.map do |childval,index|
+        struct_compare_all(childval, v2[index], path + [[index]], [])
+      end.flatten
+    else
+      raise "unhandled #{v1.class}"
+    end
+    errs
+  end
+end
+
+def struct_compare(v1raw, v2raw)
+  begin
+    res = Marty::RSpec::StructureCompare.struct_compare_all(v1raw, v2raw).first
+  rescue => e
+    e.message
+  end
+end
+def struct_compare_all(v1raw, v2raw)
+  begin
+    Marty::RSpec::StructureCompare.struct_compare_all(v1raw, v2raw)
+  rescue => e
+    e.message
+  end
+end

data/spec/support/suite.rb

@@ -0,0 +1,27 @@
+relative = Pathname.new(__FILE__).parent.to_s
+['setup',
+ 'users',
+ 'components/netzke_combobox',
+ 'components/netzke_grid',
+ 'netzke',
+ 'download_helper',
+ 'chromedriver',
+ 'delayed_job_helpers',
+ 'post_run_logger',
+ 'helper',
+ 'performance_helper',
+ 'structure_compare',
+ 'custom_matchers',
+ 'custom_selectors',
+].each {|f| require (relative + '/' + f)}
+
+module Marty; module RSpec; module Suite
+  include Marty::RSpec::Setup
+  include Marty::RSpec::Users
+  include Marty::RSpec::Netzke
+  include Marty::RSpec::DelayedJobHelpers
+  include Marty::RSpec::DownloadHelper
+  include Marty::RSpec::PostRunLogger
+  include Marty::RSpec::PerformanceHelper
+  include Marty::RSpec::StructureCompare
+end end end

data/spec/support/{integration_helpers.rb → users.rb}

@@ -1,5 +1,4 @@
-module Marty::IntegrationHelpers
-  # test setup helpers
+module Marty; module RSpec; module Users
   def populate_test_users
     (1..2).each { |i|
       Rails.configuration.marty.roles.each { |role_name|
@@ -30,12 +29,15 @@ module Marty::IntegrationHelpers
     user.save
   end
 
-  def log_in_as(username)
-    Rails.configuration.marty.auth_source = 'local'
-
-    ensure_on("/")
-    log_in(username, Rails.configuration.marty.local_password)
-    ensure_on("/")
+  def system_user
+    Marty::User.find_by_login('marty') # (system_login)
   end
 
-end
+  def create_user(name)
+    Marty::User.find_or_create_by!(login: name,
+                                   firstname: name,
+                                   lastname: 'test',
+                                   active: true)
+
+  end
+end end end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Arman Bostani
@@ -484,13 +484,13 @@ files:
 - db/migrate/400_create_dg_plv8_v1_fns.rb
 - db/migrate/410_jsonb_promise_result.rb
 - db/migrate/411_create_vw_promises.rb
-- db/migrate/501_add_api_class_to_marty_api_config.rb
-- db/migrate/502_add_parameters_to_marty_api_auth.rb
+- db/migrate/500_add_api_class_to_marty_api_config.rb
 - db/seeds.rb
 - delorean/diagnostics.dl
 - delorean/script_report.dl
 - gemini_deprecations.md
 - lib/marty.rb
+- lib/marty/aws/base.rb
 - lib/marty/content_handler.rb
 - lib/marty/data_change.rb
 - lib/marty/data_conversion.rb
@@ -1682,11 +1682,23 @@ files:
 - spec/other/diagnostic/reporter_spec.rb
 - spec/requests/routes_spec.rb
 - spec/spec_helper.rb
-- spec/support/clean_db_helpers.rb
+- spec/support/chromedriver.rb
+- spec/support/components/netzke_combobox.rb
+- spec/support/components/netzke_grid.rb
+- spec/support/custom_matchers.rb
+- spec/support/custom_selectors.rb
 - spec/support/delayed_job_helpers.rb
-- spec/support/integration_helpers.rb
-- spec/support/spec_setup.rb
-- spec/support/user_helpers.rb
+- spec/support/download_helper.rb
+- spec/support/helper.rb
+- spec/support/netzke.rb
+- spec/support/performance_helper.rb
+- spec/support/post_run_logger.rb
+- spec/support/setup.rb
+- spec/support/shared_connection.rb
+- spec/support/shared_connection_db_helpers.rb
+- spec/support/structure_compare.rb
+- spec/support/suite.rb
+- spec/support/users.rb
 homepage: https://github.com/arman000/marty
 licenses:
 - MIT
@@ -1707,7 +1719,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A framework for working with versioned data

data/db/migrate/502_add_parameters_to_marty_api_auth.rb

@@ -1,5 +0,0 @@
-class AddParametersToMartyApiAuth < ActiveRecord::Migration[5.1]
-  def change
-    add_column :marty_api_auths, :parameters, :jsonb, default: {}
-  end
-end

data/spec/support/user_helpers.rb

@@ -1,12 +0,0 @@
-module UserHelpers
-  def self.system_user
-    Marty::User.find_by_login('marty') # (system_login)
-  end
-
-  def self.create_user(name)
-    Marty::User.find_or_create_by!(login: name,
-                                   firstname: name,
-                                   lastname: 'test',
-                                   active: true)
-  end
-end