wordl-solver 1.2.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9206e179244d4923e5b43b61d7a5e41469952c1c931ed9fa9fe096275e2606fa
-  data.tar.gz: 368b816a614e6cb2cde10c7a00d0b8a4344bf7cb8dcff09b45a2308568e611df
+  metadata.gz: 3efe4e2edfac6ae7fddccd6b38b2fe803fbbc35c4e3ae01cbbb609c611a40124
+  data.tar.gz: 5d99360b9bdacf90248bb7c6b6a16a944f681b93baa33daa4aca7486b2c17b4e
 SHA512:
-  metadata.gz: f77778b28f85942040810cdf6ce3c29d144af0aaacf559aefe10e34785c911186d57d67bd90d26f271d026a26ca0c2125d4752ae36dd2f75dcde958b4087c39d
-  data.tar.gz: '080349d45b6e5f73aaac423248011dfd2d071f6fc334d9ecd92e2764951e47b27880702d0389c4040aca4fb3dc5bfaf4986266f77fb30d5d4dab592cabd1e306'
+  metadata.gz: 8765927089a057472a1545f754bcaef4a715475ca29fc38afd71a0e44bb58d9248b8abd470f1a538b1ce70b535cb9d9e4b862da4d6826bb9f446132765457a13
+  data.tar.gz: 8cf74de88be9641c8f486ae84b8448273d64e1d5a60c2e2ffbd313c1e991288627d9c12503df53724b6c40cc06d8b0d42a778a35f5d8ef410c040b5ff4f47a0d

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.4.0

data/lib/wordl_solver.rb

@@ -11,45 +11,54 @@ CSV.foreach(FILE_PATH) do |row|
   LETTER_WORDS << row[0]
 end
 
+# The Class WordlSolver is a class that contains the methods to solve the wordl puzzle.
 class WordlSolver
-  def self.find_possible_words(greys, greens, yellows)
-    @greys = greys
-    @greens = greens 
-    @yellows = yellows
-    @possible_words = @possible_words.nil? || @possible_words.empty? ? LETTER_WORDS : @possible_words
-    filter_greens
-    filter_yellows
-    filter_greys
-    @possible_words
-  end
+  class << self
+    def find_possible_words(greys, greens, yellows)
+      @greys = greys
+      @greens = greens 
+      @yellows = yellows
+      @possible_words = @possible_words.nil? || @possible_words.empty? ? LETTER_WORDS : @possible_words
+      filter_greens
+      filter_yellows
+      filter_greys
+      @possible_words
+    end
 
-  def self.filter_greens
-    @possible_words.select! do |word|
-      put_in = true
-      @greens.each do |key, value|
-        next if value.nil?
+    def filter_greens
+      @possible_words.select! do |word|
+        put_in = true
+        @greens.each do |key, value|
+          next if value.nil?
 
-        put_in = false unless word[key] == value
+          put_in = false unless word[key] == value
+        end
+        put_in
       end
-      put_in
     end
-  end
 
-  def self.filter_yellows
-    yellow_letters = @yellows.values.flatten.uniq
-    @possible_words.select! do |word|
-      possible = true
-      word.chars.each_with_index do |letter, index|
-        possible = false if @yellows[index].include?(letter)
+    def filter_yellows
+      yellow_letters = @yellows.values.flatten.uniq
+      @possible_words.select! do |word|
+        possible = true
+        word.chars.each_with_index do |letter, index|
+          possible = false if @yellows[index].include?(letter)
+        end
+        possible = false unless yellow_letters.all? { |letter| word.include?(letter) }
+        possible
       end
-      possible = false unless yellow_letters.all? { |letter| word.include?(letter) }
-      possible
     end
-  end
 
-  def self.filter_greys
-    @possible_words.reject! do |word|
-      @greys.any? { |letter| word.include?(letter) }
+    def filter_greys
+      @possible_words.reject! do |word|
+        @greys.each do |letter|
+          if @greens.values.include?(letter)
+            word.count(letter) > 1
+          else
+            word.include?(letter)
+          end
+        end
+      end
     end
   end
 end

data/lib/wordl_solver_interface.rb

@@ -53,18 +53,14 @@ class WordlSolverInterface
     puts "and then the letter that was tried."
     puts "For example, if you have tried and arose and you get grey for a"
     puts "You'd type, after being prompted for the first position: sa "
-    5.times do |t|
-      puts @greens[t]
-      if @greens[t].nil?
-        puts "for position #{t + 1}"
-        letters = gets.chomp
-        while check_word_correct(letters)
-          puts "sorry, didn't catch that, try again:"
-          letters = gets.chomp
-        end
-        sort_letter_upon_color(letters, t)
+    5.times do |position|
+      puts @greens[position]
+      if @greens[position].nil?
+        puts "for position #{position + 1}"
+        letters = retrieve_input_letters
+        sort_letter_upon_color(letters, position)
       else
-        puts "for position #{t + 1} this #{@greens[t]}"
+        puts "for position #{position + 1} this #{@greens[position]}"
       end
     end
   end
@@ -86,17 +82,25 @@ class WordlSolverInterface
     end
   end
 
-  def check_word_correct(letters)
-    letters.length != 2 || !%w[s y g].include?(letters[0])
+  def word_is_correct?(letters)
+    letters.length == 2 && %w[s y g].include?(letters[0])
   end
 
   def set_letters_frequencies
-    @frenquencies = {}
+    @frenquencies = Hash.new(0)
     @possible_words.each do |word|
       word.chars.each do |letter|
-        @frenquencies[letter] = 0 if @frenquencies[letter].nil?
         @frenquencies[letter] += 1
       end
     end
   end
+
+  def retrieve_input_letters
+    letters = gets.chomp
+    until word_is_correct?(letters)
+      puts "sorry, didn't catch that, try again:"
+      letters = gets.chomp
+    end
+    letters
+  end
 end

data/wordl-solver.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: wordl-solver 1.2.1 ruby lib
+# stub: wordl-solver 1.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "wordl-solver".freeze
-  s.version = "1.2.1"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["george kosmopoulos".freeze]
-  s.date = "2022-05-31"
+  s.date = "2022-12-24"
   s.description = "This gem helps you solve wordl puzzles. It does so by asking you for the letters position you know, the letters you know exists and the ones you know don't exists. It then proposes words depending on how good they are by weighting the letters by their frequency in the english language.".freeze
   s.email = "gkosmo1@hotmail.com".freeze
   s.executables = ["wordl-solver".freeze]
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/gkosmo/wordl-solver".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.3.10".freeze
+  s.rubygems_version = "3.3.7".freeze
   s.summary = "This gem solves wordl puzzles.".freeze
 
   if s.respond_to? :specification_version then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wordl-solver
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.4.0
 platform: ruby
 authors:
 - george kosmopoulos
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2022-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.10
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: This gem solves wordl puzzles.