marty 6.1.0 → 8.0.0

data/spec/other/diagnostic/delayed_job_workers_spec.rb

@@ -7,7 +7,7 @@ describe Marty::Diagnostic::DelayedJobWorkers do
     {
       ip || Marty::Helper.my_ip => {
         'Delayed Workers / Node' => {
-          'description' => error ? '3' : '4',
+          'description' => error ? '7' : '8',
           'status'      => status.nil? ? true : status,
           'consistent'  => nil
         },

data/spec/performance/caching_spec.rb

@@ -0,0 +1,99 @@
+require 'benchmark/ips'
+require 'spec_helper'
+
+describe 'Caching Performance' do
+  def check_cache(adapter:)
+    ::Delorean::Cache.adapter = adapter
+    ::Delorean::Cache.adapter.clear_all!
+
+    expect(Math).to receive(:gamma).once.and_call_original
+    2.times { Gemini::Helper.cached_factorial(10) }
+
+    ::Delorean::Cache.adapter.clear_all!
+  end
+
+  let(:mcfly_adapter) do
+    ::Marty::CacheAdapters::McflyRubyCache.new(size_per_class: 1000)
+  end
+
+  let(:redis_adapter) do
+    ::Marty::CacheAdapters::Redis.new
+  end
+
+  let(:memory_and_redis_adapter) do
+    ::Marty::CacheAdapters::MemoryAndRedis.new(
+      size_per_class: 1000
+    )
+  end
+
+  it 'cache works as expected' do
+    check_cache(adapter: mcfly_adapter)
+    check_cache(adapter: redis_adapter)
+    check_cache(adapter: memory_and_redis_adapter)
+  end
+
+  it 'performs fast enough' do
+    bm = Benchmark.ips do |x|
+      x.config(
+        suite: CacheSuite.new(
+          adapters: [
+            mcfly_adapter,
+            redis_adapter,
+            memory_and_redis_adapter
+          ]
+        )
+      )
+
+      x.report('redis_adapter') do |_t|
+        ::Delorean::Cache.adapter = redis_adapter
+        10.times { |n| Gemini::Helper.cached_factorial(n) }
+      end
+
+      x.report('memory_and_redis_adapter') do |_t|
+        ::Delorean::Cache.adapter = memory_and_redis_adapter
+        10.times { |n| Gemini::Helper.cached_factorial(n) }
+      end
+
+      x.report('mcfly_adapter') do |_t|
+        ::Delorean::Cache.adapter = mcfly_adapter
+        10.times { |n| Gemini::Helper.cached_factorial(n) }
+      end
+
+      x.compare!
+    end
+
+    h = bm.entries.each_with_object({}) do |e, hh|
+      hh[e.label] = e.stats.central_tendency
+    end
+
+    memory_and_redis_vs_memory_factor = h['mcfly_adapter'] / h['memory_and_redis_adapter']
+    redis_vs_memory_and_redis_factor = h['memory_and_redis_adapter'] / h['redis_adapter']
+
+    expect(memory_and_redis_vs_memory_factor).to be < 3
+    expect(redis_vs_memory_and_redis_factor).to be > 100
+  end
+end
+
+class CacheSuite
+  def initialize(adapters:)
+    @adapters = adapters
+  end
+
+  def warming(*)
+    clear_cache
+  end
+
+  def running(*)
+    clear_cache
+  end
+
+  def warmup_stats(*); end
+
+  def add_report(*); end
+
+  private
+
+  def clear_cache
+    @adapters.map(&:clear_all!)
+  end
+end

data/spec/services/background_job/fetch_missing_in_schedule_cron_jobs_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+module Marty
+  describe BackgroundJob::FetchMissingInScheduleCronJobs do
+    before do
+      schedule = Marty::BackgroundJob::Schedule.create!(
+        job_class: 'TestJob',
+        cron: '0 0 * * *',
+        state: 'on'
+      )
+
+      Marty::Jobs::Schedule.call
+
+      dj = TestJob.delayed_job
+
+      TestJob.delayed_job.dup.tap do |new_dj|
+        new_dj.handler = new_dj.handler.gsub('TestJob', 'Test2Job')
+        new_dj.cron = nil
+        new_dj.save!
+      end
+
+      TestJob.delayed_job.dup.tap do |new_dj|
+        new_dj.handler = new_dj.handler.gsub('TestJob', 'MissingJob')
+        new_dj.save!
+      end
+    end
+
+    it 'fetchs only jobs that have cron and are not present in the dashboard' do
+      result = described_class.call
+      expect(result.size).to eq 1
+      expect(result.first.handler).to include('MissingJob')
+    end
+  end
+end

data/spec/support/delayed_job_helpers.rb

@@ -1,11 +1,11 @@
 module Marty::RSpec::DelayedJobHelpers
   def start_delayed_job
-    `RAILS_ENV=test #{Rails.root}/script/delayed_job -n 4 stop | cat`
-    `RAILS_ENV=test #{Rails.root}/script/delayed_job -n 4 start | cat`
+    `RAILS_ENV=test #{Rails.root}/script/delayed_job -n 8 stop | cat`
+    `RAILS_ENV=test #{Rails.root}/script/delayed_job -n 8 start | cat`
     sleep 5
   end
 
   def stop_delayed_job
-    `RAILS_ENV=test #{Rails.root}/script/delayed_job -n 4 stop | cat`
+    `RAILS_ENV=test #{Rails.root}/script/delayed_job -n 8 stop | cat`
   end
 end

data/spec/support/shared_connection.rb

@@ -18,7 +18,15 @@ module Marty; module RSpec; module SharedConnection
     clear_connection
 
     def self.connection
-      EXCL_LAMBDA.call.include?(model_name) ? orig_connection :
+      # Workaround to fix a bug in Rails 6 with shared connections
+      # https://github.com/rails/rails/issues/36757
+      model_name_str = if name == 'primary::SchemaMigration'
+                         name
+                       else
+                         model_name
+                       end
+
+      EXCL_LAMBDA.call.include?(model_name_str) ? orig_connection :
         @@shared_connection ||
         ConnectionPool::Wrapper.new(size: 1) { retrieve_connection }
     end

data/spec/support/structure_compare.rb

@@ -12,9 +12,18 @@ module Marty::RSpec::StructureCompare
     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
+    errst = "path=#{pathstr} class mismatch "\
+            "#{v1.class}#{show_value(v1)} != "\
+            "#{v2.class}#{show_value(v2)}"
+
+    return if (cmp_opts['float_str_match'] ||
+               ENV['FLOAT_STR_MATCH'] == 'true') &&
+              v1.to_s == v2.to_s &&
+              [v1, v2].map(&:class).to_set == Set.new([String, Float])
+
+    return errs + [errst] unless
       v1.class == v2.class ||
-      (!cmp_opts['float_int_nomatch'] &&
+      (!(cmp_opts['float_int_nomatch'] || ENV['FLOAT_INT_NOMATCH'] == 'true') &&
        [v1, v2].map(&:class).to_set == Set.new([Integer, Float]))
 
     override = (cmp_opts['ignore'] || []).include?(key)
@@ -25,7 +34,7 @@ module Marty::RSpec::StructureCompare
         Regexp.new('\A' + v1 + '\z').match(v2) ||
         Regexp.new('\A' + v2 + '\z').match(v1) ||
         override
-    when Integer, DateTime, TrueClass, FalseClass, NilClass
+    when Integer, DateTime, TrueClass, FalseClass, NilClass, Time, Date
       return errs + ["path=#{pathstr} #{v1} != #{v2}"] if v1 != v2 && !override
     when Float
       return errs + ["path=#{pathstr} #{v1} != #{v2}"] if
@@ -53,6 +62,13 @@ module Marty::RSpec::StructureCompare
     end
     errs
   end
+
+  def self.show_value(val)
+    return '' if [Array, Hash, TrueClass, FalseClass, NilClass].
+                   include?(val.class)
+
+    format(' (%<val>s)', val: val)
+  end
 end
 
 def struct_compare(v1raw, v2raw, cmp_opts = {})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 8.0.0
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-14 00:00:00.000000000 Z
+date: 2019-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sigv4
@@ -184,6 +184,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -243,6 +257,7 @@ files:
 - app/assets/stylesheets/marty/application.css
 - app/assets/stylesheets/marty/codemirror/codemirror.css
 - app/assets/stylesheets/marty/codemirror/delorean.css
+- app/assets/stylesheets/marty/dark_mode.css
 - app/components/marty/api_auth_view.rb
 - app/components/marty/api_config_view.rb
 - app/components/marty/api_log_view.rb
@@ -255,7 +270,6 @@ files:
 - 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
-- app/components/marty/event_view.rb
 - app/components/marty/extras/layout.rb
 - app/components/marty/extras/misc.rb
 - app/components/marty/form.rb
@@ -293,6 +307,7 @@ files:
 - app/components/marty/reporting/client/reporting.js
 - app/components/marty/schedule_jobs_dashboard.rb
 - app/components/marty/schedule_jobs_dashboard/client/schedule_jobs_dashboard.js
+- app/components/marty/schedule_jobs_grid.rb
 - app/components/marty/schedule_jobs_logs.rb
 - app/components/marty/schedule_jobs_logs/client/schedule_jobs_logs.js
 - app/components/marty/script_form.rb
@@ -332,7 +347,6 @@ files:
 - app/models/marty/enum.rb
 - app/models/marty/enum_event_operation.rb
 - app/models/marty/enum_promise_type.rb
-- app/models/marty/event.rb
 - app/models/marty/grid_index_boolean.rb
 - app/models/marty/grid_index_int4range.rb
 - app/models/marty/grid_index_integer.rb
@@ -353,9 +367,11 @@ files:
 - app/models/marty/user.rb
 - app/models/marty/user_role.rb
 - app/models/marty/vw_promise.rb
+- app/services/marty/background_job/fetch_missing_in_schedule_cron_jobs.rb
 - app/services/marty/background_job/update_schedule.rb
 - app/services/marty/data_grid/constraint.rb
 - app/services/marty/data_grid_view/save_grid.rb
+- app/services/marty/enums/report.rb
 - app/services/marty/jobs/schedule.rb
 - app/services/marty/promises/delorean.rb
 - app/services/marty/promises/delorean/create.rb
@@ -418,11 +434,15 @@ files:
 - db/migrate/509_update_dg_plpgsql_v1_fns.rb
 - db/migrate/510_schedule_job_to_remove_old_promises.rb
 - db/migrate/511_create_marty_delayed_job_logs.rb
+- db/migrate/512_add_promise_priority.rb
+- db/migrate/513_add_priority_to_promise_view.rb
+- db/migrate/514_remove_marty_events.rb
 - db/seeds.rb
 - db/sql/lookup_grid_distinct_v1.sql
 - db/sql/query_grid_dir_v1.sql
 - delorean/blame_report.dl
 - delorean/diagnostics.dl
+- delorean/enum_report.dl
 - delorean/marty_fields.dl
 - delorean/promises.dl
 - delorean/script_report.dl
@@ -435,11 +455,14 @@ files:
 - lib/marty/aws/request.rb
 - lib/marty/cache_adapters.rb
 - lib/marty/cache_adapters/mcfly_ruby_cache.rb
+- lib/marty/cache_adapters/memory_and_redis.rb
+- lib/marty/cache_adapters/redis.rb
 - lib/marty/content_handler.rb
 - lib/marty/data_change.rb
 - lib/marty/data_conversion.rb
 - lib/marty/data_exporter.rb
 - lib/marty/data_importer.rb
+- lib/marty/delayed_job/scheduled_job_plugin.rb
 - lib/marty/diagnostic/aws/ec2_instance.rb
 - lib/marty/diagnostic/aws/error.rb
 - lib/marty/diagnostic/base.rb
@@ -467,6 +490,7 @@ files:
 - lib/marty/promise_job.rb
 - lib/marty/promise_proxy.rb
 - lib/marty/promise_ruby_job.rb
+- lib/marty/rails_app.rb
 - lib/marty/railtie.rb
 - lib/marty/relation.rb
 - lib/marty/rpc_call.rb
@@ -497,11 +521,13 @@ files:
 - spec/dummy/app/components/gemini/cm_auth_app.rb
 - spec/dummy/app/components/gemini/loan_program_view.rb
 - spec/dummy/app/components/gemini/my_rule_view.rb
+- spec/dummy/app/components/gemini/simple_view.rb
 - spec/dummy/app/components/gemini/xyz_rule_view.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/components_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/jobs/test2_job.rb
+- spec/dummy/app/jobs/test_failing_job.rb
 - spec/dummy/app/jobs/test_job.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
@@ -562,7 +588,6 @@ files:
 - spec/dummy/db/migrate/20150420000003_create_grouping_head_versions.rb
 - spec/dummy/db/migrate/20151023000001_create_simple.rb
 - spec/dummy/db/migrate/20160100000038_create_gemini_states.rb
-- spec/dummy/db/migrate/20160923183516_add_bulk_pricing_event_ops.rb
 - spec/dummy/db/migrate/20170706081300_add_state_array_to_lp.rb
 - spec/dummy/db/migrate/20170725160000_add_misc_arrays_to_lp.rb
 - spec/dummy/db/migrate/20171220150101_add_rule_type_enums.rb
@@ -570,11 +595,13 @@ files:
 - spec/dummy/db/migrate/20171221095359_create_gemini_xyz_rules.rb
 - spec/dummy/db/migrate/20171222150100_add_rule_indices.rb
 - spec/dummy/db/migrate/20190702115241_add_simple_guards_options_to_rules.rb
+- spec/dummy/db/migrate/20191101132729_add_activity_flag_to_simple.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/delorean/base_code.dl
 - spec/dummy/delorean/blame_report.dl
 - spec/dummy/delorean/data_report.dl
 - spec/dummy/delorean/delorean_fn.dl
+- spec/dummy/delorean/enum_report.dl
 - spec/dummy/delorean/marty_fields.dl
 - spec/dummy/delorean/styles.dl
 - spec/dummy/delorean/table_report.dl
@@ -1597,11 +1624,14 @@ files:
 - spec/dummy/spec/features/javascripts
 - spec/dummy/tmp/.gitkeep
 - spec/features/auth_app_spec.rb
+- spec/features/data_blame_report_spec.rb
 - spec/features/data_grid_spec.rb
 - spec/features/data_import_spec.rb
 - spec/features/endpoint_access.rb
 - spec/features/enum_spec.rb
+- spec/features/enum_values_report_spec.rb
 - spec/features/extjs_spec.rb
+- spec/features/inline_editing_spec.rb
 - spec/features/javascripts/job_dashboard_live_search.js.coffee
 - spec/features/javascripts/login.js.coffee
 - spec/features/jobs_dashboard_spec.rb
@@ -1612,6 +1642,7 @@ files:
 - spec/features/schedule_jobs_logs_spec.rb
 - spec/features/scripting_spec.rb
 - spec/features/scripting_test_spec.rb
+- spec/features/user_list_report_spec.rb
 - spec/features/user_view_spec.rb
 - spec/fixtures/csv/rule/DataGrid.csv
 - spec/fixtures/csv/rule/MyRule.csv
@@ -1635,6 +1666,7 @@ files:
 - spec/fixtures/scripts/load_tests/script1.dl
 - spec/fixtures/scripts/load_tests/script2.dl
 - spec/job_helper.rb
+- spec/jobs/cron_job_spec.rb
 - spec/lib/data_blame_spec.rb
 - spec/lib/data_exporter_spec.rb
 - spec/lib/data_importer_spec.rb
@@ -1652,7 +1684,6 @@ files:
 - spec/models/background_job/schedule.rb
 - spec/models/config_spec.rb
 - spec/models/data_grid_spec.rb
-- spec/models/event_spec.rb
 - spec/models/import_type_spec.rb
 - spec/models/posting_spec.rb
 - spec/models/promise_spec.rb
@@ -1665,7 +1696,9 @@ files:
 - spec/other/diagnostic/delayed_job_version_spec.rb
 - spec/other/diagnostic/delayed_job_workers_spec.rb
 - spec/other/diagnostic/reporter_spec.rb
+- spec/performance/caching_spec.rb
 - spec/requests/routes_spec.rb
+- spec/services/background_job/fetch_missing_in_schedule_cron_jobs_spec.rb
 - spec/services/jobs/schedule_spec.rb
 - spec/spec_helper.rb
 - spec/support/chromedriver.rb

data/app/components/marty/event_view.rb

@@ -1,129 +0,0 @@
-class Marty::EventView < Marty::Grid
-  has_marty_permissions \
-    read: :any,
-    update: [:admin],
-    delete: [:admin]
-
-  def configure(c)
-    super
-
-    c.title ||= I18n.t('events', default: 'Events')
-    c.model                  = 'Marty::Event'
-    c.paging                 = :buffered
-    c.editing                = :in_form
-    c.attributes             = [
-      :id,
-      :klass,
-      :subject_id,
-      :enum_event_operation,
-      :start_dt,
-      :end_dt,
-      :expire_secs,
-      :promise_job_id,
-      :promise_start_dt,
-      :promise_end_dt,
-      :promise_status,
-      :error,
-      :comment,
-    ]
-
-    c.store_config.merge!(sorters: [{ property: :id,
-                                 direction: 'DESC',
-                                     }])
-    Marty::Event.cleanup
-  end
-
-  def default_context_menu
-    []
-  end
-
-  attribute :klass do |c|
-    c.text = I18n.t('event_grid.klass')
-    c.width = 100
-    c.read_only = true
-  end
-
-  attribute :subject_id do |c|
-    c.text = I18n.t('event_grid.subject_id')
-    c.width = 50
-    c.read_only = true
-  end
-
-  attribute :enum_event_operation do |c|
-    c.text = I18n.t('event_grid.enum_event_operation')
-    c.width = 100
-    c.read_only = true
-  end
-
-  attribute :start_dt_dt do |c|
-    c.text = I18n.t('event_grid.start_dt')
-    c.format = 'Y-m-d H:i:s'
-  end
-
-  attribute :end_dt_dt do |c|
-    c.text = I18n.t('event_grid.end_dt')
-    c.format = 'Y-m-d H:i:s'
-  end
-
-  attribute :error do |c|
-    error_map = {
-      nil   => '',
-      true  => 'Error',
-      false => 'Success',
-    }
-    map_error = error_map.each_with_object({}) { |(k, v), h| h[v] = k }
-    editor_config = {
-      trigger_action: :all,
-      xtype:          :combo,
-      store:          ['Success', 'Error', ''],
-    }
-    c.column_config = { editor: editor_config }
-    c.field_config  = editor_config
-    c.text   = I18n.t('event_grid.error')
-    c.type   = :string
-    c.width  = 150
-    c.getter = lambda { |r| error_map[r.error] }
-    c.setter = lambda { |r, v| r.error = map_error[v] }
-  end
-
-  attribute :comment do |c|
-    c.text = I18n.t('event_grid.comment')
-    c.width = 400
-  end
-
-  def promise_getter(field)
-    lambda { |r|
-      return nil unless r.promise_id
-      return nil unless p = Marty::Promise.where(id: r.promise_id).first
-
-      p.send(field)
-    }
-  end
-  attribute :promise_job_id do |c|
-    c.text = I18n.t('event_grid.promise_job_id')
-    c.getter = promise_getter(:job_id)
-    c.read_only = true
-  end
-
-  attribute :promise_start_dt do |c|
-    c.text = I18n.t('event_grid.promise_start_dt')
-    c.width = 150
-    c.getter = promise_getter(:start_dt)
-    c.read_only = true
-  end
-
-  attribute :promise_end_dt do |c|
-    c.text = I18n.t('event_grid.promise_end_dt')
-    c.width = 150
-    c.getter = promise_getter(:end_dt)
-    c.read_only = true
-  end
-
-  attribute :promise_status do |c|
-    c.text = I18n.t('event_grid.promise_status')
-    c.getter = promise_getter(:status)
-    c.read_only = true
-  end
-end
-
-EventView = Marty::EventView