usps-support 0.1.15 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 761e690bb6f2b95e6075471bfb0db75f7b59cf060c9b14373f9bba91dbbd05d8
-  data.tar.gz: 3761939f20b64a6d07ac5fc3bc5d17f8c54be74fc09866c414439447ded0f2fc
+  metadata.gz: 7f98d7711b8b7df8cf89045473df9c7f38ded9583dc9efbfb9a387cd0f6a161e
+  data.tar.gz: 71cbb321ffc4b87d46c8d38f706abf4febb034ea427e43695737ea9e09512f09
 SHA512:
-  metadata.gz: 39bcfc845ce7507504f96d6a45446a6e858428d29748b86288a851835d2d8f18e3151db7800f71d4f32d9d662c58ee714f586527062df92255a0db06c0e8fc60
-  data.tar.gz: 4b13aa5bd085dae1afe42788f1b8d99b83e4129812219d0bf13c8b24d7daaf96bbe661bc3127267128827822dff6d787c110de394674a0fb20d91bf57fa74ea3
+  metadata.gz: 5315b72654bd1206674690b6a7155062c5cfd3fb31c277d718f9b12ab1bd03b155f0ef47bb809888833e6502b6669db22d8ce1442815a3f304852f60b15373c2
+  data.tar.gz: e19326f0f02ebe0054b552440d7cbcdddc1e083783907acfe3c343ff605012ba136f11f1bed49253a7abe4059e43fad8d07948e2c3e0e0a375d561f6599dced3

data/lib/usps/support/db/members_schema.rb

@@ -0,0 +1,198 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema[7.2].define(version: 2025_11_01_000000) do
+  create_table "abftp2", primary_key: "certificate", id: { type: :string, limit: 7 }, charset: "latin1", comment: "dtb-for PM created daily from HQ-has X members", force: :cascade do |t|
+    t.integer "district", default: 0, null: false
+    t.integer "sqdno", default: 0, null: false
+    t.string "account", limit: 5, null: false
+    t.string "password", limit: 10, null: false
+    t.string "sqdname", limit: 30, null: false
+    t.integer "month", default: 0, null: false
+    t.string "firstname", limit: 15
+    t.string "lastname", limit: 25
+    t.string "areacode", limit: 3
+    t.string "telephone", limit: 10
+    t.string "status", limit: 30, null: false, collation: "latin1_bin"
+    t.string "type", limit: 5, null: false
+    t.string "invoice", limit: 9, null: false
+    t.string "abemail", limit: 40, null: false
+    t.string "abestatus", limit: 1, null: false
+    t.string "mbrdate", limit: 8
+    t.string "cduesyr", limit: 4
+    t.string "pduesyr", limit: 4
+    t.string "nrendate", limit: 8
+    t.string "dob", limit: 8
+    t.string "family", limit: 7
+    t.string "died", limit: 8
+  end
+
+  create_table "djdesc", primary_key: "jobcode", id: { type: :string, limit: 5 }, charset: "latin1", comment: "dtb-created daily has active dist Job descritpions", force: :cascade do |t|
+    t.string "jdesc", limit: 100
+    t.string "rank", limit: 3, null: false
+    t.string "prank", limit: 3, null: false
+    t.string "OD1", limit: 1, null: false
+    t.string "OD2", limit: 1, null: false
+    t.string "ED1", limit: 1, null: false
+    t.string "Lev", limit: 1, null: false
+    t.string "EGA", limit: 1, null: false
+    t.string "Descript", limit: 7, null: false
+    t.string "OP", limit: 1
+    t.string "Sp", limit: 1
+  end
+
+  create_table "djftp", id: false, charset: "latin1", comment: "dtb - Current District Jobs loaded from HQ data", force: :cascade do |t|
+    t.string "certno", limit: 7, null: false
+    t.string "first", limit: 15
+    t.string "last", limit: 25
+    t.string "jobcode", limit: 5
+    t.string "year", limit: 4
+    t.integer "account", null: false
+    t.string "distno", limit: 2
+    t.string "acting", limit: 1
+    t.string "source", limit: 1
+  end
+
+  create_table "mbftp", primary_key: "certno", id: { type: :string, limit: 7 }, charset: "latin1", comment: "dtb-active membership created daily from HQ", force: :cascade do |t|
+    t.integer "id", null: false, auto_increment: true
+    t.integer "distno"
+    t.string "daccount", limit: 4
+    t.integer "sqdcode"
+    t.string "account", limit: 4
+    t.string "first", limit: 15
+    t.string "last", limit: 25
+    t.string "nick", limit: 15
+    t.string "nickpref", limit: 1
+    t.string "sex", limit: 1
+    t.string "address1", limit: 30
+    t.string "address2", limit: 30
+    t.string "city", limit: 30
+    t.string "state", limit: 2
+    t.string "zip5", limit: 5
+    t.string "zip4", limit: 4
+    t.string "mbrtype", limit: 2
+    t.string "mbrstatus", limit: 3
+    t.string "area", limit: 3
+    t.string "phone", limit: 7
+    t.string "area2", limit: 3
+    t.string "phone2", limit: 7
+    t.string "areac", limit: 3
+    t.string "phonec", limit: 7
+    t.string "email", limit: 40
+    t.string "estatus", limit: 1
+    t.integer "rank"
+    t.string "pastrank", limit: 3
+    t.string "sqdrank", limit: 3
+    t.string "grade", limit: 6
+    t.string "spcertno", limit: 7
+    t.string "spouse", limit: 30
+    t.string "ssex", limit: 1
+    t.string "edpro", limit: 8
+    t.string "edach", limit: 8
+    t.string "chap", limit: 8
+    t.string "years", limit: 2
+    t.string "mm", limit: 2
+    t.string "senior", limit: 4
+    t.string "life", limit: 4
+    t.string "vsc", limit: 8
+    t.string "idexpr", limit: 8
+    t.string "ot", limit: 8
+    t.string "ldao", limit: 8
+    t.string "ldxo", limit: 8
+    t.string "ldcdr", limit: 8
+    t.string "actcertno", limit: 7
+    t.string "mbrdate", limit: 8
+    t.string "trdate", limit: 8
+    t.string "pin", limit: 8
+    t.string "question", limit: 2
+    t.string "answer", limit: 25
+    t.string "bdu", limit: 8
+    t.string "hq", limit: 8
+    t.string "x", limit: 1
+    t.string "birth", limit: 8
+    t.string "ext", limit: 4
+    t.string "ok", limit: 1
+    t.string "areaf", limit: 3
+    t.string "fax", limit: 7
+    t.string "mmsi", limit: 9
+    t.string "callsign", limit: 7
+    t.string "seascout", limit: 1
+    t.integer "pdistno"
+    t.integer "psqdcode"
+    t.integer "odistno"
+    t.integer "osqdcode"
+    t.string "optout", limit: 1
+    t.string "jcode", limit: 1
+    t.string "lastmm", limit: 4
+    t.string "btype", limit: 30
+    t.string "bname", limit: 30
+    t.string "port", limit: 30
+    t.string "sptype", limit: 1
+    t.string "DB", limit: 1
+    t.string "DBdate", limit: 8
+    t.string "btemp", limit: 8
+    t.string "iMISid", limit: 8
+    t.index ["certno"], name: "certno", unique: true
+    t.index ["id"], name: "id_index"
+  end
+
+  create_table "njdesc", primary_key: "jobcode", id: { type: :string, limit: 7 }, charset: "latin1", comment: "dtb-created daily active nat job desc", force: :cascade do |t|
+    t.string "jdesc", limit: 100
+    t.string "admin", limit: 5, null: false
+    t.string "rank", limit: 3, null: false
+    t.string "prank", limit: 3, null: false
+    t.string "type", limit: 1, null: false
+    t.string "active", limit: 1, null: false
+    t.string "map", limit: 1, null: false
+  end
+
+  create_table "njftp", id: false, charset: "latin1", comment: "dtb-created daily from HQ active nat jobs", force: :cascade do |t|
+    t.string "certno", limit: 7, null: false
+    t.string "first", limit: 15
+    t.string "last", limit: 25
+    t.string "jobcode", limit: 7
+    t.string "year", limit: 4
+    t.string "distno", limit: 2
+  end
+
+  create_table "ranks", id: false, charset: "latin1", force: :cascade do |t|
+    t.string "RankCode", limit: 3
+    t.string "RankDesc", limit: 40
+    t.string "RankAbbr", limit: 15
+  end
+
+  create_table "sjdesc", primary_key: "jobcode", id: { type: :string, limit: 5 }, charset: "latin1", comment: "dtb-created daily has active squad Job descritpions", force: :cascade do |t|
+    t.string "jdesc", limit: 100
+    t.string "rank", limit: 3, null: false
+    t.string "prank", limit: 3, null: false
+    t.string "OD1", limit: 1, null: false
+    t.string "OD2", limit: 1, null: false
+    t.string "ED1", limit: 1, null: false
+    t.string "Lev", limit: 1, null: false
+    t.string "EGA", limit: 1, null: false
+    t.string "Descript", limit: 7, null: false
+    t.string "OP", limit: 1
+    t.string "Sp", limit: 1
+  end
+
+  create_table "sjftp", id: false, charset: "latin1", comment: "dtb-created daily from HQ active squadron jobs", force: :cascade do |t|
+    t.string "certno", limit: 7, null: false
+    t.string "first", limit: 15
+    t.string "last", limit: 25
+    t.string "jobcode", limit: 5
+    t.string "year", limit: 4
+    t.integer "account", null: false
+    t.string "distno", limit: 2
+    t.string "acting", limit: 1
+    t.string "source", limit: 1
+  end
+end

data/lib/usps/support/db/websites_schema.rb

@@ -0,0 +1,205 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema[7.2].define(version: 2025_11_01_000000) do
+  create_table "mbrclasses", id: :integer, charset: "latin1", comment: "dtb-Active member classes", options: "ENGINE=InnoDB", force: :cascade do |t|
+    t.string "sqnumber", limit: 4
+    t.string "account", limit: 4
+    t.string "crsid", limit: 17
+    t.string "place", limit: 60
+    t.string "adr", limit: 60
+    t.string "city", limit: 35
+    t.string "state", limit: 2
+    t.string "tzone", limit: 1, default: ""
+    t.integer "dirid"
+    t.date "date"
+    t.time "time"
+    t.date "rdate"
+    t.time "rtime"
+    t.string "edate", limit: 11
+    t.string "etime", limit: 4, default: ""
+    t.date "cdate"
+    t.string "total", limit: 3
+    t.string "passed", limit: 3
+    t.string "failed", limit: 3
+    t.string "number", limit: 13
+    t.string "name", limit: 35
+    t.string "ccertno", limit: 7
+    t.string "email", limit: 50
+    t.string "estatus", limit: 1
+    t.string "type", limit: 7
+    t.string "year", limit: 2
+    t.string "Sp", limit: 1
+    t.string "owt", limit: 1
+    t.string "zip", limit: 5
+    t.date "modified"
+    t.string "lat", limit: 10
+    t.string "lon", limit: 10
+    t.string "oreg", limit: 1
+    t.string "accept", limit: 1
+    t.string "cost", limit: 5
+    t.string "mcost", limit: 5
+    t.string "maxnum", limit: 3
+    t.string "nopub", limit: 1
+    t.string "web", limit: 1
+    t.string "webid", limit: 19
+    t.string "vclass", limit: 1
+    t.string "oexam", limit: 1
+    t.integer "oexid", default: 0
+    t.string "format", limit: 1
+    t.string "media", limit: 15
+    t.string "status", limit: 1
+    t.text "notes"
+    t.string "schedule", limit: 50
+    t.string "certifier", limit: 7
+    t.string "certifier2", limit: 7
+    t.string "certifier3", limit: 7
+    t.string "certifier4", limit: 7
+    t.string "certifier5", limit: 7
+    t.string "certifier6", limit: 7
+    t.string "whoby", limit: 20
+    t.string "source", limit: 1
+    t.string "osource", limit: 1
+    t.string "orderno", limit: 5
+    t.string "invoice", limit: 7
+    t.index ["sqnumber"], name: "csq_index"
+  end
+
+  create_table "students", id: :integer, charset: "latin1", comment: "dtb-Active eddept HQ800 students", options: "ENGINE=MyISAM", force: :cascade do |t|
+    t.string "csl", limit: 1
+    t.string "crsid", limit: 17
+    t.string "start", limit: 6
+    t.string "seq", limit: 1
+    t.string "ctype", limit: 7
+    t.string "hours", limit: 2
+    t.string "Sp", limit: 1
+    t.string "owt", limit: 1
+    t.string "squadno", limit: 4
+    t.string "distno", limit: 2
+    t.string "certno", limit: 7
+    t.string "status", limit: 1
+    t.string "accept", limit: 1
+    t.string "grade", limit: 3
+    t.string "f_name", limit: 15
+    t.string "mi", limit: 5
+    t.string "l_name", limit: 25
+    t.string "nick", limit: 15
+    t.string "nickpref", limit: 1
+    t.string "address", limit: 30
+    t.string "address2", limit: 30
+    t.string "city", limit: 30
+    t.string "state", limit: 2
+    t.string "county", limit: 30
+    t.string "zip", limit: 5
+    t.string "zippl", limit: 4
+    t.string "phone", limit: 14
+    t.string "text", limit: 1, default: ""
+    t.string "email", limit: 40
+    t.string "estatus", limit: 1
+    t.string "birth_date", limit: 8
+    t.string "u18", limit: 1, default: ""
+    t.string "sex", limit: 1
+    t.string "SS4", limit: 4
+    t.string "eye_color", limit: 3
+    t.string "hair_color", limit: 3
+    t.string "ht_ft", limit: 1
+    t.string "ht_in", limit: 2
+    t.string "entered", limit: 6
+    t.string "ED26", limit: 6
+    t.integer "ed26id"
+    t.string "ED27", limit: 6
+    t.string "learned", limit: 30
+    t.string "boatsz", limit: 8
+    t.string "boattyp", limit: 8
+    t.string "boathp", limit: 8
+    t.string "trailer", limit: 1
+    t.string "boatyrs", limit: 2
+    t.string "optout", limit: 1
+    t.string "validate", limit: 7
+    t.string "certifier", limit: 7
+    t.string "certifier2", limit: 7
+    t.string "certifier3", limit: 7
+    t.string "source", limit: 1
+    t.string "osource", limit: 1
+    t.string "sstate", limit: 2
+    t.string "X01", limit: 1, default: ""
+    t.string "X02", limit: 1, default: ""
+    t.string "X03", limit: 1, default: ""
+    t.string "X04", limit: 1, default: ""
+    t.string "X05", limit: 1, default: ""
+    t.string "X06", limit: 1, default: ""
+    t.string "X07", limit: 1, default: ""
+    t.string "X08", limit: 1, default: ""
+    t.string "X09", limit: 1, default: ""
+    t.string "X10", limit: 1, default: ""
+    t.string "crdtype", limit: 1
+  end
+
+  create_table "websites", id: :integer, charset: "latin1", comment: "dtb-Accounts profiles (squadrons, districts, BOC regins,etc)", options: "ENGINE=InnoDB PACK_KEYS=1", force: :cascade do |t|
+    t.string "type", limit: 1, default: "", null: false
+    t.string "Name", limit: 35, default: "", null: false
+    t.string "DBA", limit: 50
+    t.string "url", limit: 75, default: "", null: false
+    t.string "newsletter", limit: 40
+    t.string "email", limit: 50, default: "", null: false
+    t.string "contact", limit: 30, default: "", null: false
+    t.string "tel", limit: 15, default: "", null: false
+    t.string "ceforce", limit: 1
+    t.string "region", limit: 60, default: "", null: false
+    t.string "burgee", limit: 200
+    t.string "dist", limit: 3, default: "", null: false
+    t.string "daccount", limit: 4
+    t.string "state", limit: 2, default: "", null: false
+    t.string "tzone", limit: 1
+    t.string "sqnumber", limit: 5, default: "", null: false
+    t.integer "account", null: false
+    t.string "initials", limit: 3
+    t.string "modified", limit: 8
+    t.string "who", limit: 8
+    t.string "prov", limit: 1
+    t.string "sail", limit: 1
+    t.string "pcontact", limit: 30
+    t.string "ptel", limit: 15
+    t.string "pemail", limit: 50
+    t.string "peforce", limit: 1
+    t.string "pceforce", limit: 1
+    t.string "pzip", limit: 5
+    t.string "plat", limit: 10
+    t.string "plon", limit: 10
+    t.string "zoom", limit: 2
+    t.string "nonconform", limit: 1
+    t.string "chartered", limit: 4
+    t.string "bylaws", limit: 50
+    t.string "roster", limit: 30
+    t.string "ncreason"
+    t.string "roptions", limit: 30
+    t.string "cauth", limit: 50
+    t.string "dauth", limit: 50
+    t.string "pauth", limit: 50
+    t.string "history", limit: 35
+    t.string "retired", limit: 1
+    t.string "ccert", limit: 7
+    t.string "oldccert", limit: 7
+    t.string "pcert", limit: 7
+    t.string "oldpcert", limit: 7
+    t.string "rcert", limit: 7
+    t.string "oldrcert", limit: 7
+    t.string "rceforce", limit: 1
+    t.string "county", limit: 15
+    t.string "tax", limit: 4
+    t.string "facebook"
+    t.string "ExPicLib", limit: 75
+    t.index ["Name"], name: "Name_index"
+    t.index ["dist"], name: "dist_index"
+    t.index ["sqnumber"], name: "wsq_index"
+  end
+end

data/lib/usps/support/helpers/badges_helper.rb

@@ -87,7 +87,9 @@ module Usps::Support::Helpers
         when 'success' then :brightgreen
         when 'failure', 'timed_out', 'action_required' then :red
         when 'cancelled' then :orange
-        when 'neutral', 'skipped' then :lightgray
+        else
+          # includes 'neutral', 'skipped'
+          :lightgray
         end
       else
         :lightgray
@@ -104,8 +106,10 @@ module Usps::Support::Helpers
       timestamp =
         case datetime
         when Integer then datetime
-        when String then DateTime.strptime(datetime).in_time_zone('Eastern Time (US & Canada)').to_i
+        when String then DateTime.strptime(datetime, options[:format]).in_time_zone('Eastern Time (US & Canada)').to_i
         when DateTime, Time then datetime.to_i
+        else
+          raise "Unrecognized datetime format: #{datetime.inspect}"
         end
 
       query = options.slice(:label, :logo)
@@ -126,6 +130,7 @@ module Usps::Support::Helpers
     end
 
     # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Style/EmptyElse
     def timestamp_color(timestamp)
       case Time.zone.at(timestamp.to_i)
       when ...14.days.ago then '63a2c7' # faded :blue
@@ -134,8 +139,13 @@ module Usps::Support::Helpers
       when 1.hour.ago...1.minute.ago, 1.minute.from_now...10.minutes.from_now then :yellowgreen
       when 1.minute.ago...1.minute.from_now then :orange
       when 1.hour.from_now.. then :brightgreen
+      else
+        # :nocov:
+        # Unreachable
+        # :nocov:
       end
     end
+    # rubocop:enable Style/EmptyElse
     # rubocop:enable Metrics/AbcSize
   end
 end

data/lib/usps/support/helpers/flags_helper.rb

@@ -6,39 +6,12 @@ module Usps::Support::Helpers
   module FlagsHelper
     FLAGS_BASE_URL = 'https://flags.aws.usps.org'
     SIGNAL_BASE_URL = 'https://flags.aws.usps.org/signals'
-    RANKS = {
-      '31000' => 'CDR', '32000' => 'LTC', '31010' => 'LT',
-      '21000' => 'DC', '22000' => 'DLTC', '21010' => 'DLT',
-      '11000' => 'CC'
-    }.freeze
-    RANK_PATTERNS = {
-      /1\d000/ => 'VC', /1\d{3}0/ => 'RC', /1\d{3}1/ => 'STFC'
-    }.freeze
 
     def officer_flag(rank, format: :svg, size: nil)
       size = ".#{size}" unless size.nil?
       image_tag("#{FLAGS_BASE_URL}/#{format.to_s.upcase}/#{rank}#{size}.#{format}", alt: rank)
     end
 
-    def officer_flag_for_organization(jobcode)
-      rank = RANKS[jobcode] || RANK_PATTERNS.find { |p, _r| jobcode =~ p }[1]
-      officer_flag(rank, format: :png, size: 500)
-    end
-
-    def officer_flag_for_submission(submission)
-      if submission.squadron.present?
-        officer_flag('CDR', format: :png, size: 500)
-      elsif submission.district.present?
-        officer_flag('DC', format: :png, size: 500)
-      elsif submission.organization == '11000'
-        officer_flag('CC', format: :png, size: 500)
-      elsif submission.organization =~ /1\d000/
-        officer_flag('VC', format: :png, size: 500)
-      else
-        officer_flag('RC', format: :png, size: 500)
-      end
-    end
-
     def signal_flags(text, format: :svg)
       safe_join(text.scan(/[A-Za-z0-9\s]/).map(&:downcase).split { |s| s =~ /\s/ }.map do |word|
         content_tag(:div, class: 'word') do

data/lib/usps/support/helpers/git_helper.rb

@@ -3,6 +3,7 @@
 module Usps::Support::Helpers
   # Get git identifying information
   #
+  # :nocov:
   module GitHelper
     def current_git_tag
       prod_current_tag if Rails.env.production?
@@ -10,7 +11,6 @@ module Usps::Support::Helpers
       dev_current_tag if Rails.env.development?
     end
 
-    # :nocov:
     def prod_current_tag
       @current_git_tag = Rails.root.join('TAG').read.chomp
       @current_branch = Rails.root.join('BRANCH').read.chomp
@@ -20,6 +20,6 @@ module Usps::Support::Helpers
       @current_git_tag = `git describe --tags --abbrev=0`.chomp
       @current_branch = `git branch --show-current`.chomp
     end
-    # :nocov:
   end
+  # :nocov:
 end

data/lib/usps/support/helpers/scss_helper.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# :nocov:
 module Usps::Support::Helpers
   # Build CSS for mailers
   #
@@ -7,7 +8,10 @@ module Usps::Support::Helpers
     def render_scss(file)
       text = Rails.root.join("app/views/layouts/scss/#{file}.scss").read
 
+      # rubocop:disable Rails/OutputSafety
+      # No user content
       raw sass_engine(text).render
+      # rubocop:enable Rails/OutputSafety
     end
 
     def sass_engine(text)
@@ -24,3 +28,4 @@ module Usps::Support::Helpers
     end
   end
 end
+# :nocov:

data/lib/usps/support/models/hq/members/district_job.rb

@@ -25,7 +25,7 @@ module Usps::Support::Models::Hq::Members
 
     validate :enforce_account
 
-    def acting? = acting == 'Y'
+    enum :acting, { standard: '', acting: 'Y' }
 
     def description
       desc = district_job_description.jdesc

data/lib/usps/support/models/hq/members/district_job_description.rb

@@ -6,11 +6,15 @@ module Usps::Support::Models::Hq::Members
   class DistrictJobDescription < BaseRecord
     self.table_name = :djdesc
     self.primary_key = :jobcode
+    self.inheritance_column = nil # The database has a `type` column, which confuses with Rails STI
 
     has_many(
       :district_jobs,
       class_name: '::Members::DistrictJob',
       foreign_key: :jobcode, primary_key: :jobcode, inverse_of: :district_job_description
     )
+
+    # Not consistent in the database
+    enum :type, { bridge: 'D', elected: 'J', committee: 'C', appointed: 'A' }, default: :appointed
   end
 end

data/lib/usps/support/models/hq/members/member.rb

@@ -54,7 +54,8 @@ module Usps::Support::Models::Hq::Members
 
     def rank
       return @rank if @rank
-      return unless (raw_rank = read_attribute(:rank))
+
+      raw_rank = read_attribute(:rank)
       return if raw_rank.in?(INVALID_RANKS)
 
       normalized_rank = raw_rank.to_s.rjust(2, '0')

data/lib/usps/support/models/hq/members/national_job_description.rb

@@ -14,11 +14,27 @@ module Usps::Support::Models::Hq::Members
       foreign_key: :jobcode, primary_key: :jobcode, inverse_of: :national_job_description
     )
 
+    # Not consistent in the database
+    enum(
+      :type,
+      {
+        general: 'G',
+        bridge: 'D',
+        appointed: 'J',
+        chair: 'C',
+        assistant: 'A',
+        leadership: 'L',
+        member: 'M',
+        past: 'E'
+      },
+      default: :appointed
+    )
+
     def description
-      return 'Budget Director' if jdesc =~ %r{/Budget Director$}
+      return 'Budget Director' if jdesc =~ /Budget Director/
 
       jdesc
-        .sub(/^(?:Assistant|Asst\.)?\s?(?:Chr\.|Chair\.|Chairman)? /, '')
+        .sub(/^(?:Assistant|Ass?t\.?)?\s?(?:Chr\.|Chair\.|Chairman)? /, '')
         .sub(/ (?:Committee|Cmte|Com\.)$/, '')
     end
   end

data/lib/usps/support/models/hq/members/squadron_job.rb

@@ -25,7 +25,7 @@ module Usps::Support::Models::Hq::Members
 
     validate :enforce_account
 
-    def acting? = acting == 'Y'
+    enum :acting, { standard: '', acting: 'Y' }
 
     def description
       desc = squadron_job_description.jdesc

data/lib/usps/support/models/hq/members/squadron_job_description.rb

@@ -6,11 +6,15 @@ module Usps::Support::Models::Hq::Members
   class SquadronJobDescription < BaseRecord
     self.table_name = :sjdesc
     self.primary_key = :jobcode
+    self.inheritance_column = nil # The database has a `type` column, which confuses with Rails STI
 
     has_many(
       :squadron_jobs,
       class_name: '::Members::SquadronJob',
       foreign_key: :jobcode, primary_key: :jobcode, inverse_of: :squadron_job_description
     )
+
+    # Not consistent in the database
+    enum :type, { bridge: 'D', elected: 'J', committee: 'C', appointed: 'A', general: 'G' }, default: :appointed
   end
 end

data/lib/usps/support/models/hq/shared_record.rb

@@ -3,6 +3,7 @@
 module Usps::Support::Models::Hq
   # Base record for the HQ VHQAB database
   #
+  # rubocop:disable Rails/ApplicationRecord
   class SharedRecord < ::ActiveRecord::Base
     self.abstract_class = true
 
@@ -10,4 +11,5 @@ module Usps::Support::Models::Hq
 
     def self.allow_hq_database_edits? = false
   end
+  # rubocop:enable Rails/ApplicationRecord
 end

data/lib/usps/support/models/hq/squadrons/district.rb

@@ -12,7 +12,7 @@ module Usps::Support::Models::Hq::Squadrons
     has_many(
       :former_squadrons,
       class_name: '::Squadrons::FormerSquadron',
-      inverse_of: :district, foreign_key: 'daccount', primary_key: 'sqdno'
+      inverse_of: :district, foreign_key: 'daccount', primary_key: 'daccount'
     )
 
     has_many(
@@ -40,6 +40,6 @@ module Usps::Support::Models::Hq::Squadrons
 
     # def name = "District #{number}"
 
-    # def all_squadrons = (squadrons + former_squadrons).sort_by(&:name)
+    def all_squadrons = (squadrons + former_squadrons).sort_by(&:name)
   end
 end

data/lib/usps/support/models/hq/squadrons/former_squadron.rb

@@ -6,10 +6,9 @@ module Usps::Support::Models::Hq::Squadrons
   class FormerSquadron < Website
     belongs_to(
       :district,
-      -> { where(account: [0, nil]) },
       inverse_of: :former_squadrons,
       foreign_key: 'daccount',
-      primary_key: 'plat'
+      primary_key: 'daccount'
     )
 
     # Former Squadrons stored in the same table as current Squadrons

data/lib/usps/support/models/toast.rb

@@ -37,7 +37,7 @@ module Usps::Support::Models
     def to_s
       attributes = to_h.map { |key, value| "@#{key}=#{value.inspect}" }.join(' ')
 
-      "#<Toast:#{object_id} #{attributes}>"
+      "#<Toast #{attributes}>"
     end
     alias inspect to_s
 
@@ -51,6 +51,8 @@ module Usps::Support::Models
       }
     end
 
+    def ==(other) = to_h == other.to_h
+
     def to_json(*_)
       validate!
 

data/lib/usps/support/railtie.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails'
+
+module Usps
+  module Support
+    # Expose rake tasks to Rails
+    #
+    class Railtie < Rails::Railtie
+      railtie_name :usps_support
+
+      rake_tasks do
+        path = File.expand_path(__dir__)
+        Dir.glob("#{path}/../../tasks/**/*.rake").each { |f| load f }
+      end
+    end
+  end
+end

data/lib/usps/support/version.rb

@@ -2,6 +2,6 @@
 
 module Usps
   module Support
-    VERSION = '0.1.15'
+    VERSION = '0.1.17'
   end
 end

data/lib/usps/support.rb

@@ -12,3 +12,7 @@ end
 
 require_relative 'support/helpers'
 require_relative 'support/models'
+
+# :nocov:
+require 'usps/support/railtie' if defined?(Rails)
+# :nocov:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usps-support
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.17
 platform: ruby
 authors:
 - Julian Fiander
@@ -58,21 +58,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".ruby-version"
-- Gemfile.lock
-- Rakefile
 - Readme.md
 - lib/usps/all.rb
 - lib/usps/support.rb
+- lib/usps/support/db/members_schema.rb
+- lib/usps/support/db/websites_schema.rb
 - lib/usps/support/helpers.rb
-- lib/usps/support/helpers/.rubocop.yml
 - lib/usps/support/helpers/badges_helper.rb
 - lib/usps/support/helpers/flags_helper.rb
 - lib/usps/support/helpers/git_helper.rb
 - lib/usps/support/helpers/react_helper.rb
 - lib/usps/support/helpers/scss_helper.rb
 - lib/usps/support/models.rb
-- lib/usps/support/models/.rubocop.yml
 - lib/usps/support/models/dynamo_db.rb
 - lib/usps/support/models/git_hub.rb
 - lib/usps/support/models/hq.rb
@@ -96,8 +93,8 @@ files:
 - lib/usps/support/models/hq/squadrons/squadron.rb
 - lib/usps/support/models/hq/squadrons/website.rb
 - lib/usps/support/models/toast.rb
+- lib/usps/support/railtie.rb
 - lib/usps/support/version.rb
-- sig/usps/support.rbs
 homepage: https://github.com/unitedstatespowersquadrons/usps-rails
 licenses: []
 metadata:

data/.ruby-version

@@ -1 +0,0 @@
-3.4.6

data/Gemfile.lock

@@ -1,241 +0,0 @@
-PATH
-  remote: .
-  specs:
-    usps-support (0.1.14)
-      sassc-rails
-      usps-imis-api (~> 0.10.4)
-      usps-jwt_auth (~> 1.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (8.0.4)
-      actionview (= 8.0.4)
-      activesupport (= 8.0.4)
-      nokogiri (>= 1.8.5)
-      rack (>= 2.2.4)
-      rack-session (>= 1.0.1)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-      useragent (~> 0.16)
-    actionview (8.0.4)
-      activesupport (= 8.0.4)
-      builder (~> 3.1)
-      erubi (~> 1.11)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    activesupport (8.0.4)
-      base64
-      benchmark (>= 0.3)
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.3.1)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      logger (>= 1.4.2)
-      minitest (>= 5.1)
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
-      uri (>= 0.13.1)
-    ast (2.4.3)
-    base64 (0.3.0)
-    benchmark (0.5.0)
-    bigdecimal (3.3.1)
-    builder (3.3.0)
-    colorize (1.1.0)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.4)
-    crass (1.0.6)
-    date (3.4.1)
-    diff-lcs (1.6.2)
-    docile (1.4.1)
-    drb (2.2.3)
-    erb (5.1.3)
-    erubi (1.13.1)
-    ffi (1.17.2-aarch64-linux-gnu)
-    ffi (1.17.2-aarch64-linux-musl)
-    ffi (1.17.2-arm-linux-gnu)
-    ffi (1.17.2-arm-linux-musl)
-    ffi (1.17.2-arm64-darwin)
-    ffi (1.17.2-x86_64-darwin)
-    ffi (1.17.2-x86_64-linux-gnu)
-    ffi (1.17.2-x86_64-linux-musl)
-    fileutils (1.7.3)
-    i18n (1.14.7)
-      concurrent-ruby (~> 1.0)
-    io-console (0.8.1)
-    irb (1.15.2)
-      pp (>= 0.6.0)
-      rdoc (>= 4.0.0)
-      reline (>= 0.4.2)
-    json (2.15.2)
-    jwt (3.1.2)
-      base64
-    language_server-protocol (3.17.0.5)
-    lint_roller (1.1.0)
-    logger (1.7.0)
-    loofah (2.24.1)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
-    minitest (5.26.0)
-    nokogiri (1.18.10-aarch64-linux-gnu)
-      racc (~> 1.4)
-    nokogiri (1.18.10-aarch64-linux-musl)
-      racc (~> 1.4)
-    nokogiri (1.18.10-arm-linux-gnu)
-      racc (~> 1.4)
-    nokogiri (1.18.10-arm-linux-musl)
-      racc (~> 1.4)
-    nokogiri (1.18.10-arm64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.18.10-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.18.10-x86_64-linux-gnu)
-      racc (~> 1.4)
-    nokogiri (1.18.10-x86_64-linux-musl)
-      racc (~> 1.4)
-    parallel (1.27.0)
-    parser (3.3.10.0)
-      ast (~> 2.4.1)
-      racc
-    pp (0.6.3)
-      prettyprint
-    prettyprint (0.2.0)
-    prism (1.6.0)
-    psych (5.2.6)
-      date
-      stringio
-    racc (1.8.1)
-    rack (3.2.3)
-    rack-session (2.1.1)
-      base64 (>= 0.1.0)
-      rack (>= 3.0.0)
-    rack-test (2.2.0)
-      rack (>= 1.3)
-    rackup (2.2.1)
-      rack (>= 3)
-    rails-dom-testing (2.3.0)
-      activesupport (>= 5.0.0)
-      minitest
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
-      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (8.0.4)
-      actionpack (= 8.0.4)
-      activesupport (= 8.0.4)
-      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.3.0)
-    rdoc (6.15.0)
-      erb
-      psych (>= 4.0.0)
-      tsort
-    regexp_parser (2.11.3)
-    reline (0.6.2)
-      io-console (~> 0.5)
-    rspec (3.13.2)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.6)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.5)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.6)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.6)
-    rubocop (1.81.6)
-      json (~> 2.3)
-      language_server-protocol (~> 3.17.0.2)
-      lint_roller (~> 1.1.0)
-      parallel (~> 1.10)
-      parser (>= 3.3.0.2)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.47.1, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.47.1)
-      parser (>= 3.3.7.2)
-      prism (~> 1.4)
-    rubocop-rake (0.7.1)
-      lint_roller (~> 1.1)
-      rubocop (>= 1.72.1)
-    rubocop-rspec (3.7.0)
-      lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
-    ruby-progressbar (1.13.0)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    sassc-rails (2.1.2)
-      railties (>= 4.0.0)
-      sassc (>= 2.0)
-      sprockets (> 3.0)
-      sprockets-rails
-      tilt
-    securerandom (0.4.1)
-    simplecov (0.22.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.2)
-    simplecov_json_formatter (0.1.4)
-    sprockets (4.2.2)
-      concurrent-ruby (~> 1.0)
-      logger
-      rack (>= 2.2.4, < 4)
-    sprockets-rails (3.5.2)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      sprockets (>= 3.0.0)
-    stringio (3.1.7)
-    thor (1.4.0)
-    tilt (2.6.1)
-    tsort (0.2.0)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (3.2.0)
-      unicode-emoji (~> 4.1)
-    unicode-emoji (4.1.0)
-    uri (1.0.4)
-    useragent (0.16.11)
-    usps-imis-api (0.10.4)
-      activesupport (~> 8.0)
-    usps-jwt_auth (1.0.0)
-      activesupport (~> 8.0)
-      colorize (~> 1.1)
-      fileutils (~> 1.7)
-      jwt (~> 3.1)
-    zeitwerk (2.7.3)
-
-PLATFORMS
-  aarch64-linux-gnu
-  aarch64-linux-musl
-  arm-linux-gnu
-  arm-linux-musl
-  arm64-darwin
-  x86_64-darwin
-  x86_64-linux-gnu
-  x86_64-linux-musl
-
-DEPENDENCIES
-  irb
-  rake (~> 13.0)
-  rspec (~> 3.0)
-  rubocop (~> 1.81)
-  rubocop-rake (~> 0.7)
-  rubocop-rspec (~> 3.7)
-  simplecov (~> 0.22)
-  usps-support!
-
-BUNDLED WITH
-   2.7.2

data/Rakefile

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-require 'rubocop/rake_task'
-
-RuboCop::RakeTask.new
-
-task default: %i[spec rubocop]

data/lib/usps/support/helpers/.rubocop.yml

@@ -1,18 +0,0 @@
-inherit_from: ../../../../.rubocop.yml
-
-Metrics/ClassLength:
-  Enabled: true
-  Max: 150
-Metrics/ModuleLength:
-  Max: 150
-Metrics/CyclomaticComplexity:
-  Enabled: true
-  Max: 15
-Metrics/PerceivedComplexity:
-  Max: 15
-Metrics/AbcSize:
-  Enabled: true
-  Max: 25
-Metrics/MethodLength:
-  Enabled: true
-  Max: 25

data/lib/usps/support/models/.rubocop.yml

@@ -1,18 +0,0 @@
-inherit_from: ../../../../.rubocop.yml
-
-Metrics/ClassLength:
-  Enabled: true
-  Max: 250
-Metrics/ModuleLength:
-  Max: 250
-Metrics/CyclomaticComplexity:
-  Enabled: true
-  Max: 15
-Metrics/PerceivedComplexity:
-  Max: 15
-Metrics/AbcSize:
-  Enabled: true
-  Max: 25
-Metrics/MethodLength:
-  Enabled: true
-  Max: 25

data/sig/usps/support.rbs

@@ -1,6 +0,0 @@
-module Usps
-  module Support
-    VERSION: String
-    # See the writing guide of rbs: https://github.com/ruby/rbs#guides
-  end
-end