hackathon_manager 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a51352083b4efe91bc92f29569313d4cae2411f1
-  data.tar.gz: 67421b84d0631aa2df21a2bf15dc83f7ba60c43c
+  metadata.gz: a1312a0a0c5155bb9132a067c2623c6676895220
+  data.tar.gz: f7f4e0060ed5bba8aafd8aa791da7ebdcc2c077c
 SHA512:
-  metadata.gz: 7c63629d0dd82b8c317f929e320b73884fe947a3ca517a36f9d68b4e817b490225ad8cbe170056633b75b867bf03da186478c15b834ee6ee58c571d90fe9b925
-  data.tar.gz: 4725f0733645437c9eaf9496f95de77ecbcd87cec56f880620fae19d49a187e9fd99d6d5f297dbd30242849e5694b6b94f7c53a64c718d98e247b61dce17e13e
+  metadata.gz: 86e4b003525db2df0e8a8856223b93981ce18e1436b57818e15b4c28626d6550dba5591b88b1aefbfd5bad412c9cd0f88e7bb3db69a8249ea9c32d75835806ea
+  data.tar.gz: dc52ba638ec4902a8cf658571be4857c6d026a4a11e0544eed07ecffb85977502867b719e5a033631286ef32dbed065f245018a754bab0615889066f030c28a1

data/app/helpers/hackathon_manager_helper.rb

@@ -41,4 +41,8 @@ module HackathonManagerHelper
       Rails.application.assets_manifest.assets[logical_path].present?
     end
   end
+
+  def collection_or_text(model_value, collection)
+    model_value.blank? || collection.include?(model_value) ? collection : nil
+  end
 end

data/app/models/message.rb

@@ -101,11 +101,17 @@ class Message < ApplicationRecord
     end
     # No flatten needed here since each map returns a single option
 
+    blazer_recipients = Blazer::Query.select(:id, :name).map do |query|
+      option.call("blazer::#{query.id}", query)
+    end
+    # No flatten needed here since each map returns a single option
+
     # Combine all recipients. push(*recipients) is the most efficient,
     # as it doesn't create a new array each time (concat() does)
     recipients = POSSIBLE_SIMPLE_RECIPIENTS.invert.to_a
     recipients.push(*bus_list_recipients)
     recipients.push(*school_recipients)
+    recipients.push(*blazer_recipients)
 
     # Add current recipients if not included
     self.recipients.each do |recipient|

data/app/models/message_recipient_query.rb

@@ -31,6 +31,9 @@ class MessageRecipientQuery
     when "school"
       model ||= School.find_by_id(id)
       model_name = "School"
+    when "blazer"
+      model ||= Blazer::Query.find_by_id(id)
+      model_name = "Blazer Query"
     else
       raise "Unknown recipient query type: #{type.inspect} (in message recipient query: #{query.inspect}"
     end
@@ -61,6 +64,8 @@ class MessageRecipientQuery
       "Bus List: #{model.name} (applied/not accepted)"
     when "school"
       "Confirmed or Accepted: #{model.name}"
+    when "blazer"
+      "Blazer Query: #{model.name}"
     else
       raise "Unknown recipient query type: #{recipient_query.type.inspect} (in message recipient query: #{r.inspect}"
     end

data/app/models/questionnaire.rb

@@ -67,6 +67,30 @@ class Questionnaire < ApplicationRecord
     "rsvp_denied"    => "RSVP Denied"
   }.freeze
 
+  # From My MLH's dropdown list.
+  # Should *not* validate against this list in case My MLH changes their options,
+  # as this would cause errors until a manual gem update
+  POSSIBLE_GENDERS = [
+    "Female",
+    "Male",
+    "Non-Binary",
+    "I prefer not to say",
+    "Other"
+  ].freeze
+
+  # From My MLH's dropdown list.
+  # Should *not* validate against this list in case My MLH changes their options,
+  # as this would cause errors until a manual gem update
+  POSSIBLE_LEVELS_OF_STUDY = [
+    "Elementary / Middle School / Primary School",
+    "High School / Secondary School",
+    "University (Undergraduate)",
+    "University (Master's / Doctoral)",
+    "Vocational / Code School",
+    "Not Currently a Student",
+    "Other"
+  ].freeze
+
   validates_inclusion_of :experience, in: POSSIBLE_EXPERIENCES
   validates_inclusion_of :interest, in: POSSIBLE_INTERESTS
   # validates_inclusion_of :school_id, :in => School.select(:id)

data/app/views/questionnaires/_form.html.haml

@@ -16,9 +16,9 @@
         = f.input :date_of_birth, start_year: Date.today.year - 5, end_year: Date.today.year - 90, order: [:month, :day, :year], input_html: { "data-validate" => "presence" }
 
         = f.input :school_id, as: :school_selection, input_html: { "data-validate" => "presence" }
-        = f.input :level_of_study, input_html: { "data-validate" => "presence" }, wrapper_html: { class: 'input--half' }
+        = f.input :level_of_study, collection: collection_or_text(@questionnaire.level_of_study, Questionnaire::POSSIBLE_LEVELS_OF_STUDY), include_blank: "(select one...)", input_html: { "data-validate" => "presence" }, wrapper_html: { class: 'input--half' }
         = f.input :major, input_html: { "data-validate" => "presence" }, wrapper_html: { class: 'input--half' }
-        = f.input :gender, input_html: { "data-validate" => "presence" }, wrapper_html: { class: 'input--half' }
+        = f.input :gender, collection: collection_or_text(@questionnaire.gender, Questionnaire::POSSIBLE_GENDERS), include_blank: "(select one...)", input_html: { "data-validate" => "presence" }, wrapper_html: { class: 'input--half' }
         = f.input :shirt_size, as: :select, collection: Questionnaire::POSSIBLE_SHIRT_SIZES, include_blank: "(select one...)", input_html: { "data-validate" => "presence" }, wrapper_html: { class: 'input--half' }
         = f.input :dietary_restrictions, as: :text, placeholder: "Allergies, medical assistance, etc.", label: "Health restrictions", wrapper_html: { class: 'input--half' }
         = f.input :special_needs, as: :text, placeholder: "Any special needs or requests", label: "Special needs", wrapper_html: { class: 'input--half' }

data/app/workers/bulk_message_worker.rb

@@ -74,6 +74,11 @@ class BulkMessageWorker
       Questionnaire.joins(:school).where("schools.bus_list_id = ? AND (acc_status != 'accepted' AND acc_status != 'rsvp_confirmed' AND acc_status != 'rsvp_denied')", model.id).pluck(:user_id)
     when "school"
       Questionnaire.where("school_id = ? AND (acc_status = 'rsvp_confirmed' OR acc_status = 'accepted')", model.id).pluck(:user_id)
+    when "blazer"
+      result = Blazer::RunStatement.new.perform(Blazer.data_sources[model.data_source], model.statement)
+      user_id_column = result.columns.index("user_id")
+      raise "Blazer query is missing required \"user_id\" column" unless user_id_column.present?
+      result.rows.map { |row| row[user_id_column] }
     else
       raise "Unknown recipient query type: #{recipient_query.type.inspect} (in message recipient query: #{type.inspect}"
     end

data/lib/hackathon_manager/version.rb

@@ -1,3 +1,3 @@
 module HackathonManager
-  VERSION = '0.6.5'.freeze
+  VERSION = '0.6.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackathon_manager
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Stuart Olivera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails