Fixed the JSON 3 deprecation in the backup and import service

Upgraded to rails 8.0.2
Fixed ads.txt
2026-03-25 01:14:43 +00:00 · 2025-10-08 13:54:38 -04:00 · 2025-10-08 11:35:44 -04:00 · 2025-10-07 15:31:04 -04:00 · 2025-10-07 15:30:47 -04:00
13 changed files with 166 additions and 159 deletions
--- a/2
+++ b/2
@@ -2,7 +2,7 @@ source 'https://rubygems.org'

 ruby '3.2.0'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '8.0.2'
+gem 'rails', '8.0.3'

 # Added in rails 7.1
 gem 'rails-html-sanitizer'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,29 +1,29 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (8.0.2)
-      actionpack (= 8.0.2)
-      activesupport (= 8.0.2)
+    actioncable (8.0.3)
+      actionpack (= 8.0.3)
+      activesupport (= 8.0.3)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
      zeitwerk (~> 2.6)
-    actionmailbox (8.0.2)
-      actionpack (= 8.0.2)
-      activejob (= 8.0.2)
-      activerecord (= 8.0.2)
-      activestorage (= 8.0.2)
-      activesupport (= 8.0.2)
+    actionmailbox (8.0.3)
+      actionpack (= 8.0.3)
+      activejob (= 8.0.3)
+      activerecord (= 8.0.3)
+      activestorage (= 8.0.3)
+      activesupport (= 8.0.3)
      mail (>= 2.8.0)
-    actionmailer (8.0.2)
-      actionpack (= 8.0.2)
-      actionview (= 8.0.2)
-      activejob (= 8.0.2)
-      activesupport (= 8.0.2)
+    actionmailer (8.0.3)
+      actionpack (= 8.0.3)
+      actionview (= 8.0.3)
+      activejob (= 8.0.3)
+      activesupport (= 8.0.3)
      mail (>= 2.8.0)
      rails-dom-testing (~> 2.2)
-    actionpack (8.0.2)
-      actionview (= 8.0.2)
-      activesupport (= 8.0.2)
+    actionpack (8.0.3)
+      actionview (= 8.0.3)
+      activesupport (= 8.0.3)
      nokogiri (>= 1.8.5)
      rack (>= 2.2.4)
      rack-session (>= 1.0.1)
@@ -31,35 +31,35 @@ GEM
      rails-dom-testing (~> 2.2)
      rails-html-sanitizer (~> 1.6)
      useragent (~> 0.16)
-    actiontext (8.0.2)
-      actionpack (= 8.0.2)
-      activerecord (= 8.0.2)
-      activestorage (= 8.0.2)
-      activesupport (= 8.0.2)
+    actiontext (8.0.3)
+      actionpack (= 8.0.3)
+      activerecord (= 8.0.3)
+      activestorage (= 8.0.3)
+      activesupport (= 8.0.3)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (8.0.2)
-      activesupport (= 8.0.2)
+    actionview (8.0.3)
+      activesupport (= 8.0.3)
      builder (~> 3.1)
      erubi (~> 1.11)
      rails-dom-testing (~> 2.2)
      rails-html-sanitizer (~> 1.6)
-    activejob (8.0.2)
-      activesupport (= 8.0.2)
+    activejob (8.0.3)
+      activesupport (= 8.0.3)
      globalid (>= 0.3.6)
-    activemodel (8.0.2)
-      activesupport (= 8.0.2)
-    activerecord (8.0.2)
-      activemodel (= 8.0.2)
-      activesupport (= 8.0.2)
+    activemodel (8.0.3)
+      activesupport (= 8.0.3)
+    activerecord (8.0.3)
+      activemodel (= 8.0.3)
+      activesupport (= 8.0.3)
      timeout (>= 0.4.0)
-    activestorage (8.0.2)
-      actionpack (= 8.0.2)
-      activejob (= 8.0.2)
-      activerecord (= 8.0.2)
-      activesupport (= 8.0.2)
+    activestorage (8.0.3)
+      actionpack (= 8.0.3)
+      activejob (= 8.0.3)
+      activerecord (= 8.0.3)
+      activesupport (= 8.0.3)
      marcel (~> 1.0)
-    activesupport (8.0.2)
+    activesupport (8.0.3)
      base64
      benchmark (>= 0.3)
      bigdecimal
@@ -73,16 +73,16 @@ GEM
      tzinfo (~> 2.0, >= 2.0.5)
      uri (>= 0.13.1)
    ast (2.4.3)
-    base64 (0.2.0)
+    base64 (0.3.0)
    bcrypt (3.1.20)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
+    benchmark (0.4.1)
+    bigdecimal (3.3.0)
    bootsnap (1.18.6)
      msgpack (~> 1.2)
-    brakeman (7.0.2)
+    brakeman (7.1.0)
      racc
    builder (3.3.0)
-    bullet (8.0.7)
+    bullet (8.0.8)
      activesupport (>= 3.0.0)
      uniform_notifier (~> 1.11)
    bundler-audit (0.9.2)
@@ -90,22 +90,23 @@ GEM
      thor (~> 1.0)
    cancancan (3.6.1)
    concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    connection_pool (2.5.4)
    crass (1.0.6)
    daemons (1.4.1)
    date (3.4.1)
-    drb (2.2.1)
+    drb (2.2.3)
+    erb (5.0.3)
    erubi (1.13.1)
-    et-orbi (1.2.11)
+    et-orbi (1.4.0)
      tzinfo
-    fugit (1.11.1)
+    fugit (1.11.2)
      et-orbi (~> 1, >= 1.2.11)
      raabro (~> 1.4)
-    globalid (1.2.1)
+    globalid (1.3.0)
      activesupport (>= 6.1)
    i18n (1.14.7)
      concurrent-ruby (~> 1.0)
-    importmap-rails (2.1.0)
+    importmap-rails (2.2.2)
      actionpack (>= 6.0.0)
      activesupport (>= 6.0.0)
      railties (>= 6.0.0)
@@ -113,19 +114,19 @@ GEM
    influxdb-rails (1.0.3)
      influxdb (~> 0.6, >= 0.6.4)
      railties (>= 5.0)
-    io-console (0.8.0)
+    io-console (0.8.1)
    irb (1.15.2)
      pp (>= 0.6.0)
      rdoc (>= 4.0.0)
      reline (>= 0.4.2)
-    jbuilder (2.13.0)
-      actionview (>= 5.0.0)
-      activesupport (>= 5.0.0)
+    jbuilder (2.14.1)
+      actionview (>= 7.0.0)
+      activesupport (>= 7.0.0)
    jquery-rails (4.6.0)
      rails-dom-testing (>= 1, < 3)
      railties (>= 4.2.0)
      thor (>= 0.14, < 2.0)
-    json (2.12.2)
+    json (2.15.1)
    language_server-protocol (3.17.0.5)
    lint_roller (1.1.0)
    logger (1.7.0)
@@ -137,14 +138,15 @@ GEM
      net-imap
      net-pop
      net-smtp
-    marcel (1.0.4)
+    marcel (1.1.0)
    mini_mime (1.1.5)
    minitest (5.25.5)
    mocha (2.7.1)
      ruby2_keywords (>= 0.0.5)
    msgpack (1.8.0)
-    mysql2 (0.5.6)
-    net-imap (0.5.8)
+    mysql2 (0.5.7)
+      bigdecimal
+    net-imap (0.5.12)
      date
      net-protocol
    net-pop (0.1.2)
@@ -154,43 +156,42 @@ GEM
    net-smtp (0.5.1)
      net-protocol
    nio4r (2.7.4)
-    nokogiri (1.18.8-aarch64-linux-gnu)
+    nokogiri (1.18.10-aarch64-linux-gnu)
      racc (~> 1.4)
-    nokogiri (1.18.8-aarch64-linux-musl)
+    nokogiri (1.18.10-aarch64-linux-musl)
      racc (~> 1.4)
-    nokogiri (1.18.8-arm-linux-gnu)
+    nokogiri (1.18.10-arm-linux-gnu)
      racc (~> 1.4)
-    nokogiri (1.18.8-arm-linux-musl)
+    nokogiri (1.18.10-arm-linux-musl)
      racc (~> 1.4)
-    nokogiri (1.18.8-arm64-darwin)
+    nokogiri (1.18.10-arm64-darwin)
      racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-darwin)
+    nokogiri (1.18.10-x86_64-darwin)
      racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-gnu)
+    nokogiri (1.18.10-x86_64-linux-gnu)
      racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-musl)
+    nokogiri (1.18.10-x86_64-linux-musl)
      racc (~> 1.4)
    parallel (1.27.0)
-    parser (3.3.8.0)
+    parser (3.3.9.0)
      ast (~> 2.4.1)
      racc
-    pp (0.6.2)
+    pp (0.6.3)
      prettyprint
    prettyprint (0.2.0)
-    prism (1.4.0)
-    propshaft (1.1.0)
+    prism (1.5.1)
+    propshaft (1.3.1)
      actionpack (>= 7.0.0)
      activesupport (>= 7.0.0)
      rack
-      railties (>= 7.0.0)
    psych (5.2.6)
      date
      stringio
-    puma (6.6.0)
+    puma (7.0.4)
      nio4r (~> 2.0)
    raabro (1.4.0)
    racc (1.8.1)
-    rack (3.1.14)
+    rack (3.2.2)
    rack-session (2.1.1)
      base64 (>= 0.1.0)
      rack (>= 3.0.0)
@@ -198,25 +199,25 @@ GEM
      rack (>= 1.3)
    rackup (2.2.1)
      rack (>= 3)
-    rails (8.0.2)
-      actioncable (= 8.0.2)
-      actionmailbox (= 8.0.2)
-      actionmailer (= 8.0.2)
-      actionpack (= 8.0.2)
-      actiontext (= 8.0.2)
-      actionview (= 8.0.2)
-      activejob (= 8.0.2)
-      activemodel (= 8.0.2)
-      activerecord (= 8.0.2)
-      activestorage (= 8.0.2)
-      activesupport (= 8.0.2)
+    rails (8.0.3)
+      actioncable (= 8.0.3)
+      actionmailbox (= 8.0.3)
+      actionmailer (= 8.0.3)
+      actionpack (= 8.0.3)
+      actiontext (= 8.0.3)
+      actionview (= 8.0.3)
+      activejob (= 8.0.3)
+      activemodel (= 8.0.3)
+      activerecord (= 8.0.3)
+      activestorage (= 8.0.3)
+      activesupport (= 8.0.3)
      bundler (>= 1.15.0)
-      railties (= 8.0.2)
+      railties (= 8.0.3)
    rails-controller-testing (1.0.5)
      actionpack (>= 5.0.1.rc1)
      actionview (>= 5.0.1.rc1)
      activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.2.0)
+    rails-dom-testing (2.3.0)
      activesupport (>= 5.0.0)
      minitest
      nokogiri (>= 1.6)
@@ -228,24 +229,27 @@ GEM
      rails_stdout_logging
    rails_serve_static_assets (0.0.5)
    rails_stdout_logging (0.0.5)
-    railties (8.0.2)
-      actionpack (= 8.0.2)
-      activesupport (= 8.0.2)
+    railties (8.0.3)
+      actionpack (= 8.0.3)
+      activesupport (= 8.0.3)
      irb (~> 1.13)
      rackup (>= 1.0.0)
      rake (>= 12.2)
      thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
      zeitwerk (~> 2.6)
    rainbow (3.1.1)
-    rake (13.2.1)
+    rake (13.3.0)
    rb-readline (0.5.5)
-    rdoc (6.13.1)
+    rdoc (6.15.0)
+      erb
      psych (>= 4.0.0)
-    regexp_parser (2.10.0)
-    reline (0.6.1)
+      tsort
+    regexp_parser (2.11.3)
+    reline (0.6.2)
      io-console (~> 0.5)
    round_robin_tournament (0.1.2)
-    rubocop (1.76.0)
+    rubocop (1.81.1)
      json (~> 2.3)
      language_server-protocol (~> 3.17.0.2)
      lint_roller (~> 1.1.0)
@@ -253,18 +257,18 @@ GEM
      parser (>= 3.3.0.2)
      rainbow (>= 2.2.2, < 4.0)
      regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.45.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.45.0)
+    rubocop-ast (1.47.1)
      parser (>= 3.3.7.2)
      prism (~> 1.4)
    ruby-progressbar (1.13.0)
    ruby2_keywords (0.0.5)
-    sdoc (2.6.1)
+    sdoc (2.6.4)
      rdoc (>= 5.0)
    securerandom (0.4.1)
-    solid_cable (3.0.8)
+    solid_cable (3.0.12)
      actioncable (>= 7.2)
      activejob (>= 7.2)
      activerecord (>= 7.2)
@@ -273,45 +277,46 @@ GEM
      activejob (>= 7.2)
      activerecord (>= 7.2)
      railties (>= 7.2)
-    solid_queue (1.1.5)
+    solid_queue (1.2.1)
      activejob (>= 7.1)
      activerecord (>= 7.1)
      concurrent-ruby (>= 1.3.1)
      fugit (~> 1.11.0)
      railties (>= 7.1)
-      thor (~> 1.3.1)
-    spring (4.3.0)
-    sqlite3 (2.6.0-aarch64-linux-gnu)
-    sqlite3 (2.6.0-aarch64-linux-musl)
-    sqlite3 (2.6.0-arm-linux-gnu)
-    sqlite3 (2.6.0-arm-linux-musl)
-    sqlite3 (2.6.0-arm64-darwin)
-    sqlite3 (2.6.0-x86_64-darwin)
-    sqlite3 (2.6.0-x86_64-linux-gnu)
-    sqlite3 (2.6.0-x86_64-linux-musl)
+      thor (>= 1.3.1)
+    spring (4.4.0)
+    sqlite3 (2.7.4-aarch64-linux-gnu)
+    sqlite3 (2.7.4-aarch64-linux-musl)
+    sqlite3 (2.7.4-arm-linux-gnu)
+    sqlite3 (2.7.4-arm-linux-musl)
+    sqlite3 (2.7.4-arm64-darwin)
+    sqlite3 (2.7.4-x86_64-darwin)
+    sqlite3 (2.7.4-x86_64-linux-gnu)
+    sqlite3 (2.7.4-x86_64-linux-musl)
    stimulus-rails (1.3.4)
      railties (>= 6.0.0)
    stringio (3.1.7)
-    thor (1.3.2)
+    thor (1.4.0)
    timeout (0.4.3)
-    turbo-rails (2.0.13)
+    tsort (0.2.0)
+    turbo-rails (2.0.17)
      actionpack (>= 7.1.0)
      railties (>= 7.1.0)
    tzinfo (2.0.6)
      concurrent-ruby (~> 1.0)
    tzinfo-data (1.2025.2)
      tzinfo (>= 1.0.0)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
-    uniform_notifier (1.17.0)
-    uri (1.0.3)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
+    uniform_notifier (1.18.0)
+    uri (1.0.4)
    useragent (0.16.11)
-    websocket-driver (0.7.7)
+    websocket-driver (0.8.0)
      base64
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.5)
-    zeitwerk (2.7.2)
+    zeitwerk (2.7.3)

 PLATFORMS
  aarch64-linux-gnu
@@ -339,7 +344,7 @@ DEPENDENCIES
  mysql2
  propshaft
  puma
-  rails (= 8.0.2)
+  rails (= 8.0.3)
  rails-controller-testing
  rails-html-sanitizer
  rails_12factor
--- a/app/services/tournament_services/tournament_backup_service.rb
+++ b/app/services/tournament_services/tournament_backup_service.rb
@@ -41,7 +41,11 @@ class TournamentBackupService
        mat_assignment_rules: @tournament.mat_assignment_rules.map do |rule|
          rule.attributes.merge(
            mat: Mat.find_by(id: rule.mat_id)&.attributes.slice("name"),
-            weight_classes: rule.weight_classes.map do |weight_id|
+            # Emit the human-readable max values under a distinct key to avoid
+            # colliding with the raw DB-backed "weight_classes" attribute (which
+            # is stored as a comma-separated string). Using a different key
+            # prevents duplicate JSON keys when symbols and strings are both present.
+            "weight_class_maxes" => rule.weight_classes.map do |weight_id|
              Weight.find_by(id: weight_id)&.max
            end
          )
--- a/app/services/tournament_services/wrestlingdev_importer.rb
+++ b/app/services/tournament_services/wrestlingdev_importer.rb
@@ -86,17 +86,30 @@ class WrestlingdevImporter
    mat_assignment_rules.each do |rule_attributes|
      mat_name = rule_attributes.dig("mat", "name")
      mat = Mat.find_by(name: mat_name, tournament_id: @tournament.id)
-
-      # Map max values of weight_classes to their new IDs
-      new_weight_classes = rule_attributes["weight_classes"].map do |max_value|
-        Weight.find_by(max: max_value, tournament_id: @tournament.id)&.id
-      end.compact
-
-      # Extract bracket_positions and rounds
+  
+      # Prefer the new "weight_class_maxes" key emitted by backups (human-readable
+      # max values). If not present, fall back to the legacy "weight_classes"
+      # value which may be a comma-separated string or an array of IDs.
+      if rule_attributes.key?("weight_class_maxes") && rule_attributes["weight_class_maxes"].respond_to?(:map)
+        new_weight_classes = rule_attributes["weight_class_maxes"].map do |max_value|
+          Weight.find_by(max: max_value, tournament_id: @tournament.id)&.id
+        end.compact
+      elsif rule_attributes["weight_classes"].is_a?(Array)
+        # Already an array of IDs
+        new_weight_classes = rule_attributes["weight_classes"].map(&:to_i)
+      elsif rule_attributes["weight_classes"].is_a?(String)
+        # Comma-separated IDs stored in the DB column; split into integers.
+        new_weight_classes = rule_attributes["weight_classes"].to_s.split(",").map(&:strip).reject(&:empty?).map(&:to_i)
+      else
+        new_weight_classes = []
+      end
+  
+      # Extract bracket_positions and rounds (leave as-is; model will coerce if needed)
      bracket_positions = rule_attributes["bracket_positions"]
      rounds = rule_attributes["rounds"]
-
-      rule_attributes.except!("id", "mat", "tournament_id", "weight_classes")
+  
+      # Remove any keys we don't want to mass-assign (including both old/new weight keys)
+      rule_attributes.except!("id", "mat", "tournament_id", "weight_classes", "weight_class_maxes")
      
      MatAssignmentRule.create(
        rule_attributes.merge(
--- a/bin/dev
+++ b/bin/dev
@@ -1,4 +1,2 @@
 #!/usr/bin/env ruby
-
-# Start Rails server with defaults
-exec "bin/rails", "server", *ARGV
+exec "./bin/rails", "server", *ARGV
--- a/config/application.rb
+++ b/config/application.rb
@@ -55,5 +55,7 @@ module Wrestling
    # Set cache format version to a value supported by Rails 8.0
    # Valid values are 7.0 or 7.1
    config.active_support.cache_format_version = 7.1
+
+    config.load_defaults 8.0
  end
 end
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = "1.0"
+
+# Add additional assets to the asset load path.
+# Rails.application.config.assets.paths << Emoji.images_path
--- a/public/ads.txt
+++ b/public/ads.txt
@@ -1 +1 @@
-pub-6845455733812572
+google.com, pub-6845455733812572, DIRECT, f08c47fec0942fa0
--- a/test/fixtures/tournament_job_statuses.yml
+++ b/test/fixtures/tournament_job_statuses.yml
@@ -2,26 +2,4 @@

 # This model requires tournament, job_name, and status fields

-queued_job:
-  tournament: one
-  job_name: "Test Queued Job"
-  status: "Queued"
-  details: "Test job details"

-running_job:
-  tournament: one
-  job_name: "Test Running Job"
-  status: "Running"
-  details: "Test running job details"
-
-errored_job:
-  tournament: one
-  job_name: "Test Errored Job"
-  status: "Errored"
-  details: "Test error message"
-
-another_tournament_job:
-  tournament: two
-  job_name: "Another Tournament Job"
-  status: "Running"
-  details: "Different tournament test"
--- a/test/models/mat_test.rb
+++ b/test/models/mat_test.rb
@@ -8,7 +8,7 @@ class MatTest < ActiveSupport::TestCase
  test "Mat validations" do
    mat = Mat.new
    assert_not mat.valid?
-    assert_equal [:name], mat.errors.attribute_names
+    assert_equal [:tournament, :name], mat.errors.attribute_names
  end
  
 end
--- a/test/models/school_test.rb
+++ b/test/models/school_test.rb
@@ -8,7 +8,7 @@ class SchoolTest < ActiveSupport::TestCase
  test "School validations" do
    school = School.new
    assert_not school.valid?
-    assert_equal [:name], school.errors.attribute_names
+    assert_equal [:tournament, :name], school.errors.attribute_names
  end
  
 end
--- a/test/models/weight_test.rb
+++ b/test/models/weight_test.rb
@@ -8,7 +8,7 @@ class WeightTest < ActiveSupport::TestCase
  test "Weight validations" do
    weight = Weight.new
    assert_not weight.valid?
-    assert_equal [:max], weight.errors.attribute_names
+    assert_equal [:tournament, :max], weight.errors.attribute_names
  end
  
 end
--- a/test/models/wrestler_test.rb
+++ b/test/models/wrestler_test.rb
@@ -8,7 +8,7 @@ class WrestlerTest < ActiveSupport::TestCase
  test "Wrestler validations" do
    wrestler = Wrestler.new
    assert_not wrestler.valid?
-    assert_equal [:name, :weight_id, :school_id], wrestler.errors.attribute_names
+    assert_equal [:school, :weight, :name, :weight_id, :school_id], wrestler.errors.attribute_names
  end
  
 end
Author	SHA1	Message	Date
Jacob Cody Wimer	6e9554be55	Fixed the JSON 3 deprecation in the backup and import service	2025-10-08 13:54:38 -04:00
Jacob Cody Wimer	34f1783031	Upgraded to rails 8.0.2	2025-10-08 11:35:44 -04:00
Jacob Cody Wimer	bbd2bd9b44	Fixed ads.txt	2025-10-07 15:31:04 -04:00
Jacob Cody Wimer	6ecebba70d	Updated gems	2025-10-07 15:30:47 -04:00