undle updates & rubocop updates; moved zero?, positive? & present? helpers directly into TimingManageable; specs updates

Author: steveoro

.rubocop.yml

@@ -141,6 +141,11 @@ RSpec/PendingWithoutReason:
   Exclude:
     - 'spec/models/goggles_db/goggle_cup*'
 
+# Yields an error with:
+# - v. 1.68.0 (using Parser 3.3.6.0, rubocop-ast 1.36.1, analyzing as Ruby 3.1, running on ruby 3.1.4)
+Style/BitwisePredicate:
+  Enabled: false
+
 Style/Documentation:
   Exclude:
     - 'db/migrate/**/*'

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 _Please, add the latest build info on top of the list; use Version::MAJOR only after gold release; keep semantic versioning in line with framework's_
 
+- **0.7.24** [Steve A.] bundle updates & rubocop updates; moved zero?, positive? & present? helpers directly into TimingManageable; specs updates
 - **0.7.23** [Steve A.] bundle updates
 - **0.7.20** [Steve A.] bundle updates; added a missing/new EventType used for Coopernuoto meetings ('6X50SL')
 - **0.7.19** [Steve A.] bundle updates; added new Seasons & categories for 2024-2025

Gemfile

@@ -36,7 +36,7 @@ group :development do
   gem 'rubocop'
   gem 'rubocop-factory_bot', require: false
   gem 'rubocop-performance'
-  gem 'rubocop-rails', '= 2.19', require: false # currently 2.20 introduces a bug with '#falsey_literal?'
+  gem 'rubocop-rails'
   gem 'rubocop-rake'
   gem 'rubocop-rspec'
   gem 'rubocop-rspec_rails'

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    goggles_db (0.7.23)
+    goggles_db (0.7.24)
       acts-as-taggable-on
       acts_as_votable
       cities
@@ -118,7 +118,7 @@ GEM
     brakeman (6.2.2)
       racc
     builder (3.3.0)
-    bullet (7.2.0)
+    bullet (8.0.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)
@@ -137,7 +137,7 @@ GEM
     country_select (10.0.0)
       countries (> 5.0, < 8.0)
     crass (1.0.6)
-    date (3.3.4)
+    date (3.4.0)
     debug_inspector (1.2.0)
     devise (4.9.4)
       bcrypt (~> 3.0)
@@ -162,20 +162,20 @@ GEM
     factory_bot_rails (6.4.4)
       factory_bot (~> 6.5)
       railties (>= 5.0.0)
-    faraday (2.12.0)
-      faraday-net_http (>= 2.0, < 3.4)
+    faraday (2.12.1)
+      faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.3.0)
-      net-http
+    faraday-net_http (3.4.0)
+      net-http (>= 0.5.0)
     ffaker (2.23.0)
     ffi (1.17.0-x86_64-linux-gnu)
     formatador (1.1.0)
     fuzzy-string-match (1.0.1)
       RubyInline (>= 3.8.6)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    guard (2.18.1)
+    guard (2.19.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -234,7 +234,7 @@ GEM
       sparkr (>= 0.2.0)
       term-ansicolor
       yard (~> 0.9.12)
-    json (2.7.4)
+    json (2.8.2)
     jwt (2.9.3)
       base64
     language_server-protocol (3.17.0.3)
@@ -268,9 +268,9 @@ GEM
       bigdecimal (~> 3.1)
     mysql2 (0.5.6)
     nenv (0.3.0)
-    net-http (0.4.1)
+    net-http (0.5.0)
       uri
-    net-imap (0.5.0)
+    net-imap (0.5.1)
       date
       net-protocol
     net-pop (0.1.2)
@@ -279,7 +279,7 @@ GEM
       timeout
     net-smtp (0.5.0)
       net-protocol
-    nio4r (2.7.3)
+    nio4r (2.7.4)
     nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
     notiffany (0.1.3)
@@ -307,7 +307,7 @@ GEM
       omniauth (~> 2.0)
     orm_adapter (0.5.0)
     parallel (1.26.3)
-    parser (3.3.5.0)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
     plus_codes (0.2.1)
@@ -371,7 +371,7 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rouge (4.4.0)
+    rouge (4.5.1)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -398,7 +398,7 @@ GEM
     rspec_pacman_formatter (0.1.7)
       colorize
       rspec
-    rubocop (1.67.0)
+    rubocop (1.68.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -408,20 +408,21 @@ GEM
       rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.3)
+    rubocop-ast (1.36.1)
       parser (>= 3.3.1.0)
     rubocop-factory_bot (2.26.1)
       rubocop (~> 1.61)
-    rubocop-performance (1.22.1)
+    rubocop-performance (1.23.0)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.19.0)
+    rubocop-rails (2.27.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
+      rubocop (>= 1.52.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (3.1.0)
+    rubocop-rspec (3.2.0)
       rubocop (~> 1.61)
     rubocop-rspec_rails (2.30.0)
       rubocop (~> 1.61)
@@ -476,7 +477,7 @@ GEM
       tins (~> 1.0)
     thor (1.3.2)
     tilt (2.4.0)
-    timeout (0.4.1)
+    timeout (0.4.2)
     tins (1.37.0)
       bigdecimal
       sync
@@ -485,7 +486,7 @@ GEM
     unaccent (0.4.0)
     unicode-display_width (2.6.0)
     uniform_notifier (1.16.0)
-    uri (0.13.1)
+    uri (1.0.2)
     version_gem (1.1.4)
     warden (1.2.9)
       rack (>= 2.0.9)
@@ -533,7 +534,7 @@ DEPENDENCIES
   rubocop
   rubocop-factory_bot
   rubocop-performance
-  rubocop-rails (= 2.19)
+  rubocop-rails
   rubocop-rake
   rubocop-rspec
   rubocop-rspec_rails

app/commands/goggles_db/cmd_clone_categories.rb

@@ -30,7 +30,7 @@ def call
       return unless internal_members_valid?
 
       # @from_season.category_types.each do |category_type|
-      GogglesDb::CategoryType.includes(:season).where(season_id: @from_season.id).each do |category_type|
+      GogglesDb::CategoryType.includes(:season).where(season_id: @from_season.id).find_each do |category_type|
         GogglesDb::CategoryType.create!(
           reject_common_columns(category_type.attributes)
             .merge(season_id: @to_season.id)

app/models/concerns/timing_manageable.rb

@@ -5,7 +5,7 @@
 #
 # = TimingManageable
 #
-#   - version:  7-0.5.21
+#   - version:  7-0.7.24
 #   - author:   Steve A.
 #
 # Concrete Interface for Timing helper methods (@see lib/wrappers/timing.rb).
@@ -38,6 +38,30 @@ module TimingManageable
   #   end
   # end
   # ---8<---
+  #-- ------------------------------------------------------------------------
+  #++
+
+  # Returns +true+ if the timing associated with this result is positive.
+  # If the includee responds (at least) also to #hundredths_from_start,
+  # this will check all the <tt>XXX_from_start</tt> columns as well.
+  def positive?
+    base_timing_positive = minutes.positive? || seconds.positive? || hundredths.positive?
+    return base_timing_positive unless respond_to?(:hundredths_from_start)
+
+    base_timing_positive || minutes_from_start.positive? || seconds_from_start.positive? || hundredths_from_start.positive?
+  end
+
+  # Make sure only positive timings will be considered as "present":
+  alias present? positive? # (new, old)
+
+  # Returns +true+ if the timing associated with this result is zero.
+  # If the includee responds (at least) also to #hundredths_from_start,
+  # this will check all the <tt>XXX_from_start</tt> columns as well.
+  def zero?
+    !positive?
+  end
+  #-- ------------------------------------------------------------------------
+  #++
 
   # Returns a new Timing instance initialized with the timing data from this row
   # (@see lib/wrappers/timing.rb)

app/models/goggles_db/abstract_lap.rb

@@ -6,7 +6,7 @@ module GogglesDb
   #
   # Encapsulates common behavior for Laps & User Laps.
   #
-  #   - version:  7-0.6.30
+  #   - version:  7-0.7.24
   #   - author:   Steve A.
   #
   class AbstractLap < ApplicationRecord
@@ -48,41 +48,6 @@ class AbstractLap < ApplicationRecord
     #-- -----------------------------------------------------------------------
     #++
 
-    # Returns the single lap row preceding this one by distance, if any; +nil+ otherwise.
-    def previous_lap
-      self.class.related_laps(self).where("#{self.class.table_name}.length_in_meters < ?", length_in_meters).last
-    end
-
-    # ADD recompute_delta method using same strategy as in main
-
-    # Returns the Timing instance storing the lap timing from the start of the race.
-    #
-    # If the "_from_start" fields have not been filled in, this will try to recompute the
-    # absolute timing using all deltas
-    #
-    # (Note that this will imply 3 summing queries and it may fail to yield correct values
-    #  if the preceding deltas are not set.)
-    def timing_from_start
-      # Quick way to detect if the timing from start is already set:
-      amount = minutes_from_start.to_i + hundredths_from_start.to_i + seconds_from_start.to_i
-      if amount.positive?
-        Timing.new(
-          hundredths: hundredths_from_start,
-          seconds: seconds_from_start,
-          minutes: minutes_from_start
-        )
-      else
-        laps = self.class.summing_laps(self)
-        Timing.new(
-          hundredths: laps.sum(:hundredths),
-          seconds: laps.sum(:seconds),
-          minutes: laps.sum(:minutes)
-        )
-      end
-    end
-    #-- ------------------------------------------------------------------------
-    #++
-
     # Override: returns the list of single association names (as symbols)
     # included by <tt>#to_hash</tt> (and, consequently, by <tt>#to_json</tt>).
     #
@@ -94,8 +59,8 @@ def single_associations
     #
     def minimal_attributes(locale = I18n.locale)
       super.merge(
-        'timing' => to_timing.to_s,
-        'timing_from_start' => timing_from_start.to_s
+        'timing' => to_timing.to_s, # (delta timing)
+        'timing_from_start' => timing_from_start.to_s # (actual lap timing)
       )
     end
 
@@ -129,6 +94,43 @@ def swimmer_attributes
         'year_guessed' => swimmer.year_guessed
       }
     end
+    #-- ------------------------------------------------------------------------
+    #++
+
+    # Returns the single lap row preceding this one by distance, if any; +nil+ otherwise.
+    def previous_lap
+      self.class.related_laps(self).where("#{self.class.table_name}.length_in_meters < ?", length_in_meters).last
+    end
+
+    # ADD recompute_delta method using same strategy as in main
+
+    # Returns the Timing instance storing the lap timing from the start of the race.
+    #
+    # If the "_from_start" fields have not been filled in, this will try to recompute the
+    # absolute timing using all deltas
+    #
+    # (Note that this will imply 3 summing queries and it may fail to yield correct values
+    #  if the preceding deltas are not set.)
+    def timing_from_start
+      # Quick way to detect if the timing from start is already set:
+      lap_present = minutes_from_start.positive? || seconds_from_start.positive? || hundredths_from_start.positive?
+      if lap_present
+        Timing.new(
+          hundredths: hundredths_from_start,
+          seconds: seconds_from_start,
+          minutes: minutes_from_start
+        )
+      else
+        laps = self.class.summing_laps(self)
+        Timing.new(
+          hundredths: laps.sum(:hundredths),
+          seconds: laps.sum(:seconds),
+          minutes: laps.sum(:minutes)
+        )
+      end
+    end
+    #-- ------------------------------------------------------------------------
+    #++
 
     protected
 

app/models/goggles_db/abstract_meeting.rb

@@ -6,7 +6,7 @@ module GogglesDb
   #
   # Encapsulates common behavior for Meetings & User Workshops.
   #
-  #   - version:  7-0.5.10
+  #   - version:  7-0.7.24
   #   - author:   Steve A.
   #
   class AbstractMeeting < ApplicationRecord
@@ -35,7 +35,7 @@ class AbstractMeeting < ApplicationRecord
 
     # Filtering scopes:
     scope :not_cancelled,   -> { where(cancelled: false) }
-    scope :not_expired,     -> { not_cancelled.where('header_date >= ?', Time.zone.today) }
+    scope :not_expired,     -> { not_cancelled.where(header_date: Time.zone.today..) }
     scope :for_season_type, ->(season_type) { joins(:season_type).where(season_types: { id: season_type.id }) }
     scope :for_season,      ->(season) { joins(:season).where(season_id: season.id) }
     scope :for_code,        ->(code) { where(code:) }
@@ -95,16 +95,14 @@ def name_with_edition(meeting_name = description)
     # - <tt>meeting_name</tt>: the meeting name to be processed;
     #   defaults to +description+.
     #
-    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def condensed_name(meeting_name = description)
       tokens = split_description_in_tokens(name_without_edition(meeting_name))
       # Fallback to using the notes if we have them and the splitting above does not yield tokens:
       tokens = split_description_in_tokens(notes) if tokens.blank? && notes.present?
       # Remove spaces, split in shorter tokens, delete blanks and take just the first 3:
-      tokens = tokens&.to_s&.strip&.split(/\s|,/)&.reject(&:blank?)
+      tokens = tokens.to_s.strip.split(/\s|,/).compact_blank if tokens.present?
       tokens.is_a?(Array) ? tokens[0..3]&.join(' ') : tokens.to_s
     end
-    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     #++
 
     # Returns +true+ if this abstract meeting has either been cancelled or closed for due time.

app/models/goggles_db/abstract_result.rb

@@ -118,6 +118,8 @@ def swimmer_attributes
         'year_guessed' => swimmer&.year_guessed
       }
     end
+    #-- ------------------------------------------------------------------------
+    #++
 
     protected