marty 9.3.0 → 9.3.2

data/app/models/marty/base_rule.rb

@@ -69,7 +69,7 @@ class Marty::BaseRule < Marty::Base
       "- Error in rule '#{name}' field 'results': #{res_err.capitalize}" if res_err
   end
 
-  validates_presence_of :name
+  validates :name, presence: true
   validate :validate
   validate :validate_simple_guard_options
 

data/app/models/marty/config.rb

@@ -7,8 +7,8 @@ class Marty::Config < Marty::Base
     end
   end
 
-  validates_presence_of :key, :value
-  validates_uniqueness_of :key
+  validates :key, :value, presence: true
+  validates :key, uniqueness: true
   validates_with ConfigValidator
 
   delorean_fn :lookup, sig: 1 do |key|
@@ -29,7 +29,7 @@ class Marty::Config < Marty::Base
                            "(given #{args.size}, expected 1..2)"
     end
 
-    entry = find_by_key(args[0])
+    entry = find_by(key: args[0])
     return entry.get_value if entry
     return args[1] if args.size > 1
 
@@ -37,7 +37,7 @@ class Marty::Config < Marty::Base
   end
 
   def self.[]=(key, value)
-    entry = find_by_key(key)
+    entry = find_by(key: key)
     if !entry
       entry = new
       entry.key = key
@@ -53,7 +53,7 @@ class Marty::Config < Marty::Base
   end
 
   def self.del(key)
-    entry = find_by_key(key)
+    entry = find_by(key: key)
     if entry
       result = entry.get_value
       entry.destroy

data/app/models/marty/data_grid.rb

@@ -35,7 +35,7 @@ class Marty::DataGrid < Marty::Base
         attr, type, keys, rs_keep =
           inf['attr'], inf['type'], inf['keys'], inf['rs_keep']
 
-        unless rs_keep.nil? || rs_keep.empty?
+        if rs_keep.present?
           m = /\A *(<|<=|>|>=)? *([a-z][a-z_0-9]+) *\z/.match(rs_keep)
           unless m
             dg.errors.add(:base, "invalid grid modifier expression: #{rs_keep}")
@@ -81,7 +81,7 @@ class Marty::DataGrid < Marty::Base
       end
       data_check = Marty::DataGrid::Constraint.check_data(dg.data_type,
                                                           dg.data, con_chk)
-      return unless data_check.present?
+      return if data_check.blank?
 
       data_check.each do |(err, x, y)|
         dg.errors.add(:base, "cell #{x}, #{y} fails constraint check") if
@@ -94,7 +94,7 @@ class Marty::DataGrid < Marty::Base
 
   has_mcfly
 
-  validates_presence_of :name, :data, :metadata
+  validates :name, :data, :metadata, presence: true
 
   mcfly_validates_uniqueness_of :name
   validates_with DataGridValidator

data/app/models/marty/delorean_rule.rb

@@ -1,7 +1,7 @@
 class Marty::DeloreanRule < Marty::BaseRule
   self.abstract_class = true
 
-  validates_presence_of :rule_type, :start_dt
+  validates :rule_type, :start_dt, presence: true
 
   def validate
     super
@@ -200,7 +200,7 @@ class Marty::DeloreanRule < Marty::BaseRule
 
   def self.get_grid_rename_handler(klass)
     proc do |old, new|
-      klass.where(obsoleted_dt: 'infinity').each do |r|
+      klass.where(obsoleted_dt: 'infinity').find_each do |r|
         r.grids.each { |k, v| r.grids[k] = new if v == old }
         r.results.each do |k, _v|
           r.results[k] = %Q("#{new}") if

data/app/models/marty/grid_index_boolean.rb

@@ -1,4 +1,4 @@
 class Marty::GridIndexBoolean < Marty::Base
-  validates_presence_of :created_dt, :data_grid_id, :attr, :index
-  validates_inclusion_of :key, in: [true, false, nil]
+  validates :created_dt, :data_grid_id, :attr, :index, presence: true
+  validates :key, inclusion: { in: [true, false, nil] }
 end

data/app/models/marty/grid_index_int4range.rb

@@ -1,3 +1,3 @@
 class Marty::GridIndexInt4range < Marty::Base
-  validates_presence_of :created_dt, :data_grid_id, :attr, :index
+  validates :created_dt, :data_grid_id, :attr, :index, presence: true
 end

data/app/models/marty/grid_index_integer.rb

@@ -1,3 +1,3 @@
 class Marty::GridIndexInteger < Marty::Base
-  validates_presence_of :created_dt, :data_grid_id, :attr, :index
+  validates :created_dt, :data_grid_id, :attr, :index, presence: true
 end

data/app/models/marty/grid_index_numrange.rb

@@ -1,3 +1,3 @@
 class Marty::GridIndexNumrange < Marty::Base
-  validates_presence_of :created_dt, :data_grid_id, :attr, :index
+  validates :created_dt, :data_grid_id, :attr, :index, presence: true
 end

data/app/models/marty/grid_index_string.rb

@@ -1,3 +1,3 @@
 class Marty::GridIndexString < Marty::Base
-  validates_presence_of :created_dt, :data_grid_id, :attr, :index
+  validates :created_dt, :data_grid_id, :attr, :index, presence: true
 end

data/app/models/marty/import_type.rb

@@ -27,8 +27,8 @@ class Marty::ImportType < Marty::Base
     self.preprocess_function = nil if preprocess_function.blank?
   end
 
-  validates_presence_of :name, :db_model_name, :role
-  validates_uniqueness_of :name
+  validates :name, :db_model_name, :role, presence: true
+  validates :name, uniqueness: true
   validates_with ImportTypeValidator
 
   def get_model_class

data/app/models/marty/notifications/notification.rb

@@ -9,7 +9,8 @@ module Marty
         :deliveries,
         class_name: '::Marty::Notifications::Delivery',
         dependent: :destroy,
-        foreign_key: :notification_id
+        foreign_key: :notification_id,
+        inverse_of: :notification
       )
 
       state_machine :state, initial: :pending do

data/app/models/marty/posting.rb

@@ -2,7 +2,7 @@ class Marty::Posting < Marty::Base
   has_mcfly append_only: true
 
   mcfly_validates_uniqueness_of :name
-  validates_presence_of :name, :posting_type_id, :comment
+  validates :name, :posting_type_id, :comment, presence: true
 
   belongs_to :user, class_name: 'Marty::User'
   belongs_to :posting_type
@@ -16,19 +16,19 @@ class Marty::Posting < Marty::Base
     # use Time.now.strftime to name the posting.  This has the effect
     # of using the host's timezone. i.e. since we're in PST8PDT, names
     # will be based off of the Pacific TZ.
-    dt ||= Time.now
+    dt ||= Time.zone.now
     "#{posting_type.name}-#{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)
+    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)
+    posting_type = Marty::PostingType.find_by(name: type_name)
 
     raise "unknown posting type #{name}" unless posting_type
 
@@ -50,12 +50,12 @@ class Marty::Posting < Marty::Base
   # might be created.  Or, use regular validates_uniqueness_of instead
   # of mcfly_validates_uniqueness_of.
   delorean_fn :lookup, sig: 1 do |name|
-    p = select(get_struct_attrs).find_by_name(name)
+    p = select(get_struct_attrs).find_by(name: name)
     make_openstruct(p)
   end
 
   delorean_fn :lookup_dt, sig: 1 do |name|
-    find_by_name(name).try(:created_dt)
+    find_by(name: name).try(:created_dt)
   end
 
   delorean_fn :first_match, sig: [1, 2] do |dt, posting_type = nil|

data/app/models/marty/posting_type.rb

@@ -1,6 +1,6 @@
 class Marty::PostingType < Marty::Base
   extend Marty::Enum
 
-  validates_presence_of :name
-  validates_uniqueness_of :name
+  validates :name, presence: true
+  validates :name, uniqueness: true
 end

data/app/models/marty/promise.rb

@@ -13,9 +13,10 @@ class Marty::Promise < Marty::Base
   has_many :children,
            foreign_key: 'parent_id',
            class_name: 'Marty::Promise',
-           dependent: :destroy
+           dependent: :destroy,
+           inverse_of: :parent
 
-  validates_presence_of :title, :promise_type
+  validates :title, :promise_type, presence: true
 
   belongs_to :parent, class_name: 'Marty::Promise'
   belongs_to :user, class_name: 'Marty::User'
@@ -94,7 +95,7 @@ class Marty::Promise < Marty::Base
   end
 
   def self.job_by_id(job_id)
-    Delayed::Job.uncached { Delayed::Job.find_by_id(job_id) }
+    Delayed::Job.uncached { Delayed::Job.find_by(id: job_id) }
   end
 
   def work_off_job(job)

data/app/models/marty/script.rb

@@ -1,11 +1,11 @@
 class Marty::Script < Marty::Base
   has_mcfly
 
-  validates_presence_of :name, :body
+  validates :name, :body, presence: true
   mcfly_validates_uniqueness_of :name
-  validates_format_of :name,
-                      with: /\A[A-Z][a-zA-Z0-9]*(::[A-Z][a-zA-Z0-9]*)*\z/,
-                      message: I18n.t('script.save_error')
+  validates :name,
+            format: { with: /\A[A-Z][a-zA-Z0-9]*(::[A-Z][a-zA-Z0-9]*)*\z/,
+            message: I18n.t('script.save_error') }
 
   belongs_to :user, class_name: 'Marty::User'
 
@@ -50,7 +50,7 @@ class Marty::Script < Marty::Base
   end
 
   delorean_fn :pretty_print, sig: 1 do |id|
-    script = find_by_id id
+    script = find_by id: id
 
     next "unknown script #{id}" unless script
 
@@ -96,7 +96,7 @@ class Marty::Script < Marty::Base
       tag = Marty::Tag.get_latest1
       latest = Marty::Script.order('created_dt DESC').first
 
-      tag_time = (dt || [latest.try(:created_dt), Time.now].compact.max) +
+      tag_time = (dt || [latest.try(:created_dt), Time.zone.now].compact.max) +
         1.second
 
       # If no tag_time is provided, the tag created_dt will be the same
@@ -149,7 +149,7 @@ class Marty::Script < Marty::Base
       return paths_from_config if paths_from_config.present?
 
       [
-        "#{Rails.root}/delorean",
+        Rails.root.join('delorean'),
         # FIXME: HACKY, wouldn't it be better to use
         # Gem::Specification.find_by_name("marty").gem_dir??
         File.expand_path('../../../../delorean', __FILE__),

data/app/models/marty/tag.rb

@@ -2,7 +2,7 @@ class Marty::Tag < Marty::Base
   has_mcfly append_only: true
 
   mcfly_validates_uniqueness_of :name
-  validates_presence_of :name, :comment
+  validates :name, :comment, presence: true
 
   belongs_to :user, class_name: 'Marty::User'
 
@@ -17,7 +17,7 @@ class Marty::Tag < Marty::Base
     # use Time.now.strftime to name the posting.  This has the effect
     # of using the host's timezone. i.e. since we're in PST8PDT, names
     # will be based off of the Pacific TZ.
-    dt ||= Time.now
+    dt ||= Time.zone.now
     dt.strftime('%Y%m%d-%H%M')
   end
 
@@ -44,9 +44,9 @@ class Marty::Tag < Marty::Base
     # many different types of arguments.
     case tag_id
     when Integer, /\A[0-9]+\z/
-      tag = find_by_id(tag_id)
+      tag = find_by(id: tag_id)
     when String
-      tag = find_by_name(tag_id)
+      tag = find_by(name: tag_id)
       # if tag name wasn't found, look for a matching
       # posting, then find the tag whose created_dt <= posting dt.
       if !tag
@@ -65,7 +65,7 @@ class Marty::Tag < Marty::Base
   end
 
   delorean_fn :lookup, cache: true, sig: 1 do |name|
-    t = find_by_name(name).select(get_struct_attrs)
+    t = find_by(name: name).select(get_struct_attrs)
     t && t.attributes
   end
 

data/app/models/marty/token.rb

@@ -1,6 +1,6 @@
 class Marty::Token < Marty::Base
   belongs_to :user
-  validates_uniqueness_of :value
+  validates :value, uniqueness: true
 
   before_create :delete_previous_tokens, :generate_new_token
 

data/app/models/marty/user.rb

@@ -1,9 +1,9 @@
 class Marty::User < Marty::Base
-  validates_presence_of :login, :firstname, :lastname
-  validates_uniqueness_of :login
+  validates :login, :firstname, :lastname, presence: true
+  validates :login, uniqueness: true
 
-  validates_format_of :login, with: /\A[a-z0-9_\-@\.]*\z/i
-  validates_length_of :login, :firstname, :lastname, maximum: 100
+  validates :login, format: { with: /\A[a-z0-9_\-@\.]*\z/i }
+  validates :login, :firstname, :lastname, length: { maximum: 100 }
 
   MARTY_IMPORT_UNIQUENESS = [:login]
 
@@ -13,7 +13,8 @@ class Marty::User < Marty::Base
     :notification_deliveries,
     class_name: '::Marty::Notifications::Delivery',
     dependent: :destroy,
-    foreign_key: :recipient_id
+    foreign_key: :recipient_id,
+    inverse_of: :recipient
   )
 
   scope :active, -> { where(active: true) }
@@ -56,7 +57,7 @@ class Marty::User < Marty::Base
     # Make sure no one can sign in with an empty password
     return nil if password.empty?
 
-    user = find_by_login(login)
+    user = find_by(login: login)
 
     return nil if !user || !user.active?
 
@@ -93,7 +94,7 @@ class Marty::User < Marty::Base
       raise "bad auth_source: #{auth_source.inspect}"
     end
 
-    find_by_login(login) if ok
+    find_by(login: login) if ok
   end
 
   def self.current=(user)
@@ -135,8 +136,8 @@ class Marty::User < Marty::Base
     # 1 - Do not allow user to edit own record
     # 2 - Do not allow user to edit the application system record
     if user_manager_only
-      system_user = Marty::User.find_by_login(
-        Rails.configuration.marty.system_account.to_s)
+      system_user = Marty::User.find_by(
+        login: Rails.configuration.marty.system_account.to_s)
       system_id = system_user.id if system_user
 
       roles = user_roles.map(&:role)
@@ -173,6 +174,6 @@ class Marty::User < Marty::Base
     errors.add :base,
                "Users cannot be deleted - set 'Active' to false to disable the account"
 
-    throw :abort unless errors.blank?
+    throw :abort if errors.present?
   end
 end

data/app/models/marty/user_role.rb

@@ -1,6 +1,6 @@
 class Marty::UserRole < Marty::Base
-  validates_uniqueness_of :user_id, scope: [:role]
-  validates_presence_of :user_id, :role
+  validates :user_id, uniqueness: { scope: [:role] }
+  validates :user_id, :role, presence: true
 
   belongs_to :user
 end

data/app/models/marty/vw_promise.rb

@@ -2,7 +2,8 @@ class Marty::VwPromise < Marty::Base
   has_many :children,
            foreign_key: 'parent_id',
            class_name: 'Marty::VwPromise',
-           dependent: :destroy
+           dependent: :destroy,
+           inverse_of: :parent
 
   belongs_to :parent, class_name: 'Marty::VwPromise'
   belongs_to :user, class_name: 'Marty::User'

data/app/services/marty/background_job/update_schedule.rb

@@ -4,7 +4,7 @@ module Marty
       def self.call(id:, job_class:)
         model = Marty::BackgroundJob::Schedule.find_by(id: id)
 
-        return remove_schedule(job_class: job_class) unless model.present?
+        return remove_schedule(job_class: job_class) if model.blank?
         return remove_schedule(job_class: job_class) if model.off?
         return schedule(job_class: job_class) if model.on?
       end

data/app/services/marty/data_grid/constraint.rb

@@ -14,7 +14,7 @@ module Marty
           [r[0, 2], r[2..-1].reverse]
         else
           raw_vals = constraint.split('|')
-          return unless raw_vals.present?
+          return if raw_vals.blank?
           raise 'list constraint not allowed for type Float' if dt == 'float'
 
           pt = 'infinity'
@@ -37,6 +37,7 @@ module Marty
                   [data_type]
                 end
         types << Integer if types.include?(Float)
+        types
       end
 
       # if check_data is called from validation, data has already been converted
@@ -55,8 +56,8 @@ module Marty
             err = nil
             begin
               cvt_val = cvt && !data_v.class.in?(rt) ?
-                          DataGrid.parse_fvalue(pt, data_v, dt, klass)&.first :
-                          data_v
+                          [DataGrid.parse_fvalue(pt, data_v, dt, klass)].
+                            flatten.first : data_v
             rescue StandardError => e
               err = e.message
             end

data/app/services/marty/jobs/schedule.rb

@@ -4,10 +4,10 @@ module Marty
       extend Delorean::Functions
 
       delorean_fn :call, sig: 0 do
-        glob = Rails.root.join('app', 'jobs', '**', '*_job.rb')
+        glob = Rails.root.join('app/jobs/**/*_job.rb')
         Dir.glob(glob).sort.each { |f| require f }
 
-        glob2 = Marty.root.join('app', 'jobs', '**', '*_job.rb')
+        glob2 = Marty.root.join('app/jobs/**/*_job.rb')
         Dir.glob(glob2).sort.each { |f| require f }
 
         Delayed::Job.where.not(cron: nil).each(&:destroy!)

data/lib/marty/data_change.rb

@@ -94,7 +94,7 @@ class Marty::DataChange
   end
 
   delorean_fn :user_name, sig: 1 do |user_id|
-    Marty::User.find_by_id(user_id).try(:name)
+    Marty::User.find_by(id: user_id).try(:name)
   end
 
   delorean_fn :sanitize_classes, sig: 1 do |classes|