marty 5.2.0 → 6.1.0

data/{other → lib}/marty/diagnostic/nodes.rb

@@ -34,8 +34,7 @@ module Marty::Diagnostic; class Nodes < Base
        'shutting_down' => error_if(instances.shutting_down),
        'terminated'    => error_if(instances.terminated),
        'stopping'      => error_if(instances.stopping),
-       'stopped'       => error_if(instances.stopped),
-      }.delete_if { |_k, v| v.empty? }
+       'stopped'       => error_if(instances.stopped), }.delete_if { |_k, v| v.empty? }
     rescue StandardError => e
       error(e.message)
     end

data/{other → lib}/marty/diagnostic/reporter.rb

@@ -9,7 +9,7 @@ module Marty::Diagnostic; class Reporter < Request
     self.request = request
 
     ops = op.split(/,\s*/).uniq - [unresolve_diagnostic(self)]
-    reps = ops.select { |o| reports.keys.include?(o) }
+    reps = ops.select { |o| reports.key?(o) }
 
     self.diagnostics = ((ops - reps) + reps.map { |r| reports[r] }.flatten).uniq.
                          map { |d| resolve_diagnostic(d) }
@@ -26,7 +26,7 @@ module Marty::Diagnostic; class Reporter < Request
       klass = (n + '::Diagnostic::' + diag_name).constantize rescue nil
       break if klass
     end
-    raise NameError.new("#{diag_name} could not be resolved by #{name}") if
+    raise NameError, "#{diag_name} could not be resolved by #{name}" if
       klass.nil?
 
     klass

data/lib/marty/engine.rb

@@ -11,5 +11,10 @@ module Marty
     config.generators do |g|
       g.test_framework :rspec, view_specs: false
     end
+
+    config.assets.precompile += [
+      'marty/application.js',
+      'marty/application.css'
+    ]
   end
 end

data/lib/marty/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Marty
-  VERSION = '5.2.0'
+  VERSION = '6.1.0'
 end

data/lib/marty/xl.rb

@@ -190,7 +190,7 @@ class Marty::Xl
 
             # counter == col0 == (colw - 1) => merge the edges:
             a = boxborders[edge_h[r.object_id][1].to_sym] =
-                  merge_cell_edges(a, deep_copy(boxborders[edge_h[r.object_id][1].to_sym])) if
+              merge_cell_edges(a, deep_copy(boxborders[edge_h[r.object_id][1].to_sym])) if
               counter == (colw - 1)
 
             a = boxborders[edge_h[r.object_id][2].to_sym] unless
@@ -368,11 +368,11 @@ class Marty::Xl
       [d[0], d[1], d[2].select { |inner| inner if inner[0] != 'pos' }]
     end
     new_ops = new_ops1 + new_ops2
-    count = new_ops.select do |d|
-      d[2].select do |inner_ops|
+    count = new_ops.count do |d|
+      d[2].count do |inner_ops|
         inner_ops if inner_ops[0] == 'pos'
-      end.count > 0
-    end.count
+      end > 0
+    end
 
     count == 0 ? new_ops.sort : recalc_offsets(new_ops)
   end

data/spec/dummy/app/jobs/test2_job.rb

@@ -0,0 +1,4 @@
+class Test2Job < Marty::CronJob
+  def perform
+  end
+end

data/spec/dummy/config/application.rb

@@ -46,10 +46,7 @@ module Dummy
     config.active_support.escape_html_entities_in_json = true
 
     # eager load paths instead of autoload paths
-    config.eager_load_paths += ['lib', 'other'].map do
-      |dir|
-      File.expand_path("../../#{dir}", __FILE__)
-    end
+    config.eager_load_paths << File.expand_path("../../lib", __FILE__)
 
     # Use SQL instead of Active Record's schema dumper when creating the database.
     # This is necessary if your schema can't be completely dumped by the schema dumper,

data/spec/dummy/config/initializers/assets.rb

@@ -1 +1 @@
-Rails.application.config.assets.precompile = ['*.js', '*.css']
+Rails.application.config.assets.precompile += ['*.js', '*.css']

data/spec/features/extjs_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+feature 'on grid cells', js: true do
+  def go_to_user_view
+    press('System')
+    press('User Management')
+    wait_for_ajax
+  end
+
+  def go_to_data_grid_view
+    find(:xpath, "//a[contains(., 'Applications')]").click
+    press('Data Grids')
+    wait_for_ajax
+  end
+
+  let(:uv) { netzke_find('user_view') }
+
+  before do
+    Mcfly.whodunnit = Marty::User.find_by_login('marty')
+  end
+
+  it 'grid cells should encode html' do
+    log_in_as('marty')
+    go_to_user_view
+
+    by 'add user with html in field' do
+      wait_for_ajax
+      press('New User')
+
+      within(:gridpanel, 'add_window', match: :first) do
+        fill_in('Login', with: 'extjs_test_login')
+        fill_in('First Name', with: 'test_fname')
+        fill_in('Last Name',
+                with:
+                "<b class='test class' onclick='alert()'>test text</b>"
+               )
+        press 'Ok'
+      end
+    end
+
+    and_by 'check html rendering' do
+      # negative test
+      expect do
+        find(:xpath, "//b[contains(@class, 'test class')]")
+      end.to raise_error(Capybara::ElementNotFound)
+
+      # positive test
+      find('tr', text: 'extjs_test_login').should have_content(
+        "<b class='test class' onclick='alert()'>test text</b>"
+      )
+
+      # positive test
+      find(:xpath, "//td[contains(., 'test text')]").click
+      go_to_data_grid_view
+      expect(URI.parse(current_url).fragment).to eq 'data_grid_user_view'
+    end
+  end
+end

data/spec/features/schedule_jobs_dashboard_spec.rb

@@ -26,7 +26,7 @@ feature 'Schedule Jobs Dashboard', js: true do
 
     let!(:schedule) do
       Marty::BackgroundJob::Schedule.create(
-        job_class: 'TestJob2',
+        job_class: 'Test2Job',
         cron: '0 0 * * *',
         state: 'on'
       ).tap do |job|
@@ -38,7 +38,7 @@ feature 'Schedule Jobs Dashboard', js: true do
     end
 
     before do
-      expect(TestJob2.scheduled?).to be true
+      expect(Test2Job.scheduled?).to be true
 
       log_in_as('admin1')
       wait_for_ajax
@@ -72,34 +72,34 @@ feature 'Schedule Jobs Dashboard', js: true do
       expect(TestJob.scheduled?).to be true
       expect(TestJob.delayed_job.cron).to eq '1 1 * * *'
 
-      expect(TestJob2.scheduled?).to be true
-      expect(TestJob2.delayed_job.cron).to eq '0 0 * * *'
+      expect(Test2Job.scheduled?).to be true
+      expect(Test2Job.delayed_job.cron).to eq '0 0 * * *'
     end
 
     it 'deletes schedule' do
-      find('.x-grid-item', text: 'TestJob2').click
+      find('.x-grid-item', text: 'Test2Job').click
       press 'Delete'
       press 'Yes'
 
       wait_for_ajax
 
-      expect(TestJob2.scheduled?).to be false
+      expect(Test2Job.scheduled?).to be false
     end
 
     it 'turns the schedule off' do
-      find('.x-grid-item', text: 'TestJob2').click
+      find('.x-grid-item', text: 'Test2Job').click
       press 'Edit'
       fill_in('state', with: 'off')
 
       press 'OK'
       wait_for_ajax
-      expect(TestJob2.scheduled?).to be false
+      expect(Test2Job.scheduled?).to be false
     end
 
     it 'shows validation errors' do
       press('Add')
 
-      fill_in('Job class', with: 'TestJob2')
+      fill_in('Job class', with: 'Test2Job')
       fill_in('state', with: 'on')
       fill_in('cron', with: '1')
 

data/spec/lib/logger_spec.rb

@@ -101,9 +101,9 @@ module Marty
         line_count = File.readlines('/tmp/logaction.txt').count
 
         log_count = Marty::Log.all.count
-        failed_count = f.readlines.select do |l|
+        failed_count = f.readlines.count do |l|
           l == "Marty::Logger failure: database is locked\n"
-        end.count
+        end
 
         expect(Marty::Promise.where.not(result: {}).count).to eq 1000
 

data/spec/models/posting_spec.rb

@@ -27,19 +27,6 @@ module Marty
         expect(Posting.lookup_dt('NOW')).to eq Float::INFINITY
       end
 
-      describe '.get_latest' do
-        it 'provide a list of latest of postings in descending order' do
-          4.times do |d|
-            Posting.do_create('BASE', d.day.from_now, 'a comment')
-          end
-          dt3 = 3.day.from_now
-
-          latest = Posting.get_latest(1)
-          expect(latest.count).to eq 1
-          expect(latest[0].name).to match /BASE-#{dt3.strftime("%Y%m%d-%H%M")}/
-        end
-      end
-
       describe '.get_latest_by_type' do
         context 'when invalid parameters are supplied' do
           it "raises 'posting type list missing' error" do

data/spec/services/jobs/schedule_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+module Marty
+  describe Jobs::Schedule do
+    let!(:schedule) do
+      Marty::BackgroundJob::Schedule.create!(
+        job_class: 'TestJob',
+        cron: '0 0 * * *',
+        state: 'on'
+      )
+    end
+
+    it 'schedules jobs' do
+      expect(TestJob).to_not be_scheduled
+      described_class.call
+      expect(TestJob).to be_scheduled
+    end
+
+    it 'deletes previously scheduled jobs' do
+      described_class.call
+      expect(TestJob).to be_scheduled
+      schedule.destroy!
+
+      non_cron_job = Delayed::Job.create!(handler: 'Non cron job')
+
+      dj = Delayed::Job.last
+      dj.handler = dj.handler.gsub('TestJob', 'WrongTestJob')
+      dj.save!
+
+      described_class.call
+
+      expect(TestJob).to_not be_scheduled
+      any_old_scheduled_jobs = Delayed::Job.where('handler ILIKE ?', '%WrongTestJob%').any?
+      expect(any_old_scheduled_jobs).to be false
+
+      non_cron_job = Delayed::Job.find_by(handler: 'Non cron job')
+      expect(non_cron_job).to be_present
+    end
+  end
+end

data/spec/support/chromedriver.rb

@@ -13,6 +13,8 @@ module Marty; module RSpec; module Chromedriver
       }
 
       options = ::Selenium::WebDriver::Chrome::Options.new
+      options.add_preference(:download, default_directory:
+                              Marty::RSpec::DownloadHelper::PATH.to_s)
 
       # Add arguments to the driver using the Options interface
       if opts[:args]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-09 00:00:00.000000000 Z
+date: 2019-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sigv4
@@ -318,6 +318,7 @@ files:
 - app/helpers/marty/enum_helper.rb
 - app/helpers/marty/script_set.rb
 - app/jobs/marty/cron_job.rb
+- app/jobs/marty/remove_old_promises_job.rb
 - app/models/marty/api_auth.rb
 - app/models/marty/api_config.rb
 - app/models/marty/background_job.rb
@@ -415,6 +416,7 @@ files:
 - db/migrate/507_migrate_marty_roles_to_enum.rb
 - db/migrate/508_add_not_to_data_grids_tables.rb
 - 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/seeds.rb
 - db/sql/lookup_grid_distinct_v1.sql
@@ -428,6 +430,7 @@ files:
 - docker-compose.dummy.yml
 - gemini_deprecations.md
 - lib/marty.rb
+- lib/marty/api/base.rb
 - lib/marty/aws/base.rb
 - lib/marty/aws/request.rb
 - lib/marty/cache_adapters.rb
@@ -437,6 +440,23 @@ files:
 - lib/marty/data_conversion.rb
 - lib/marty/data_exporter.rb
 - lib/marty/data_importer.rb
+- lib/marty/diagnostic/aws/ec2_instance.rb
+- lib/marty/diagnostic/aws/error.rb
+- lib/marty/diagnostic/base.rb
+- lib/marty/diagnostic/collection.rb
+- lib/marty/diagnostic/connections.rb
+- lib/marty/diagnostic/database.rb
+- lib/marty/diagnostic/delayed_job_version.rb
+- lib/marty/diagnostic/delayed_job_workers.rb
+- lib/marty/diagnostic/environment_variables.rb
+- lib/marty/diagnostic/fatal.rb
+- lib/marty/diagnostic/node.rb
+- lib/marty/diagnostic/nodes.rb
+- lib/marty/diagnostic/packer.rb
+- lib/marty/diagnostic/reporter.rb
+- lib/marty/diagnostic/request.rb
+- lib/marty/diagnostic/scheduled_jobs.rb
+- lib/marty/diagnostic/version.rb
 - lib/marty/engine.rb
 - lib/marty/json_schema.rb
 - lib/marty/logger.rb
@@ -464,24 +484,6 @@ files:
 - lib/tasks/scripts_tasks.rake
 - make-app.mk
 - 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
-- other/marty/diagnostic/database.rb
-- other/marty/diagnostic/delayed_job_version.rb
-- other/marty/diagnostic/delayed_job_workers.rb
-- other/marty/diagnostic/environment_variables.rb
-- other/marty/diagnostic/fatal.rb
-- other/marty/diagnostic/node.rb
-- other/marty/diagnostic/nodes.rb
-- other/marty/diagnostic/packer.rb
-- other/marty/diagnostic/reporter.rb
-- other/marty/diagnostic/request.rb
-- other/marty/diagnostic/scheduled_jobs.rb
-- other/marty/diagnostic/version.rb
 - script/rails
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/delayed_job_controller_spec.rb
@@ -491,6 +493,7 @@ files:
 - spec/controllers/rpc_import_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - 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
@@ -498,8 +501,8 @@ files:
 - 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_job.rb
-- spec/dummy/app/jobs/test_job2.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
 - spec/dummy/app/models/gemini/amortization_type.rb
@@ -1598,6 +1601,7 @@ files:
 - spec/features/data_import_spec.rb
 - spec/features/endpoint_access.rb
 - spec/features/enum_spec.rb
+- spec/features/extjs_spec.rb
 - spec/features/javascripts/job_dashboard_live_search.js.coffee
 - spec/features/javascripts/login.js.coffee
 - spec/features/jobs_dashboard_spec.rb
@@ -1662,6 +1666,7 @@ files:
 - spec/other/diagnostic/delayed_job_workers_spec.rb
 - spec/other/diagnostic/reporter_spec.rb
 - spec/requests/routes_spec.rb
+- spec/services/jobs/schedule_spec.rb
 - spec/spec_helper.rb
 - spec/support/chromedriver.rb
 - spec/support/components/netzke_combobox.rb
@@ -1700,7 +1705,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A framework for working with versioned data