scrabble-solver 0.1.1 → 0.2

data/Guardfile

@@ -5,5 +5,6 @@ guard 'rspec', version: 2, cli: '-cfs'  do
   watch(%r{spec/(.+)\.rb})  { |m| "spec/#{m[1]}.rb" }
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec/" }
+  watch('bin/scrabble-solver')  { "spec/" }
 end
 

data/README.md

@@ -63,9 +63,17 @@ your Z is the first letter in the word, check this out:
 
     $ scrabble-solver zloogsti --contains z --at 1
 
-The `--contains` and `--at` flags must be used in conjunction. They will not
-do anything if used separately. They will only return words that have the
-specified pattern at the specified location.
+You can also use wildcards in the `--contains` flag:
+
+    $ scrabble-solver zloogsti --contains z?o --at 1
+
+This will match z, anything, o and then anything after that. So "zoo"
+will match beautifully.
+
+If you don't feel like specifying an `--at` flag, you don't have to.
+This will return "zoology" just fine:
+
+    $ scrabble-solver zlogoyo --contains gy
 
 # Word lists
 

data/bin/scrabble-solver

@@ -65,4 +65,8 @@ if letters.nil?
 end
 
 # If all is well, solve :)
-puts Scrabble::Solver.words_for letters, options
+words = Scrabble::Solver.words_for(letters, options).sort do |word1, word2|
+  word1.length <=> word2.length
+end
+
+puts words

data/lib/scrabble-solver/solver.rb

@@ -98,9 +98,16 @@ module Scrabble
       end
 
       # Filter words that contain a specific sequence at a given 1-based index.
-      if options[:contains] and options[:at]
+      if options[:contains]
+        # Generate a regex to match against the string. This regex will replace
+        # question marks with dots, so that they match any character. This
+        # gives the user a lot of power with the --contains --at combo.
+        regex  = ''
+        regex += ('^' + ('.' * (options[:at].to_i - 1))) if options[:at]
+        regex += options[:contains].gsub('?', '.')
+        regex  = Regexp.new regex
         words.keep_if do |word|
-          word[options[:at].to_i - 1, options[:contains].length] == options[:contains]
+          word =~ regex
         end
       end
 

data/spec/scrabble-solver/solver_spec.rb

@@ -89,6 +89,27 @@ module Scrabble
         words.length.should be > 0, "No words scanned."
       end
 
+      it "should be able to use wildcards in --contains" do
+        words = Solver.words_for "diegti?wj", contains: "g?t", at: "3"
+        words.each do |word|
+          word.should match /^..g.t/
+        end
+
+        # Ensure that some words were actually checked in the above loop.
+        words.length.should be > 0, "No words scanned."
+      end
+
+      it "should be able to use --contains without --at" do
+        words = Solver.words_for "diegti?wj", contains: "g?t"
+        words.each do |word|
+          word.should match /g.t/
+        end
+
+        # Ensure that some words were actually checked in the above loop.
+        words.length.should be > 0, "No words scanned."
+      end
+
+
       it "should be able to take a new word file if specified" do
         words = Solver.words_for "????", word_file: test_word_file
         words.should be_empty
@@ -172,6 +193,26 @@ module Scrabble
         words.length.should be > 0, "No words scanned."
       end
 
+      it "should be able to use wildcards in --contains" do
+        words = `#{executable} diegti?wj --contains g?t --at 3`.split(/\n/)
+        words.each do |word|
+          word.should match /^..g.t/
+        end
+
+        # Ensure that some words were actually checked in the above loop.
+        words.length.should be > 0, "No words scanned."
+      end
+
+      it "should be able to use --contains without --at" do
+        words = `#{executable} diegti?wj --contains g?t`.split(/\n/)
+        words.each do |word|
+          word.should match /g.t/
+        end
+
+        # Ensure that some words were actually checked in the above loop.
+        words.length.should be > 0, "No words scanned."
+      end
+
       it "should be able to take a new word file if specified" do
         words = `#{executable} ???? --word-file #{test_word_file}`.split(/\n/)
         words.should be_empty

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scrabble-solver
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors: