git_game_show 0.1.3 → 0.1.5

data/lib/git_game_show/updater.rb

@@ -13,7 +13,7 @@ module GitGameShow
         latest_version = fetch_latest_version
 
         return if latest_version.nil?
-        
+
         # Compare versions
         if newer_version_available?(current_version, latest_version)
           display_update_prompt(current_version, latest_version)
@@ -26,7 +26,7 @@ module GitGameShow
         begin
           uri = URI.parse("https://rubygems.org/api/v1/gems/git_game_show.json")
           response = Net::HTTP.get_response(uri)
-          
+
           if response.code == "200"
             data = JSON.parse(response.body)
             return data["version"]
@@ -57,22 +57,22 @@ module GitGameShow
 
       def display_update_prompt(current_version, latest_version)
         prompt = TTY::Prompt.new
-        
+
         # Clear the terminal for better visibility
         puts "\n\n"
-        
-        puts "┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓".colorize(:cyan)
-        puts "┃           UPDATE AVAILABLE FOR GIT GAME SHOW                   ┃".colorize(:cyan)
-        puts "┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫".colorize(:cyan)
-        puts "┃                                                                ┃".colorize(:cyan)
-        puts "┃  Current version: #{current_version.ljust(38)}  ┃".colorize(:cyan)
-        puts "┃  Latest version:  #{latest_version.ljust(38)}  ┃".colorize(:cyan)
-        puts "┃                                                                ┃".colorize(:cyan)
-        puts "┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛".colorize(:cyan)
+
+        puts "╭―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――╮".colorize(:cyan)
+        puts "│           UPDATE AVAILABLE FOR GIT GAME SHOW                  │".colorize(:cyan)
+        puts "├―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――┤".colorize(:cyan)
+        puts "│                                                               │".colorize(:cyan)
+        puts "│  Current version: #{current_version.ljust(44)}│".colorize(:cyan)
+        puts "│  Latest version:  #{latest_version.ljust(44)}│".colorize(:cyan)
+        puts "│                                                               │".colorize(:cyan)
+        puts "╰―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――╯".colorize(:cyan)
         puts "\n"
-        
+
         update_now = prompt.yes?("Would you like to update now?")
-        
+
         if update_now
           perform_update
         else
@@ -83,12 +83,12 @@ module GitGameShow
 
       def perform_update
         puts "\nUpdating Git Game Show to the latest version...".colorize(:cyan)
-        
+
         begin
           # Use system to capture both stdout and stderr
           update_command = "gem update git_game_show"
           result = system(update_command)
-          
+
           if result
             puts "\n✅ Update completed successfully!".colorize(:green)
             puts "Please restart Git Game Show to use the new version.".colorize(:yellow)
@@ -104,4 +104,4 @@ module GitGameShow
       end
     end
   end
-end
+end

data/lib/git_game_show/version.rb

@@ -1,4 +1,4 @@
 module GitGameShow
   # Current version of Git Game Show
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

data/lib/git_game_show.rb

@@ -17,16 +17,16 @@ require 'net/http'
 # Define module and constants first before loading any other files
 module GitGameShow
   # VERSION is defined in version.rb
-  
+
   # Default configuration
   DEFAULT_CONFIG = {
-    port: 3030,
+    internal_port: 80,
     rounds: 3,
     question_timeout: 30, # seconds
     question_display_time: 5, # seconds to show results before next question
     transition_delay: 5 # seconds between rounds
   }.freeze
-  
+
   # Message types for WebSocket communication
   module MessageType
     JOIN_REQUEST = 'join_request'
@@ -47,4 +47,4 @@ end
 Dir[File.join(__dir__, 'git_game_show', '*.rb')].sort.each { |file| require file }
 
 # Load all mini-games
-Dir[File.join(__dir__, '..', 'mini_games', '*.rb')].sort.each { |file| require file }
+Dir[File.join(__dir__, '..', 'mini_games', '*.rb')].sort.each { |file| require file }

data/mini_games/date_ordering_quiz.rb

@@ -179,29 +179,68 @@ module GitGameShow
     def evaluate_answers(question, player_answers)
       results = {}
       
+      # Safety check for nil or empty responses
+      return results if player_answers.nil? || player_answers.empty?
+      return results unless question && question[:correct_answer]
+      
+      # Get total number of items in the correct answer
+      total_items = question[:correct_answer].size
+      
       player_answers.each do |player_name, answer_data|
+        # Skip nil entries
+        next unless player_name && answer_data
+        
+        # Extract player's answer with defensive checks
         player_answer = answer_data[:answer]
         time_taken = answer_data[:time_taken] || 20
         
-        # For the ordering quiz, we allow partial credit
-        correct_positions = 0
+        # Initialize points
+        points = 0
         
-        # Count how many items are in the correct position
-        question[:correct_answer].each_with_index do |item, index|
-          if player_answer && index < player_answer.size && player_answer[index] == item
-            correct_positions += 1
+        # New scoring system: checks positions relative to each other item
+        if player_answer && !player_answer.empty?
+          # Create a mapping from item to its position in player's answer
+          item_positions = {}
+          player_answer.each_with_index do |item, index|
+            item_positions[item] = index if item # Skip nil items
+          end
+          
+          # Create mapping from item to correct position
+          correct_positions = {}
+          question[:correct_answer].each_with_index do |item, index|
+            correct_positions[item] = index if item # Skip nil items
+          end
+          
+          # For each item, calculate points based on relative positions
+          question[:correct_answer].each_with_index do |item, correct_index|
+            # Skip if the item isn't in the player's answer
+            next unless item && item_positions.key?(item)
+            
+            player_index = item_positions[item]
+            
+            # Check position relative to other items
+            question[:correct_answer].each_with_index do |other_item, other_correct_index|
+              next if !other_item || item == other_item || !item_positions.key?(other_item)
+              
+              other_player_index = item_positions[other_item]
+              
+              # If this item should be before the other item
+              if correct_index < other_correct_index
+                points += 1 if player_index < other_player_index
+              # If this item should be after the other item
+              elsif correct_index > other_correct_index
+                points += 1 if player_index > other_player_index
+              end
+            end
           end
         end
         
-        # Calculate points: full credit for all correct, partial for some correct
-        total_items = question[:correct_answer].size
-        points = (correct_positions.to_f / total_items * 10).round
+        # Bonus points for perfect answer
+        perfect_score = total_items * (total_items - 1)
+        perfect_score = 1 if perfect_score <= 0 # Prevent division by zero
+        fully_correct = points == perfect_score
         
-        # Fully correct gets bonus points
-        if correct_positions == total_items
-          # Base bonus for fully correct answer
-          points += 3
-          
+        if fully_correct
           # Additional time-based bonus (faster answers get more points)
           if time_taken < 8  # Really fast (under 8 seconds)
             points += 4
@@ -210,17 +249,35 @@ module GitGameShow
           end
         end
         
-        # Create feedback with date info for displaying in results
-        feedback = "#{correct_positions}/#{total_items} positions correct"
+        # Create detailed feedback
+        max_possible = total_items * (total_items - 1)
+        max_possible = 1 if max_possible <= 0 # Prevent division by zero
+        feedback = "#{points}/#{max_possible} points (based on relative ordering)"
         if question[:commit_dates]
-          feedback += "\n\nActual dates:\n" + question[:commit_dates]
+          feedback += "\n\nActual dates:"
+          # Split by newlines and add them as separate lines for better readability
+          question[:commit_dates].to_s.split("\n").each do |date_line|
+            feedback += "\n  • #{date_line}"
+          end
         end
         
+        # Ensure we return all required fields
+        results[player_name] = {
+          answer: player_answer || [],
+          correct: fully_correct || false,
+          points: points || 0,
+          partial_score: feedback || ""
+        }
+      end
+      
+      # Return a default result if somehow we ended up with empty results
+      if results.empty? && !player_answers.empty?
+        player_name = player_answers.keys.first
         results[player_name] = {
-          answer: player_answer,
-          correct: correct_positions == total_items,
-          points: points,
-          partial_score: feedback
+          answer: [],
+          correct: false,
+          points: 0,
+          partial_score: "Error calculating score"
         }
       end
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_game_show
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Justin Paulson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-04 00:00:00.000000000 Z
+date: 2025-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor