Merge branch 'main' into joss

Author: xuanxu

.ruby-version

@@ -1 +1 @@
-3.2.1
+3.2.2

Gemfile.lock

@@ -39,7 +39,7 @@ GEM
       rugged (>= 0.24, < 2.0)
       thor (>= 0.19, < 2.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.1)
+    mini_portile2 (2.8.2)
     multi_json (1.15.0)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
@@ -57,7 +57,7 @@ GEM
     puma (6.2.2)
       nio4r (~> 2.0)
     racc (1.6.2)
-    rack (2.2.6.4)
+    rack (2.2.7)
     rack-protection (3.0.5)
       rack
     rack-test (2.1.0)
@@ -71,9 +71,9 @@ GEM
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-mocks (3.12.5)
@@ -91,11 +91,11 @@ GEM
       multi_json (~> 1.15)
       rexml (~> 3.2, >= 3.2.5)
       thor (~> 1.2, >= 1.2.1)
-    sidekiq (7.0.8)
+    sidekiq (7.1.0)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
-      redis-client (>= 0.11.0)
+      redis-client (>= 0.14.0)
     sinatra (3.0.5)
       mustermann (~> 3.0)
       rack (~> 2.2, >= 2.2.4)

app/responders/reminders_responder.rb

@@ -17,19 +17,20 @@ def process_message(message)
 
     human = "@#{user_login(context.sender)}" if human == "me"
 
-    unless targets.include?(human)
+    unless targets.include?(human.downcase)
       respond("#{human} doesn't seem to be a reviewer or author for this submission.")
       return false
     end
 
     schedule_at = target_time(size, unit)
 
     if schedule_at
-      if user_login(human) == user_login(context.sender)
+      if user_login(human).downcase == user_login(context.sender).downcase
+        human = "@#{user_login(context.sender)}"
         msg = ":wave: #{human}, please take a look at the state of the submission (this is an automated reminder)."
         AsyncMessageWorker.perform_at(schedule_at, serializable(locals), msg)
       else
-        ReviewReminderWorker.perform_at(schedule_at, serializable(locals), human, authors_list.include?(human))
+        ReviewReminderWorker.perform_at(schedule_at, serializable(locals), human, authors_list.include?(human.downcase))
       end
       respond("Reminder set for #{human} in #{size} #{unit}")
     else
@@ -38,16 +39,16 @@ def process_message(message)
   end
 
   def targets
-    (authors_list + reviewers_list + ["@#{user_login(context.sender)}"]).uniq
+    (authors_list + reviewers_list + ["@#{user_login(context.sender).downcase}"]).uniq
   end
 
   def reviewers_list
-    @reviewers_list ||= reviewers_value.inject([]) {|re, value| re + read_value_from_body(value).split(",").map(&:strip)}
+    @reviewers_list ||= reviewers_value.inject([]) {|re, value| re + read_value_from_body(value).split(",").map(&:strip).map(&:downcase)}
     @reviewers_list.compact.uniq
   end
 
   def authors_list
-    @authors_list ||= authors_value.inject([]) {|au, value| au + read_value_from_body(value).split(",").map(&:strip)}
+    @authors_list ||= authors_value.inject([]) {|au, value| au + read_value_from_body(value).split(",").map(&:strip).map(&:downcase)}
     @authors_list.compact.uniq
   end
 

app/responders/reviewer_checklist_comment_responder.rb

@@ -22,7 +22,7 @@ def process_message(message)
   end
 
   def sender_in_reviewers_list?
-    reviewers.include?("@#{context.sender}")
+    reviewers.include?("@#{context.sender.downcase}")
   end
 
   def update_checklists_links
@@ -38,7 +38,7 @@ def update_checklists_links
   end
 
   def reviewers
-    @reviewers ||= read_value_from_body("reviewers-list").split(",").map(&:strip)
+    @reviewers ||= read_value_from_body("reviewers-list").split(",").map(&:strip).map(&:downcase)
   end
 
   def checklists_mapping

spec/responders/reminders_responder_spec.rb

@@ -56,6 +56,19 @@
       @responder.process_message(msg)
     end
 
+    it "should be case insensitive with the editor's GitHub handles" do
+      msg = "@botsci remind @eDItoR21 in 5 weeks"
+      @responder.match_data = @responder.event_regex.match(msg)
+      in_five_weeks = Chronic.parse("in 5 weeks")
+      expect(@responder).to receive(:target_time).with("5", "weeks").and_return(in_five_weeks)
+      expected_msg = ":wave: @editor21, please take a look at the state of the submission (this is an automated reminder)."
+      expect(AsyncMessageWorker).to receive(:perform_at).with(in_five_weeks, @responder.locals, expected_msg)
+      expect(ReviewReminderWorker).to_not receive(:perform_at)
+      expect(@responder).to receive(:respond).with("Reminder set for @editor21 in 5 weeks")
+
+      @responder.process_message(msg)
+    end
+
     it "should respond success message and schedule worker run for 'me'" do
       msg = "@botsci remind me in 15 days"
       @responder.match_data = @responder.event_regex.match(msg)
@@ -88,6 +101,26 @@
       expect(ReviewReminderWorker).to receive(:perform_at).with(in_four_days, @responder.locals, "@author", true)
       @responder.process_message(msg)
     end
+
+    it "should be case insensitive with the reviewers GitHub handles" do
+      msg = "@botsci remind @ReVieWEr42 in 3 weeks"
+      @responder.match_data = @responder.event_regex.match(msg)
+      expect(ReviewReminderWorker).to receive(:perform_at)
+      expect(@responder).to receive(:respond).with("Reminder set for @ReVieWEr42 in 3 weeks")
+
+      @responder.process_message(msg)
+    end
+
+    it "should be case insensitive with the authors GitHub handles" do
+      msg = "@botsci remind @AUTHor in 4 days"
+      @responder.match_data = @responder.event_regex.match(msg)
+
+      in_four_days = Chronic.parse("in 4 days")
+      expect(@responder).to receive(:target_time).with("4", "days").and_return(in_four_days)
+
+      expect(ReviewReminderWorker).to receive(:perform_at).with(in_four_days, @responder.locals, "@AUTHor", true)
+      @responder.process_message(msg)
+    end
   end
 
   describe "configurable targets" do

spec/responders/reviewer_checklist_comment_responder_spec.rb

@@ -51,6 +51,18 @@
         @responder.process_message(@msg)
       end
 
+      it "should be case insensitive for the reviewer's username" do
+        @responder.context[:sender] = "ReVIEwer1"
+
+        expected_locals = { issue_id: 5, issue_author: "opener", bot_name: "botsci", repo: "openjournals/buffy", sender: "ReVIEwer1" }
+        expected_checklist = "Checklist for @ReVIEwer1 \n[] A"
+
+        expect(@responder).to receive(:render_external_template).with("checklist.md", expected_locals).and_return(expected_checklist)
+        expect(@responder).to receive(:update_comment).with(111222, expected_checklist)
+        expect(@responder).to_not receive(:respond)
+        @responder.process_message(@msg)
+      end
+
       it "should not add user checklist if sender is not a reviewer" do
         @responder.context[:sender] = "nonreviewer"