extract canvas sort gem

Nick Cloward · simonista · commit 4748aba483c6 · 2014-04-04T14:53:09.000Z
fixes: CNVS-11890 Test Plan: Canvas Should not be broken, test requests that use the SortLast and SortFirst class. One is account settings. Make sure its sorted correctly. Another is submissions_controller show method and make sure the visible rubric assesments are sorted correctly. Change-Id: I75a61475a928e069d6566fcc51305a6c442ec5a0 Reviewed-on: https://gerrit.instructure.com/32014 Tested-by: Jenkins <jenkins@instructure.com> Reviewed-by: Simon Williams <simon@instructure.com> Product-Review: Simon Williams <simon@instructure.com> QA-Review: Simon Williams <simon@instructure.com>
diff --git a/Gemfile.d/other_stuff.rb b/Gemfile.d/other_stuff.rb
@@ -121,6 +121,7 @@
 gem 'canvas_http', :path => 'gems/canvas_http'
 gem 'canvas_mimetype_fu', :path => 'gems/canvas_mimetype_fu'
 gem 'canvas_sanitize', :path => 'gems/canvas_sanitize'
+gem 'canvas_sort', :path => 'gems/canvas_sort'
 gem 'canvas_statsd', :path => 'gems/canvas_statsd'
 gem 'canvas_stringex', :path => 'gems/canvas_stringex'
 gem 'canvas_uuid', :path => 'gems/canvas_uuid'
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
@@ -484,7 +484,7 @@ def settings
       @account.available_account_roles.each_with_index do |type, idx|
         order_hash[type] = idx
       end
-      @account_users = @account_users.select(&:user).sort_by{|au| [order_hash[au.membership_type] || SortLast, Canvas::ICU.collation_key(au.user.sortable_name)] }
+      @account_users = @account_users.select(&:user).sort_by{|au| [order_hash[au.membership_type] || CanvasSort::Last, Canvas::ICU.collation_key(au.user.sortable_name)] }
       @alerts = @account.alerts
       @role_types = RoleOverride.account_membership_types(@account)
       @enrollment_types = RoleOverride.enrollment_types
diff --git a/app/controllers/calendar_events_api_controller.rb b/app/controllers/calendar_events_api_controller.rb
@@ -556,7 +556,7 @@ def public_feed
       end
     end
 
-    @events = @events.sort_by { |e| [e.start_at || SortLast, Canvas::ICU.collation_key(e.title)] }
+    @events = @events.sort_by { |e| [e.start_at || CanvasSort::Last, Canvas::ICU.collation_key(e.title)] }
 
     @contexts.each do |context|
       log_asset_access("calendar_feed:#{context.asset_string}", "calendar", 'other')
diff --git a/app/controllers/communication_channels_controller.rb b/app/controllers/communication_channels_controller.rb
@@ -257,7 +257,7 @@ def confirm
           @merge_opportunities.last.last.sort! { |a, b| Canvas::ICU.compare(a.account.name, b.account.name) }
         end
       end
-      @merge_opportunities.sort_by! { |a| [a.first == @current_user ? SortFirst : SortLast, Canvas::ICU.collation_key(a.first.name)] }
+      @merge_opportunities.sort_by! { |a| [a.first == @current_user ? CanvasSort::First : CanvasSort::Last, Canvas::ICU.collation_key(a.first.name)] }
 
       js_env :PASSWORD_POLICY => @domain_root_account.password_policy
 
diff --git a/app/controllers/content_migrations_controller.rb b/app/controllers/content_migrations_controller.rb
@@ -150,7 +150,7 @@ def index
     if api_request?
       render :json => content_migration_json_hash
     else
-      @plugins = ContentMigration.migration_plugins(true).sort_by {|p| [p.metadata(:sort_order) || SortLast, p.metadata(:select_text)]}
+      @plugins = ContentMigration.migration_plugins(true).sort_by {|p| [p.metadata(:sort_order) || CanvasSort::Last, p.metadata(:select_text)]}
 
       options = @plugins.map{|p| {:label => p.metadata(:select_text), :id => p.id}}
 
diff --git a/app/controllers/context_controller.rb b/app/controllers/context_controller.rb
@@ -331,7 +331,7 @@ def roster_user_services
       @users.each_with_index{|u, i| @users_hash[u.id] = u; @users_order_hash[u.id] = i }
       @current_user_services = {}
       @current_user.user_services.each{|s| @current_user_services[s.service] = s }
-      @services = UserService.for_user(@users.except(:select, :order)).sort_by{|s| @users_order_hash[s.user_id] || SortLast}
+      @services = UserService.for_user(@users.except(:select, :order)).sort_by{|s| @users_order_hash[s.user_id] || CanvasSort::Last}
       @services = @services.select{|service|
         !UserService.configured_service?(service.service) || feature_and_service_enabled?(service.service.to_sym)
       }
diff --git a/app/controllers/question_banks_controller.rb b/app/controllers/question_banks_controller.rb
@@ -32,7 +32,7 @@ def index
         @question_banks += @context.inherited_assessment_question_banks.active
       end
       @question_banks = @question_banks.select{|b| b.grants_right?(@current_user, nil, :manage) } if params[:managed] == '1'
-      @question_banks = Canvas::ICU.collate_by(@question_banks.uniq) { |b| b.title || SortLast }
+      @question_banks = Canvas::ICU.collate_by(@question_banks.uniq) { |b| b.title || CanvasSort::Last }
       respond_to do |format|
         format.html
         format.json { render :json => @question_banks.map{ |b| b.as_json(methods: [:cached_context_short_name, :assessment_question_count]) }}
diff --git a/app/controllers/quizzes/quizzes_controller.rb b/app/controllers/quizzes/quizzes_controller.rb
@@ -39,7 +39,7 @@ def index
         redirect_to fabulous_quizzes_course_quizzes_path
       end
       return unless tab_enabled?(@context.class::TAB_QUIZZES)
-      @quizzes = @context.quizzes.active.include_assignment.sort_by{|q| [(q.assignment ? q.assignment.due_at : q.lock_at) || SortLast, Canvas::ICU.collation_key(q.title || SortFirst)]}
+      @quizzes = @context.quizzes.active.include_assignment.sort_by{|q| [(q.assignment ? q.assignment.due_at : q.lock_at) || CanvasSort::Last, Canvas::ICU.collation_key(q.title || CanvasSort::First)]}
 
       # draft state - only filter by available? for students
       if @context.feature_enabled?(:draft_state)
diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb
@@ -235,7 +235,7 @@ def show
     if @assignment.muted? && !@submission.grants_right?(@current_user, :read_grade)
       @visible_rubric_assessments = []
     else
-      @visible_rubric_assessments = @submission.rubric_assessments.select{|a| a.grants_rights?(@current_user, session, :read)[:read]}.sort_by{|a| [a.assessment_type == 'grading' ? SortFirst : SortLast, Canvas::ICU.collation_key(a.assessor_name)] }
+      @visible_rubric_assessments = @submission.rubric_assessments.select{|a| a.grants_rights?(@current_user, session, :read)[:read]}.sort_by{|a| [a.assessment_type == 'grading' ? CanvasSort::First : CanvasSort::Last, Canvas::ICU.collation_key(a.assessor_name)] }
     end
 
     @assessment_request = @submission.assessment_requests.find_by_assessor_id(@current_user.id) rescue nil
diff --git a/app/models/assignment.rb b/app/models/assignment.rb
@@ -1298,7 +1298,7 @@ def representatives(user)
 
   def visible_rubric_assessments_for(user)
     if self.rubric_association
-      self.rubric_association.rubric_assessments.select{|a| a.grants_rights?(user, :read)[:read]}.sort_by{|a| [a.assessment_type == 'grading' ? SortFirst : SortLast, Canvas::ICU.collation_key(a.assessor_name)] }
+      self.rubric_association.rubric_assessments.select{|a| a.grants_rights?(user, :read)[:read]}.sort_by{|a| [a.assessment_type == 'grading' ? CanvasSort::First : CanvasSort::Last, Canvas::ICU.collation_key(a.assessor_name)] }
     end
   end
 
@@ -1396,7 +1396,7 @@ def assign_peer_reviews
       }.sort_by { |c|
         [
           # prefer those who still need more reviews done.
-          assessment_request_counts[c.id] < self.peer_review_count ? SortFirst : SortLast,
+          assessment_request_counts[c.id] < self.peer_review_count ? CanvasSort::First : CanvasSort::Last,
           # then prefer those who are assigned fewer reviews at this point --
           # this helps avoid loops where everybody is reviewing those who are
           # reviewing them, leaving the final assignee out in the cold.
@@ -1796,7 +1796,7 @@ def <=>(comparable)
 
   def sort_key
     # undated assignments go last
-    [due_at || SortLast, Canvas::ICU.collation_key(title)]
+    [due_at || CanvasSort::Last, Canvas::ICU.collation_key(title)]
   end
 
   def special_class; nil; end
diff --git a/app/models/context.rb b/app/models/context.rb
@@ -117,7 +117,7 @@ def add_aggregate_entries(entries, feed)
 
   def sorted_rubrics(user, context)
     associations = RubricAssociation.bookmarked.for_context_codes(context.asset_string).include_rubric
-    Canvas::ICU.collate_by(associations.to_a.uniq(&:rubric_id).select{|r| r.rubric }) { |r| r.rubric.title || SortLast }
+    Canvas::ICU.collate_by(associations.to_a.uniq(&:rubric_id).select{|r| r.rubric }) { |r| r.rubric.title || CanvasSort::Last }
   end
 
   def rubric_contexts(user)
@@ -140,7 +140,7 @@ def rubric_contexts(user)
         :name => context_name
       }
     end
-    contexts.sort_by{|c| codes_order[c[:context_code]] || SortLast }
+    contexts.sort_by{|c| codes_order[c[:context_code]] || CanvasSort::Last }
   end
 
   def active_record_types
diff --git a/app/models/context_external_tool.rb b/app/models/context_external_tool.rb
@@ -460,7 +460,7 @@ def self.find_external_tool(url, context, preferred_tool_id=nil)
       return preferred_tool
     end
 
-    sorted_external_tools = contexts.collect{|context| context.context_external_tools.active.sort_by{|t| [t.precedence, t.id == preferred_tool_id ? SortFirst : SortLast] }}.flatten(1)
+    sorted_external_tools = contexts.collect{|context| context.context_external_tools.active.sort_by{|t| [t.precedence, t.id == preferred_tool_id ? CanvasSort::First : CanvasSort::Last] }}.flatten(1)
 
     res = sorted_external_tools.detect{|tool| tool.url && tool.matches_url?(url) }
     return res if res
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
@@ -730,7 +730,7 @@ def self.preload_participants(conversations)
     if shards.length > 1
       participants.each do |key, value|
         participants[key] = value.uniq(&:id).sort_by do |user|
-          [user.last_authored_at ? -user.last_authored_at.to_f : SortLast, Canvas::ICU.collation_key(user.short_name || user.name)]
+          [user.last_authored_at ? -user.last_authored_at.to_f : CanvasSort::Last, Canvas::ICU.collation_key(user.short_name || user.name)]
         end
       end
     end
diff --git a/app/models/learning_outcome.rb b/app/models/learning_outcome.rb
@@ -74,7 +74,7 @@ def reorder_alignments(context, order)
     order_hash = {}
     order.each_with_index{|o, i| order_hash[o.to_i] = i; order_hash[o] = i }
     tags = self.alignments.find_all_by_context_id_and_context_type_and_tag_type(context.id, context.class.to_s, 'learning_outcome')
-    tags = tags.sort_by{|t| order_hash[t.id] || order_hash[t.content_asset_string] || SortLast }
+    tags = tags.sort_by{|t| order_hash[t.id] || order_hash[t.content_asset_string] || CanvasSort::Last }
     updates = []
     tags.each_with_index do |tag, idx|
       tag.position = idx + 1
diff --git a/app/models/message.rb b/app/models/message.rb
@@ -482,7 +482,7 @@ def self.dashboard_messages(messages)
     end
 
     # not sure what this is even doing?
-    message_types.to_a.sort_by { |m| m[0] == 'Other' ? SortLast : m[0] }
+    message_types.to_a.sort_by { |m| m[0] == 'Other' ? CanvasSort::Last : m[0] }
   end
 
   # Public: Format and return the body for this message.
diff --git a/app/models/notification.rb b/app/models/notification.rb
@@ -174,7 +174,7 @@ def self.dashboard_categories(user = nil)
         res << n if n.category && n.dashboard?
       end
     end
-    res.sort_by{|n| n.category == "Other" ? SortLast : n.category }
+    res.sort_by{|n| n.category == "Other" ? CanvasSort::Last : n.category }
   end
 
   # Return a hash with information for a related user option if one exists.
diff --git a/app/models/quizzes/quiz.rb b/app/models/quizzes/quiz.rb
@@ -485,7 +485,7 @@ def root_entries(force_check=false)
     result = []
     result.concat self.active_quiz_questions_without_group
     result.concat self.quiz_groups
-    result = result.sort_by { |e| e.position || ::SortLast }.map do |e|
+    result = result.sort_by { |e| e.position || ::CanvasSort::Last }.map do |e|
       res = nil
       if e.is_a? Quizzes::QuizQuestion
         res = e.data
@@ -496,7 +496,7 @@ def root_entries(force_check=false)
           data[:assessment_question_bank_id] = e.assessment_question_bank_id
           data[:questions] = []
         else
-          data[:questions] = e.quiz_questions.active.sort_by { |q| q.position || ::SortLast }.map(&:data)
+          data[:questions] = e.quiz_questions.active.sort_by { |q| q.position || ::CanvasSort::Last }.map(&:data)
         end
         data[:actual_pick_count] = e.actual_pick_count
         res = data
@@ -539,7 +539,7 @@ def stored_questions(hashes=nil)
 
       if val[:answers]
         val[:answers] = prepare_answers(val)
-        val[:matches] = val[:matches].sort_by { |m| m[:text] || ::SortFirst } if val[:matches]
+        val[:matches] = val[:matches].sort_by { |m| m[:text] || ::CanvasSort::First } if val[:matches]
       elsif val[:questions] # It's a Quizzes::QuizGroup
         if val[:assessment_question_bank_id]
           # It points to a question bank
@@ -549,7 +549,7 @@ def stored_questions(hashes=nil)
           val[:questions].each do |question|
             if question[:answers]
               question[:answers] = prepare_answers(question)
-              question[:matches] = question[:matches].sort_by { |m| m[:text] || ::SortFirst } if question[:matches]
+              question[:matches] = question[:matches].sort_by { |m| m[:text] || ::CanvasSort::First } if question[:matches]
             end
             questions << question
           end
@@ -667,7 +667,7 @@ def generate_submission(user, preview=false)
             questions.each do |question|
               if question[:answers]
                 question[:answers] = prepare_answers(question)
-                question[:matches] = question[:matches].sort_by { |m| m[:text] || ::SortFirst } if question[:matches]
+                question[:matches] = question[:matches].sort_by { |m| m[:text] || ::CanvasSort::First } if question[:matches]
               end
               question[:points_possible] = q[:question_points]
               question[:published_at] = q[:published_at]
diff --git a/app/models/quizzes/quiz_question/numerical_question.rb b/app/models/quizzes/quiz_question/numerical_question.rb
@@ -20,7 +20,7 @@
 
 class Quizzes::QuizQuestion::NumericalQuestion < Quizzes::QuizQuestion::Base
   def answers
-    @question_data[:answers].sort_by { |a| a[:weight] || SortFirst }
+    @question_data[:answers].sort_by { |a| a[:weight] || CanvasSort::First }
   end
 
   def correct_answer_parts(user_answer)
diff --git a/app/models/quizzes/quiz_question/short_answer_question.rb b/app/models/quizzes/quiz_question/short_answer_question.rb
@@ -37,7 +37,7 @@ def matching_answer(user_answer)
 
     answer_text = CGI::escapeHTML(answer_text).strip.downcase
 
-    answer = @question_data[:answers].sort_by { |a| a[:weight] || SortFirst }.find do |answer|
+    answer = @question_data[:answers].sort_by { |a| a[:weight] || CanvasSort::First }.find do |answer|
       valid_answer = (answer[:text] || '').strip.downcase
       # Ignore blank answers (no match on that)
       (CGI::escapeHTML(valid_answer) == answer_text) && !valid_answer.blank?
diff --git a/app/models/rubric.rb b/app/models/rubric.rb
@@ -245,7 +245,7 @@ def generate_criteria(params)
         rating[:id] = unique_item_id(rating_data[:id])
         ratings[jdx.to_i] = rating
       end
-      criterion[:ratings] = ratings.select{|r| r}.sort_by{|r| [-1 * (r[:points] || 0), r[:description] || SortFirst]}
+      criterion[:ratings] = ratings.select{|r| r}.sort_by{|r| [-1 * (r[:points] || 0), r[:description] || CanvasSort::First]}
       criterion[:points] = criterion[:ratings].map{|r| r[:points]}.max || 0
       points_possible += criterion[:points] unless criterion[:ignore_for_scoring]
       criteria[idx.to_i] = criterion
diff --git a/app/models/submission.rb b/app/models/submission.rb
@@ -552,7 +552,7 @@ def submission_history
       end
     end
     res = self.versions.to_a[0,1].map(&:model) if res.empty?
-    res.sort_by{ |s| s.submitted_at || SortFirst }
+    res.sort_by{ |s| s.submitted_at || CanvasSort::First }
   end
 
   def check_url_changed
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -1366,7 +1366,7 @@ def sorted_rubrics
     context_codes = ([self] + self.management_contexts).uniq.map(&:asset_string)
     rubrics = self.context_rubrics.active
     rubrics += Rubric.active.find_all_by_context_code(context_codes)
-    rubrics.uniq.sort_by{|r| [(r.association_count || 0) > 3 ? SortFirst : SortLast, Canvas::ICU.collation_key(r.title || SortLast)]}
+    rubrics.uniq.sort_by{|r| [(r.association_count || 0) > 3 ? CanvasSort::First : CanvasSort::Last, Canvas::ICU.collation_key(r.title || CanvasSort::Last)]}
   end
 
   def assignments_recently_graded(opts={})
@@ -1867,7 +1867,7 @@ def calendar_events_for_calendar(opts={})
     event_codes = context_codes + AppointmentGroup.manageable_by(self, context_codes).intersecting(opts[:start_at], opts[:end_at]).map(&:asset_string)
     events += ev.for_user_and_context_codes(self, event_codes, []).between(opts[:start_at], opts[:end_at]).updated_after(opts[:updated_at])
     events += Assignment.published.for_context_codes(context_codes).due_between(opts[:start_at], opts[:end_at]).updated_after(opts[:updated_at]).with_just_calendar_attributes
-    events.sort_by{|e| [e.start_at, Canvas::ICU.collation_key(e.title || SortFirst)] }.uniq
+    events.sort_by{|e| [e.start_at, Canvas::ICU.collation_key(e.title || CanvasSort::First)] }.uniq
   end
 
   def upcoming_events(opts={})
@@ -2244,7 +2244,7 @@ def set_menu_data(enrollment_uuid)
 
       if existing_enrollment_info
         existing_enrollment_info[:types] << e.readable_type
-        existing_enrollment_info[:sortable] = [existing_enrollment_info[:sortable] || SortLast, [e.rank_sortable, e.state_sortable, 0 - e.id]].min
+        existing_enrollment_info[:sortable] = [existing_enrollment_info[:sortable] || CanvasSort::Last, [e.rank_sortable, e.state_sortable, 0 - e.id]].min
       else
         coalesced_enrollments << { :enrollment => e, :sortable => [e.rank_sortable, e.state_sortable, 0 - e.id], :types => [ e.readable_type ] }
       end
diff --git a/app/presenters/grade_summary_assignment_presenter.rb b/app/presenters/grade_summary_assignment_presenter.rb
@@ -125,7 +125,7 @@ def rubric_assessments
     @visible_rubric_assessments ||= begin
       if submission && !assignment.muted?
         assessments = submission.rubric_assessments.select { |a| a.grants_rights?(@current_user, :read)[:read] }
-        assessments.sort_by { |a| [a.assessment_type == 'grading' ? SortFirst : SortLast, a.assessor_name] }
+        assessments.sort_by { |a| [a.assessment_type == 'grading' ? CanvasSort::First : CanvasSort::Last, a.assessor_name] }
       else
         []
       end
diff --git a/app/views/courses/copy.html.erb b/app/views/courses/copy.html.erb
@@ -30,7 +30,7 @@
 
       <div class="controls">
         <select name="course[enrollment_term_id]" id="course_enrollment_term_id">
-          <% @context.root_account.enrollment_terms.sort_by { |t| t.start_at || SortFirst }.each do |term| %>
+          <% @context.root_account.enrollment_terms.sort_by { |t| t.start_at || CanvasSort::First }.each do |term| %>
             <option value="<%= term.id %>" <%= 'selected' if term.id == @context.enrollment_term_id %>><%= term.name %></option>
           <% end %>
         </select>
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
@@ -114,7 +114,7 @@
           <span class="course_form">
             <% if can_do(@context.root_account, @current_user, :manage_courses) %>
               <select name="course[enrollment_term_id]" id="course_enrollment_term_id">
-                <% @context.root_account.enrollment_terms.active.sort_by{|t| t.start_at || SortFirst}.each do |term| %>
+                <% @context.root_account.enrollment_terms.active.sort_by{|t| t.start_at || CanvasSort::First}.each do |term| %>
                   <option value="<%= term.id %>" <%= 'selected' if term.id == @context.enrollment_term_id %>><%= term.name %></option>
                 <% end %>
               </select>
diff --git a/app/views/wiki_pages/_wiki_right_side.html.erb b/app/views/wiki_pages/_wiki_right_side.html.erb
@@ -22,7 +22,7 @@
     </div>
   <% end %>
   <div>
-    <% pages = Canvas::ICU.collate_by(@context.wiki.wiki_pages.not_deleted.select{|p| !p.new_record? }){|p| p.title || SortFirst} %>
+    <% pages = Canvas::ICU.collate_by(@context.wiki.wiki_pages.not_deleted.select{|p| !p.new_record? }){|p| p.title || CanvasSort::First} %>
     <% if pages.length > 10 %>
     <h2><%= t 'headers.common_pages', 'Common Pages' %></h2>
     <div class="rs-margin-lr rs-margin-bottom">
diff --git a/gems/canvas_sort/Gemfile b/gems/canvas_sort/Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in canvas_sort.gemspec
+gemspec
diff --git a/gems/canvas_sort/Rakefile b/gems/canvas_sort/Rakefile
@@ -0,0 +1 @@
+require "bundler/gem_tasks"
diff --git a/gems/canvas_sort/canvas_sort.gemspec b/gems/canvas_sort/canvas_sort.gemspec
@@ -0,0 +1,20 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+Gem::Specification.new do |spec|
+  spec.name          = "canvas_sort"
+  spec.version       = "1.0.0"
+  spec.authors       = ["Nick Cloward"]
+  spec.email         = ["ncloward@instructure.com"]
+  spec.summary       = %q{Canvas Sort}
+
+  spec.files         = Dir.glob("{lib,spec}/**/*") + %w(test.sh)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+end
diff --git a/gems/canvas_sort/lib/canvas_sort.rb b/gems/canvas_sort/lib/canvas_sort.rb
@@ -0,0 +1,4 @@
+module CanvasSort
+  require 'canvas_sort/sort_first'
+  require 'canvas_sort/sort_last'
+end
diff --git a/gems/canvas_sort/lib/canvas_sort/sort_first.rb b/gems/canvas_sort/lib/canvas_sort/sort_first.rb
diff --git a/gems/canvas_sort/lib/canvas_sort/sort_last.rb b/gems/canvas_sort/lib/canvas_sort/sort_last.rb
diff --git a/gems/canvas_sort/spec/canvas_sort/sorting_spec.rb b/gems/canvas_sort/spec/canvas_sort/sorting_spec.rb
diff --git a/gems/canvas_sort/spec/spec_helper.rb b/gems/canvas_sort/spec/spec_helper.rb
diff --git a/gems/canvas_sort/test.sh b/gems/canvas_sort/test.sh
diff --git a/lib/dates_overridable.rb b/lib/dates_overridable.rb
diff --git a/lib/kaltura/kaltura_client_v3.rb b/lib/kaltura/kaltura_client_v3.rb
diff --git a/lib/sort_first.rb b/lib/sort_first.rb
diff --git a/lib/sort_last.rb b/lib/sort_last.rb
diff --git a/lib/submission_list.rb b/lib/submission_list.rb
diff --git a/spec/lib/canvas/icu_spec.rb b/spec/lib/canvas/icu_spec.rb
diff --git a/spec/lib/sort_spec.rb b/spec/lib/sort_spec.rb

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ def roster_user_services`
`331`	`331`	`@users.each_with_index{\|u, i\| @users_hash[u.id] = u; @users_order_hash[u.id] = i }`
`332`	`332`	`@current_user_services = {}`
`333`	`333`	`@current_user.user_services.each{\|s\| @current_user_services[s.service] = s }`
`334`		`- @services = UserService.for_user(@users.except(:select, :order)).sort_by{\|s\| @users_order_hash[s.user_id] \|\| SortLast}`
	`334`	`+ @services = UserService.for_user(@users.except(:select, :order)).sort_by{\|s\| @users_order_hash[s.user_id] \|\| CanvasSort::Last}`
`335`	`335`	`@services = @services.select{\|service\|`
`336`	`336`	`!UserService.configured_service?(service.service) \|\| feature_and_service_enabled?(service.service.to_sym)`
`337`	`337`	`}`