math24 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f74b8740c44cb687f969796f75da38eb4f8be35
-  data.tar.gz: 00af2b3953d8ba39dbace437aa492e98d06eb5b4
+  metadata.gz: 857a194911be2e38f064f35f9721244adb7b3f80
+  data.tar.gz: 324ffd0100d3904ac2f282cf7d81b911b8cf3620
 SHA512:
-  metadata.gz: f0b61333de0fc6abe2a4f0aeb37e7b04460b6d95badf210101c89489ff9695727dcead8ce0e47db3d6fb9481b27644a6b7ee2c005e8d037ef625d2feb943c20e
-  data.tar.gz: 739035936665c88a482592b1180a7659dd3d567bfc32c42aff6d71b4cce51a8f47362e8394154cdee4db45b56b87d589924fc16b437a6ac2e3519040bed0f03f
+  metadata.gz: f03d431b6b5e5f2197c01fce69f11bd3328ff400e34c2f988a9aecf249926b61b28dfe54f8ebc5d6bec362816eecdefe3325ce9c99812c2c8c2fa72235e26b4f
+  data.tar.gz: e47fe0aa504d1c30c8125cdb42f0be3615f46abc136a3d39a8b63f795458d2cbb1e6ed39203d88af30cf10ba926709af5410fbae35ff6be0bc8b7a75e0e8eb72

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 math24-*.gem
+.byebug_history

data/README.md

@@ -1,5 +1,6 @@
 # Math24
 [![CircleCI](https://circleci.com/gh/randallreedjr/math24/tree/master.svg?style=svg)](https://circleci.com/gh/randallreedjr/math24/tree/master)
+[![Gem Version](https://badge.fury.io/rb/math24.svg)](https://badge.fury.io/rb/math24)
 
 Math24 is a gem providing functionality to play the base version of the Math 24
  game. In the base version of Math 24, a player must combine 4 integers, using

data/lib/math24.rb

@@ -20,33 +20,36 @@ module Math24
     num_permutation.each do |numbers|
       op_permutation.each do |operators|
         begin
-          forward_result = instance_eval("((#{numbers[0].to_f} #{operators[0]} #{numbers[1]}.to_f) #{operators[1]} #{numbers[2]}.to_f) #{operators[2]} #{numbers[3].to_f}")
+          proposed_solution = "((#{numbers[0].to_f} #{operators[0]} #{numbers[1]}.to_f) #{operators[1]} #{numbers[2]}.to_f) #{operators[2]} #{numbers[3].to_f}"
+          forward_result = instance_eval(proposed_solution)
         rescue ZeroDivisionError
           forward_result = 0
         end
 
         begin
-          alternate_result = instance_eval("(#{numbers[0].to_f} #{operators[0]} #{numbers[1].to_f}) #{operators[1]} (#{numbers[2].to_f} #{operators[2]} #{numbers[3].to_f})")
+          proposed_solution = "(#{numbers[0].to_f} #{operators[0]} #{numbers[1].to_f}) #{operators[1]} (#{numbers[2].to_f} #{operators[2]} #{numbers[3].to_f})"
+          alternate_result = instance_eval(proposed_solution)
         rescue ZeroDivisionError
           alternate_result = 0
         end
 
         begin
-          reverse_result = instance_eval("#{numbers[0].to_f} #{operators[0]} (#{numbers[1].to_f} #{operators[1]} (#{numbers[2].to_f} #{operators[2]} #{numbers[3].to_f}))")
+          proposed_solution = "#{numbers[0].to_f} #{operators[0]} (#{numbers[1].to_f} #{operators[1]} (#{numbers[2].to_f} #{operators[2]} #{numbers[3].to_f}))"
+          reverse_result = instance_eval(proposed_solution)
         rescue ZeroDivisionError
           reverse_result = 0
         end
 
-        if forward_result == 24
+        if forward_result == 24 && integer_division_only?(proposed_solution)
           if (operators.include?("+") || operators.include?("-")) && (operators.include?("*") || operators.include?("/"))
             #Might need parentheses for order of operations
             return "((#{numbers[0]} #{operators[0]} #{numbers[1]}) #{operators[1]} #{numbers[2]}) #{operators[2]} #{numbers[3]}"
           else
             return "#{numbers[0]} #{operators[0]} #{numbers[1]} #{operators[1]} #{numbers[2]} #{operators[2]} #{numbers[3]}"
           end
-        elsif alternate_result == 24
+        elsif alternate_result == 24 && integer_division_only?(proposed_solution)
           return "(#{numbers[0]} #{operators[0]} #{numbers[1]}) #{operators[1]} (#{numbers[2]} #{operators[2]} #{numbers[3]})"
-        elsif reverse_result == 24
+        elsif reverse_result == 24 && integer_division_only?(proposed_solution)
           return "#{numbers[0]} #{operators[0]} (#{numbers[1]} #{operators[1]} (#{numbers[2]} #{operators[2]} #{numbers[3]}))"
         end
       end
@@ -55,12 +58,23 @@ module Math24
     return false
   end
 
-    def self.check(problem, solution)
-      raise ArgumentError unless /\A\d{4}\z/.match problem.join
-      raise ArgumentError unless solution.is_a? String
-      raise ArgumentError unless /\A(\(*(\d{1}[()\s]*[*+-\/]+[()\s]*){3}\d{1}\)*)\z/.match(solution)
+  def self.check(problem, solution)
+    raise ArgumentError unless /\A\d{4}\z/.match problem.join
+    raise ArgumentError unless solution.is_a? String
+    raise ArgumentError unless /\A(\(*(\d{1}[()\s]*[*+-\/]+[()\s]*){3}\d{1}\)*)\z/.match(solution)
+
+    problem.count {|i| solution.include?(i.to_s) } == 4 &&
+      instance_eval(solution) == 24
+  end
 
-      problem.count {|i| solution.include?(i.to_s) } == 4 &&
-        instance_eval(solution) == 24
+  private
+
+  def self.integer_division_only? proposed_solution
+    # float and integer division yield same result
+    begin
+      instance_eval(proposed_solution) == instance_eval(proposed_solution.delete('.0'))
+    rescue ZeroDivisionError
+      false
     end
+  end
 end

data/lib/math24/version.rb

@@ -1,3 +1,3 @@
 module Math24
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/math24.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "byebug"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: math24
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Randall Reed, Jr.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  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: Randomly generates a solvable 24 Game problem, verifies user's solution,
   or finds a solution for a given set of numbers.
 email: