marty 9.3.0 → 9.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fd7c45cf6825476a774ee84fe6b3f9bff603e022747ecc5079cda8a037a869b
-  data.tar.gz: 48fdb90df6cb49e720fc4446975f8b55205eaa560a23af60a49b1d02769127cf
+  metadata.gz: a8acd94fdad2d0427eaea410e20f8df3acccec4ddb55d6932c8ac558a4f320cb
+  data.tar.gz: e6d14dc726a688d44bc575c512678522890c90b2cb848167f7dc2a2a661de034
 SHA512:
-  metadata.gz: 81813549a4614fa1191c466a5506ec2d36796e21e6d45dec4eb8bf054e0614a01c1c2bf1a0539e2afdc980c81e22a32bcdce2749d27634bf65c6f491e058978d
-  data.tar.gz: be097e58e928782e89761d4980218e417c2df6c5fa9a28233c4449feed3df1a5492a244ce7211cb604471e7188e08d5b8e923921948b7614dcc6a873cab60af6
+  metadata.gz: 03a0f36614dfde9a168825250d41a94c8c7a5912b83d2ee347fa0ed9fdaf10da1d08b28b0ff8497dccf4ef0999d76eadbfb8bd320fde1e4a6636a307297a8df7
+  data.tar.gz: '039559d4fd376ce6741a9fa8ea71a7276daba6df5050dcf3950f24e78cc2bb8c5944cb425e45dbc6ce4a7b6f32b5e69a0c27bd74f5dcf664271476f1da3b8771'

data/.gemignore

@@ -0,0 +1,2 @@
+.gitlab-ci.yml
+.gitlab

data/.gitignore

@@ -42,3 +42,6 @@ Gemfile.lock
 
 # JS stuff
 /node_modules
+
+# Ignore code coverage
+coverage/

data/.rubocop.yml

@@ -1,5 +1,7 @@
 inherit_from: .rubocop_todo.yml
-require: rubocop-performance
+require:
+  - rubocop-performance
+  - rubocop-rails
 
 AllCops:
   TargetRubyVersion: 2.4.2
@@ -46,3 +48,34 @@ Style/SymbolArray:
 Security/MarshalLoad:
   Exclude:
     - 'lib/marty/cache_adapters/redis.rb'
+
+Rails/TimeZone:
+  EnforcedStyle: strict
+
+Rails/OutputSafety:
+  Exclude:
+    - 'app/components/marty/main_auth_app.rb'
+
+Rails/HelperInstanceVariable:
+  Exclude:
+    - 'app/helpers/marty/script_set.rb' # It's a class, not a helper
+
+Rails/SkipsModelValidations:
+  Exclude:
+    - 'app/models/marty/promise.rb'
+
+Rails/DynamicFindBy:
+  Exclude:
+    - 'app/models/marty/data_grid.rb' # Enum
+    - 'app/models/marty/enum.rb' # Enum
+    - 'spec/features/**/*'
+    - 'spec/support/**/*'
+
+Rails/ApplicationRecord:
+  Enabled: false
+
+Rails/ApplicationJob:
+  Enabled: false
+
+Rails/ApplicationController:
+  Enabled: false

data/Gemfile

@@ -37,6 +37,7 @@ group :development, :test do
   gem 'rubocop-performance', require: false
   gem 'rubocop-rails', require: false
   gem 'selenium-webdriver'
+  gem 'simplecov', require: false
   gem 'timecop'
   gem 'webdrivers'
 end

data/Rakefile

@@ -26,3 +26,13 @@ load 'rails/tasks/engine.rake'
 Bundler::GemHelper.install_tasks
 
 task default: 'app:spec'
+
+namespace :marty do
+  desc 'Merge the results of various SimpleCov coverage reports'
+  task merge_coverage_reports: :environment do
+    require_relative 'spec/support/simplecov_helper'
+    SimpleCovHelper.configure_profile
+    puts 'Merging code coverage reports...'
+    SimpleCovHelper.merge_all_results!
+  end
+end

data/app/assets/javascripts/marty/cable.js

@@ -4,13 +4,25 @@
 (function() {
   this.RailsApp || (this.RailsApp = {});
 
-  if (window.location.port === "") {
-    RailsApp.cable = ActionCable.createConsumer(
-      `ws://${window.location.hostname}/cable`
-    );
-  } else {
-    RailsApp.cable = ActionCable.createConsumer(
-      `ws://${window.location.hostname}:${window.location.port}/cable`
-    );
-  }
+  this.RailsApp.startActionCable = () => {
+    // Already started
+    if (RailsApp.cable) {
+      return false;
+    }
+
+    const protocol =
+      window.location.protocol.slice(0, 5) === "https" ? "wss" : "ws";
+
+    if (window.location.port === "") {
+      RailsApp.cable = ActionCable.createConsumer(
+        `${protocol}://${window.location.hostname}/cable`
+      );
+    } else {
+      RailsApp.cable = ActionCable.createConsumer(
+        `${protocol}://${window.location.hostname}:${window.location.port}/cable`
+      );
+    }
+
+    return true;
+  };
 }.call(this));

data/app/channels/application_cable/connection.rb

@@ -9,7 +9,7 @@ module ApplicationCable
     private
 
     def find_verified_user
-      return unless cookies.signed[:user_id].present?
+      return if cookies.signed[:user_id].blank?
 
       ::Marty::User.find_by(id: cookies.signed[:user_id])
     end

data/app/channels/marty/notification_channel.rb

@@ -1,7 +1,10 @@
 module Marty
   class NotificationChannel < ::ApplicationCable::Channel
     def subscribed
-      reject && return unless current_user.present?
+      reject && return unless
+        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/api_config_view.rb

@@ -67,7 +67,7 @@ class Marty::ApiConfigView < Marty::Grid
   [:node, :attr].each do |a|
     attribute a do |c|
       c.width = 150
-      c.setter = lambda { |r, v| r.send("#{a}=", v.blank? ? nil : v) }
+      c.setter = lambda { |r, v| r.send("#{a}=", v.presence) }
     end
   end
 

data/app/components/marty/api_log_view.rb

@@ -103,7 +103,7 @@ class Marty::ApiLogView < Marty::Grid
     c.field_config = {
       xtype: :displayfield,
     }
-    c.getter = lambda { |r| Time.at(r.timestamp) }
+    c.getter = lambda { |r| Time.zone.at(r.timestamp) }
     c.sorting_scope = lambda { |r, dir| r.order('timestamp ' + dir.to_s) }
 
     # FIXME?: The UI AR/PG DateTime workaround requires the timestamp to be cast

data/app/components/marty/auth_app.rb

@@ -5,6 +5,13 @@
 require 'marty/notifications/window'
 
 class Marty::AuthApp < Marty::SimpleApp
+  def configure(c)
+    super
+
+    enable_action_cable = Rails.application.config.marty.enable_action_cable
+    client_config[:marty_enable_action_cable] = enable_action_cable
+  end
+
   client_class do |c|
     c.include :auth_app
   end
@@ -44,7 +51,7 @@ class Marty::AuthApp < Marty::SimpleApp
   def unread_notifications_count
     user = Mcfly.whodunnit
 
-    return 0 unless user.present?
+    return 0 if user.blank?
 
     user.unread_web_notifications_count
   end

data/app/components/marty/auth_app/client/auth_app.js

@@ -118,7 +118,13 @@
   },
 
   netzkeInitComponentCallback() {
+    if (!this.config.clientConfig.marty_enable_action_cable) {
+      return;
+    }
+
     try {
+      RailsApp.startActionCable();
+
       const subscription = RailsApp.cable.subscriptions.subscriptions.find(
         (sub) => sub.identifier === '{"channel":"Marty::NotificationChannel"}'
       );

data/app/components/marty/data_grid_view.rb

@@ -116,9 +116,9 @@ module Marty; class DataGridView < McflyGridPanel
       Marty::RoleType.from_nice_names(plist)
     end
     dg.permissions = {
-      view: view.present? ? view : [],
-      edit_data: edit_data.present? ? edit_data : [],
-      edit_all: edit_all.present? ? edit_all : [],
+      view: view.presence || [],
+      edit_data: edit_data.presence || [],
+      edit_all: edit_all.presence || [],
     }
     dg.save!
   end
@@ -142,7 +142,7 @@ module Marty; class DataGridView < McflyGridPanel
   endpoint :edit_window__edit_form__submit do |params|
     data = ActiveSupport::JSON.decode(params[:data])
 
-    dg = DataGrid.find_by_id(data['id'])
+    dg = DataGrid.find_by(id: data['id'])
 
     begin
       dg.update_from_import(data['name'], data['export'])
@@ -169,7 +169,7 @@ module Marty; class DataGridView < McflyGridPanel
   endpoint :show_grid do |params|
     record_id = params[:record_id]
 
-    dg = DataGrid.find_by_id(record_id)
+    dg = DataGrid.find_by(id: record_id)
 
     return client.netzke_notify('No data grid.') unless dg
 
@@ -193,7 +193,7 @@ module Marty; class DataGridView < McflyGridPanel
   endpoint :edit_grid do |params|
     record_id = params[:record_id]
 
-    dg = DataGrid.find_by_id(record_id)
+    dg = DataGrid.find_by(id: record_id)
 
     return client.netzke_notify('No data grid.') unless dg
 

data/app/components/marty/extras/misc.rb

@@ -13,7 +13,7 @@ module Marty::Extras::Misc
     renderer: "function(v){return ('0' + v).slice (-2);}",
     # FIXME: a little bogus since this is computed statically.  lambda
     # didn't work.
-    default_value: Date.today.month
+    default_value: Time.zone.today.month
   }
   def self.numberfield_cfg(decimal_places)
     {

data/app/components/marty/log_view.rb

@@ -63,7 +63,7 @@ class Marty::LogView < Marty::Grid
     c.field_config = {
       xtype: :displayfield,
     }
-    c.getter = lambda { |r| Time.at(r.timestamp) }
+    c.getter = lambda { |r| Time.zone.at(r.timestamp) }
     c.sorting_scope = lambda { |r, dir| r.order('timestamp ' + dir.to_s) }
 
     # FIXME?: The UI AR/PG DateTime workaround requires the timestamp to be cast

data/app/components/marty/posting_grid.rb

@@ -42,7 +42,7 @@ class Marty::PostingGrid < Marty::Grid
     # Prepare an HTML popup with session details such that the
     # contents can be easily pasted into a spreadsheet.
 
-    pt = Marty::Posting.find_by_id(record_id)
+    pt = Marty::Posting.find_by(id: record_id)
 
     dt = pt.created_dt.to_s == 'Infinity' ? '---' :
       pt.created_dt.strftime('%Y-%m-%d %I:%M %p')

data/app/components/marty/script_form.rb

@@ -61,7 +61,7 @@ class Marty::ScriptForm < Marty::Form
       data[k] = nil if v.blank? || v == 'null'
     end
 
-    @record = script = Marty::Script.find_by_id(data['id'])
+    @record = script = Marty::Script.find_by(id: data['id'])
 
     unless script
       client.netzke_notify 'no record'
@@ -81,7 +81,7 @@ class Marty::ScriptForm < Marty::Form
     end
 
     begin
-      dev = Marty::Tag.find_by_name('DEV')
+      dev = Marty::Tag.find_by(name: 'DEV')
       Marty::ScriptSet.new(dev).parse_check(script.name, data['body'])
     rescue Delorean::ParseError => e
       client.netzke_notify e.message
@@ -106,7 +106,7 @@ class Marty::ScriptForm < Marty::Form
     return client.netzke_notify('Permission Denied') unless
       self.class.has_any_perm?
 
-    script = Marty::Script.find_by_id(script_id)
+    script = Marty::Script.find_by(id: script_id)
 
     return client.netzke_notify('bad script') unless script
 

data/app/components/marty/user_view.rb

@@ -31,7 +31,7 @@ module Marty; class UserView < Marty::Grid
   end
 
   def self.set_roles(roles, user)
-    roles = [] unless roles.present?
+    roles = [] if roles.blank?
 
     roles = ::Marty::RoleType.from_nice_names(roles)
 

data/app/components/marty/users/user_view.rb

@@ -34,7 +34,7 @@ module Marty
       end
 
       def self.set_roles(roles, user)
-        roles = [] unless roles.present?
+        roles = [] if roles.blank?
 
         roles = ::Marty::RoleType.from_nice_names(roles)
 

data/app/controllers/marty/application_controller.rb

@@ -24,7 +24,7 @@ class Marty::ApplicationController < ActionController::Base
         reset_session
         reset_signed_cookies
       else
-        session[:atime] = Time.now.utc.to_i
+        session[:atime] = Time.zone.now.utc.to_i
       end
     end
   end
@@ -35,13 +35,13 @@ class Marty::ApplicationController < ActionController::Base
 
     if session_lifetime
       return true unless session[:ctime] &&
-        (Time.now.utc.to_i -
+        (Time.zone.now.utc.to_i -
          session[:ctime].to_i <= session_lifetime.to_i * 60)
     end
 
     if session_timeout
       return true unless session[:atime] &&
-        (Time.now.utc.to_i - session[:atime].to_i <= session_timeout.to_i * 60)
+        (Time.zone.now.utc.to_i - session[:atime].to_i <= session_timeout.to_i * 60)
     end
 
     false
@@ -49,8 +49,8 @@ class Marty::ApplicationController < ActionController::Base
 
   def start_user_session(user)
     session[:user_id] = user.id
-    session[:ctime] = Time.now.utc.to_i
-    session[:atime] = Time.now.utc.to_i
+    session[:ctime] = Time.zone.now.utc.to_i
+    session[:atime] = Time.zone.now.utc.to_i
 
     set_signed_cookies
   end
@@ -119,12 +119,12 @@ class Marty::ApplicationController < ActionController::Base
 
   def failed_authentication(login)
     logger.info("Failed authentication for '#{login}' " +
-                "from #{request.remote_ip} at #{Time.now.utc}")
+                "from #{request.remote_ip} at #{Time.zone.now.utc}")
   end
 
   def successful_authentication(user)
     logger.info("Successful authentication for '#{user.login}' " +
-                "from #{request.remote_ip} at #{Time.now.utc}")
+                "from #{request.remote_ip} at #{Time.zone.now.utc}")
     set_user(user)
   end
 

data/app/controllers/marty/delayed_job_controller.rb

@@ -1,4 +1,6 @@
-class Marty::DelayedJobController < ActionController::Base
+class Marty::DelayedJobController < ApplicationController
+  # FIXME: We probably don't need this endpoint anymore.
+  # It's not used by lambda
   def trigger
     work_off_job if delayed_job.present?
     render json: { status: :ok }, status: :ok
@@ -7,7 +9,7 @@ class Marty::DelayedJobController < ActionController::Base
   private
 
   def delayed_job
-    return unless params['id'].present?
+    return if params['id'].blank?
 
     @delayed_job ||= ::Delayed::Job.find_by(id: params['id'])
   end
@@ -15,8 +17,9 @@ class Marty::DelayedJobController < ActionController::Base
   def work_off_job
     return if delayed_job.locked_at.present?
 
-    ::Delayed::Job.where(id: delayed_job.id).
-      update_all(locked_at: ::Delayed::Job.db_time_now, locked_by: 'Lambda')
+    ::Delayed::Job.find_by(id: delayed_job.id)&.update!(
+      locked_at: ::Delayed::Job.db_time_now, locked_by: 'Lambda'
+    )
 
     w = ::Delayed::Worker.new
     w.run(delayed_job)

data/app/controllers/marty/diagnostic/controller.rb

@@ -8,7 +8,7 @@ module Marty::Diagnostic; class Controller < ActionController::Base
   def op
       @result = Reporter.run(request)
   rescue NameError
-      render file: 'public/400', formats: [:html], status: 400, layout: false
+      render file: 'public/400', formats: [:html], status: :bad_request, layout: false
   else
       respond_to do |format|
         format.html { @result = display_parameters }

data/app/controllers/marty/job_controller.rb

@@ -1,8 +1,8 @@
-class Marty::JobController < ActionController::Base
+class Marty::JobController < ApplicationController
   def download
     job_id = params['job_id']
 
-    promise = Marty::Promise.find_by_id(job_id)
+    promise = Marty::Promise.find_by(id: job_id)
 
     if promise
       format = promise.cformat

data/app/models/marty/api_auth.rb

@@ -3,7 +3,7 @@ class Marty::ApiAuth < Marty::Base
 
   KEY_SIZE = 19
 
-  validates_presence_of :app_name, :api_key, :script_name
+  validates :app_name, :api_key, :script_name, presence: true
 
   class ApiAuthValidator < ActiveModel::Validator
     def validate(api)
@@ -18,8 +18,8 @@ class Marty::ApiAuth < Marty::Base
   validates_with ApiAuthValidator
 
   mcfly_validates_uniqueness_of :api_key, scope: [:script_name]
-  validates_uniqueness_of :app_name, scope: [:script_name,
-                                             :obsoleted_dt]
+  validates :app_name, uniqueness: { scope: [:script_name,
+                                             :obsoleted_dt] }
 
   before_validation do
     self.api_key = Marty::ApiAuth.generate_key if

data/app/models/marty/api_config.rb

@@ -1,5 +1,5 @@
 class Marty::ApiConfig < Marty::Base
-  validates_presence_of :script
+  validates :script, presence: true
 
   def self.lookup(script, node, attr)
     res = where('node IS NULL OR node = ?', node).