waylon-wordle 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6db7ed70378421cf71a537df618751aaeb7ce1bf203248dbc9bb480acabc5d67
-  data.tar.gz: 8413894c357ff8c94c4e30a1cb0ef23f0f3c2ec3f4b481413674aed3a8324b70
+  metadata.gz: 9b2f1328994cbe7a3b0aa4c1425893e23e53971b07b39f86019d6702379c9815
+  data.tar.gz: d81c4633ed5dbb9e2a4ad6512184351a6ed0c3b401ae72cdc0ed4b5ed8971a11
 SHA512:
-  metadata.gz: a3b47236b1eec73f56138ca62f85be4f68cbf302555321374dd4128f563aa6c08d8ccd104730cca2b18ff556e0114cf6ac9e7ea0e66c47f4daf394f70b2a57b8
-  data.tar.gz: e827295dc9c1599243ebf462b649ba00c5b32d67ec45ea7764967abb1b3e4f74c4b7c435fc2bc98511baa9bd23e0093046c52988b422c4f255b1e2bcf1159409
+  metadata.gz: e5b0562471f6855464c9aaae9c62e13b60cd5f15041f807c41caa859e6202c012d0d9f204d58763dd4509cca69a41d63107b6b59b1f55942fc6b0f183befe01d
+  data.tar.gz: 863e0b7e98e16a3c977b7ca9cd01e0475050b962e0edcaaf5ca8abf250e4f68a384d977a9c326c91e0e83be6b701903821a22d186a131d3225b64c1264592b0f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    waylon-wordle (0.2.0)
+    waylon-wordle (0.3.0)
       waylon-core (~> 0.1)
 
 GEM

data/lib/waylon/skills/wordle.rb

@@ -24,7 +24,7 @@ module Waylon
 
       def todays_wordle
         solution = solve_todays_wordle
-        case solution.size
+        case solution.attempts.size
         when 1..2
           reply("I got *really* lucky today!")
         when 3
@@ -32,44 +32,40 @@ module Waylon
         when 4..5
           reply("I managed to figure it out.")
         when 6
-          reply("I barely solved it!")
-        else
-          reply("Unfortunately, I didn't solve it.")
+          if solution.last_attempted_word == Waylon::Wordle.for_today
+            reply("I barely solved it!")
+          else
+            reply("Unfortunately, I didn't solve it.")
+          end
         end
 
-        reply(formatted_wordle_score(solution))
+        reply(formatted_wordle_score(solution.attempts.map { _1[:result] }))
       end
 
       def spoil_wordle
         threaded_reply("Here's what my attempt looked like...")
         threaded_reply(
           codify(
-            JSON.pretty_generate(solve_todays_wordle.map { |w| w.join.upcase })
+            JSON.pretty_generate(solve_todays_wordle.attempts.map { |w| w[:word].upcase })
           )
         )
       end
 
       private
 
-      def formatted_wordle_score(solution)
-        miss = "⬛"
-        hit = "🟩"
-        near_hit = "🟨"
-        todays_answer = Waylon::Wordle.for_today.chars
-        solved_in = solution.include?(todays_answer) ? solution.size : "X"
+      def formatted_wordle_score(scores)
+        translation = {
+          miss: "⬛",
+          hit: "🟩",
+          near_hit: "🟨"
+        }
+
+        solved_in = scores.last.map(&:to_sym) == %i[hit hit hit hit hit] ? scores.size : "X"
 
         lines = ["Wordle #{Waylon::Wordle.todays_number} #{solved_in}/6"]
         lines << ""
-        solution.each do |word|
-          lines << word.map.with_index do |letter, index|
-            if letter == todays_answer[index]
-              hit
-            elsif todays_answer.include?(letter)
-              near_hit
-            else
-              miss
-            end
-          end.join
+        scores.each do |score|
+          lines << score.map { translation[_1.to_sym] }.join
         end
         lines.join("\n")
       end
@@ -78,6 +74,7 @@ module Waylon
         cache("solution_#{DateTime.now.new_offset("-05:00").to_date}", expires: 24 * 60 * 60) do
           solver = Waylon::Wordle::Solver.new(Waylon::Wordle.random_startword)
           solver.solve_todays_wordle
+          solver
         end
       end
     end

data/lib/waylon/wordle/solver.rb

@@ -4,39 +4,81 @@ module Waylon
   module Wordle
     # Utility class for solving Wordle puzzles
     class Solver
-      attr_reader :startword
+      attr_reader :startword, :answer
+      attr_accessor :attempts, :hits, :near_hits, :misses
 
       def initialize(startword)
         @startword = startword
+        @attempts = []
+        @hits = []
+        @near_hits = []
+        @misses = []
+        @answer = Waylon::Wordle.for_today.chars
       end
 
       def solve_todays_wordle
-        answer = Waylon::Wordle.for_today.chars
-        attempts = [startword.chars]
-        attempts << make_attempt(answer, attempts) until attempts.last == answer || attempts.size == 6
+        until attempts.any? && (last_attempted_word == answer.join || attempts.size == 6)
+          attempts << make_attempt(answer)
+        end
 
-        attempts.compact
+        last_attempted_word == answer.join
       end
 
-      def make_attempt(answer, attempts)
-        hits = []
-        near_hits = []
-        misses = []
-
-        attempts.compact.each do |attempt|
-          attempt.each_with_index do |letter, index|
-            if letter == answer[index]
-              hits[index] = letter
-            elsif answer.include?(letter) && hits.count(letter) < answer.count(letter)
-              near_hits[index] ||= []
-              near_hits[index] << letter
-            else
-              misses << letter unless misses.include?(letter)
-            end
+      def make_attempt(answer)
+        word = next_word
+        attempt = { word: word.join, result: [] }
+        word.each_with_index do |letter, index|
+          if letter == answer[index]
+            add_hit(letter, index, attempt)
+          elsif answer.include?(letter)
+            add_near_hit(letter, index, word, attempt)
+          else
+            add_miss(letter, attempt)
           end
         end
 
-        find_potential_solution(hits, near_hits, misses)
+        attempt
+      end
+
+      def find_potential_solution
+        potential_solutions = Waylon::Wordle.vocabulary.map(&:chars).reject { _1.intersect?(misses) }
+
+        potential_solutions.select do |word|
+          hits_match?(hits, word) && near_hits_match?(near_hits, word)
+        end.sample
+      end
+
+      def last_attempted_word = attempts.last[:word]
+
+      private
+
+      def add_hit(letter, index, attempt)
+        hits[index] = letter
+        attempt[:result] << :hit
+      end
+
+      def add_near_hit(letter, index, word, attempt)
+        near_hits[index] ||= []
+        near_hits[index] << letter
+        attempt[:result] << (counts_as_near_hit?(word, index) ? :near_hit : :miss)
+      end
+
+      def add_miss(letter, attempt)
+        misses << letter unless misses.include?(letter)
+        attempt[:result] << :miss
+      end
+
+      def next_word = attempts.empty? ? startword.chars : find_potential_solution
+
+      def counts_as_near_hit?(word, index)
+        return false unless answer.include?(word[index])
+
+        answer_hit_count = answer.count(word[index])
+        word_hits = word.each_with_index.with_object([]) do |(letter, idx), indices|
+          indices << idx if letter == word[index] && answer[idx] == word[idx]
+        end
+
+        answer_hit_count > word_hits.size
       end
 
       def hits_match?(hits, exploded_word)
@@ -59,16 +101,6 @@ module Waylon
 
         true
       end
-
-      def find_potential_solution(hits, near_hits, misses)
-        potential_solutions = Waylon::Wordle.vocabulary.map(&:chars).reject do |word|
-          word.intersect?(misses)
-        end
-
-        potential_solutions.select do |word|
-          hits_match?(hits, word) && near_hits_match?(near_hits, word)
-        end.sample
-      end
     end
   end
 end

data/lib/waylon/wordle/version.rb

@@ -2,6 +2,6 @@
 
 module Waylon
   module Wordle
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waylon-wordle
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-30 00:00:00.000000000 Z
+date: 2023-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: waylon-core