nuffle 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b849e017faea3c21e8d0447341d5ac796029ad8
-  data.tar.gz: df918be95dad4fb9fc62170838d61cb0342e959b
+  metadata.gz: 2b1880e05185b3d3a5224d94c51631030f18799a
+  data.tar.gz: 2b052a7e840a08705166b6027e61c9d49a92f224
 SHA512:
-  metadata.gz: c68ee6dc1917642d21d14fc1ed760b046b1bf7181b4b532d000550790836f9a947ac9480fb25071f37924759e29b0d1fdafa23a3f7d7ef43a17079e3dca36d96
-  data.tar.gz: 29518a23005a0c2b540facbbc42bd35f15a127fffb59b8ab2f9c4737d0a077cff69058d5941633239b91cf725a4201bd73ee56c279d307c21187858a9c90f2be
+  metadata.gz: 7b25d91e48637f1591ebd115e72e8c042c97e8d674e669519be5219c847e68511d6bbd6ff98c6faf38c3f239939bcf5439ead5abedf564810e3dce07f66c0a2c
+  data.tar.gz: d0fc966473b6061f5716eae6a8ea788c644449470997f459fc2cf96b8d4e7814b232e0414f8b9b327a884eaee465a368b17a44ed710635642cfcb982ba7042b2

data/lib/nuffle.rb

@@ -1,11 +1,94 @@
 class Nuffle
 
-  # Roll an x-sided dice
-  def self.roll(x)
-    # validate
-    raise "Invalid number of sides." if !x.is_a?(Integer) || x < 2
-
-    # roll
-    return 1 + rand(x);
+  def self.roll(x = '')
+    ::Nuffle::Calculator.new(x).calculate
   end
 end
+
+class Nuffle::Calculator
+
+  attr_reader :input,
+              :rolls,
+              :equation,
+              :result
+
+  def initialize(input)
+    validate(input)
+  end
+
+  def calculate
+    # reset the rolls array
+    @rolls = []
+
+    # throw rolls and replace 'xdy' dice notation with results
+    @equation = @input.gsub(/(\d+)d(\d+)/) do |match|
+      rolls = []
+
+      (1..$1.to_i).each do
+        rolls << 1 + rand($2.to_i)
+      end
+
+      # save individual roll results
+      @rolls << {
+          'notation' => match,
+          'rolls' => rolls
+        }
+
+      "(#{rolls.join(" + ")})"
+    end
+
+    # cast integers to floats
+    equation = @equation.gsub(/\b(\d+)\b/) do |match|
+      $1.to_f.to_s
+    end
+
+    # calculate result
+    @result = eval(equation);
+
+    # cast result to integer if a whole float
+    @result = @result.to_i if @result % 1 == 0
+
+    self
+  end
+
+  private
+
+  def validate(input)
+    # has to be something we can calculate
+    raise("Input must be an equation or a number.") unless input.is_a?(String) || input.is_a?(Numeric)
+
+    # no empty inputs
+    raise("Input can't be blank.") if input.to_s.strip == ''
+
+    # cast input to a string
+    input = input.to_s
+
+    # validate the input format
+    raise("Invalid equation.") unless /^[\(\s]*(([1-9][0-9]*d[1-9][0-9]*)|\d+)[\s\)]*(\s*([\-\+\*\/])[\s\(]*(([1-9][0-9]*d[1-9][0-9]*)|\d+)\)*)*$/i.match(input)
+
+    # make sure the parens are balanced
+    raise("Unbalanced parens.") unless is_balanced?(input)
+
+    @input = input
+  end
+
+  def is_balanced?(input)
+    balance = 0
+
+    input.split("").each do |char|
+      if char == '('
+        balance += 1
+      elsif char == ')'
+        balance -= 1
+      end
+
+      # found a close paren without a matching open paren,
+      # no need to continue further
+      if balance < 0
+        break
+      end
+    end
+
+    return balance === 0
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nuffle
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Zachary Flower
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest