marty 6.1.0 → 8.0.0

data/lib/marty/monkey.rb

@@ -70,14 +70,10 @@ class Delorean::BaseModule::NodeCall
 end
 
 class Delorean::Engine
-  def background_eval(node, params, attrs, event = {})
+  # FIXME: Marty::Event no longer exists, we should remove event at some point
+  def background_eval(node, params, attrs, _event = {})
     raise 'background_eval bad params' unless params.is_a?(Hash)
 
-    unless event.empty?
-      params['p_event'] = event.each_with_object({}) do |(k, v), h|
-        h[k.to_s] = v
-      end
-    end
     nc = Delorean::BaseModule::NodeCall.new({}, self, node, params)
     # start the background promise
     nc | attrs
@@ -112,6 +108,25 @@ class Netzke::Base
   end
 end
 
+# FIXME: Move to Netzke
+module Netzke
+  module Basepack
+    class ColumnConfig < AttrConfig
+      alias old_set_defaults set_defaults
+
+      def set_defaults
+        old_set_defaults
+
+        return unless xtype == :checkcolumn
+        # Use default value only if there is a boolean attribute with that name
+        return unless @model_adapter.attr_type(name) == :boolean
+        return if key?(:default_value)
+
+        self.default_value = false
+      end
+    end
+  end
+end
 ######################################################################
 
 # The following is a hack to get around ActiveRecord's broken handling
@@ -356,3 +371,8 @@ module Netzke
     end
   end
 end
+
+require 'delayed_cron_job'
+require_relative './delayed_job/scheduled_job_plugin.rb'
+
+Delayed::Worker.plugins << Marty::DelayedJob::ScheduledJobPlugin

data/lib/marty/promise_ruby_job.rb

@@ -23,6 +23,7 @@ class Marty::PromiseRubyJob < Struct.new(:promise,
     begin
       Mcfly.whodunnit = promise.user
 
+      ENV['__promise_id'] = promise.id.to_s
       mod = module_name.constantize
       res = { 'result' => mod.send(method_name, *method_args) }
     rescue StandardError => e
@@ -31,6 +32,7 @@ class Marty::PromiseRubyJob < Struct.new(:promise,
 
     promise.set_result(res)
     process_hook(res)
+    ENV.delete('__promise_id')
   end
 
   def process_hook(res)

data/lib/marty/rails_app.rb

@@ -0,0 +1,29 @@
+module Marty
+  module RailsApp
+    class << self
+      def application_name
+        if Gem::Version.new(Rails.version) >= Gem::Version.new('6.0.0')
+          Rails.application.class.module_parent_name
+        else
+          Rails.application.class.parent_name
+        end
+      end
+
+      def needs_migration?
+        if Gem::Version.new(Rails.version) >= Gem::Version.new('5.2.0')
+          ActiveRecord::Base.connection.migration_context.needs_migration?
+        else
+          ActiveRecord::Migrator.needs_migration?
+        end
+      end
+
+      def parameter_filter_class
+        if Gem::Version.new(Rails.version) >= Gem::Version.new('6.0.0')
+          ActiveSupport::ParameterFilter
+        else
+          ActionDispatch::Http::ParameterFilter
+        end
+      end
+    end
+  end
+end

data/lib/marty/railtie.rb

@@ -4,5 +4,6 @@ module Marty
     config.marty.default_posting_type = 'BASE'
     config.marty.extjs_theme = 'classic'
     config.marty.promise_job_enqueue_hooks = []
+    config.marty.redis_url = nil
   end
 end

data/lib/marty/version.rb

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

data/marty.gemspec

@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'net-ldap'
   s.add_dependency 'netzke'
   s.add_dependency 'pg'
+  s.add_dependency 'redis'
   s.add_dependency 'rubyzip'
   s.add_dependency 'zip-zip'
 end

data/spec/controllers/job_controller_spec.rb

@@ -208,13 +208,13 @@ describe Marty::JobController, slow: true do
 
     expect_csv = "a,b\r\n1,1\r\n2,4\r\n3,9\r\n"
     expect(response.body).to eq expect_csv
-    expect(response.content_type).to eq 'text/csv'
+    expect(response.media_type).to eq 'text/csv'
 
     get 'download', params: {
       job_id: promise.parent_id,
     }
 
-    expect(response.content_type).to eq 'application/zip'
+    expect(response.media_type).to eq 'application/zip'
 
     Zip::InputStream.open(StringIO.new(response.body)) do |io|
       count = 0

data/spec/dummy/app/components/gemini/cm_auth_app.rb

@@ -13,6 +13,7 @@ class Gemini::CmAuthApp < Marty::MainAuthApp
           :loan_program_view,
           :my_rule_view,
           :xyz_rule_view,
+          :simple_view,
         ],
       }
     ]
@@ -33,13 +34,24 @@ class Gemini::CmAuthApp < Marty::MainAuthApp
     a.handler = :netzke_load_component_by_action
   end
 
+  action :simple_view do |a|
+    a.text    = a.tooltip = 'Gemini Simple'
+    a.handler = :netzke_load_component_by_action
+  end
+
   component :loan_program_view do |c|
     c.klass = Gemini::LoanProgramView
   end
+
   component :my_rule_view do |c|
     c.klass = Gemini::MyRuleView
   end
+
   component :xyz_rule_view do |c|
     c.klass = Gemini::XyzRuleView
   end
+
+  component :simple_view do |c|
+    c.klass = Gemini::SimpleView
+  end
 end

data/spec/dummy/app/components/gemini/simple_view.rb

@@ -0,0 +1,17 @@
+class Gemini::SimpleView < Marty::McflyGridPanel
+  has_marty_permissions create: :dev,
+                        read: :dev,
+                        update: :dev,
+                        delete: :dev
+
+  def configure(c)
+    super
+    c.title = 'Gemini Simple'
+    c.model = Gemini::Simple
+    c.attributes = [
+      :user_id,
+      :some_name,
+      :active,
+    ]
+  end
+end

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

@@ -0,0 +1,14 @@
+class TestFailingJob < Marty::CronJob
+  def perform
+    self.class.trigger_destroy
+    self.class.trigger_failure
+  end
+
+  def self.trigger_destroy
+    delayed_job.destroy!
+  end
+
+  def self.trigger_failure
+    raise 'failure triggered'
+  end
+end

data/spec/dummy/app/models/gemini/helper.rb

@@ -5,8 +5,33 @@ class Gemini::Helper
 
   # Just for testing
   delorean_fn :sleep, sig: 1 do
-    |seconds|
+    |seconds, label = ''|
+
+    Marty::Logger.info('sleeping', {label: label}) if label.present?
+
     Kernel.sleep seconds
+    seconds.to_s
+  end
+
+  def self.pr_wait(ids)
+    idh = ids.each_with_object({}) do |id, h|
+      h[id] = false
+    end
+    timeout = 60
+    all_done = false
+    loop do
+      idh.each do |id, v|
+        next if v
+        p = Marty::Promise.uncached { Marty::Promise.find_by(id: id) }
+        idh[id] = p.result if p.status
+      end
+      all_done = idh.values.all? { |v| v }
+      break if all_done || timeout == 0
+      timeout -= 1
+      sleep 1
+    end
+    raise "DID NOT FINISH" unless all_done
+    idh.values.map { |h| h['result'] }
   end
 
   # Just for testing
@@ -57,4 +82,68 @@ class Gemini::Helper
     end
     true
   end
+
+  delorean_fn :get_inds do |cnt|
+    (0..cnt-1).to_a
+  end
+
+  delorean_fn :cached_factorial, cache: true do |number|
+    Kernel.sleep 0.001
+    Math.gamma(number + 1) 
+  end
+
+  delorean_fn :priority_tester do |reverse, job_cnt|
+    blockers = 8.times.map do |idx|
+      title =  "Blocker #{idx}"
+      Marty::Promises::Ruby::Create.call(
+        module_name: 'Gemini::Helper',
+        method_name: 'sleep',
+        method_args: [5, title],
+        params: {
+          p_title: title,
+          _user_id: 1,
+          p_priority: 0,
+        }.compact
+      ).as_json.values.first.first
+    end
+    prioritized = job_cnt.times.map do |idx|
+      pri = reverse ? job_cnt - idx : idx
+      title =  "Prioritized #{idx} pri=#{pri}"
+      Marty::Promises::Ruby::Create.call(
+        module_name: 'Gemini::Helper',
+        method_name: 'sleep',
+        method_args: [2, title],
+        params: {
+          p_title: title,
+          _user_id: 1,
+          p_priority: pri
+        }.compact
+      ).as_json.values.first.first
+    end
+    pr_wait(blockers) + pr_wait(prioritized)
+  end
+
+  delorean_fn :priority_inh_tester do |title|
+    [Marty::Promises::Ruby::Create.call(
+        module_name: 'Gemini::Helper',
+        method_name: 'sleep',
+        method_args: [0, 'child1'],
+        params: {
+          p_title: title + ' child1',
+          _user_id: 1,
+          _parent_id: ENV['__promise_id']&.to_i
+        }.compact
+     ).as_json.values.first.first,
+     Marty::Promises::Ruby::Create.call(
+        module_name: 'Gemini::Helper',
+        method_name: 'sleep',
+        method_args: [0, 'child2'],
+        params: {
+          p_title: title + ' child2',
+          _user_id: 1,
+          p_priority: 10,
+          _parent_id: ENV['__promise_id']&.to_i
+        }.compact
+     ).as_json.values.first.first]
+  end
 end

data/spec/dummy/config/application.rb

@@ -83,6 +83,7 @@ module Dummy
     config.marty.extjs_theme = 'crisp'
 
     config.active_job.queue_adapter = :delayed_job
+    config.marty.redis_url = ENV['MARTY_REDIS_URL']
   end
 end
 require "marty/permissions"

data/spec/dummy/db/migrate/20191101132729_add_activity_flag_to_simple.rb

@@ -0,0 +1,10 @@
+class AddActivityFlagToSimple < ActiveRecord::Migration[5.2]
+  def up
+    add_column :gemini_simples, :active, :boolean, null: false, default: false
+    change_column_default :gemini_simples, :active, nil
+  end
+
+  def down
+    remove_column :gemini_simples, :active
+  end
+end

data/spec/dummy/delorean/blame_report.dl

@@ -0,0 +1 @@
+../../../delorean/blame_report.dl

data/spec/dummy/delorean/enum_report.dl

@@ -0,0 +1 @@
+../../../delorean/enum_report.dl

data/spec/dummy/delorean/marty_fields.dl

@@ -0,0 +1 @@
+../../../delorean/marty_fields.dl

data/spec/dummy/delorean/table_report.dl

@@ -0,0 +1 @@
+../../../delorean/table_report.dl

data/spec/features/data_blame_report_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+feature 'Data Blame report', js: true do
+  before(:each) do
+    populate_test_users
+    Marty::Script.load_scripts(nil)
+  end
+
+  def go_to_reporting
+    press('Applications')
+    press('Reports')
+  end
+
+  def with_user(uname)
+    u = Marty::User.find_by_login(uname)
+    begin
+      old_u, Mcfly.whodunnit = Mcfly.whodunnit, u
+      yield(u)
+    ensure
+      Mcfly.whodunnit = old_u
+    end
+  end
+
+  def select_node node_name
+    wait_for_ajax
+    # hacky: assumes only 1 combobox without label
+    within(:gridpanel, 'report_select', match: :first) do
+      # hacky, hardcoding netzkecombobox dropdown arrow name
+      arrow = find(:input, 'nodename')['data-componentid'] + '-trigger-picker'
+      find(:xpath, ".//div[@id='#{arrow}']").click
+      find(:xpath, "//li[text()='#{node_name}']").click
+    end
+  end
+
+  it 'run_script displays proper data' do
+    log_in_as('admin1')
+    go_to_reporting
+
+    tag_grid = netzke_find('tag_grid')
+    script_grid = netzke_find('script_grid')
+    posting_combo = netzke_find('Posting', 'combobox')
+    script_combo = netzke_find('', 'combobox')
+
+    by 'select tag' do
+      wait_for_ajax
+      tag_grid.select_row(1)
+    end
+
+    and_by 'select TableReport script & UserList node' do
+      find('table', text: 'BlameReport').click
+      select_node('Data Blame Report (xlsx)')
+    end
+
+    and_by 'generate report' do
+      wait_for_ajax
+      press('Generate Report')
+      wait_for_ajax
+      expect(page).to have_content('Generate: Data Blame Report')
+    end
+
+    path = Rails.root.join('spec/tmp/downloads/Data Blame Report.xlsx')
+    file_exists = File.file?(path)
+
+    expect(file_exists).to be true
+  end
+end

data/spec/features/data_grid_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'data grid view', js: true do
+feature 'data grid view', js: true, speed: :super_slow do
   before(:all) do
     self.use_transactional_tests = true
   end

data/spec/features/enum_values_report_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+
+feature 'Enum Values List report', js: true do
+  before(:each) do
+    populate_test_users
+    Marty::Script.load_scripts(nil)
+  end
+
+  def go_to_reporting
+    press('Applications')
+    press('Reports')
+  end
+
+  def with_user(uname)
+    u = Marty::User.find_by_login(uname)
+    begin
+      old_u, Mcfly.whodunnit = Mcfly.whodunnit, u
+      yield(u)
+    ensure
+      Mcfly.whodunnit = old_u
+    end
+  end
+
+  def select_node node_name
+    wait_for_ajax
+    # hacky: assumes only 1 combobox without label
+    within(:gridpanel, 'report_select', match: :first) do
+      # hacky, hardcoding netzkecombobox dropdown arrow name
+      arrow = find(:input, 'nodename')['data-componentid'] + '-trigger-picker'
+      find(:xpath, ".//div[@id='#{arrow}']").click
+      find(:xpath, "//li[text()='#{node_name}']").click
+    end
+  end
+
+  it 'run_script displays proper data' do
+    log_in_as('admin1')
+    go_to_reporting
+
+    tag_grid = netzke_find('tag_grid')
+    script_grid = netzke_find('script_grid')
+    posting_combo = netzke_find('Posting', 'combobox')
+    script_combo = netzke_find('', 'combobox')
+
+    by 'select tag' do
+      wait_for_ajax
+      tag_grid.select_row(1)
+    end
+
+    and_by 'select TableReport script & UserList node' do
+      find('table', text: 'EnumReport').click
+      select_node('Enum Values List (csv)')
+    end
+
+    and_by 'generate report' do
+      wait_for_ajax
+      press('Generate Report')
+      wait_for_ajax
+      expect(page).to have_content('Generate: Enum Values List')
+    end
+
+    path = Rails.root.join('spec/tmp/downloads/Enum Values List.csv')
+    csv_content = CSV.parse File.read(path)
+
+    expect(csv_content.size > 1).to be true
+    expect(csv_content.first).to eq ['enum_name', 'value']
+
+    expected_rows = [
+      ['marty_promise_types', 'delorean'],
+      ['marty_promise_types', 'ruby']
+    ]
+
+    promise_types = csv_content.select { |v| v[0] == 'marty_promise_types' }
+
+    expect(promise_types).to eq expected_rows
+  end
+end