scrabblestuff 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5930b2f7e2ec61effc7fba76ee5520fe1392b24c
-  data.tar.gz: e5e3521c4c6ed00b02601fd7fc5ef9ef7930029e
+  metadata.gz: bfaf3d78979001b0135400415b5affcc1f136986
+  data.tar.gz: 4e09e359f1f2ea9dfe3af67ee954c34d7e3e1471
 SHA512:
-  metadata.gz: 47b10e9df5329e3f8c1e362fa5fb808431fea0df89cf65833dfa664fd260a1cc6faa7bf2131a5e0b662aa09a7ddc8330af709ac5494f43717910b7b1808a122d
-  data.tar.gz: 8f5bba4f6f5cc3ab071c6f8a5f0257c8d45281ecda67342035fa0b68794347bf144fd5e85b9e628b2ac255e9c80cf98034e9aea032a07988e325b5be6531b08d
+  metadata.gz: 370b744c9fee6fc2b08607cac7119e560e3dd71f26b91a3a52ddf847872a7bf0a8edeceb44ff5d1b18808ff03307d5a86e96e1794b4f0b98d3cb89e2d44d14f2
+  data.tar.gz: 546066d02b7a3d4038e57597dfb6f4dadfac783652b71683b5ce623abd98dd9e546693844591e6ee3a623e09e672be738f421f1c49e51a8fb840e38031d51003

data/README.md

@@ -10,6 +10,15 @@ based on the algorithm used by https://github.com/samwho/scrabble-solver
 
 `gem install scrabblestuff`
 
+## Usage
+
+```ruby
+solver = Scrabble::Solver.new
+solver.load_dictionary
+solver.find("astrd").sort { |x,y| x.length <=> y.length }
+=> ["at", "ad", "as", "ta", "ar", "ads", "ars", "art", "tas", "tar", "tad", "sat", "sad", "rad", "rat", "ras", "rats", "rads", "sard", "drat", "star", "tads", "arts", "tars", "dart", "trad", "tsar", "darts", "drats"]
+```
+
 ## Copyright
 
 Copyright &copy; 2014 Cody Barr. See LICENSE.md for

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/scrabblestuff/solver.rb

@@ -1,96 +1,45 @@
+# trie.rb
+# from https://gist.github.com/Sirupsen/6481936
 module Scrabble
-  module Solver
-    # The name of the file to use as a word dictionary. This file can be any
-    # file that contains a list of words, one word per line.
-    # @word_file_name = File.dirname(__FILE__) + "/../../assets/words.txt"
-    @word_file_name = File.dirname(__FILE__) + '/../../assets/wwf.txt'
-
-    # Reads in the words.txt file and returns an array containing all of the words
-    # in that file.
-    #
-    # Used by other methods
-
-    def self.word_list
-      @word_list ||= File.open(@word_file_name) do |file|
-        file.readlines.map do |line|
-          line.chomp
-        end.delete_if do |line|
-          line.length < 2
-        end
-      end
-
-      @word_list.clone
+  class Solver
+    attr_accessor :word, :nodes, :used, :all
+   
+    def initialize
+      @word, @nodes = false, {}
     end
 
-    # Gets an array of words that would fit the current board of Scrabble
-    # tiles.
-    #
-    # Example:
-    #
-    #   Scrabble::Solver.words_for "there"
-    #   # => An array of words that the tiles t, h, e, r, e could make.
-    #
-    #   Scrabble::Solver.words_for "there?"
-    #   # => An array of words that the tiles t, h, e, r, e plus a blank tile
-    #   #    could make.
-
-    def self.words_for(letters, options = {})
-      # splits the letters into lowercase array of individual letters
-      letters  = letters.downcase.split(//)
-
-      # cycles through the entire word list, returns a list of new words as long as they match the algorithm
-      words = word_list.keep_if do |word|
-        # Split the current dictionary word into an array of its letters.
-        word = word.split(//)
-
-        # cycles through each of the letters in our letters array
-        letters.each do |letter|
-          # if the letter is found...
-          unless word.index(letter).nil?
-            # delete the letter from the word, move to the next letter
-            word.delete_at word.index(letter)
-          end
-        end
-
-        # Only return the word if there are no remaining letters
-        word.length == 0
-      end
-
-      # Filter only words that start with a specific sequence.
-      if options[:starts_with]
-        words.keep_if { |word| word.start_with? options[:starts_with] }
-      end
-
-      # Filter words that only end in a certain sequence.
-      if options[:ends_with]
-        words.keep_if { |word| word.end_with? options[:ends_with] }
-      end
-
-      # Fitler only words shorter than a given amount.
-      if options[:shorter_than]
-        words.keep_if { |word| word.length < options[:shorter_than].to_i }
-      end
-
-      # Filter words only longer than a given amount.
-      if options[:longer_than]
-        words.keep_if { |word| word.length > options[:longer_than].to_i }
-      end
+    def load_dictionary(word_file_name = File.dirname(__FILE__) + '/../../assets/words.txt')
+      words = File.read(word_file_name).split("\n").map(&:downcase)
 
-      # Filter words that contain a specific sequence at a given 1-based index.
-      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 =~ regex
-        end
+      words.each do |word|
+        self.<< word.chomp
       end
-
-      return words
+    end
+   
+    def <<(word)
+      node = word.each_char.inject(self) { |node, char| node.nodes[char] ||= Solver.new }
+      node.word = true
+    end
+   
+    def find(letters)
+      @all = []
+      @used = frequency_map(letters)
+      recursive_find self, ""
+      @all
+    end
+   
+    def recursive_find(root, word)
+      nodes.reject { |c, v| root.used[c] == 0 }.each { |char, node|
+        root.used[char] -= 1
+        node.recursive_find(root, word + char)
+        root.used[char] += 1
+      }
+   
+      root.all << word if self.word
+    end
+   
+    def frequency_map(letters)
+      letters.each_char.inject(Hash.new(0)) { |map, char| (map[char] += 1) && map }
     end
   end
-end
+end

data/scrabblestuff.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: scrabblestuff 0.1.1 ruby lib
+# stub: scrabblestuff 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scrabblestuff"
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Cody Barr"]
-  s.date = "2014-05-23"
+  s.date = "2014-05-31"
   s.description = "scrabblestuff is a simple scrabble solver gem with a default WWF dictionary."
   s.email = "cody.barr@gmail.com"
   s.extra_rdoc_files = [
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
-    "assets/wwf.txt",
+    "assets/words.txt",
     "lib/scrabblestuff.rb",
     "lib/scrabblestuff/solver.rb",
     "scrabblestuff.gemspec",

data/test/helper.rb

@@ -1,34 +1,4 @@
 require 'simplecov'
+require 'minitest/autorun'
 
-module SimpleCov::Configuration
-  def clean_filters
-    @filters = []
-  end
-end
-
-SimpleCov.configure do
-  clean_filters
-  load_adapter 'test_frameworks'
-end
-
-ENV["COVERAGE"] && SimpleCov.start do
-  add_filter "/.rvm/"
-end
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'scrabblestuff'
-
-class Test::Unit::TestCase
-end
+require_relative '../lib/scrabblestuff'

data/test/test_scrabblestuff.rb

@@ -1,7 +1,9 @@
 require 'helper'
 
-class TestScrabblestuff < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+describe ".find" do
+  it "should return correct results" do
+    solver = Scrabble::Solver.new
+    solver.load_dictionary
+    solver.find("astrd").sort { |x,y| x.length <=> y.length }.must_equal(["at", "ad", "as", "ta", "ar", "ads", "ars", "art", "tas", "tar", "tad", "sat", "sad", "rad", "rat", "ras", "rats", "rads", "sard", "drat", "star", "tads", "arts", "tars", "dart", "trad", "tsar", "darts", "drats"])
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrabblestuff
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Cody Barr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -96,7 +96,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- assets/wwf.txt
+- assets/words.txt
 - lib/scrabblestuff.rb
 - lib/scrabblestuff/solver.rb
 - scrabblestuff.gemspec