From c58686c0321032a858428485794995c7e7732e1e Mon Sep 17 00:00:00 2001 From: rebuilt Date: Mon, 12 Dec 2022 16:38:37 -0800 Subject: [PATCH] rename race and gender modules to avoid naming collision with race and gender classes --- .../analyze/graph/column/american_indian.rb | 26 ----------------- app/presenters/analyze/graph/column/asian.rb | 26 ----------------- app/presenters/analyze/graph/column/black.rb | 26 ----------------- .../{gender => gender_column}/female.rb | 4 +-- .../column/{gender => gender_column}/male.rb | 4 +-- .../{gender => gender_column}/non_binary.rb | 4 +-- .../score_for_gender.rb | 2 +- .../{gender => gender_column}/unknown.rb | 4 +-- .../analyze/graph/column/hispanic.rb | 26 ----------------- .../analyze/graph/column/middle_eastern.rb | 27 ----------------- .../analyze/graph/column/multiracial.rb | 26 ----------------- .../column/race_column/american_indian.rb | 28 ++++++++++++++++++ .../analyze/graph/column/race_column/asian.rb | 28 ++++++++++++++++++ .../analyze/graph/column/race_column/black.rb | 28 ++++++++++++++++++ .../graph/column/race_column/hispanic.rb | 28 ++++++++++++++++++ .../column/race_column/middle_eastern.rb | 29 +++++++++++++++++++ .../graph/column/race_column/multiracial.rb | 28 ++++++++++++++++++ .../graph/column/race_column/unknown.rb | 28 ++++++++++++++++++ .../analyze/graph/column/race_column/white.rb | 28 ++++++++++++++++++ .../analyze/graph/column/unknown.rb | 26 ----------------- app/presenters/analyze/graph/column/white.rb | 26 ----------------- .../analyze/graph/students_by_gender.rb | 10 +++---- .../analyze/graph/students_by_race.rb | 16 +++++----- .../graph/column/gender/female_spec.rb | 2 +- .../analyze/graph/students_by_race_spec.rb | 1 + 25 files changed, 249 insertions(+), 232 deletions(-) delete mode 100644 app/presenters/analyze/graph/column/american_indian.rb delete mode 100644 app/presenters/analyze/graph/column/asian.rb delete mode 100644 app/presenters/analyze/graph/column/black.rb rename app/presenters/analyze/graph/column/{gender => gender_column}/female.rb (84%) rename app/presenters/analyze/graph/column/{gender => gender_column}/male.rb (84%) rename app/presenters/analyze/graph/column/{gender => gender_column}/non_binary.rb (84%) rename app/presenters/analyze/graph/column/{gender => gender_column}/score_for_gender.rb (98%) rename app/presenters/analyze/graph/column/{gender => gender_column}/unknown.rb (84%) delete mode 100644 app/presenters/analyze/graph/column/hispanic.rb delete mode 100644 app/presenters/analyze/graph/column/middle_eastern.rb delete mode 100644 app/presenters/analyze/graph/column/multiracial.rb create mode 100644 app/presenters/analyze/graph/column/race_column/american_indian.rb create mode 100644 app/presenters/analyze/graph/column/race_column/asian.rb create mode 100644 app/presenters/analyze/graph/column/race_column/black.rb create mode 100644 app/presenters/analyze/graph/column/race_column/hispanic.rb create mode 100644 app/presenters/analyze/graph/column/race_column/middle_eastern.rb create mode 100644 app/presenters/analyze/graph/column/race_column/multiracial.rb create mode 100644 app/presenters/analyze/graph/column/race_column/unknown.rb create mode 100644 app/presenters/analyze/graph/column/race_column/white.rb delete mode 100644 app/presenters/analyze/graph/column/unknown.rb delete mode 100644 app/presenters/analyze/graph/column/white.rb diff --git a/app/presenters/analyze/graph/column/american_indian.rb b/app/presenters/analyze/graph/column/american_indian.rb deleted file mode 100644 index 4ca2121c..00000000 --- a/app/presenters/analyze/graph/column/american_indian.rb +++ /dev/null @@ -1,26 +0,0 @@ -# frozen_string_literal: true - -module Analyze - module Graph - module Column - class AmericanIndian < GroupedBarColumnPresenter - include Analyze::Graph::Column::ScoreForRace - def label - 'American Indian' - end - - def show_irrelevancy_message? - false - end - - def show_insufficient_data_message? - false - end - - def race - Race.find_by_qualtrics_code 1 - end - end - end - end -end diff --git a/app/presenters/analyze/graph/column/asian.rb b/app/presenters/analyze/graph/column/asian.rb deleted file mode 100644 index b963cedf..00000000 --- a/app/presenters/analyze/graph/column/asian.rb +++ /dev/null @@ -1,26 +0,0 @@ -# frozen_string_literal: true - -module Analyze - module Graph - module Column - class Asian < GroupedBarColumnPresenter - include Analyze::Graph::Column::ScoreForRace - def label - 'Asian' - end - - def show_irrelevancy_message? - false - end - - def show_insufficient_data_message? - false - end - - def race - Race.find_by_qualtrics_code 2 - end - end - end - end -end diff --git a/app/presenters/analyze/graph/column/black.rb b/app/presenters/analyze/graph/column/black.rb deleted file mode 100644 index 02d65420..00000000 --- a/app/presenters/analyze/graph/column/black.rb +++ /dev/null @@ -1,26 +0,0 @@ -# frozen_string_literal: true - -module Analyze - module Graph - module Column - class Black < GroupedBarColumnPresenter - include Analyze::Graph::Column::ScoreForRace - def label - 'Black' - end - - def show_irrelevancy_message? - false - end - - def show_insufficient_data_message? - false - end - - def race - Race.find_by_qualtrics_code 3 - end - end - end - end -end diff --git a/app/presenters/analyze/graph/column/gender/female.rb b/app/presenters/analyze/graph/column/gender_column/female.rb similarity index 84% rename from app/presenters/analyze/graph/column/gender/female.rb rename to app/presenters/analyze/graph/column/gender_column/female.rb index fdcb0b25..a4ea0af6 100644 --- a/app/presenters/analyze/graph/column/gender/female.rb +++ b/app/presenters/analyze/graph/column/gender_column/female.rb @@ -3,9 +3,9 @@ module Analyze module Graph module Column - module Gender + module GenderColumn class Female < GroupedBarColumnPresenter - include Analyze::Graph::Column::Gender::ScoreForGender + include Analyze::Graph::Column::GenderColumn::ScoreForGender def label 'Female' end diff --git a/app/presenters/analyze/graph/column/gender/male.rb b/app/presenters/analyze/graph/column/gender_column/male.rb similarity index 84% rename from app/presenters/analyze/graph/column/gender/male.rb rename to app/presenters/analyze/graph/column/gender_column/male.rb index 7a3eba06..f8403e6c 100644 --- a/app/presenters/analyze/graph/column/gender/male.rb +++ b/app/presenters/analyze/graph/column/gender_column/male.rb @@ -3,9 +3,9 @@ module Analyze module Graph module Column - module Gender + module GenderColumn class Male < GroupedBarColumnPresenter - include Analyze::Graph::Column::Gender::ScoreForGender + include Analyze::Graph::Column::GenderColumn::ScoreForGender def label 'Male' end diff --git a/app/presenters/analyze/graph/column/gender/non_binary.rb b/app/presenters/analyze/graph/column/gender_column/non_binary.rb similarity index 84% rename from app/presenters/analyze/graph/column/gender/non_binary.rb rename to app/presenters/analyze/graph/column/gender_column/non_binary.rb index 25caab34..61778768 100644 --- a/app/presenters/analyze/graph/column/gender/non_binary.rb +++ b/app/presenters/analyze/graph/column/gender_column/non_binary.rb @@ -3,9 +3,9 @@ module Analyze module Graph module Column - module Gender + module GenderColumn class NonBinary < GroupedBarColumnPresenter - include Analyze::Graph::Column::Gender::ScoreForGender + include Analyze::Graph::Column::GenderColumn::ScoreForGender def label 'Non-Binary' end diff --git a/app/presenters/analyze/graph/column/gender/score_for_gender.rb b/app/presenters/analyze/graph/column/gender_column/score_for_gender.rb similarity index 98% rename from app/presenters/analyze/graph/column/gender/score_for_gender.rb rename to app/presenters/analyze/graph/column/gender_column/score_for_gender.rb index 4e1cad38..d5e47e6e 100644 --- a/app/presenters/analyze/graph/column/gender/score_for_gender.rb +++ b/app/presenters/analyze/graph/column/gender_column/score_for_gender.rb @@ -1,7 +1,7 @@ module Analyze module Graph module Column - module Gender + module GenderColumn module ScoreForGender def score(year_index) academic_year = academic_years[year_index] diff --git a/app/presenters/analyze/graph/column/gender/unknown.rb b/app/presenters/analyze/graph/column/gender_column/unknown.rb similarity index 84% rename from app/presenters/analyze/graph/column/gender/unknown.rb rename to app/presenters/analyze/graph/column/gender_column/unknown.rb index b0adbf8c..325b58a9 100644 --- a/app/presenters/analyze/graph/column/gender/unknown.rb +++ b/app/presenters/analyze/graph/column/gender_column/unknown.rb @@ -3,9 +3,9 @@ module Analyze module Graph module Column - module Gender + module GenderColumn class Unknown < GroupedBarColumnPresenter - include Analyze::Graph::Column::Gender::ScoreForGender + include Analyze::Graph::Column::GenderColumn::ScoreForGender def label 'Unknown' end diff --git a/app/presenters/analyze/graph/column/hispanic.rb b/app/presenters/analyze/graph/column/hispanic.rb deleted file mode 100644 index c365db1e..00000000 --- a/app/presenters/analyze/graph/column/hispanic.rb +++ /dev/null @@ -1,26 +0,0 @@ -# frozen_string_literal: true - -module Analyze - module Graph - module Column - class Hispanic < GroupedBarColumnPresenter - include Analyze::Graph::Column::ScoreForRace - def label - 'Hispanic' - end - - def show_irrelevancy_message? - false - end - - def show_insufficient_data_message? - false - end - - def race - Race.find_by_qualtrics_code 4 - end - end - end - end -end diff --git a/app/presenters/analyze/graph/column/middle_eastern.rb b/app/presenters/analyze/graph/column/middle_eastern.rb deleted file mode 100644 index 6f918c22..00000000 --- a/app/presenters/analyze/graph/column/middle_eastern.rb +++ /dev/null @@ -1,27 +0,0 @@ -# frozen_string_literal: true - -module Analyze - module Graph - module Column - class MiddleEastern < GroupedBarColumnPresenter - include Analyze::Graph::Column::ScoreForRace - - def label - 'Middle Eastern' - end - - def show_irrelevancy_message? - false - end - - def show_insufficient_data_message? - false - end - - def race - Race.find_by_qualtrics_code 8 - end - end - end - end -end diff --git a/app/presenters/analyze/graph/column/multiracial.rb b/app/presenters/analyze/graph/column/multiracial.rb deleted file mode 100644 index 87fa7802..00000000 --- a/app/presenters/analyze/graph/column/multiracial.rb +++ /dev/null @@ -1,26 +0,0 @@ -# frozen_string_literal: true - -module Analyze - module Graph - module Column - class Multiracial < GroupedBarColumnPresenter - include Analyze::Graph::Column::ScoreForRace - def label - 'Multiracial' - end - - def show_irrelevancy_message? - false - end - - def show_insufficient_data_message? - false - end - - def race - Race.find_by_qualtrics_code 100 - end - end - end - end -end diff --git a/app/presenters/analyze/graph/column/race_column/american_indian.rb b/app/presenters/analyze/graph/column/race_column/american_indian.rb new file mode 100644 index 00000000..7c0a70c2 --- /dev/null +++ b/app/presenters/analyze/graph/column/race_column/american_indian.rb @@ -0,0 +1,28 @@ +# frozen_string_literal: true + +module Analyze + module Graph + module Column + module RaceColumn + class AmericanIndian < GroupedBarColumnPresenter + include Analyze::Graph::Column::ScoreForRace + def label + 'American Indian' + end + + def show_irrelevancy_message? + false + end + + def show_insufficient_data_message? + false + end + + def race + Race.find_by_qualtrics_code 1 + end + end + end + end + end +end diff --git a/app/presenters/analyze/graph/column/race_column/asian.rb b/app/presenters/analyze/graph/column/race_column/asian.rb new file mode 100644 index 00000000..dc289d27 --- /dev/null +++ b/app/presenters/analyze/graph/column/race_column/asian.rb @@ -0,0 +1,28 @@ +# frozen_string_literal: true + +module Analyze + module Graph + module Column + module RaceColumn + class Asian < GroupedBarColumnPresenter + include Analyze::Graph::Column::ScoreForRace + def label + 'Asian' + end + + def show_irrelevancy_message? + false + end + + def show_insufficient_data_message? + false + end + + def race + Race.find_by_qualtrics_code 2 + end + end + end + end + end +end diff --git a/app/presenters/analyze/graph/column/race_column/black.rb b/app/presenters/analyze/graph/column/race_column/black.rb new file mode 100644 index 00000000..4b707586 --- /dev/null +++ b/app/presenters/analyze/graph/column/race_column/black.rb @@ -0,0 +1,28 @@ +# frozen_string_literal: true + +module Analyze + module Graph + module Column + module RaceColumn + class Black < GroupedBarColumnPresenter + include Analyze::Graph::Column::ScoreForRace + def label + 'Black' + end + + def show_irrelevancy_message? + false + end + + def show_insufficient_data_message? + false + end + + def race + Race.find_by_qualtrics_code 3 + end + end + end + end + end +end diff --git a/app/presenters/analyze/graph/column/race_column/hispanic.rb b/app/presenters/analyze/graph/column/race_column/hispanic.rb new file mode 100644 index 00000000..a4fb233f --- /dev/null +++ b/app/presenters/analyze/graph/column/race_column/hispanic.rb @@ -0,0 +1,28 @@ +# frozen_string_literal: true + +module Analyze + module Graph + module Column + module RaceColumn + class Hispanic < GroupedBarColumnPresenter + include Analyze::Graph::Column::ScoreForRace + def label + 'Hispanic' + end + + def show_irrelevancy_message? + false + end + + def show_insufficient_data_message? + false + end + + def race + Race.find_by_qualtrics_code 4 + end + end + end + end + end +end diff --git a/app/presenters/analyze/graph/column/race_column/middle_eastern.rb b/app/presenters/analyze/graph/column/race_column/middle_eastern.rb new file mode 100644 index 00000000..54cfc08b --- /dev/null +++ b/app/presenters/analyze/graph/column/race_column/middle_eastern.rb @@ -0,0 +1,29 @@ +# frozen_string_literal: true + +module Analyze + module Graph + module Column + module RaceColumn + class MiddleEastern < GroupedBarColumnPresenter + include Analyze::Graph::Column::ScoreForRace + + def label + 'Middle Eastern' + end + + def show_irrelevancy_message? + false + end + + def show_insufficient_data_message? + false + end + + def race + Race.find_by_qualtrics_code 8 + end + end + end + end + end +end diff --git a/app/presenters/analyze/graph/column/race_column/multiracial.rb b/app/presenters/analyze/graph/column/race_column/multiracial.rb new file mode 100644 index 00000000..f33f7641 --- /dev/null +++ b/app/presenters/analyze/graph/column/race_column/multiracial.rb @@ -0,0 +1,28 @@ +# frozen_string_literal: true + +module Analyze + module Graph + module Column + module RaceColumn + class Multiracial < GroupedBarColumnPresenter + include Analyze::Graph::Column::ScoreForRace + def label + 'Multiracial' + end + + def show_irrelevancy_message? + false + end + + def show_insufficient_data_message? + false + end + + def race + Race.find_by_qualtrics_code 100 + end + end + end + end + end +end diff --git a/app/presenters/analyze/graph/column/race_column/unknown.rb b/app/presenters/analyze/graph/column/race_column/unknown.rb new file mode 100644 index 00000000..2670b573 --- /dev/null +++ b/app/presenters/analyze/graph/column/race_column/unknown.rb @@ -0,0 +1,28 @@ +# frozen_string_literal: true + +module Analyze + module Graph + module Column + module RaceColumn + class Unknown < GroupedBarColumnPresenter + include Analyze::Graph::Column::ScoreForRace + def label + 'Race/Ethnicity Not-Listed' + end + + def show_irrelevancy_message? + false + end + + def show_insufficient_data_message? + false + end + + def race + Race.find_by_qualtrics_code 99 + end + end + end + end + end +end diff --git a/app/presenters/analyze/graph/column/race_column/white.rb b/app/presenters/analyze/graph/column/race_column/white.rb new file mode 100644 index 00000000..143d5287 --- /dev/null +++ b/app/presenters/analyze/graph/column/race_column/white.rb @@ -0,0 +1,28 @@ +# frozen_string_literal: true + +module Analyze + module Graph + module Column + module RaceColumn + class White < GroupedBarColumnPresenter + include Analyze::Graph::Column::ScoreForRace + def label + 'White' + end + + def show_irrelevancy_message? + false + end + + def show_insufficient_data_message? + false + end + + def race + Race.find_by_qualtrics_code 5 + end + end + end + end + end +end diff --git a/app/presenters/analyze/graph/column/unknown.rb b/app/presenters/analyze/graph/column/unknown.rb deleted file mode 100644 index 46d6cdd1..00000000 --- a/app/presenters/analyze/graph/column/unknown.rb +++ /dev/null @@ -1,26 +0,0 @@ -# frozen_string_literal: true - -module Analyze - module Graph - module Column - class Unknown < GroupedBarColumnPresenter - include Analyze::Graph::Column::ScoreForRace - def label - 'Race/Ethnicity Not-Listed' - end - - def show_irrelevancy_message? - false - end - - def show_insufficient_data_message? - false - end - - def race - Race.find_by_qualtrics_code 99 - end - end - end - end -end diff --git a/app/presenters/analyze/graph/column/white.rb b/app/presenters/analyze/graph/column/white.rb deleted file mode 100644 index d07bff72..00000000 --- a/app/presenters/analyze/graph/column/white.rb +++ /dev/null @@ -1,26 +0,0 @@ -# frozen_string_literal: true - -module Analyze - module Graph - module Column - class White < GroupedBarColumnPresenter - include Analyze::Graph::Column::ScoreForRace - def label - 'White' - end - - def show_irrelevancy_message? - false - end - - def show_insufficient_data_message? - false - end - - def race - Race.find_by_qualtrics_code 5 - end - end - end - end -end diff --git a/app/presenters/analyze/graph/students_by_gender.rb b/app/presenters/analyze/graph/students_by_gender.rb index aef0e794..6e12cdc8 100644 --- a/app/presenters/analyze/graph/students_by_gender.rb +++ b/app/presenters/analyze/graph/students_by_gender.rb @@ -1,7 +1,7 @@ module Analyze module Graph class StudentsByGender - include Analyze::Graph::Column::Gender + include Analyze::Graph::Column::GenderColumn attr_reader :genders def initialize(genders:) @@ -32,10 +32,10 @@ module Analyze end CFR = { - 1 => Analyze::Graph::Column::Gender::Female, - 2 => Analyze::Graph::Column::Gender::Male, - 4 => Analyze::Graph::Column::Gender::NonBinary, - 99 => Analyze::Graph::Column::Gender::Unknown + 1 => Analyze::Graph::Column::GenderColumn::Female, + 2 => Analyze::Graph::Column::GenderColumn::Male, + 4 => Analyze::Graph::Column::GenderColumn::NonBinary, + 99 => Analyze::Graph::Column::GenderColumn::Unknown }.freeze end end diff --git a/app/presenters/analyze/graph/students_by_race.rb b/app/presenters/analyze/graph/students_by_race.rb index 7f077741..0c4009ae 100644 --- a/app/presenters/analyze/graph/students_by_race.rb +++ b/app/presenters/analyze/graph/students_by_race.rb @@ -31,14 +31,14 @@ module Analyze end CFR = { - '1' => Analyze::Graph::Column::AmericanIndian, - '2' => Analyze::Graph::Column::Asian, - '3' => Analyze::Graph::Column::Black, - '4' => Analyze::Graph::Column::Hispanic, - '5' => Analyze::Graph::Column::White, - '8' => Analyze::Graph::Column::MiddleEastern, - '99' => Analyze::Graph::Column::Unknown, - '100' => Analyze::Graph::Column::Multiracial + '1' => Analyze::Graph::Column::RaceColumn::AmericanIndian, + '2' => Analyze::Graph::Column::RaceColumn::Asian, + '3' => Analyze::Graph::Column::RaceColumn::Black, + '4' => Analyze::Graph::Column::RaceColumn::Hispanic, + '5' => Analyze::Graph::Column::RaceColumn::White, + '8' => Analyze::Graph::Column::RaceColumn::MiddleEastern, + '99' => Analyze::Graph::Column::RaceColumn::Unknown, + '100' => Analyze::Graph::Column::RaceColumn::Multiracial }.freeze end end diff --git a/spec/presenters/analyze/graph/column/gender/female_spec.rb b/spec/presenters/analyze/graph/column/gender/female_spec.rb index ed05c6de..a9dd8eed 100644 --- a/spec/presenters/analyze/graph/column/gender/female_spec.rb +++ b/spec/presenters/analyze/graph/column/gender/female_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' include Analyze::Graph -include Analyze::Graph::Column::Gender +include Analyze::Graph::Column::GenderColumn describe StudentsByRace do let(:female) { create(:gender, qualtrics_code: 1, designation: 'Female') } let(:school) { create(:school) } diff --git a/spec/presenters/analyze/graph/students_by_race_spec.rb b/spec/presenters/analyze/graph/students_by_race_spec.rb index a3697c27..5f78582c 100644 --- a/spec/presenters/analyze/graph/students_by_race_spec.rb +++ b/spec/presenters/analyze/graph/students_by_race_spec.rb @@ -1,6 +1,7 @@ require 'rails_helper' include Analyze::Graph include Analyze::Graph::Column +include Analyze::Graph::Column::RaceColumn describe StudentsByRace do let(:american_indian) { create(:race, qualtrics_code: 1) } let(:asian) { create(:race, qualtrics_code: 2) }