marty 11.0.0 → 13.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 119afa3c55c47a985cce5d53a9868f605e2fe401f90bd66bcf3465b03eaf8c5d
-  data.tar.gz: 83dfb56e30a009281111f825a05d603fef30830cf3c67e69c9e0399124d7e5a6
+  metadata.gz: 9af04e8e76cf3023af1aa02e26000f68ecfe47ded9811345921b01a266a79e8f
+  data.tar.gz: 4846444b2028e4f757082647c453cae88e6d034e1eea15c4b14eadee0eedb632
 SHA512:
-  metadata.gz: 1dfadeffa2456aa43340ba6a6848d78dcf8f938e7e500b78a262c9ae5886145884921ef58c08c9e8edc5451a01d0d21e1eabbd37a175065f988c402f63af8e11
-  data.tar.gz: 35e5a24aa4475cd027cc2111f64fba44510aeac35040ea0d13e84f64bbc6f4e3df45120ec9101499cf13c9b1676036a9dcd6e3f8a6b4fb58416f6311091a9ea0
+  metadata.gz: 590a21ed0061f1a29fc294f5600ce409c2f0c762f481373a42552559c20f5f8ea2149b213afe38c3dfae46a532f180ab8853aaf65dc96a338283f04291973eec
+  data.tar.gz: ad4a62998ce1d912205c118c8403cf5ef008a29e60427871fd75b595631b5ab4309460e6ebd4619459cd9b028e10d64daf98c2190cd52ef724c0c1c7ecffce2f

data/.eslintignore

@@ -1 +1,3 @@
 app/assets/javascripts/marty/codemirror/*
+!.schemalintrc.js
+!.eslintrc.js

data/.eslintrc.js

@@ -1,26 +1,31 @@
 module.exports = {
   env: {
     browser: true,
-    es6: true,
+    es6: true
   },
   extends: ["eslint:recommended", "prettier"],
   globals: {
     RailsApp: "writable",
     ActionCable: "readonly",
     Ext: "readonly",
-    CodeMirror: "readonly"
+    CodeMirror: "readonly",
+    module: "writable",
+    process: "readonly"
   },
   parserOptions: {
-    ecmaVersion: 6,
+    ecmaVersion: 6
   },
   plugins: ["prettier"],
   rules: {
     "no-var": ["error"],
     "prefer-const": ["error"],
     "linebreak-style": ["error", "unix"],
-    "quotes": [2, "double", { "avoidEscape": true }],
-    "no-unused-vars": ["error", { "args": "after-used", "argsIgnorePattern": "^_" }],
+    "quotes": [2, "double", { avoidEscape: true }],
+    "no-unused-vars": [
+      "error",
+      { args: "after-used", argsIgnorePattern: "^_" }
+    ],
     "object-shorthand": ["error", "always"],
-    "no-constant-condition": ["error", { "checkLoops": false }]
+    "no-constant-condition": ["error", { checkLoops: false }]
   }
 };

data/.gitignore

@@ -26,6 +26,7 @@ spec/dummy/.sass-cache
 *.swp
 
 /spec/dummy/public/extjs
+/spec/dummy/public/assets
 .rspec
 .rspec-results
 

data/.rubocop.yml

@@ -87,3 +87,18 @@ Rails/ApplicationController:
 
 Rails/IndexWith:
   Enabled: false
+
+Lint/RaiseException:
+  Enabled: false
+
+Lint/StructNewOverride:
+  Enabled: false
+
+Style/HashEachMethods:
+  Enabled: false
+
+Style/HashTransformKeys:
+  Enabled: false
+
+Style/HashTransformValues:
+  Enabled: false

data/.schemalintrc.js

@@ -0,0 +1,41 @@
+module.exports = {
+  connection: {
+    host: process.env["POSTGRES_HOST"] || "localhost",
+    user: process.env["POSTGRES_USER"] || "postgres",
+    password: process.env["POSTGRES_PASSWORD"] || "postgres",
+    database: process.env["POSTGRES_DB_NAME"] || "marty_dev",
+    charset: "utf8"
+  },
+
+  // plugins: ['./custom-rules'],
+
+  rules: {
+    "name-casing": ["error", "snake"],
+    "name-inflection": ["error", "plural"],
+    "prefer-jsonb-to-json": ["error"]
+    // FIXME: user varchar with no size limit instead
+    // We would need to update lib so it would return column size info
+    // And create our own rule that checks that
+    // "prefer-text-to-varchar": ["error"]
+  },
+
+  schemas: [{ name: "public" }],
+
+  ignores: [
+    {
+      identifierPattern: ".*_rules.computed_guards.*",
+      rulePattern: "prefer-jsonb-to-json"
+    },
+    {
+      identifierPattern: ".*_rules.results.*",
+      rulePattern: "prefer-jsonb-to-json"
+    },
+    { identifierPattern: ".*ar_internal_metadata.*", rulePattern: ".*" },
+    { identifierPattern: ".*schema_migrations.*", rulePattern: ".*" },
+    { identifierPattern: ".*gemini_.*", rulePattern: ".*" },
+    { identifierPattern: "entities.*", rulePattern: ".*" },
+    { identifierPattern: "groupings.*", rulePattern: ".*" },
+    { identifierPattern: "heads.*", rulePattern: ".*" },
+    { identifierPattern: "head_versions.*", rulePattern: ".*" }
+  ]
+};

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+13.0.2 - 2020-04-14
+=================
+* Use VARCHAR without size limit instead of recently added TEXT columns, since default field for TEXT column is textarea.
+
+13.0.1 - 2020-04-14
+=================
+* Add missing index by `posting_type` for `marty_postings` table.
+
+12.0.0 - 2020-04-02
+=================
+* Marty::PostingType converted to PgEnum. AR methods (find_by, all, etc...) will no longer work.
+

data/app/channels/marty/notification_channel.rb

@@ -5,6 +5,7 @@ module Marty
         Rails.application.config.marty.enable_action_cable
 
       reject && return if current_user.blank?
+
       stream_from "marty_notifications_#{current_user.id}"
     end
   end

data/app/components/marty/postings/new_form.rb

@@ -31,17 +31,23 @@ module Marty
 
         c.model = 'Marty::Posting'
         c.items = [
-          {
-            name: :posting_type__name,
-            scope: lambda { |r|
-              r.where(name: Marty::Postings::NewForm.can_perform_actions)
-            },
-          },
+          :posting_type,
           :comment,
           :summary_grid
         ]
       end
 
+      attribute :posting_type do |c|
+        store = Marty::Postings::NewForm.can_perform_actions
+
+        c.editor_config = {
+          multi_select: false,
+          store:        store,
+          type:         :string,
+          xtype:        :combo,
+        }
+      end
+
       component :summary_grid do |c|
         c.klass = Marty::Postings::SummaryGrid
         c.data_store = { auto_load: false }

data/app/components/marty/postings/new_form/client/new_form.js

@@ -7,7 +7,7 @@
   initComponent() {
     this.callParent();
 
-    const postingType = this.getForm().findField("posting_type__name");
+    const postingType = this.getForm().findField("posting_type");
     const me = this;
 
     me.serverConfig.selected_posting_type = null;

data/app/components/marty/postings/summary_grid.rb

@@ -41,13 +41,13 @@ module Marty
         return [] if config[:selected_posting_type].to_i.negative?
 
         last_posting = Marty::Posting.where(
-          posting_type_id: config[:selected_posting_type]
+          posting_type: config[:selected_posting_type]
         ).where.not(created_dt: 'infinity').order(:created_dt).last
 
         start_dt = last_posting&.created_dt || 1.year.ago
         end_dt = Time.zone.now
 
-        posting_type = Marty::PostingType.find(config[:selected_posting_type])
+        posting_type = Marty::PostingType[config[:selected_posting_type]]
 
         summary_records = class_list(posting_type).map do |klass|
           summary = Marty::DataChange.change_summary(start_dt, end_dt, klass)
@@ -69,7 +69,7 @@ module Marty
       end
 
       def class_list(posting_type)
-        method_name = "class_list_#{posting_type.name}".downcase.to_sym
+        method_name = "class_list_#{posting_type}".downcase.to_sym
 
         if Marty::DataChange.respond_to?(method_name)
           Marty::DataChange.send(method_name)

data/app/helpers/marty/application_helper.rb

@@ -1,4 +1,21 @@
 module Marty
   module ApplicationHelper
+    DEFAULT_ASSETS_PATH = 'app/assets'
+
+    def asset_exists?(file, file_extension, default_path)
+      path = Rails.configuration.marty.send("assets_#{file_extension}_path") ||
+             default_path
+
+      asset_path = Rails.root.join("#{path}/#{file}.#{file_extension}")
+      File.exist?(asset_path)
+    end
+
+    def javascript_exists?(file)
+      asset_exists?(file, :js, DEFAULT_ASSETS_PATH + '/javascript')
+    end
+
+    def stylesheet_exists?(file)
+      asset_exists?(file, :css, DEFAULT_ASSETS_PATH + '/stylesheets')
+    end
   end
 end

data/app/jobs/marty/cron_job.rb

@@ -43,7 +43,7 @@ class Marty::CronJob < ActiveJob::Base
     def schedule(schedule_obj:)
       dj = schedule_obj.delayed_job
 
-      return reschedule_obj(schedule_obj: schedule_obj) if dj.present?
+      return reschedule(schedule_obj: schedule_obj) if dj.present?
 
       cron = schedule_obj.cron
 
@@ -57,7 +57,8 @@ class Marty::CronJob < ActiveJob::Base
       return dj.update(cron: schedule_obj.cron) if dj.locked_by?
 
       remove(dj)
-      schedule(schedule_obj: schedule_obj)
+      set(cron: schedule_obj.cron, schedule_id: schedule_obj.id).
+        perform_later(*schedule_obj.arguments)
     end
 
     def remove(dj)

data/app/models/marty/posting.rb

@@ -2,10 +2,9 @@ class Marty::Posting < Marty::Base
   has_mcfly append_only: true
 
   mcfly_validates_uniqueness_of :name
-  validates :name, :posting_type_id, :comment, presence: true
+  validates :name, :posting_type, :comment, presence: true
 
   belongs_to :user, class_name: 'Marty::User'
-  belongs_to :posting_type
 
   def self.make_name(posting_type, dt)
     return 'NOW' if Mcfly.is_infinity(dt)
@@ -17,19 +16,17 @@ class Marty::Posting < Marty::Base
     # of using the host's timezone. i.e. since we're in PST8PDT, names
     # will be based off of the Pacific TZ.
     dt ||= Time.zone.now
-    "#{posting_type.name}-#{dt.strftime('%Y%m%d-%H%M')}"
+    "#{posting_type}-#{dt.strftime('%Y%m%d-%H%M')}"
   end
 
   before_validation :set_posting_name
+
   def set_posting_name
-    posting_type = Marty::PostingType.find_by(id: posting_type_id)
     self.name = self.class.make_name(posting_type, created_dt)
     true
   end
 
-  def self.do_create(type_name, dt, comment)
-    posting_type = Marty::PostingType.find_by(name: type_name)
-
+  def self.do_create(posting_type, dt, comment)
     raise "unknown posting type #{name}" unless posting_type
 
     o              = new
@@ -60,10 +57,10 @@ class Marty::Posting < Marty::Base
 
   delorean_fn :first_match, sig: [1, 2] do |dt, posting_type = nil|
     raise 'bad posting type' if
-      posting_type && !posting_type.is_a?(Marty::PostingType)
+      posting_type && !posting_type[posting_type]
 
     q = where('created_dt <= ?', dt)
-    q = q.where(posting_type_id: posting_type.id) if posting_type
+    q = q.where(posting_type: posting_type) if posting_type
     q.order('created_dt DESC').first&.attributes
   end
 
@@ -71,10 +68,11 @@ class Marty::Posting < Marty::Base
     raise 'missing posting types list' unless posting_types
     raise 'bad posting types list' unless posting_types.is_a?(Array)
 
-    q = joins(:posting_type).where("created_dt <> 'infinity'").
-       where(marty_posting_types: { name: posting_types }).
+    q = where("created_dt <> 'infinity'").
+       where(posting_type: posting_types).
        select(get_struct_attrs).
        order('created_dt DESC').limit(limit || 1)
+
     q.map(&:attributes)
   end
 end

data/app/models/marty/posting_type.rb

@@ -1,6 +1,5 @@
 class Marty::PostingType < Marty::Base
-  extend Marty::Enum
+  extend Marty::PgEnum
 
-  validates :name, presence: true
-  validates :name, uniqueness: true
+  VALUES = ['BASE']
 end

data/app/models/marty/promise.rb

@@ -44,8 +44,12 @@ class Marty::Promise < Marty::Base
     # log "SETRES #{Process.pid} #{self}"
 
     reload
+    # If exception happened before the promise was started
+    # we should still update the record
+    if res['error'].present? && !start_dt
+      self.start_dt ||= DateTime.now
     # promise must have been started and not yet ended
-    if !start_dt || end_dt || result != {}
+    elsif !start_dt || end_dt || result != {}
       # log "SETERR #{Process.pid} #{self}"
       Marty::Util.logger.error("unexpected promise state: #{self}")
       return
@@ -136,7 +140,10 @@ class Marty::Promise < Marty::Base
             work_off_job(job)
           rescue StandardError => e
             # log "OFFERR #{exc}"
-            error = exception_to_result(e)
+            error = self.class.exception_to_result(
+              promise: self,
+              exception: e
+            )
             last.set_result(error)
           end
           # log "OFF1 #{Process.pid} #{last}"

data/app/views/layouts/marty/application.html.erb

@@ -1,3 +1,5 @@
+<% cookies[:dark_mode] ||= Rails.configuration.marty.dark_mode_default.to_s %>
+
 <!DOCTYPE html>
 <html>
   <head>
@@ -10,6 +12,8 @@
     <%= csrf_meta_tag %>
     <%= javascript_include_tag 'marty/application' %>
     <%= stylesheet_link_tag 'marty/application' %>
+    <%= javascript_include_tag 'application' if javascript_exists?('application') %>
+    <%= stylesheet_link_tag 'application' if stylesheet_exists?('application') %>
     <% if cookies[:dark_mode] == 'true' %>
       <%= stylesheet_link_tag 'marty/dark_mode', media: 'all', 'data-turbolinks-track': 'reload' %>
     <% end %>

data/db/migrate/527_use_pg_enum_for_posting_types.rb

@@ -0,0 +1,61 @@
+class UsePgEnumForPostingTypes < ActiveRecord::Migration[5.1]
+  include Marty::Migrations
+
+  def up
+    disable_triggers 'marty_postings' do
+      posting_types = Marty::PostingType.all.to_a
+      rename_table :marty_posting_types, :marty_posting_types_old
+
+      new_enum(Marty::PostingType, 'keep_marty_prefix_here')
+      add_column :marty_postings, :posting_type, :marty_posting_types
+
+      posting_types.each do |posting_type|
+        Marty::Posting.where(posting_type_id: posting_type.id).update_all(posting_type: posting_type.name)
+      end
+
+      update_views_up
+      remove_column :marty_postings, :posting_type_id
+
+      drop_table :marty_posting_types_old
+      change_column_null :marty_postings, :posting_type, false
+    end
+  end
+
+  def down
+    disable_triggers 'marty_postings' do
+      posting_types = Marty::Posting.pluck(:posting_type).uniq
+
+      execute <<-SQL
+        ALTER TYPE marty_posting_types RENAME TO marty_posting_types_old;
+      SQL
+
+      create_table :marty_posting_types do |t|
+        t.string :name, null: false, limit: 255
+      end
+
+      add_column :marty_postings, :posting_type_id, :integer
+
+      posting_types.each do |posting_type|
+        new_record = Marty::PostingType.create!(name: posting_type)
+        Marty::Posting.where('posting_type = ?', posting_type).update_all(posting_type_id: new_record.id)
+      end
+
+      update_views_down
+      remove_column :marty_postings, :posting_type
+
+      execute <<-SQL
+        DROP TYPE marty_posting_types_old
+      SQL
+
+      change_column_null :marty_postings, :posting_type_id, false
+    end
+  end
+
+  def update_views_up
+    # Add your code here
+  end
+
+  def update_views_down
+    # Add your code here
+  end
+end

data/db/migrate/600_replace_varchars_with_text.rb

@@ -0,0 +1,89 @@
+class ReplaceVarcharsWithText < ActiveRecord::Migration[5.1]
+  def up
+    drop_views
+    execute('
+      ALTER TABLE "delayed_jobs" ALTER COLUMN "locked_by" TYPE TEXT;
+      ALTER TABLE "delayed_jobs" ALTER COLUMN "queue" TYPE TEXT;
+      ALTER TABLE "delayed_jobs" ALTER COLUMN "cron" TYPE TEXT;
+      ALTER TABLE "marty_api_auths" ALTER COLUMN "app_name" TYPE TEXT;
+      ALTER TABLE "marty_api_auths" ALTER COLUMN "api_key" TYPE TEXT;
+      ALTER TABLE "marty_api_auths" ALTER COLUMN "script_name" TYPE TEXT;
+      ALTER TABLE "marty_api_configs" ALTER COLUMN "script" TYPE TEXT;
+      ALTER TABLE "marty_api_configs" ALTER COLUMN "node" TYPE TEXT;
+      ALTER TABLE "marty_api_configs" ALTER COLUMN "attr" TYPE TEXT;
+      ALTER TABLE "marty_api_configs" ALTER COLUMN "api_class" TYPE TEXT;
+      ALTER TABLE "marty_background_job_logs" ALTER COLUMN "job_class" TYPE TEXT;
+      ALTER TABLE "marty_background_job_logs" ALTER COLUMN "status" TYPE TEXT;
+      ALTER TABLE "marty_background_job_schedules" ALTER COLUMN "job_class" TYPE TEXT;
+      ALTER TABLE "marty_background_job_schedules" ALTER COLUMN "cron" TYPE TEXT;
+      ALTER TABLE "marty_background_job_schedules" ALTER COLUMN "state" TYPE TEXT;
+      ALTER TABLE "marty_configs" ALTER COLUMN "key" TYPE TEXT;
+      ALTER TABLE "marty_data_grids" ALTER COLUMN "name" TYPE TEXT;
+      ALTER TABLE "marty_data_grids" ALTER COLUMN "data_type" TYPE TEXT;
+      ALTER TABLE "marty_data_grids" ALTER COLUMN "constraint" TYPE TEXT;
+      ALTER TABLE "marty_grid_index_booleans" ALTER COLUMN "attr" TYPE TEXT;
+      ALTER TABLE "marty_grid_index_int4ranges" ALTER COLUMN "attr" TYPE TEXT;
+      ALTER TABLE "marty_grid_index_integers" ALTER COLUMN "attr" TYPE TEXT;
+      ALTER TABLE "marty_grid_index_numranges" ALTER COLUMN "attr" TYPE TEXT;
+      ALTER TABLE "marty_grid_index_strings" ALTER COLUMN "attr" TYPE TEXT;
+      ALTER TABLE "marty_import_types" ALTER COLUMN "name" TYPE TEXT;
+      ALTER TABLE "marty_import_types" ALTER COLUMN "db_model_name" TYPE TEXT;
+      ALTER TABLE "marty_import_types" ALTER COLUMN "synonym_fields" TYPE TEXT;
+      ALTER TABLE "marty_import_types" ALTER COLUMN "cleaner_function" TYPE TEXT;
+      ALTER TABLE "marty_import_types" ALTER COLUMN "validation_function" TYPE TEXT;
+      ALTER TABLE "marty_import_types" ALTER COLUMN "preprocess_function" TYPE TEXT;
+      ALTER TABLE "marty_logs" ALTER COLUMN "message_type" TYPE TEXT;
+      ALTER TABLE "marty_logs" ALTER COLUMN "message" TYPE TEXT;
+      ALTER TABLE "marty_notifications" ALTER COLUMN "state" TYPE TEXT;
+      ALTER TABLE "marty_notifications_configs" ALTER COLUMN "delivery_type" TYPE TEXT;
+      ALTER TABLE "marty_notifications_configs" ALTER COLUMN "state" TYPE TEXT;
+      ALTER TABLE "marty_notifications_deliveries" ALTER COLUMN "delivery_type" TYPE TEXT;
+      ALTER TABLE "marty_notifications_deliveries" ALTER COLUMN "state" TYPE TEXT;
+      ALTER TABLE "marty_notifications_deliveries" ALTER COLUMN "error_text" TYPE TEXT;
+      ALTER TABLE "marty_postings" ALTER COLUMN "name" TYPE TEXT;
+      ALTER TABLE "marty_postings" ALTER COLUMN "comment" TYPE TEXT;
+      ALTER TABLE "marty_promises" ALTER COLUMN "title" TYPE TEXT;
+      ALTER TABLE "marty_promises" ALTER COLUMN "cformat" TYPE TEXT;
+      ALTER TABLE "marty_scripts" ALTER COLUMN "name" TYPE TEXT;
+      ALTER TABLE "marty_tags" ALTER COLUMN "name" TYPE TEXT;
+      ALTER TABLE "marty_tags" ALTER COLUMN "comment" TYPE TEXT;
+      ALTER TABLE "marty_tokens" ALTER COLUMN "value" TYPE TEXT;
+      ALTER TABLE "marty_users" ALTER COLUMN "login" TYPE TEXT;
+      ALTER TABLE "marty_users" ALTER COLUMN "firstname" TYPE TEXT;
+      ALTER TABLE "marty_users" ALTER COLUMN "lastname" TYPE TEXT;
+    ')
+    recreate_views
+  end
+
+  def down
+    announce("No-op on ReplaceVarcharsWithText.down")
+  end
+
+  def drop_views
+    execute <<SQL
+DROP VIEW IF EXISTS marty_vw_promises;
+SQL
+  end
+
+  def recreate_views
+    execute <<SQL
+       CREATE OR REPLACE VIEW marty_vw_promises
+       AS
+       SELECT
+       id,
+       title,
+       user_id,
+       cformat,
+       parent_id,
+       job_id,
+       status,
+       start_dt,
+       end_dt,
+       priority,
+       timeout
+       FROM marty_promises;
+
+       GRANT SELECT ON marty_vw_promises TO public;
+SQL
+  end
+end

data/db/migrate/601_add_posting_type_index_to_postings.rb

@@ -0,0 +1,7 @@
+class AddPostingTypeIndexToPostings < ActiveRecord::Migration[5.1]
+  include Marty::Migrations
+
+  def change
+    add_index :marty_postings, :posting_type
+  end
+end

data/db/migrate/602_replace_text_with_varchars_without_size_limit.rb

@@ -0,0 +1,89 @@
+class ReplaceTextWithVarcharsWithoutSizeLimit < ActiveRecord::Migration[5.1]
+  def up
+    drop_views
+    execute <<SQL
+      ALTER TABLE "delayed_jobs" ALTER COLUMN "locked_by" TYPE VARCHAR;
+      ALTER TABLE "delayed_jobs" ALTER COLUMN "queue" TYPE VARCHAR;
+      ALTER TABLE "delayed_jobs" ALTER COLUMN "cron" TYPE VARCHAR;
+      ALTER TABLE "marty_api_auths" ALTER COLUMN "app_name" TYPE VARCHAR;
+      ALTER TABLE "marty_api_auths" ALTER COLUMN "api_key" TYPE VARCHAR;
+      ALTER TABLE "marty_api_auths" ALTER COLUMN "script_name" TYPE VARCHAR;
+      ALTER TABLE "marty_api_configs" ALTER COLUMN "script" TYPE VARCHAR;
+      ALTER TABLE "marty_api_configs" ALTER COLUMN "node" TYPE VARCHAR;
+      ALTER TABLE "marty_api_configs" ALTER COLUMN "attr" TYPE VARCHAR;
+      ALTER TABLE "marty_api_configs" ALTER COLUMN "api_class" TYPE VARCHAR;
+      ALTER TABLE "marty_background_job_logs" ALTER COLUMN "job_class" TYPE VARCHAR;
+      ALTER TABLE "marty_background_job_logs" ALTER COLUMN "status" TYPE VARCHAR;
+      ALTER TABLE "marty_background_job_schedules" ALTER COLUMN "job_class" TYPE VARCHAR;
+      ALTER TABLE "marty_background_job_schedules" ALTER COLUMN "cron" TYPE VARCHAR;
+      ALTER TABLE "marty_background_job_schedules" ALTER COLUMN "state" TYPE VARCHAR;
+      ALTER TABLE "marty_configs" ALTER COLUMN "key" TYPE VARCHAR;
+      ALTER TABLE "marty_data_grids" ALTER COLUMN "name" TYPE VARCHAR;
+      ALTER TABLE "marty_data_grids" ALTER COLUMN "data_type" TYPE VARCHAR;
+      ALTER TABLE "marty_data_grids" ALTER COLUMN "constraint" TYPE VARCHAR;
+      ALTER TABLE "marty_grid_index_booleans" ALTER COLUMN "attr" TYPE VARCHAR;
+      ALTER TABLE "marty_grid_index_int4ranges" ALTER COLUMN "attr" TYPE VARCHAR;
+      ALTER TABLE "marty_grid_index_integers" ALTER COLUMN "attr" TYPE VARCHAR;
+      ALTER TABLE "marty_grid_index_numranges" ALTER COLUMN "attr" TYPE VARCHAR;
+      ALTER TABLE "marty_grid_index_strings" ALTER COLUMN "attr" TYPE VARCHAR;
+      ALTER TABLE "marty_import_types" ALTER COLUMN "name" TYPE VARCHAR;
+      ALTER TABLE "marty_import_types" ALTER COLUMN "db_model_name" TYPE VARCHAR;
+      ALTER TABLE "marty_import_types" ALTER COLUMN "synonym_fields" TYPE VARCHAR;
+      ALTER TABLE "marty_import_types" ALTER COLUMN "cleaner_function" TYPE VARCHAR;
+      ALTER TABLE "marty_import_types" ALTER COLUMN "validation_function" TYPE VARCHAR;
+      ALTER TABLE "marty_import_types" ALTER COLUMN "preprocess_function" TYPE VARCHAR;
+      ALTER TABLE "marty_logs" ALTER COLUMN "message_type" TYPE VARCHAR;
+      ALTER TABLE "marty_logs" ALTER COLUMN "message" TYPE VARCHAR;
+      ALTER TABLE "marty_notifications" ALTER COLUMN "state" TYPE VARCHAR;
+      ALTER TABLE "marty_notifications_configs" ALTER COLUMN "delivery_type" TYPE VARCHAR;
+      ALTER TABLE "marty_notifications_configs" ALTER COLUMN "state" TYPE VARCHAR;
+      ALTER TABLE "marty_notifications_deliveries" ALTER COLUMN "delivery_type" TYPE VARCHAR;
+      ALTER TABLE "marty_notifications_deliveries" ALTER COLUMN "state" TYPE VARCHAR;
+      ALTER TABLE "marty_notifications_deliveries" ALTER COLUMN "error_text" TYPE VARCHAR;
+      ALTER TABLE "marty_postings" ALTER COLUMN "name" TYPE VARCHAR;
+      ALTER TABLE "marty_postings" ALTER COLUMN "comment" TYPE VARCHAR;
+      ALTER TABLE "marty_promises" ALTER COLUMN "title" TYPE VARCHAR;
+      ALTER TABLE "marty_promises" ALTER COLUMN "cformat" TYPE VARCHAR;
+      ALTER TABLE "marty_scripts" ALTER COLUMN "name" TYPE VARCHAR;
+      ALTER TABLE "marty_tags" ALTER COLUMN "name" TYPE VARCHAR;
+      ALTER TABLE "marty_tags" ALTER COLUMN "comment" TYPE VARCHAR;
+      ALTER TABLE "marty_tokens" ALTER COLUMN "value" TYPE VARCHAR;
+      ALTER TABLE "marty_users" ALTER COLUMN "login" TYPE VARCHAR;
+      ALTER TABLE "marty_users" ALTER COLUMN "firstname" TYPE VARCHAR;
+      ALTER TABLE "marty_users" ALTER COLUMN "lastname" TYPE VARCHAR;
+SQL
+    recreate_views
+  end
+
+  def down
+    announce("No-op on ReplaceVarcharsWithText.down")
+  end
+
+  def drop_views
+    execute <<SQL
+      DROP VIEW IF EXISTS marty_vw_promises;
+SQL
+  end
+
+  def recreate_views
+    execute <<SQL
+      CREATE OR REPLACE VIEW marty_vw_promises
+      AS
+      SELECT
+      id,
+      title,
+      user_id,
+      cformat,
+      parent_id,
+      job_id,
+      status,
+      start_dt,
+      end_dt,
+      priority,
+      timeout
+      FROM marty_promises;
+
+      GRANT SELECT ON marty_vw_promises TO public;
+SQL
+  end
+end

data/db/seeds.rb

@@ -1,5 +1,6 @@
 # create system account if not there
 system_login = Rails.configuration.marty.system_account || 'marty'
+
 unless Marty::User.find_by_login(system_login)
   user           = Marty::User.new
   user.login     = system_login
@@ -13,22 +14,20 @@ end
 Mcfly.whodunnit = Marty::User.find_by_login(system_login)
 
 # Give system account all roles
-Marty::RoleType.get_all.map { |role|
+Marty::RoleType.get_all.map do |role|
   ur = Marty::UserRole.new
   ur.user = Mcfly.whodunnit
   ur.role = role
   ur.save
-}
+end
 
 # Create default PostingType from configuration
 default_p_type =  Rails.configuration.marty.default_posting_type
 
-Marty::PostingType.create(name: default_p_type)
-
 # Create NOW posting
 unless Marty::Posting.find_by_name('NOW')
   sn                 = Marty::Posting.new
-  sn.posting_type_id = Marty::PostingType[default_p_type].id
+  sn.posting_type    = Marty::PostingType[default_p_type]
   sn.comment         = '---'
   sn.created_dt      = 'infinity'
   sn.save!

data/docker-compose.dummy.yml

@@ -18,6 +18,7 @@ services:
       - "PGTZ=America/Los_Angeles"
       - "BUNDLER_VERSION=2.0.1"
       - "MARTY_REDIS_URL=redis:6379/1"
+      - "POSTGRES_HOST=postgres"
     # env_file: ".rbenv-vars"
     depends_on:
       - "postgres"

data/lib/marty/aws/request.rb

@@ -16,11 +16,13 @@ class Marty::Aws::Request < Marty::Aws::Base
     url += '?' + (default + params).map { |a, v| "#{a}=#{v}" }.join('&') unless
       params.empty?
 
-    sig = Aws::Sigv4::Signer.new(service:           @service,
-                                 region:            @doc[:region],
-                                 access_key_id:     @creds[:access_key_id],
-                                 secret_access_key: @creds[:secret_access_key],
-                                 session_token:     @creds[:token])
+    sig = ::Aws::Sigv4::Signer.new(
+      service: @service,
+      region: @doc[:region],
+      access_key_id: @creds[:access_key_id],
+      secret_access_key: @creds[:secret_access_key],
+      session_token: @creds[:token]
+    )
     signed_url = sig.presign_url(http_method: 'GET', url: url)
 
     http = Net::HTTP.new(host, 443)

data/lib/marty/diagnostic/version.rb

@@ -11,8 +11,9 @@ module Marty::Diagnostic
           }
         end.reduce(&:merge) || {}
 
-        git_tag = `cd #{Rails.root}; git describe --tags --always;`.strip
-        git = { 'Root Git' => git_tag }.merge(submodules)
+        git_tag = `cd #{Rails.root}; git describe --tags --always --abbrev=7;`.strip
+        git_datetime = `cd #{Rails.root}; git log -1 --format=%cd;`.strip
+        git = { 'Root Git' => "#{git_tag} (#{git_datetime})" }.merge(submodules)
       rescue StandardError
         git = { 'Root Git' => error('Failed accessing git') }
       end

data/lib/marty/migrations.rb

@@ -304,6 +304,16 @@ OUT
     end.map(&:to_sym)
   end
 
+  def disable_triggers(table_name)
+    ActiveRecord::Base.connection.
+      execute("ALTER TABLE #{table_name} DISABLE TRIGGER USER;")
+
+    yield
+  ensure
+    ActiveRecord::Base.connection.
+      execute("ALTER TABLE #{table_name} ENABLE TRIGGER USER;")
+  end
+
   def self.get_plv8_migration(file)
     fnname = %r(/([^/]+)_v[0-9]+\.js\z).match(file)[1]
     lines = File.readlines(file)

data/lib/marty/version.rb

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

data/make-lint.mk

@@ -1,6 +1,7 @@
 lint:
 	make lint-ruby
 	make lint-js
+	make lint-schema
 
 lint-fix:
 	make lint-ruby-fix
@@ -16,4 +17,7 @@ lint-js:
 	yarn lint
 
 lint-js-fix:
-	yarn lintfix
+	yarn lint-fix
+
+lint-schema:
+	yarn lint-schema

data/package.json

@@ -1,16 +1,21 @@
 {
   "private": true,
   "scripts": {
-    "lint": "eslint 'app/**/*.{js,jsx}' && prettier --check \"app/**/*.{js,jsx,css,scss}\"",
-    "lintfix": "eslint --fix 'app/**/*.{js,jsx}' && prettier --write \"app/**/*.{js,jsx,css,scss}\""
-  },
-  "dependencies": {
+    "eslint-check": "eslint  'app/**/*.{js,jsx}' ./.schemalintrc.js ./.eslintrc.js ./prettier.config.js",
+    "eslint-write": "eslint --fix 'app/**/*.{js,jsx}' ./.schemalintrc.js ./.eslintrc.js ./prettier.config.js",
+    "prettier-check": "prettier --check \"app/**/*.{js,jsx,css,scss}\" ./.schemalintrc.js ./.eslintrc.js ./prettier.config.js",
+    "prettier-write": "prettier --write \"app/**/*.{js,jsx,css,scss}\" ./.schemalintrc.js ./.eslintrc.js ./prettier.config.js",
+    "lint": "yarn run eslint-check && yarn run prettier-check",
+    "lint-fix": "yarn run eslint-write && yarn run prettier-write",
+    "lint-schema": "schemalint"
   },
+  "dependencies": {},
   "devDependencies": {
     "babel-eslint": "^10.0.1",
     "eslint": "^6.0.0",
     "eslint-config-prettier": "^6.0.0",
     "eslint-plugin-prettier": "^3.1.0",
-    "prettier": "^1.17.1"
+    "prettier": "^1.17.1",
+    "schemalint": "^0.2.2"
   }
 }

data/spec/controllers/diagnostic/controller_spec.rb

@@ -14,8 +14,12 @@ module Marty::Diagnostic
     end
 
     def git
-      `cd #{Rails.root}; git describe --tags --always;`.
-        strip rescue 'Failed accessing git'
+      tag = `cd #{Rails.root}; git describe --tags --always;`.strip
+      git_datetime = `cd #{Rails.root}; git log -1 --format=%cd;`.strip
+
+      "#{tag} (#{git_datetime})"
+    rescue StandardError
+      'Failed accessing git'
     end
 
     describe 'GET #op' do

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1 @@
+// = link_directory ../javascripts .js

data/spec/dummy/app/assets/javascripts/application.js

@@ -0,0 +1,14 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's
+// vendor/assets/javascripts directory can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
+//
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require rails-ujs
+//= require_tree .

data/spec/dummy/db/migrate/20200402150405_add_posting_types.rb

@@ -0,0 +1,14 @@
+class AddPostingTypes < ActiveRecord::Migration[5.2]
+  include Marty::Migrations
+
+  disable_ddl_transaction!
+
+  def up
+    Marty::PostingType::VALUES += [
+      'OTHER',
+      'SNAPSHOT'
+    ]
+
+    update_enum(Marty::PostingType, 'do_not_override_prefix')
+  end
+end

data/spec/lib/migrations/vw_marty_postings.sql.expected

@@ -14,11 +14,9 @@ select
     main.created_dt,
     main.obsoleted_dt,
     main.name,
-    marty_posting_types1.name as posting_type_name,
-    marty_posting_types1.id as post_type_id
+    main.posting_type
 from marty_postings main
     join marty_users u on main.user_id = u.id
-    left join marty_users ou on main.o_user_id = ou.id
-    left join marty_posting_types marty_posting_types1 on main.posting_type_id = marty_posting_types1.id;
+    left join marty_users ou on main.o_user_id = ou.id;
 
 grant select on vw_marty_postings to public;

data/spec/models/posting_spec.rb

@@ -42,8 +42,6 @@ module Marty
 
         context 'when valid parameters are supplied' do
           before do
-            PostingType.create(name: 'SNAPSHOT')
-            PostingType.create(name: 'OTHER')
             Posting.do_create('BASE',     0.days.from_now, 'base posting')
             Posting.do_create('SNAPSHOT', 1.day.from_now, 'snapshot1 posting')
             Posting.do_create('SNAPSHOT', 2.days.from_now, 'snapshot2 posting')

data/spec/models/promise_spec.rb

@@ -362,6 +362,39 @@ describe Marty::Promise, slow: true, retry: 3 do
       expect(promise.result['error']).to eq 'Something went wrong'
       expect(promise.result['backtrace']).to_not be_empty
     end
+
+    describe 'without DJs' do
+      before do
+        stop_delayed_job
+      end
+
+      after do
+        start_delayed_job
+      end
+
+      it 'fails on exception' do
+        Marty::Promises::Ruby::Create.call(
+          module_name: 'Gemini::BudCategory',
+          method_name: 'create_from_promise_error',
+          method_args: [],
+          params: {
+            _user_id: user.id,
+          }
+        )
+
+        promise = Marty::Promise.where(promise_type: 'ruby').last
+        # Simulate exception outside of the job
+        expect(promise).to receive(:work_off_job).once.and_raise 'Test exception'
+
+        promise.wait_for_result(Marty::Promise::DEFAULT_PROMISE_TIMEOUT)
+        promise.reload
+
+        expect(promise.status).to be false
+        expect(promise.promise_type).to eq 'ruby'
+        expect(promise.result['error']).to eq 'Test exception'
+        expect(promise.result['backtrace']).to_not be_empty
+      end
+    end
   end
 
   describe 'priority' do

data/spec/services/background_job/update_schedule_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+module Marty
+  describe BackgroundJob::UpdateSchedule do
+    before(:each) do
+      @schedule = Marty::BackgroundJob::Schedule.create!(
+        job_class: 'TestJob',
+        cron: '0 0 * * *',
+        state: 'on'
+      )
+      Marty::Jobs::Schedule.call
+    end
+    context '.call' do
+      let(:new_cron) { '1 0 * * *' }
+      it 'updates a Delayed::Job cron when cron is updated to on' do
+        @schedule.update(cron: new_cron)
+        described_class.call(
+          id: @schedule.id,
+          job_class: @schedule.job_class
+        )
+        expect(@schedule.reload.delayed_job.cron).to eq(new_cron)
+      end
+
+      it 'does not update Delayed::Job cron when cron is updated to off' do
+        @schedule.update(cron: new_cron, state: 'off')
+        described_class.call(
+          id: @schedule.id,
+          job_class: @schedule.job_class
+        )
+        expect(@schedule.reload.delayed_job).to be_nil
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 11.0.0
+  version: 13.0.2
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actioncable
@@ -283,8 +283,10 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".schemalintrc.js"
 - ".ssh-docker/.keep"
 - ".travis.yml"
+- CHANGELOG.md
 - Dockerfile.dummy
 - Gemfile
 - INDEPENDENCE_ISSUES.md
@@ -521,6 +523,10 @@ files:
 - db/migrate/524_add_timeout_to_promise_view.rb
 - db/migrate/525_add_arguments_to_jobs_schedules.rb
 - db/migrate/526_add_schedule_id_to_delayed_jobs.rb
+- db/migrate/527_use_pg_enum_for_posting_types.rb
+- db/migrate/600_replace_varchars_with_text.rb
+- db/migrate/601_add_posting_type_index_to_postings.rb
+- db/migrate/602_replace_text_with_varchars_without_size_limit.rb
 - db/seeds.rb
 - db/sql/lookup_grid_distinct_v1.sql
 - db/sql/query_grid_dir_v1.sql
@@ -609,6 +615,7 @@ files:
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/config/manifest.js
+- spec/dummy/app/assets/javascripts/application.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
@@ -689,6 +696,7 @@ files:
 - 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/migrate/20191206132729_add_default_true_column_to_simple.rb
+- spec/dummy/db/migrate/20200402150405_add_posting_types.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/delorean/base_code.dl
 - spec/dummy/delorean/blame_report.dl
@@ -1801,6 +1809,7 @@ files:
 - spec/performance/caching_spec.rb
 - spec/requests/routes_spec.rb
 - spec/services/background_job/fetch_missing_in_schedule_cron_jobs_spec.rb
+- spec/services/background_job/update_schedule_spec.rb
 - spec/services/jobs/schedule_spec.rb
 - spec/services/notifications/create_spec.rb
 - spec/spec_helper.rb