mathy 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c519a5a7e7b51b1575c89d96e1adb11656d3b38
-  data.tar.gz: 7f0b59a4f0a1853319eee609ce9745547b23a8f4
+  metadata.gz: 2ade07e7975c9605113ece23644be57c1786183b
+  data.tar.gz: b595bc96b10e6537dffe7d440f4ca2906dee1596
 SHA512:
-  metadata.gz: 2f00ca5fa3c9a45402b074065e17cea90a50c433fec28124d00bb2f18ec3d12c91215f864d33bfedac751f15d3b89f7db28b4fb4a98237337b2571ac3e687c4b
-  data.tar.gz: 76ce21412799aa03a79fc1ea84c0bd6078d0d83236273fc7a1b528b6f32c807a2d85f1b1d119797027cff02eb3f8f35b543b0ca1e506b75e4e49aa8a932382fa
+  metadata.gz: 06029b403ea8ac242731f141d5ac6a8dbf8fe60758641cb0dfd020074c4b4ad50790784ef5462e33c9187ca15c7f0d4aa032f8ca76522e6dd0a15b13c069837d
+  data.tar.gz: bd315a6e8644068e8da4256d8b48efd1639f687dc386fcf32a2ba562cb725add4e09dd0c5ef322adf084d902b973b1cb26660b9cad87486ffd72c6204146ccc9

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 2.1.1

data/Gemfile.lock

@@ -6,6 +6,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    minitest (4.7.5)
     rake (10.1.0)
 
 PLATFORMS
@@ -14,4 +15,5 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.6)
   mathy!
+  minitest
   rake

data/Rakefile

@@ -1,2 +1,9 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+end
+
+task :default => :test
 

data/bin/mathy

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+require 'mathy'
+
+module Mathy
+  console = Console.new
+  game = Game.new(Player.new(console.greet))
+  game.play(console)
+end

data/lib/mathy.rb

@@ -1,11 +1,9 @@
 require "mathy/version"
 require 'mathy/console'
 require 'mathy/verification'
+require 'mathy/player'
 require 'mathy/game'
 require 'mathy/operations/operation'
-require 'mathy/operations/addition'
-require 'mathy/operations/subtraction'
-
 require 'mathy/difficulties/grade_two'
 
 module Mathy

data/lib/mathy/console.rb

@@ -14,15 +14,31 @@ module Mathy
       operations.find { |operation| operation.matches?(selection) }
     end
 
+    def difficulty?
+      Difficulties::GradeTwo.new
+    end
+
+    def display_results(player, score, turns_played)
+      report ""
+      report "+++++++++++++++++++++++++++++++++++"
+      report "You got #{score}/#{turns_played}."
+      report "Good bye #{player.name}"
+      report "+++++++++++++++++++++++++++++++++++"
+    end
+
     def prompt?(question)
-      puts question
+      report question
       gets.strip
     end
 
+    def report(message)
+      puts message
+    end
+
     private
 
     def clear_screen
-      puts "\e[H\e[2J"
+      report "\e[H\e[2J"
     end
   end
 end

data/lib/mathy/difficulties/grade_two.rb

@@ -4,6 +4,14 @@ module Mathy
       def next_operands
         [rand(20), rand(20)].sort.reverse
       end
+
+      def choose_operation(console)
+        verifier = Verification.new(console)
+        console.operation?([
+          Operations::Operation.new(self, "+", verifier),
+          Operations::Operation.new(self, "-", verifier)
+        ])
+      end
     end
   end
 end

data/lib/mathy/game.rb

@@ -1,26 +1,27 @@
 module Mathy
   class Game
-    def initialize(console, score = 0)
-      @name = console.greet
+    def initialize(player, score = 0)
+      @player = player
       @score = score
     end
 
-    def play(games_to_play = 2, operation, difficulty)
-      games_to_play.times do
-        @score += 1 if operation.play_turn(difficulty.next_operands)
-      end
-
-      display_results(@name, @score, games_to_play)
+    def play(console)
+      turns_played = play_turns(console)
+      console.display_results(@player, @score, turns_played)
     end
 
     private
 
-    def display_results(name, score, games_to_play)
-      puts ""
-      puts "+++++++++++++++++++++++++++++++++++"
-      puts "You got #{score}/#{games_to_play}."
-      puts "Good bye #{name}"
-      puts "+++++++++++++++++++++++++++++++++++"
+    def play_turns(console)
+      turns_to_play = console.how_many_turns?
+      turns_to_play.times do
+        @score += 1 if operation(console).play_turn
+      end
+      turns_to_play
+    end
+
+    def operation(console)
+      @operation ||= console.difficulty?.choose_operation(console)
     end
   end
 end

data/lib/mathy/operations/operation.rb

@@ -3,18 +3,24 @@ module Mathy
     class Operation
       attr_reader :key
 
-      def initialize(verification, key)
-        @verifier = verification
+      def initialize(difficulty, key, verification)
+        @difficulty = difficulty
         @key = key
+        @verifier = verification
       end
 
-      def play_turn(operands)
+      def play_turn
+        operands = @difficulty.next_operands
         @verifier.check_answer("#{operands.join(" #{key} ")} = ", calculate(operands))
       end
 
       def matches?(other_key)
         key == other_key
       end
+
+      def calculate(operands)
+        operands.inject { |result, x| result.send(key.to_sym, x) }
+      end
     end
   end
 end

data/lib/mathy/player.rb

@@ -0,0 +1,9 @@
+module Mathy
+  class Player
+    attr_reader :name
+
+    def initialize(name)
+      @name = name
+    end
+  end
+end

data/lib/mathy/verification.rb

@@ -1,14 +1,18 @@
 module Mathy
   class Verification
+    def initialize(console)
+      @console = console
+    end
+
     def check_answer(question, correct_answer)
-      puts ""
-      print question
+      @console.report ""
+      @console.report question
       answer = gets
       if answer.to_i == correct_answer
-        print "Correct!"
+        @console.report "Correct!"
         return true
       end
-      print "The correct answer is #{correct_answer}."
+      @console.report "The correct answer is #{correct_answer}."
       false
     end
   end

data/lib/mathy/version.rb

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

data/mathy.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
 end

data/test/minitest_helper.rb

@@ -0,0 +1,4 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'mathy'
+
+require 'minitest/autorun'

data/test/test_mathy.rb

@@ -0,0 +1,11 @@
+require 'minitest_helper'
+
+class TestMathy < MiniTest::Unit::TestCase
+  def test_that_it_has_a_version_number
+    refute_nil ::Mathy::VERSION
+  end
+
+  def test_it_does_something_useful
+    assert false
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mathy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - mo khan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-26 00:00:00.000000000 Z
+date: 2014-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,32 +38,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: this is an application that my daughter and i are writing to help her
   practice her math.
 email:
 - mo@mokhan.ca
 executables:
-- mathy.rb
+- mathy
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/mathy.rb
+- bin/mathy
 - lib/mathy.rb
 - lib/mathy/console.rb
 - lib/mathy/difficulties/grade_two.rb
 - lib/mathy/game.rb
-- lib/mathy/operations/addition.rb
 - lib/mathy/operations/operation.rb
-- lib/mathy/operations/subtraction.rb
+- lib/mathy/player.rb
 - lib/mathy/verification.rb
 - lib/mathy/version.rb
 - mathy.gemspec
-- mathy/.gitignore
+- test/minitest_helper.rb
+- test/test_mathy.rb
 homepage: ''
 licenses:
 - MIT
@@ -88,4 +104,6 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: a command line application to practice your math.
-test_files: []
+test_files:
+- test/minitest_helper.rb
+- test/test_mathy.rb

data/bin/mathy.rb

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-require 'mathy'
-
-verifier = Mathy::Verification.new
-operations = [
-  Mathy::Operations::Addition.new(verifier),
-  Mathy::Operations::Subtraction.new(verifier)
-]
-
-console = Mathy::Console.new
-game = Mathy::Game.new(console)
-difficulty = Mathy::Difficulties::GradeTwo.new
-game.play(console.how_many_turns?, console.operation?(operations), difficulty)

data/lib/mathy/operations/addition.rb

@@ -1,15 +0,0 @@
-module Mathy
-  module Operations
-    class Addition < Operation
-      def initialize(verification)
-        super(verification, "+")
-      end
-
-      def calculate(operands)
-        operands.inject(0) do |result, x|
-          result + x
-        end
-      end
-    end
-  end
-end

data/lib/mathy/operations/subtraction.rb

@@ -1,15 +0,0 @@
-module Mathy
-  module Operations
-    class Subtraction < Operation
-      def initialize(verification)
-        super(verification, "-")
-      end
-
-      def calculate(operands)
-        operands.inject(0) do |result, x|
-          result + x
-        end
-      end
-    end
-  end
-end