More Sorbet fixes

Author: stefan-burke

.env.example

@@ -89,3 +89,6 @@ SIMPLE_USER_ACTIVATION=false
 
 # Whether to show units/inspections at all
 HAS_ASSESSMENTS=true
+
+# If you're building the Tapioca RBI files, enable this
+RUNNING_TAPIOCA=false

.github/workflows/pre-release.yml

@@ -18,16 +18,10 @@ jobs:
     uses: ./.github/workflows/test-ruby.yml
     permissions:
       contents: read
-  
-  typecheck:
-    name: Type Check
-    uses: ./.github/workflows/sorbet.yml
-    permissions:
-      contents: read
-  
+ 
   docker-build:
     name: Test Docker Build
-    needs: [test, typecheck]
+    needs: [test]
     uses: ./.github/workflows/docker-build.yml
     with:
       push: false

.github/workflows/sorbet.yml

@@ -30,8 +30,10 @@ jobs:
       
       - name: Generate Sorbet RBI files
         run: |
-          bundle exec tapioca gems
-          bundle exec tapioca dsl
+          RUNNING_TAPIOCA=true \
+            bundle exec tapioca annotations && \
+            bundle exec tapioca gems && \
+            bundle exec tapioca dsl
       
       - name: Run Sorbet type check
         run: |

.gitignore

@@ -51,6 +51,10 @@
 
 # Ignore generated Sorbet RBI files (can be regenerated)
 .sorbet-results
+sorbet/rbi/dsl/*
+sorbet/rbi/gems/*
+sorbet/rbi/annotations/*
+!sorbet/rbi/manual/
 
 # Pinned docker versions
 PINNED_VERSION

Gemfile

@@ -14,8 +14,7 @@ gem "sqlite3", ">= 1.4"
 # Use the Puma web server [https://github.com/puma/puma]
 gem "puma", ">= 5.0"
 # Using in-memory queue for background processing
-gem "solid_queue", "~> 1.0"
-gem "mission_control-jobs", "~> 1.0"
+gem "solid_queue"
 
 # WebAuthn for passkey support
 gem "webauthn", "~> 3.4"
@@ -120,6 +119,12 @@ gem "sentry-rails"
 # S3-compatible storage
 gem "aws-sdk-s3", require: false
 
+# Production and development gems
+group :development, :production do
+  # Mission Control for managing background jobs
+  gem "mission_control-jobs", "~> 1.0", require: false
+end
+
 # Production-only gems
 group :production do
   # Cron job management

Gemfile.lock

@@ -624,7 +624,7 @@ DEPENDENCIES
   sentry-ruby
   simplecov
   simplecov-cobertura
-  solid_queue (~> 1.0)
+  solid_queue
   sorbet
   sorbet-runtime (= 0.5.12016)
   sprockets-rails

app/controllers/application_controller.rb

@@ -48,18 +48,23 @@ class ApplicationController < ActionController::Base
     raise exception
   end
 
-  private
-
   sig { returns(T::Boolean) }
   def skip_authentication?
     false
   end
 
+  # Class method version for use in rescue_from blocks
   sig { params(table: Symbol, key: Symbol, args: T.untyped).returns(String) }
-  def app_i18n(table, key, **args)
+  def self.app_i18n(table, key, **args)
     I18n.t("application.#{table}.#{key}", **args)
   end
 
+  # Instance method delegates to class method
+  sig { params(table: Symbol, key: Symbol, args: T.untyped).returns(String) }
+  def app_i18n(table, key, **args)
+    self.class.app_i18n(table, key, **args)
+  end
+
   sig { params(form: Symbol, key: T.any(Symbol, String), args: T.untyped).returns(String) }
   def form_i18n(form, key, **args)
     I18n.t("forms.#{form}.#{key}", **args)
@@ -88,9 +93,9 @@ def update_last_active_at
     current_user.update(last_active_at: Time.current)
 
     # Update UserSession last_active_at
-    if session[:session_token]
-      current_session&.touch_last_active
-    end
+    return unless session[:session_token]
+
+    current_session&.touch_last_active
   end
 
   sig { void }
@@ -195,9 +200,7 @@ def should_notify_error?(exception)
       return false if csrf_ignored_actions.include?(action)
     end
 
-    if exception.is_a?(ActionController::InvalidCrossOriginRequest)
-      return false unless logged_in?
-    end
+    return false if exception.is_a?(ActionController::InvalidCrossOriginRequest) && !logged_in?
 
     true
   end

app/controllers/concerns/session_management.rb

@@ -14,7 +14,7 @@ def establish_user_session(user)
     )
 
     session[:session_token] = user_session.session_token
-    create_user_session(user)
+    create_user_session
 
     user_session
   end

app/helpers/concerns/controller_context.rb

@@ -10,7 +10,10 @@ module ControllerContext
 
   abstract!
 
-  # Core Rails controller methods
+  # These methods are provided by ActionController/ActionView
+  # We declare them as abstract so Sorbet knows about them
+  # but doesn't provide implementations that would override Rails
+
   sig { abstract.returns(T.untyped) }
   def session
   end
@@ -31,15 +34,15 @@ def request
   def flash
   end
 
-  sig { abstract.returns(T.untyped) }
-  def redirect_to
+  sig { abstract.params(args: T.untyped).returns(T.untyped) }
+  def redirect_to(*args)
   end
 
-  sig { abstract.returns(T.untyped) }
-  def render
+  sig { abstract.params(args: T.untyped).returns(T.untyped) }
+  def render(*args)
   end
 
-  sig { abstract.returns(T.untyped) }
-  def respond_to
+  sig { abstract.params(args: T.untyped, block: T.untyped).returns(T.untyped) }
+  def respond_to(*args, &block)
   end
 end

app/helpers/inspections_helper.rb

@@ -23,11 +23,11 @@ def inspection_result_badge(inspection)
     end
   end
 
-  sig {
+  sig do
     params(inspection: Inspection).returns(
       T::Array[T::Hash[Symbol, T.any(String, Symbol, T::Boolean)]]
     )
-  }
+  end
   def inspection_actions(inspection)
     actions = T.let([], T::Array[T::Hash[Symbol, T.any(String, Symbol, T::Boolean)]])
 
@@ -115,18 +115,16 @@ def next_tab_navigation_info(inspection, current_tab)
     current_tab_incomplete = !assessment_complete?(inspection, current_tab)
 
     # Find first incomplete tab after current (excluding results for now)
-    next_incomplete = tabs_after.find { |tab|
+    next_incomplete = tabs_after.find do |tab|
       tab != "results" && !assessment_complete?(inspection, tab)
-    }
+    end
 
     # If current tab is incomplete and there's a next tab available
     if current_tab_incomplete && tabs_after.any?
       incomplete_count = incomplete_fields_count(inspection, current_tab)
 
       # If there's an incomplete tab after, user should skip current incomplete
-      if next_incomplete
-        return {tab: next_incomplete, skip_incomplete: true, incomplete_count: incomplete_count}
-      end
+      return {tab: next_incomplete, skip_incomplete: true, incomplete_count: incomplete_count} if next_incomplete
 
       # If results tab is incomplete, user should skip to results
       if tabs_after.include?("results") && inspection.passed.nil?
@@ -138,14 +136,10 @@ def next_tab_navigation_info(inspection, current_tab)
     end
 
     # Current tab is complete, just suggest next incomplete tab
-    if next_incomplete
-      return {tab: next_incomplete, skip_incomplete: false}
-    end
+    return {tab: next_incomplete, skip_incomplete: false} if next_incomplete
 
     # Check if results tab is incomplete
-    if tabs_after.include?("results") && inspection.passed.nil?
-      return {tab: "results", skip_incomplete: false}
-    end
+    return {tab: "results", skip_incomplete: false} if tabs_after.include?("results") && inspection.passed.nil?
 
     nil
   end