word_scramble 0.0.5 → 0.1.0

data/.gitignore

@@ -17,3 +17,5 @@ test/version_tmp
 tmp
 .rvmrc
 .rspec
+time.rb
+time/*

data/README.md

@@ -29,8 +29,8 @@ You can use it from the command line, like this
 Or you can call the Descrambler library directly
 
 ```ruby
-descrambler = WordScramble::Descrambler.new("realapin")
-descrambler.matching_words # => ["airplane", ... ]
+descrambler = WordScramble::Descrambler.new("liopts")
+descrambler.matching_words # => ["pilots", "spoilt", "pistol"]
 ```
 
 ## Contributing

data/bin/descramble

@@ -7,6 +7,9 @@ if ARGV.empty?
 end
 
 descrambler = WordScramble::Descrambler.new(ARGV.first)
+
+puts "no matches" if descrambler.matching_words.empty?
+
 descrambler.matching_words.each do |word|
   puts word
 end

data/lib/word_scramble.rb

@@ -7,23 +7,26 @@ require "word_scramble/version"
 # A game played in the Virgin Airlines waiting lounge.
 #
 # Input is a scrambled string.
-# You try to make a word (or words) from those letters.
+# You try to make a word from those letters.
 #
 # ===== Examples
-#   "valesages" => "las vegas"
+#   "rnmteial" => "terminal"
 #   "realapin" => "airplane"
 #   "liopt" => "pilot"
 #
 # ==== Usage
 #
 #   descrambler = WordScramble::Descrambler.new("realapin")
-#   descrambler.matching_words  # => ["airplane", ... ]
+#   descrambler.matching_words  # => ["airplane"]
 
 module WordScramble 
   DICTIONARY = File.open(File.expand_path('../dictionary.txt', __FILE__)) do |f|
-    dictionary = []
+    dictionary = {}
     f.each_line do |line|
-      dictionary.push(line.strip)
+      word = line.strip
+      length = word.length
+      dictionary[length] ||= []
+      dictionary[length].push(word)
     end
     dictionary
   end
@@ -31,3 +34,4 @@ end
 
 require File.expand_path('../word_scramble/scrambled_word', __FILE__)
 require File.expand_path('../word_scramble/descrambler', __FILE__)
+require File.expand_path('../word_scramble/letter_frequency', __FILE__)

data/lib/word_scramble/descrambler.rb

@@ -13,7 +13,7 @@ class WordScramble::Descrambler
   end
 
   def descramble
-    WordScramble::DICTIONARY.each do |word|
+    same_length_words.each do |word|
       if @scrambled_word.can_make?(word)
         @matching_words.push(word)
       end
@@ -22,4 +22,12 @@ class WordScramble::Descrambler
     @already_descrambled = true
   end
 
+  def same_length_words
+    if WordScramble::DICTIONARY[@scrambled_word.length].nil?
+      []
+    else
+      WordScramble::DICTIONARY[@scrambled_word.length]
+    end
+  end
+
 end

data/lib/word_scramble/letter_frequency.rb

@@ -0,0 +1,18 @@
+class WordScramble::LetterFrequency
+  attr_reader :frequency_hash, :length
+
+  def initialize(str)
+    @length = str.length
+    @frequency_hash = {}
+
+    str.downcase.each_char do |c| 
+      @frequency_hash[c] ||= 0
+      @frequency_hash[c] += 1
+    end
+  end
+
+  def ==(other)
+    other.is_a?(WordScramble::LetterFrequency) and other.frequency_hash == @frequency_hash
+  end
+
+end

data/lib/word_scramble/scrambled_word.rb

@@ -1,38 +1,17 @@
 class WordScramble::ScrambledWord
 
   def initialize(scrambled_word)
-    @scrambled_word = scrambled_word
+    @scrambled_word = WordScramble::LetterFrequency.new(scrambled_word)
   end
 
   def can_make(word)
-    WordChecker.new(@scrambled_word, word).matches?
+    WordScramble::LetterFrequency.new(word) == @scrambled_word
   end
 
-  alias_method :can_make?, :can_make
-
-  class WordChecker
-    def initialize(scrambled_word, word)
-      @scrambled_letters = scrambled_word.downcase.split('').sort.inject({}) do |frequency_hash, l|
-        frequency_hash[l] ||= 0
-        frequency_hash[l] += 1
-        frequency_hash
-      end
-      @word_letters = word.downcase.split('').sort.inject({}) do |frequency_hash, l|
-        frequency_hash[l] ||= 0
-        frequency_hash[l] += 1
-        frequency_hash
-      end
-    end
-
-    def matches?
-      @word_letters.each do |letter, count|
-        scrambled_count = @scrambled_letters[letter]
-        return false if scrambled_count.nil? or scrambled_count < count
-      end
-      return true
-    end
-
-    alias_method :matches, :matches?
+  def length
+    @scrambled_word.length
   end
 
+  alias_method :can_make?, :can_make
+
 end

data/lib/word_scramble/version.rb

@@ -1,3 +1,3 @@
 module WordScramble
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

data/spec/descrambler_spec.rb

@@ -18,9 +18,27 @@ describe WordScramble::Descrambler do
     descrambled.should include("airplane")
   end
 
-  it "orders the matching words by length" do
+  it "only returns words of the same length as the scrambled string" do
     @scrambled = "liopt"
-    descrambled.first.downcase.should == "pilot"
+    descrambled.select { |word| word.length != @scrambled.length }.should be_empty
+  end
+
+  it "doesnt crash with strings that are longer than any words in the dictionary" do
+    @scrambled = "a" * 100
+    lambda {descrambled}.should_not raise_error
+  end
+
+  describe "same_length_words" do
+    let(:descrambler) { WordScramble::Descrambler.new(@scrambled) }
+    it "returns an array of words" do
+      @scrambled = "fxo"
+      descrambler.same_length_words.should include("fox")
+    end
+    
+    it "returns an empty array if there are no words of the same length" do
+      @scrambled = "a" * 100
+      descrambler.same_length_words.should be_empty
+    end
   end
 
 end

data/spec/letter_frequency_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe WordScramble::LetterFrequency do
+  it 'knows that "pilots" and "spoilt" have the same letters' do
+    pilots = WordScramble::LetterFrequency.new("pilots")
+    spoilt = WordScramble::LetterFrequency.new("spoilt")
+    pilots.should == spoilt
+  end
+
+  it 'knows that "neocon" and "satan" have different letter' do
+    neocon = WordScramble::LetterFrequency.new("neocon")
+    satan = WordScramble::LetterFrequency.new("satan")
+    neocon.should_not == satan
+  end
+
+  it "knows how long the word should be" do
+    WordScramble::LetterFrequency.new("pop").length.should == 3
+  end
+end

data/spec/scrambled_word_spec.rb

@@ -12,5 +12,9 @@ describe WordScramble::ScrambledWord do
       sw.can_make("hooligans").should == false
     end
 
+    it "knows how longs it is" do
+      sw.length.should == "valesags".length
+    end
+
   end
 end

data/spec/word_scramble_spec.rb

@@ -1,11 +1,20 @@
 require 'spec_helper'
 
 describe WordScramble do
-  it "has a Dictionary" do
-    WordScramble::DICTIONARY.count.should be > 80000
-  end
 
-  it "has some common words in the dictionary" do
-    WordScramble::DICTIONARY.should include("porridge")
+  describe "Dictionary" do
+    let(:d) { WordScramble::DICTIONARY }
+    it "contains hello" do
+      d[5].should include("hello")
+    end
+
+    it "contains fox" do
+      d[3].should include("fox")
+    end
+
+    it "contains willow" do
+      d[6].should include("willow")
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: word_scramble
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-15 00:00:00.000000000 Z
+date: 2012-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &75348930 !ruby/object:Gem::Requirement
+  requirement: &75502060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75348930
+  version_requirements: *75502060
 description: Take a string of scrambled characters and find all the words that can
   be made from those characters.
 email:
@@ -40,12 +40,13 @@ files:
 - lib/dictionary.txt
 - lib/word_scramble.rb
 - lib/word_scramble/descrambler.rb
+- lib/word_scramble/letter_frequency.rb
 - lib/word_scramble/scrambled_word.rb
 - lib/word_scramble/version.rb
 - spec/descrambler_spec.rb
+- spec/letter_frequency_spec.rb
 - spec/scrambled_word_spec.rb
 - spec/spec_helper.rb
-- spec/word_checker_spec.rb
 - spec/word_scramble_spec.rb
 - word_scramble.gemspec
 homepage: ''
@@ -75,7 +76,7 @@ summary: Written to solve the Word Scramble game that they give out on Virgin Ai
   when the flight is delayed.
 test_files:
 - spec/descrambler_spec.rb
+- spec/letter_frequency_spec.rb
 - spec/scrambled_word_spec.rb
 - spec/spec_helper.rb
-- spec/word_checker_spec.rb
 - spec/word_scramble_spec.rb

data/spec/word_checker_spec.rb

@@ -1,27 +0,0 @@
-require 'spec_helper'
-
-describe WordScramble::ScrambledWord::WordChecker do
-  describe "lelho" do
-    let(:scrambled_word) { "lelho" }
-
-    it "matches 'hello'" do
-      wc = WordScramble::ScrambledWord::WordChecker.new(scrambled_word, "hello")
-      wc.matches?.should be_true
-    end
-    
-    it "doesn't match 'kittens'" do
-      wc = WordScramble::ScrambledWord::WordChecker.new(scrambled_word, "kittens")
-      wc.matches.should be_false
-    end
-
-    it "'princess' doesn't match 'princes'" do
-      wc = WordScramble::ScrambledWord::WordChecker.new("princes", "princess")
-      wc.matches.should be_false
-    end
-
-    it "is case insensitive" do
-      wc = WordScramble::ScrambledWord::WordChecker.new("chicago", "Chicago")
-      wc.matches.should be_true
-    end
-  end
-end