cinch_hangman 0.0.1 → 0.0.2

data/lib/cinch/plugins/hangman.rb

@@ -20,18 +20,18 @@ module Cinch::Plugins
     def initialize(answer, max_guesses = 6)
       @answer            = answer
       @max_guesses       = max_guesses
-      @correct_guesses   = []
+      @correct_chars     = Set.new
       @incorrect_guesses = []
     end
     def guess(guess)
       if @answer.include?(guess)
-        @correct_guesses << guess
+        @correct_chars.merge(guess.chars)
       else
 				@incorrect_guesses << guess
       end
     end
     def describe
-      if @correct_guesses.empty? && @incorrect_guesses.empty?
+      if @correct_chars.empty? && @incorrect_guesses.empty?
         "(#{hint}) a new hangman riddle has started."
       elsif won
         "(#{hint}) that hangman riddle was solved, awesome!"
@@ -42,7 +42,7 @@ module Cinch::Plugins
       end
     end
     def won
-      @correct_guesses.join.include?(@answer)
+      @correct_chars.superset?(Set.new(@answer.chars))
     end
     def lost
       guesses_left == 0
@@ -51,7 +51,7 @@ module Cinch::Plugins
       @max_guesses - @incorrect_guesses.size
     end
     def hint
-      @answer.chars.map { |char| @correct_guesses.join.include?(char) ? char : "_" }.join(" ")
+      @answer.chars.map { |char| @correct_chars.include?(char) ? char : "_" }.join(" ")
     end
 
   end

data/lib/cinch_hangman/version.rb

@@ -1,3 +1,3 @@
 module CinchHangman
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/hangman_spec.rb

@@ -14,15 +14,25 @@ describe Cinch::Plugins::Game do
       subject.describe.should include 'new hangman'
     end
     describe 'guesses' do
-      it 'reduce after an incorrect guess' do
-        subject.guess("x")
-        subject.describe.should include '5 guesses'
-        subject.guess("lol")
-        subject.describe.should include '4 guesses'
+      describe 'correct' do 
+        it 'when containing a single character in the answer' do
+          subject.guess("h")
+          subject.describe.should include '6 guesses'
+        end
       end
-      it 'do not reduce after a correct guess' do
-        subject.guess("h")
-        subject.describe.should include '6 guesses'
+      describe 'incorrect' do
+        it 'when containing a single character not in the answer' do
+          subject.guess("x")
+          subject.describe.should include '5 guesses'
+        end
+        it 'when containing a word not in the answer' do
+          subject.guess("lol")
+          subject.describe.should include '5 guesses'
+        end
+        it 'when containing the correct answer in reverse' do
+          subject.guess("ho")
+          subject.describe.should include '5 guesses'
+        end
       end
     end
     describe 'hints' do
@@ -50,6 +60,11 @@ describe Cinch::Plugins::Game do
         subject.guess("oh")
         subject.describe.should include 'awesome!'
       end
+      it 'occurs no matter what order guesses are given' do
+        subject.guess("h")
+        subject.guess("o")
+        subject.describe.should include 'awesome!'
+      end
       it 'should not be automatic for hassox' do
         subject = Cinch::Plugins::Game.new("hassox")
         subject.guess("s")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch_hangman
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-07 00:00:00.000000000Z
+date: 2011-09-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch
-  requirement: &2153646940 !ruby/object:Gem::Requirement
+  requirement: &2153442480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153646940
+  version_requirements: *2153442480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153644200 !ruby/object:Gem::Requirement
+  requirement: &2153441180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153644200
+  version_requirements: *2153441180
 description: 
 email:
 - shanonmcquay@gmail.com
@@ -62,7 +62,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1342828520626394308
+      hash: 1370904378984459373
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1342828520626394308
+      hash: 1370904378984459373
 requirements: []
 rubyforge_project: cinch_hangman
 rubygems_version: 1.8.6