Merge pull request #4 from randallreedjr/bug/updated-math24-syntax

Bug/updated math24 syntax

.gitignore

@@ -1,2 +1,4 @@
 /.bundle/
+/log/
 math24-*.gem
+.byebug_history

.rspec

@@ -1,3 +1,4 @@
 --color
 --warnings
 --require spec_helper
+--format documentation

Gemfile

@@ -4,9 +4,17 @@ gem 'sinatra', '1.4.5'
 gem 'tilt', '1.4.1'
 gem 'rack', '1.5.2'
 gem 'rack-protection', '1.5.0'
-gem 'rspec', '3.0.0'
-gem 'rspec-core', '3.0.1'
 gem 'math24', '~>2.0.0'
 gem 'require_all', '~>1.4.0'
 gem 'thin', '~>1.7.0'
-gem 'newrelic_rpm', '~>3.17.1'
+
+group :development, :test do
+  gem 'rspec', '3.0.0'
+  gem 'rspec-core', '3.0.1'
+  gem 'rack-test'
+  gem 'byebug'
+end
+
+group :production do
+  gem 'newrelic_rpm', '~>3.17.1'
+end

Gemfile.lock

@@ -1,27 +1,30 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    byebug (9.0.6)
     daemons (1.2.4)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     eventmachine (1.2.1)
     math24 (2.0.1)
-    newrelic_rpm (3.17.1.326)
+    newrelic_rpm (3.17.2.327)
     rack (1.5.2)
     rack-protection (1.5.0)
       rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
     require_all (1.4.0)
     rspec (3.0.0)
       rspec-core (~> 3.0.0)
       rspec-expectations (~> 3.0.0)
       rspec-mocks (~> 3.0.0)
     rspec-core (3.0.1)
       rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.1)
+    rspec-expectations (3.0.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.1)
+    rspec-mocks (3.0.4)
       rspec-support (~> 3.0.0)
-    rspec-support (3.0.0)
+    rspec-support (3.0.4)
     sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
@@ -36,10 +39,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  byebug
   math24 (~> 2.0.0)
   newrelic_rpm (~> 3.17.1)
   rack (= 1.5.2)
   rack-protection (= 1.5.0)
+  rack-test
   require_all (~> 1.4.0)
   rspec (= 3.0.0)
   rspec-core (= 3.0.1)

app/controllers/math24_controller.rb

@@ -7,15 +7,8 @@ class Math24Controller < ApplicationController
     erb :'math24/about'
   end
 
-  get '/problem' do 
-    math24 = Math24.new
-    problem = math24.generate_problem.join(" ")
-    erb :'math24/problem', :locals => {:problem => problem}
-  end
-
-  post '/problem' do
-    math24 = Math24.new
-    problem = "#{params[:problem] || ""}"
+  get '/problem' do
+    problem = Math24.generate_problem.join(" ")
     erb :'math24/problem', :locals => {:problem => problem}
   end
 
@@ -24,20 +17,22 @@ class Math24Controller < ApplicationController
   end
 
   post '/solution' do
-    math24solver = Math24Solver.new
     problem = "#{params[:problem] || ""}"
     if problem.include?(",")
-      numbers = problem.gsub(" ","").split(",")
+      numbers = problem.delete(" ").split(",")
     else
-      numbers = problem.squeeze(" ").split(" ")
+      numbers = problem.squeeze(" ").split
     end
+
     valid = numbers.all? do |number|
       number.to_i > 0 && number.to_i < 10
     end
+
     if valid
-      solution = math24solver.solve(numbers)
-      erb :'math24/solution', :locals => {:problem => numbers.join(" "), 
-                                 :solution => solution,
+      solution = Math24.solve(numbers)
+      message = solution ? "#{solution} = 24" : "No solution found"
+      erb :'math24/solution', :locals => {:problem => numbers.join(" "),
+                                 :message => message,
                                  :last_answer => 24}
     else
       erb :'math24/solve', :locals => {:invalid => true}
@@ -47,16 +42,29 @@ class Math24Controller < ApplicationController
   post '/check' do
     problem = "#{params[:problem] || ""}"
     solution = "#{params[:solution] || ""}"
-    math24 = Math24.new
-    math24.numbers = problem.split(" ")
-    if math24.solution?(solution)
-      erb :'math24/correct', :locals => {:problem => problem, 
-                                :solution => solution, 
-                                :last_answer => math24.last_answer}
+    numbers = problem.split
+
+    begin
+      valid_solution = Math24.check(numbers, solution)
+    rescue ArgumentError
+      error = true
+      valid_solution = false
+    end
+
+    if valid_solution
+      erb :'math24/correct',
+          :locals => {
+            :problem => problem,
+            :solution => solution
+          }
+    elsif error
+      erb :'math24/incorrect', :locals => {:problem => problem,
+                                  :solution => solution,
+                                  :last_answer => '???'}
     else
-      erb :'math24/incorrect', :locals => {:problem => problem, 
-                                  :solution => solution, 
-                                  :last_answer => math24.last_answer}
+      erb :'math24/incorrect', :locals => {:problem => problem,
+                                  :solution => solution,
+                                  :last_answer => instance_eval(solution)}
     end
   end
-end
+end

app/views/math24/correct.erb

@@ -12,7 +12,7 @@
     <div class="container">
       <div class="jumbotron">
     <div class="numbers"><%= problem %></div>
-    <div class="numbers correct"><%= solution %> = <%= last_answer %>!</div>
+    <div class="numbers correct"><%= solution %> = 24!</div>
     <!--<div class="status green">CORRECT!</div>-->
     <div class="green mybutton"><a href="/problem">Give me another!</a></div>
-<%= erb :'layouts/_footer' %>
+<%= erb :'layouts/_footer' %>

app/views/math24/solution.erb

@@ -12,9 +12,9 @@
     <div class="container">
       <div class="jumbotron">
     <div class="numbers"><%= problem %></div>
-    <div class="numbers"><%= solution %>!</div>
+    <div class="numbers"><%= message %>!</div>
     <div>
       <div class="green mybutton"><a href="/problem">Give me problems</a></div>
       <div class="red mybutton"><a href="/solve">Show me solutions</a></div>
     </div>
-<%= erb :'layouts/_footer' %>
+<%= erb :'layouts/_footer' %>

config/environment.rb

@@ -1,14 +1,6 @@
-require_relative "../lib/math24solvercli.rb"
-#require "math24"
-
- ENV['SINATRA_ENV'] ||= "development"
+ENV['SINATRA_ENV'] ||= "development"
 
 require 'bundler/setup'
 Bundler.require(:default, ENV['SINATRA_ENV'])
 
-# ActiveRecord::Base.establish_connection(
-#   :adapter => "sqlite3",
-#   :database => "db/math24#{ENV['SINATRA_ENV']}.sqlite"
-# )
-
-require_all 'app'
+require_all 'app'