marty 2.8.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e99ecbf41a6cda553cf318fb21bbe9c3150ec13e46b074171eaa1bd1ea12aed
-  data.tar.gz: c6dcdf2a95d456e27189c1369ff54de3d62ce4cd58b5d7125bf8f83d57ba8d57
+  metadata.gz: c435918b8631f55957b62cb3137f3aab3fede68f9f36b9fb5e23ad5eba146d7a
+  data.tar.gz: cb3cd4077c2fea46d6d7a6575d00894ea7db6703bfdb898490f893703d909bfb
 SHA512:
-  metadata.gz: a43ae65fe90a06f4c1c35652aaba4627431ea449fedc6c262aa37a384d5d4e02d879a47c145b9dab56c756025d42e92d2c49e1a9658301ba50598164dc3e514b
-  data.tar.gz: ef2702ad5285cb59f777faa7b1ecceecd570945e490100e6542cd3fe7e237e597d491e3b9e7f7b9de32149645959b9142481efc3bf8614330a344a234f9c2397
+  metadata.gz: 364f286811546d110fff8a4325a4e488e3f79d166f5696f12ad7d9a2c2a481316745d54347f19a04c692315b518ee9d85ac7de80b3c71aeb1b14cd0fc6adb22d
+  data.tar.gz: ae33ba46d6118abcd9b25e06510250b11502b175cb078d80a3be7e463f621713ac9fe11c73b31060c6375ee79d56f8a12e575f21fccb7d425f8e298dcb287614

data/Gemfile

@@ -20,6 +20,7 @@ group :development, :test do
   gem 'rails-controller-testing'
   gem 'rspec-instafail', require: false
   gem 'rspec-rails'
+  gem 'rspec-retry'
   gem 'rubocop', require: false
   gem 'selenium-webdriver'
   gem 'timecop'

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    marty (2.7.3)
+    marty (2.9.1)
       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 (~> 0.6)
+      delorean_lang (~> 1.0)
       json-schema
       mcfly (~> 0.0.20)
       net-ldap (~> 0.16.1)
@@ -97,9 +97,9 @@ GEM
     delayed_job_active_record (4.1.3)
       activerecord (>= 3.0, < 5.3)
       delayed_job (>= 3.0, < 5)
-    delorean_lang (0.6.1)
-      activerecord (>= 3.2)
-      treetop (~> 1.5)
+    delorean_lang (1.0.0)
+      activerecord
+      treetop
     diff-lcs (1.3)
     erubi (1.8.0)
     execjs (2.7.0)

data/Makefile

@@ -1,2 +1,2 @@
-include make-dummy.mk
+include make-app.mk
 

data/README.md

@@ -72,15 +72,15 @@ $ cp -r PATH/TO/YOUR/EXTJS/FILES spec/dummy/public/extjs
 You can run it with docker:
 
 ```bash
-$ make dummy-app-initialise-docker
+$ make app-initialise-docker
 
-$ make dummy-app-start
+$ make app-start
 ```
 
 To run tests:
 
 ```bash
-$ make dummy-app-bash
+$ make app-bash
 
 $ HEADLESS=true rspec
 ```

data/app/components/marty/main_auth_app.rb

@@ -3,7 +3,7 @@ require 'marty/api_config_view'
 require 'marty/api_log_view'
 require 'marty/config_view'
 require 'marty/data_grid_view'
-require 'marty/background_job_schedule_view'
+require 'marty/schedule_jobs_dashboard'
 require 'marty/event_view'
 require 'marty/import_type_view'
 require 'marty/new_posting_window'
@@ -113,7 +113,7 @@ class Marty::MainAuthApp < Marty::AuthApp
           :bg_status,
           :bg_stop,
           :bg_restart,
-          :background_job_schedule_view,
+          :schedule_jobs_dashboard,
         ]
       },
     ]
@@ -278,8 +278,8 @@ class Marty::MainAuthApp < Marty::AuthApp
     a.disabled = !self.class.has_admin_perm?
   end
 
-  action :background_job_schedule_view do |a|
-    a.text     = 'Schedule Background Jobs'
+  action :schedule_jobs_dashboard do |a|
+    a.text     = 'Schedule Jobs Dashboard'
     a.tooltip  = 'Edit Delayed Jobs Cron schedules'
     a.icon_cls = 'fa fa-cog glyph'
     a.disabled = !self.class.has_admin_perm?
@@ -383,7 +383,7 @@ class Marty::MainAuthApp < Marty::AuthApp
 
   component :api_config_view
 
-  component :background_job_schedule_view
+  component :schedule_jobs_dashboard
 
   component :config_view
 

data/app/components/marty/{background_job_schedule_view.rb → schedule_jobs_dashboard.rb}

@@ -1,4 +1,4 @@
-class Marty::BackgroundJobScheduleView < Marty::Grid
+class Marty::ScheduleJobsDashboard < Marty::Grid
   ACCESSIBLE_BY = [:admin]
 
   has_marty_permissions(
@@ -14,10 +14,11 @@ class Marty::BackgroundJobScheduleView < Marty::Grid
   def configure(c)
     super
 
-    c.title ||= I18n.t('delayed_jobs_schedule_view_title', default: 'Background Jobs Schedule')
+    c.title ||= I18n.t('schedule_jobs_dashboard_view_title', default: 'Schedule Jobs Dashboard')
     c.model = 'Marty::BackgroundJob::Schedule'
     c.paging = :buffered
     c.editing = :in_form
+    c.multi_select = false
 
     c.attributes = [
       :job_class,
@@ -91,4 +92,4 @@ class Marty::BackgroundJobScheduleView < Marty::Grid
   end
 end
 
-BackgroundJobScheduleView = Marty::BackgroundJobScheduleView
+ScheduleJobsDashboard = Marty::ScheduleJobsDashboard

data/app/models/marty/data_grid.rb

@@ -86,13 +86,13 @@ class Marty::DataGrid < Marty::Base
 
   # FIXME: if the caller requests data as part of fields, there could
   # be memory concerns with caching since some data_grids have massive data
-  cached_delorean_fn :lookup_h, sig: [2, 3] do |pt, name, fields = nil|
+  delorean_fn :lookup_h, cache: true, sig: [2, 3] do |pt, name, fields = nil|
     fields ||= %w(id group_id created_dt metadata data_type name)
     dga = mcfly_pt(pt).where(name: name).pluck(*fields).first
     dga && Hash[fields.zip(dga)]
   end
 
-  cached_delorean_fn :exists, sig: 2 do |pt, name|
+  delorean_fn :exists, cache: true, sig: 2 do |pt, name|
     Marty::DataGrid.mcfly_pt(pt).where(name: name).exists?
   end
 
@@ -235,16 +235,16 @@ class Marty::DataGrid < Marty::Base
   end
 
   # private method used to cache lookup_grid_distinct_entry_h result
-  cached_delorean_fn :lookup_grid_h_priv,
-                     private: true, sig: 4 do |pt, dgh, h, distinct|
+  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
 
-  # FIXME: using cached_delorean_fn just for the caching -- this is
+  # FIXME: using delorean_fn just for the caching -- this is
   # not expected to be called from Delorean.
-  cached_delorean_fn :find_class_instance, sig: 3 do |pt, klass, v|
+  delorean_fn :find_class_instance, cache: true, sig: 3 do |pt, klass, v|
     if ::Marty::EnumHelper.pg_enum?(klass: klass)
       klass.find_by_name(v)
     else

data/app/models/marty/tag.rb

@@ -64,7 +64,7 @@ class Marty::Tag < Marty::Base
     tag
   end
 
-  cached_delorean_fn :lookup, sig: 1 do |name|
+  delorean_fn :lookup, cache: true, sig: 1 do |name|
     t = find_by_name(name).select(get_struct_attrs)
     t && t.attributes
   end

data/docker-compose.dummy.yml

@@ -24,8 +24,7 @@ services:
       - .:/opt/app:delegated
       - '.bash_history.docker:/root/.bash_history'
       - '.pry_history.docker:/root/.pry_history'
-    volumes_from:
-      - bundle_box
+      - bundle_box:/bundle_box
     tty: true
     stdin_open: true
 
@@ -41,4 +40,5 @@ services:
 
 volumes:
   postgresql-data:
+  bundle_box:
 

data/lib/marty/mcfly_model.rb

@@ -10,10 +10,8 @@ module Mcfly::Model
       !private && q.is_a?(ActiveRecord::Base) ? make_openstruct(q) : q
     end
 
-    def base_mcfly_lookup(meth, name, options = {}, &block)
-      priv = options[:private]
-
-      send(meth, name, options) do |ts, *args|
+    def base_mcfly_lookup(name, options = {}, &block)
+      delorean_fn name, options do |ts, *args|
         raise 'time cannot be nil' if ts.nil?
 
         # FIXME: sig is removed from delorean. We need to find a better way
@@ -37,16 +35,16 @@ module Mcfly::Model
 
         q = q.first if q.respond_to?(:first) && options[:mode] == :first
 
-        hash_if_necessary(q, priv)
+        hash_if_necessary(q, options[:private])
       end
     end
 
     def cached_mcfly_lookup(name, options = {}, &block)
-      base_mcfly_lookup(:cached_delorean_fn, name, options, &block)
+      base_mcfly_lookup(name, options.merge(cache: true), &block)
     end
 
     def mcfly_lookup(name, options = {}, &block)
-      base_mcfly_lookup(:delorean_fn, name, options, &block)
+      base_mcfly_lookup(name, options, &block)
     end
 
     def gen_mcfly_lookup(name, attrs, options = {})
@@ -80,8 +78,7 @@ module Mcfly::Model
         raise 'bad attrs' unless Array === attrs
       end
 
-      fn = cache ? :cached_delorean_fn : :delorean_fn
-      base_mcfly_lookup(fn, name, options + { sig:  attrs.length + 1,
+      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|
@@ -140,10 +137,15 @@ module Mcfly::Model
       raise "need #{rel_attr} argument" unless lpi
 
       # cache if mode is not nil
-      fn = options.fetch(:mode, :first) ? :cached_delorean_fn : :delorean_fn
       priv = options[:private]
 
-      send(fn, name, sig: attrs.length + 1) do |ts, *args|
+      delorean_options = {
+        private: options.fetch(:private, false),
+        cache: options.fetch(:cache, false),
+        sig: attrs.length + 1
+      }
+
+      delorean_fn name, delorean_options do |ts, *args|
         # Example: rel is a Gemini::SecurityInstrument instance.
         rel = args[lpi]
         raise "#{rel_attr} can't be nil" unless rel

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = '2.8.0'
+  VERSION = '2.9.1'
 end

data/{make-dummy.mk → make-app.mk}

@@ -1,47 +1,46 @@
-dummy-app-build:
+app-build:
 	docker-compose --file=docker-compose.dummy.yml build
 
-dummy-app:
+app:
 	docker-compose --file=docker-compose.dummy.yml up -d app
 	docker attach marty_app_1
 
-dummy-app-start:
+app-start:
 	docker-compose --file=docker-compose.dummy.yml up -d app
 	docker attach marty_app_1
 
-dummy-app-stop:
+app-stop:
 	docker-compose --file=docker-compose.dummy.yml stop
 
-dummy-app-down:
+app-down:
 	docker-compose --file=docker-compose.dummy.yml down
 
-dummy-app-bash:
+app-bash:
 	docker-compose --file=docker-compose.dummy.yml run --rm app bash
 
-dummy-app-console:
+app-console:
 	docker-compose --file=docker-compose.dummy.yml run --rm app /bin/bash -c "cd spec/dummy && bin/rails c"
 
-dummy-app-initialise-docker:
+app-initialise-docker:
 	touch .bash_history.docker
 	touch .pry_history.docker
-	make dummy-app-install
-	make dummy-app-db-prepare
+	make app-install
+	make app-db-prepare
 
-dummy-app-install:
+app-install:
 	docker-compose --file=docker-compose.dummy.yml run --rm app gem install bundler
-	make dummy-app-install-bundle
+	make app-install-bundle
 
-dummy-app-install-bundle:
+app-install-bundle:
 	docker-compose --file=docker-compose.dummy.yml run --rm app bundle
 
-dummy-app-db-drop:
+app-db-drop:
 	docker-compose --file=docker-compose.dummy.yml run --rm app rake db:drop
 
-dummy-app-db-prepare:
+app-db-prepare:
 	cp spec/dummy/config/database.yml.example spec/dummy/config/database.yml
 	docker-compose --file=docker-compose.dummy.yml run --rm app bundle exec rake db:create db:migrate db:seed app:marty:load_scripts
 
-dummy-app-db-seed:
+app-db-seed:
 	docker-compose --file=docker-compose.dummy.yml run --rm app rake db:seed
 
-

data/marty.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'axlsx', '3.0.0pre'
 
-  s.add_dependency 'delorean_lang', '~> 0.6'
+  s.add_dependency 'delorean_lang', '~> 1.0'
   s.add_dependency 'mcfly', '~> 0.0.20'
 
   s.add_dependency 'coderay'

data/spec/features/{background_job_schedule_spec.rb → schedule_jobs_dashboard_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Background jobs schedule view', js: true do
+feature 'Schedule Jobs Dashboard', js: true do
   before do
     Delayed::Job.delete_all
     populate_test_users
@@ -12,17 +12,17 @@ feature 'Background jobs schedule view', js: true do
       wait_for_ajax
       press('System')
       press('Background Jobs')
-      press('Schedule Background Jobs')
+      press('Schedule Jobs Dashboard')
       wait_for_ajax
     end
 
     it 'access denied' do
-      expect(page).to_not have_content 'Background Jobs Schedule'
+      expect(page).to_not have_content 'Schedule Jobs Dashboard'
     end
   end
 
   context 'as admin' do
-    let(:schedule_view) { netzke_find('background_job_schedule_view') }
+    let(:schedule_view) { netzke_find('schedule_jobs_dashboard') }
 
     let!(:schedule) do
       Marty::BackgroundJob::Schedule.create(
@@ -44,11 +44,11 @@ feature 'Background jobs schedule view', js: true do
       wait_for_ajax
       press('System')
       press('Background Jobs')
-      press('Schedule Background Jobs')
+      press('Schedule Jobs Dashboard')
 
       wait_for_ajax
 
-      expect(page).to have_content 'Background Jobs Schedule'
+      expect(page).to have_content 'Schedule Jobs Dashboard'
     end
 
     it 'creates new schedule' do

data/spec/lib/mcfly_model_spec.rb

@@ -83,10 +83,10 @@ describe 'McflyModel' do
       {
         'AA' => script,
       }, dt)
-    @errs = ['E1', 'lookup_p',
-             'E2', 'clookup_p',
-             'E3', 'lookupn_p',
-             'E4', 'clookupn_p']
+    @errs = ['E1', 'lookup',
+             'E2', 'clookup',
+             'E3', 'lookupn',
+             'E4', 'clookupn']
 
     @errs.in_groups_of(2) do |name, fn|
       Marty::Script.load_script_bodies(
@@ -173,34 +173,6 @@ describe 'McflyModel' do
     end
   end
 
-  it 'raises exception when too many arguments passed (2)' do
-    # non-generated
-    aggregate_failures 'errors' do
-      expect do
-        Marty::ScriptSet.new.get_engine('E5').evaluate(
-          'Err',
-          ['result'],
-          'pt' => Time.zone.now, 'e_id' => nil, 'bc_id' => nil
-        )
-      end.to raise_error(
-        ArgumentError,
-        /Too many args to a_func_p/
-      )
-
-      expect do
-        Marty::ScriptSet.new.get_engine('E6').evaluate(
-          'Err',
-          ['result'],
-          'pt' => Time.zone.now, 'e_id' => nil,
-           'bc_id' => nil, 'mm' => nil
-        )
-      end.to raise_error(
-        ArgumentError,
-        /Too many args to b_func_p/
-      )
-    end
-  end
-
   it 'caching times' do
     ts = DateTime.now
     x = Benchmark.measure do

data/spec/spec_helper.rb

@@ -14,6 +14,8 @@ 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__)
 
+require 'rspec/retry'
+
 RSpec.configure do |config|
   config.include Marty::RSpec::Suite
   config.include Marty::RSpec::SharedConnection
@@ -58,4 +60,16 @@ RSpec.configure do |config|
   config.use_transactional_fixtures = true
 
   Netzke::Testing.rspec_init(config)
+
+  config.verbose_retry = true
+  config.display_try_failure_messages = true
+
+  config.around :each, :js do |ex|
+    ex.run_with_retry retry: 3
+  end
+
+  config.retry_callback = proc do |ex|
+    # run some additional clean up task - can be filtered by example metadata
+    Capybara.reset! if ex.metadata[:js]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.1
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-12 00:00:00.000000000 Z
+date: 2019-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: mcfly
   requirement: !ruby/object:Gem::Requirement
@@ -254,7 +254,6 @@ files:
 - app/components/marty/api_log_view.rb
 - app/components/marty/auth_app.rb
 - app/components/marty/auth_app/client/auth_app.js
-- app/components/marty/background_job_schedule_view.rb
 - app/components/marty/base_rule_view.rb
 - app/components/marty/config_view.rb
 - app/components/marty/data_grid_view.rb
@@ -295,6 +294,7 @@ files:
 - app/components/marty/report_select/client/report_select.js
 - app/components/marty/reporting.rb
 - app/components/marty/reporting/client/reporting.js
+- app/components/marty/schedule_jobs_dashboard.rb
 - app/components/marty/script_form.rb
 - app/components/marty/script_form/client/script_form.js
 - app/components/marty/script_grid.rb
@@ -453,7 +453,7 @@ files:
 - lib/tasks/marty_jobs.rake
 - lib/tasks/marty_tasks.rake
 - lib/tasks/scripts_tasks.rake
-- make-dummy.mk
+- make-app.mk
 - marty.gemspec
 - other/marty/api/base.rb
 - other/marty/diagnostic/aws/ec2_instance.rb
@@ -1582,7 +1582,6 @@ files:
 - spec/dummy/spec/features/javascripts
 - spec/dummy/tmp/.gitkeep
 - spec/features/auth_app_spec.rb
-- spec/features/background_job_schedule_spec.rb
 - spec/features/data_import_spec.rb
 - spec/features/endpoint_access.rb
 - spec/features/enum_spec.rb
@@ -1592,6 +1591,7 @@ files:
 - spec/features/log_view_spec.rb
 - spec/features/reporting_spec.rb
 - spec/features/rule_spec.rb
+- spec/features/schedule_jobs_dashboard_spec.rb
 - spec/features/scripting_spec.rb
 - spec/features/scripting_test_spec.rb
 - spec/features/user_view_spec.rb