eqn 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcea04f191cf70d2f6248b5d46ed239e67993062
-  data.tar.gz: 0cde20afa46cfcabd29a11240eeb47b082a93cb3
+  metadata.gz: 1719c42c8c6c2969cbc5bc1895317205b233a23b
+  data.tar.gz: c3917e3e216c4c5cb6738886d505bde0f2ab73b6
 SHA512:
-  metadata.gz: b0d4e68fae317102d84ebfd8bbd920dbb60e04826764a7f9a7ca5c813d169f1a734a4e26f62878923c58932a521268ddcef52f176de060cb535ebf9442aaf6c9
-  data.tar.gz: 3535a6c2ebaa09fb57f1c082e2e691b57d582755939df737853ba5d6dc90182b6b94d0345f59d246a314dbd0dec8be1f103d5129c8e0255305f6c08ef67403d5
+  metadata.gz: 7bc8f654be594c43376da76c350026ffc6be2078047b334aa8d5ab3fad3b04e5d86bab77f9a7d6d9a6ea7c895eeb8dd314173260d5982132a7cfd1d288a13de1
+  data.tar.gz: 28202b1fa04f0ee38140bf772699b68dd2643e8f3f8506fe38f693baf294ae82533219379b87c91b117003fd33bd76f7e5ffbd996e887dee9b0d28438f49a20a

data/.rubocop.yml

@@ -3,6 +3,8 @@ AllCops:
     - db/**/*
     - vendor/**/*
 
+AbcSize:
+  Enabled: False
 BlockNesting: 
   Max: 4
 ClassLength:

data/README.md

@@ -70,21 +70,21 @@ For example, `if(5 > 3, 1, 2)` would evaluate to `1`.
 
 **round**
 
-Syntax: `round(number)`
+Syntax: `round(number, [decimals])`
 
-Rounds the number up if the decimal is greater than 0.5 and down otherwise (i.e. "normal" rounding).
+Rounds the number up if the decimal is greater than 0.5 and down otherwise (i.e. "normal" rounding). Optionally, pass a number of decimal places to round to as a second parameter (the default is 0).
 
 **roundup**
 
-Syntax: `roundup(number)`
+Syntax: `roundup(number, [decimals])`
 
-Rounds the number up to the next whole integer (i.e. ceiling function)
+Rounds the number up (i.e. ceiling function). Optionally, pass a number of decimal places to round to as a second parameter (the default is 0).
 
 **rounddown**
 
-Syntax: `rounddown(number)`
+Syntax: `rounddown(number, [decimals])`
 
-Rounds the number down to the next whole integer (i.e. floor function)
+Rounds the number down (i.e. floor function). Optionally, pass a number of decimal places to round to as a second parameter (the default is 0).
 
 ## Development
 

data/lib/eqn/expression.rb

@@ -10,7 +10,6 @@ module Eqn
       elements.empty?
     end
 
-    # rubocop:disable Metrics/AbcSize
     def value
       if elements.count == 1
         elements.shift.value
@@ -34,7 +33,6 @@ module Eqn
         end
       end
     end
-    # rubocop:enable Metrics/AbcSize
 
     class ExprGroup < Node
       def left_associative?

data/lib/eqn/function.rb

@@ -16,7 +16,11 @@ module Eqn
       def value
         value = elements.shift.value
         fail ZeroDivisionError if value.is_a?(Float) && (value.abs == Float::INFINITY || value.nan?)
-        value.round
+        if elements.empty?
+          value.round
+        else
+          value.round(elements.shift.value)
+        end
       end
     end
 
@@ -24,7 +28,12 @@ module Eqn
       def value
         value = elements.shift.value
         fail ZeroDivisionError if value.is_a?(Float) && (value.abs == Float::INFINITY || value.nan?)
-        value.ceil
+        if elements.empty?
+          value.ceil
+        else
+          decimals = elements.shift.value
+          (value * 10**decimals).ceil.to_f / 10**decimals
+        end
       end
     end
 
@@ -32,7 +41,12 @@ module Eqn
       def value
         value = elements.shift.value
         fail ZeroDivisionError if value.is_a?(Float) && (value.abs == Float::INFINITY || value.nan?)
-        value.floor
+        if elements.empty?
+          value.floor
+        else
+          decimals = elements.shift.value
+          (value * 10**decimals).floor.to_f / 10**decimals
+        end
       end
     end
   end

data/lib/eqn/terminal.rb

@@ -3,7 +3,6 @@ module Eqn
     class Node < Treetop::Runtime::SyntaxNode; end
 
     class Variable < Node
-      # rubocop:disable Metrics/AbcSize
       def value
         unless Eqn::Calculator.class_variable_get(:@@vars).key? text_value.intern
           fail NoVariableValueError, "No value given for: #{text_value}"
@@ -13,7 +12,6 @@ module Eqn
         end
         Eqn::Calculator.class_variable_get(:@@vars)[text_value.intern]
       end
-      # rubocop:enable Metrics/AbcSize
     end
 
     class Digits < Node

data/lib/eqn/version.rb

@@ -1,3 +1,3 @@
 module Eqn
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

data/lib/eqn.treetop

@@ -44,15 +44,19 @@ grammar Eqn
   end
 
   rule round_func
-    'round' space? group <Eqn::Function::Round>
+    'round' space? '(' expression round_group? ')' <Eqn::Function::Round>
   end
 
   rule roundup_func
-    'roundup' space? group <Eqn::Function::RoundUp>
+    'roundup' space? '(' expression round_group? ')' <Eqn::Function::RoundUp>
   end
 
   rule rounddown_func
-    'rounddown' space? group <Eqn::Function::RoundDown>
+    'rounddown' space? '(' expression round_group? ')' <Eqn::Function::RoundDown>
+  end
+
+  rule round_group
+    ',' expression <Eqn::Expression>
   end
 
   rule group

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eqn
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Zach Schneider
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop