wordl-solver 1.3.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb3bf465211db353a6705e7a34a9678ab1c054e02fc8ee99c6420577705b8a09
-  data.tar.gz: 90e1a0ccec7e76c4c4e9609f8e55a858c557b7db48d73658ec0f3c8acb59f3cf
+  metadata.gz: a4a62f4eeebb61e2c99c23028737e472001a3f09380397d4b30e0d1564a2784f
+  data.tar.gz: 3d7ffec7b36cbd41937eae53a7a104a35e116357fae62726640549412cbcdf96
 SHA512:
-  metadata.gz: 7056a94cb5ad3f64cd8bbef26ae67e5bc72a7f85df20ad5084ef49e7a8f882236cb6fd6c97de30ee67f338035b14b5176838a74ac09bc473d8c5de46e33ff23b
-  data.tar.gz: b549d2effd15ae76b8910efaba4912d3f2f2974c335a2b5d5e99f08bcf79433f6256d2da37ce02f3e5ce57019e282d88a0caf185f05eb2ac135ce7831b1931b2
+  metadata.gz: a02c49ebcaaefb0d97cb40ffec08f34d8875a70e624325570198024770a72b4ca0de8806ac1dfe26a4c3c19f3d4fb32e3177e46f281b1e59acbc8f1f19031388
+  data.tar.gz: 32c6b2fa2b25b50a25bc0f61c63d2b92c7dab9760d3334d65dd5cbc9a89fb940309260654338eaea9aad2e0562c55abdbb297915a744d7f222ffa2e247118ecc

data/Gemfile.lock

@@ -110,4 +110,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   1.17.3
+   2.6.6

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.4.2

data/lib/wordl_solver.rb

@@ -18,7 +18,7 @@ class WordlSolver
       @greys = greys
       @greens = greens 
       @yellows = yellows
-      @possible_words = @possible_words.nil? || @possible_words.empty? ? LETTER_WORDS : @possible_words
+      @possible_words = @possible_words.nil? || @possible_words.empty? ? LETTER_WORDS.dup : @possible_words
       filter_greens
       filter_yellows
       filter_greys
@@ -41,17 +41,37 @@ class WordlSolver
       yellow_letters = @yellows.values.flatten.uniq
       @possible_words.select! do |word|
         possible = true
+        # Check that the word doesn't have yellow letters in the same position
         word.chars.each_with_index do |letter, index|
-          possible = false if @yellows[index].include?(letter)
+          if @yellows[index].include?(letter)
+            possible = false
+            break
+          end
+        end
+        # Check that the word contains all yellow letters
+        if possible && !yellow_letters.empty?
+          yellow_letters.each do |letter|
+            unless word.include?(letter)
+              possible = false
+              break
+            end
+          end
         end
-        possible = false unless yellow_letters.all? { |letter| word.include?(letter) }
         possible
       end
     end
 
     def filter_greys
       @possible_words.reject! do |word|
-        @greys.any? { |letter| word.include?(letter) }
+        reject = false
+        @greys.each do |letter|
+          if @greens.values.include?(letter)
+            reject = true if word.count(letter) > 1
+          else
+            reject = true if word.include?(letter)
+          end
+        end
+        reject
       end
     end
   end

data/lib/wordl_solver_interface.rb

@@ -44,7 +44,7 @@ class WordlSolverInterface
     else
       @greens[t] = letters[1]
     end
-    @greys.reject! { |letter| @greens.include?(letter) || @yellows.values.flatten.include?(letter) }
+    @greys.reject! { |letter| @greens.values.include?(letter) || @yellows.values.flatten.include?(letter) }
   end
 
   def ask_for_letters_and_colours

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.3.0 ruby lib
+# stub: wordl-solver 1.4.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "wordl-solver".freeze
-  s.version = "1.3.0"
+  s.version = "1.4.2"
 
   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-06-16"
+  s.date = "2025-03-20"
   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
@@ -45,13 +45,13 @@ Gem::Specification.new do |s|
   if s.respond_to? :add_runtime_dependency then
     s.add_development_dependency(%q<shoulda>.freeze, [">= 0"])
     s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-    s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
+    s.add_development_dependency(%q<bundler>.freeze, [">= 1.0"])
     s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.1.0"])
     s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
   else
     s.add_dependency(%q<shoulda>.freeze, [">= 0"])
     s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-    s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
+    s.add_dependency(%q<bundler>.freeze, [">= 1.0"])
     s.add_dependency(%q<juwelier>.freeze, ["~> 2.1.0"])
     s.add_dependency(%q<simplecov>.freeze, [">= 0"])
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wordl-solver
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.2
 platform: ruby
 authors:
 - george kosmopoulos
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-16 00:00:00.000000000 Z
+date: 2025-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -42,14 +42,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
@@ -108,7 +108,7 @@ homepage: http://github.com/gkosmo/wordl-solver
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -123,8 +123,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.10
-signing_key:
+rubygems_version: 3.5.9
+signing_key: 
 specification_version: 4
 summary: This gem solves wordl puzzles.
 test_files: []