dentaku 3.3.0 → 3.4.0

data/spec/ast/count_spec.rb

@@ -5,36 +5,36 @@ require 'dentaku'
 describe 'Dentaku::AST::Count' do
   it 'returns the length of an array' do
     result = Dentaku('COUNT(1, x, 1.8)', x: 2.3)
-    expect(result).to eq 3
+    expect(result).to eq(3)
   end
 
   it 'returns the length of a single number object' do
     result = Dentaku('COUNT(x)', x: 2.3)
-    expect(result).to eq 1
+    expect(result).to eq(1)
   end
 
   it 'returns the length if a single String is passed' do
     result = Dentaku('COUNT(x)', x: 'dentaku')
-    expect(result).to eq 7
+    expect(result).to eq(7)
   end
 
   it 'returns the length if an array is passed' do
     result = Dentaku('COUNT(x)', x: [4, 5])
-    expect(result).to eq 2
+    expect(result).to eq(2)
   end
 
   it 'returns the length if an array with one element is passed' do
     result = Dentaku('COUNT(x)', x: [4])
-    expect(result).to eq 1
+    expect(result).to eq(1)
   end
 
   it 'returns the length if an array even if it has nested array' do
     result = Dentaku('COUNT(1, x, 3)', x: [4, 5])
-    expect(result).to eq 3
+    expect(result).to eq(3)
   end
 
   it 'returns the length if an array is passed' do
     result = Dentaku('COUNT()')
-    expect(result).to eq 0
+    expect(result).to eq(0)
   end
 end

data/spec/ast/division_spec.rb

@@ -9,9 +9,15 @@ describe Dentaku::AST::Division do
 
   let(:t)    { Dentaku::AST::Numeric.new Dentaku::Token.new(:logical, true) }
 
+  it 'allows access to its sub-trees' do
+    node = described_class.new(five, six)
+    expect(node.left).to eq(five)
+    expect(node.right).to eq(six)
+  end
+
   it 'performs division' do
     node = described_class.new(five, six)
-    expect(node.value.round(4)).to eq 0.8333
+    expect(node.value.round(4)).to eq(0.8333)
   end
 
   it 'requires numeric operands' do

data/spec/ast/function_spec.rb

@@ -14,7 +14,7 @@ describe Dentaku::AST::Function do
     described_class.register("flarble", :string, -> { "flarble" })
     expect { described_class.get("flarble") }.not_to raise_error
     function = described_class.get("flarble").new
-    expect(function.value).to eq "flarble"
+    expect(function.value).to eq("flarble")
   end
 
   it 'does not throw an error when registering a function with a name that matches a currently defined constant' do
@@ -22,15 +22,15 @@ describe Dentaku::AST::Function do
   end
 
   describe "#arity" do
-    it "gives the correct arity for custom functions" do
+    it "returns the correct arity for custom functions" do
       zero = described_class.register("zero", :numeric, ->() { 0 })
-      expect(zero.arity).to eq 0
+      expect(zero.arity).to eq(0)
 
       one = described_class.register("one", :numeric, ->(x) { x * 2 })
-      expect(one.arity).to eq 1
+      expect(one.arity).to eq(1)
 
       two = described_class.register("two", :numeric, ->(x, y) { x + y })
-      expect(two.arity).to eq 2
+      expect(two.arity).to eq(2)
 
       many = described_class.register("many", :numeric, ->(*args) { args.max })
       expect(many.arity).to be_nil
@@ -38,19 +38,19 @@ describe Dentaku::AST::Function do
   end
 
   it 'casts a String to an Integer if possible' do
-    expect(described_class.numeric('3')).to eq 3
+    expect(described_class.numeric('3')).to eq(3)
   end
 
   it 'casts a String to a BigDecimal if possible and if Integer would loose information' do
-    expect(described_class.numeric('3.2')).to eq 3.2
+    expect(described_class.numeric('3.2')).to eq(3.2)
   end
 
   it 'casts a String to a BigDecimal with a negative number' do
-    expect(described_class.numeric('-3.2')).to eq -3.2
+    expect(described_class.numeric('-3.2')).to eq(-3.2)
   end
 
   it 'casts a String to a BigDecimal without a leading zero' do
-    expect(described_class.numeric('-.2')).to eq -0.2
+    expect(described_class.numeric('-.2')).to eq(-0.2)
   end
 
   it 'raises an error if the value could not be cast to a Numeric' do

data/spec/ast/max_spec.rb

@@ -5,16 +5,16 @@ require 'dentaku'
 describe 'Dentaku::AST::Function::Max' do
   it 'returns the largest numeric value in an array of Numeric values' do
     result = Dentaku('MAX(1, x, 1.8)', x: 2.3)
-    expect(result).to eq 2.3
+    expect(result).to eq(2.3)
   end
 
   it 'returns the largest value even if a String is passed' do
     result = Dentaku('MAX(1, x, 1.8)', x: '2.3')
-    expect(result).to eq 2.3
+    expect(result).to eq(2.3)
   end
 
   it 'returns the largest value even if an Array is passed' do
     result = Dentaku('MAX(1, x, 1.8)', x: [1.5, 2.3, 1.7])
-    expect(result).to eq 2.3
+    expect(result).to eq(2.3)
   end
 end

data/spec/ast/min_spec.rb

@@ -5,16 +5,16 @@ require 'dentaku'
 describe 'Dentaku::AST::Function::Min' do
   it 'returns the smallest numeric value in an array of Numeric values' do
     result = Dentaku('MIN(1, x, 1.8)', x: 2.3)
-    expect(result).to eq 1
+    expect(result).to eq(1)
   end
 
   it 'returns the smallest value even if a String is passed' do
     result = Dentaku('MIN(1, x, 1.8)', x: '0.3')
-    expect(result).to eq 0.3
+    expect(result).to eq(0.3)
   end
 
   it 'returns the smallest value even if an Array is passed' do
     result = Dentaku('MIN(1, x, 1.8)', x: [1.5, 0.3, 1.7])
-    expect(result).to eq 0.3
+    expect(result).to eq(0.3)
   end
 end

data/spec/ast/mul_spec.rb

@@ -5,34 +5,38 @@ require 'dentaku'
 describe 'Dentaku::AST::Function::Mul' do
   it 'returns the product of an array of Numeric values' do
     result = Dentaku('MUL(1, x, 1.8)', x: 2.3)
-    expect(result).to eq 4.14
+    expect(result).to eq(4.14)
   end
 
   it 'returns the product of a single entry array of a Numeric value' do
     result = Dentaku('MUL(x)', x: 2.3)
-    expect(result).to eq 2.3
+    expect(result).to eq(2.3)
   end
 
   it 'coerces string inputs to numeric' do
     result = Dentaku('mul(1, x, 1.8)', x: '2.3')
-    expect(result).to eq 4.14
+    expect(result).to eq(4.14)
   end
 
   it 'returns the product even if an array is passed' do
     result = Dentaku('mul(1, x, 2.3)', x: [4, 5])
-    expect(result).to eq 46
+    expect(result).to eq(46)
   end
 
   it 'handles nested calls' do
     result = Dentaku('mul(1, x, mul(4, 5))', x: '2.3')
-    expect(result).to eq 46
+    expect(result).to eq(46)
   end
 
   context 'checking errors' do
     let(:calculator) { Dentaku::Calculator.new }
 
     it 'raises an error if no arguments are passed' do
-      expect { calculator.evaluate!('MUL()') }.to raise_error(ArgumentError)
+      expect { calculator.evaluate!('MUL()') }.to raise_error(Dentaku::ArgumentError)
+    end
+
+    it 'raises an error if an empty array is passed' do
+      expect { calculator.evaluate!('MUL(x)', x: []) }.to raise_error(Dentaku::ArgumentError)
     end
   end
 end

data/spec/ast/negation_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+require 'dentaku/ast/arithmetic'
+
+require 'dentaku/token'
+
+describe Dentaku::AST::Negation do
+  let(:five) { Dentaku::AST::Numeric.new Dentaku::Token.new(:numeric, 5) }
+  let(:t)    { Dentaku::AST::Logical.new Dentaku::Token.new(:logical, true) }
+  let(:x)    { Dentaku::AST::Identifier.new Dentaku::Token.new(:identifier, 'x') }
+
+  it 'allows access to its sub-node' do
+    node = described_class.new(five)
+    expect(node.node).to eq(five)
+  end
+
+  it 'performs negation' do
+    node = described_class.new(five)
+    expect(node.value).to eq(-5)
+  end
+
+  it 'requires numeric operands' do
+    expect {
+      described_class.new(t)
+    }.to raise_error(Dentaku::NodeError, /requires numeric operands/)
+
+    expression = Dentaku::AST::Negation.new(five)
+    group = Dentaku::AST::Grouping.new(expression)
+
+    expect {
+      described_class.new(group)
+    }.not_to raise_error
+  end
+
+  it 'correctly parses string operands to numeric values' do
+    node = described_class.new(x)
+    expect(node.value('x' => '5')).to eq(-5)
+  end
+
+  it 'raises error if input string is not coercible to numeric' do
+    node = described_class.new(x)
+    expect { node.value('x' => 'invalid') }.to raise_error(Dentaku::ArgumentError)
+  end
+
+  it 'raises error if given a non-numeric argument' do
+    node = described_class.new(x)
+    expect { node.value('x' => true) }.to raise_error(Dentaku::ArgumentError)
+  end
+end

data/spec/ast/node_spec.rb

@@ -6,30 +6,33 @@ require 'dentaku/parser'
 describe Dentaku::AST::Node do
   it 'returns list of dependencies' do
     node = make_node('x + 5')
-    expect(node.dependencies).to eq ['x']
+    expect(node.dependencies).to eq(['x'])
 
     node = make_node('5 < x')
-    expect(node.dependencies).to eq ['x']
+    expect(node.dependencies).to eq(['x'])
 
     node = make_node('5 < 7')
-    expect(node.dependencies).to eq []
+    expect(node.dependencies).to eq([])
 
     node = make_node('(y * 7)')
-    expect(node.dependencies).to eq ['y']
+    expect(node.dependencies).to eq(['y'])
 
     node = make_node('if(x > 5, y, z)')
-    expect(node.dependencies).to eq ['x', 'y', 'z']
+    expect(node.dependencies).to eq(['x', 'y', 'z'])
 
     node = make_node('if(x > 5, y, z)')
-    expect(node.dependencies('x' => 7)).to eq ['y', 'z']
+    expect(node.dependencies('x' => 7)).to eq(['y'])
+
+    node = make_node('if(x > 5, y, z)')
+    expect(node.dependencies('x' => 2)).to eq(['z'])
 
     node = make_node('')
-    expect(node.dependencies).to eq []
+    expect(node.dependencies).to eq([])
   end
 
   it 'returns unique list of dependencies' do
     node = make_node('x + x')
-    expect(node.dependencies).to eq ['x']
+    expect(node.dependencies).to eq(['x'])
   end
 
   private

data/spec/ast/numeric_spec.rb

@@ -7,7 +7,7 @@ describe Dentaku::AST::Numeric do
   subject { described_class.new(Dentaku::Token.new(:numeric, 5)) }
 
   it 'has numeric type' do
-    expect(subject.type).to eq :numeric
+    expect(subject.type).to eq(:numeric)
   end
 
   it 'has no dependencies' do

data/spec/ast/or_spec.rb

@@ -7,29 +7,29 @@ describe 'Dentaku::AST::Or' do
 
   it 'returns false if all of the arguments are false' do
     result = Dentaku('OR(1 = "1", 0 = 1)')
-    expect(result).to eq false
+    expect(result).to eq(false)
   end
 
   it 'supports nested expressions' do
     result = Dentaku('OR(y = 1, x = 1)', x: 1, y: 2)
-    expect(result).to eq true
+    expect(result).to eq(true)
   end
 
   it 'returns true if any of the arguments is true' do
     result = Dentaku('OR(1 = "1", "2" = "2", true = false, false)')
-    expect(result).to eq true
+    expect(result).to eq(true)
   end
 
   it 'returns true if any nested OR function returns true' do
     result = Dentaku('OR(OR(1 = 0), OR(true = false, OR(true)))')
-    expect(result).to eq true
+    expect(result).to eq(true)
   end
 
   it 'raises an error if no arguments are passed' do
-    expect { calculator.evaluate!('OR()') }.to raise_error(ArgumentError)
+    expect { calculator.evaluate!('OR()') }.to raise_error(Dentaku::ArgumentError)
   end
 
   it 'raises an error if a non logical argument is passed' do
-    expect { calculator.evaluate!('OR("r")') }.to raise_error(ArgumentError)
+    expect { calculator.evaluate!('OR("r")') }.to raise_error(Dentaku::ArgumentError)
   end
 end

data/spec/ast/round_spec.rb

@@ -5,21 +5,31 @@ require 'dentaku'
 describe 'Dentaku::AST::Function::Round' do
   it 'returns the rounded down value' do
     result = Dentaku('ROUND(1.8)')
-    expect(result).to eq 2
+    expect(result).to eq(2)
   end
 
   it 'returns the rounded down value to the given precision' do
     result = Dentaku('ROUND(x, y)', x: 1.8453, y: 3)
-    expect(result).to eq 1.845
+    expect(result).to eq(1.845)
   end
 
   it 'returns the rounded down value to the given precision, also with strings' do
     result = Dentaku('ROUND(x, y)', x: '1.8453', y: '3')
-    expect(result).to eq 1.845
+    expect(result).to eq(1.845)
   end
 
   it 'returns the rounded down value to the given precision, also with nil' do
     result = Dentaku('ROUND(x, y)', x: '1.8453', y: nil)
-    expect(result).to eq 2
+    expect(result).to eq(2)
+  end
+
+  context 'checking errors' do
+    it 'raises an error if first argument is not numeric' do
+      expect { Dentaku!("ROUND(2020-1-1, 0)") }.to raise_error(Dentaku::ArgumentError)
+    end
+
+    it 'raises an error if places is not numeric' do
+      expect { Dentaku!("ROUND(1.8, 2020-1-1)") }.to raise_error(Dentaku::ArgumentError)
+    end
   end
 end

data/spec/ast/rounddown_spec.rb

@@ -5,21 +5,31 @@ require 'dentaku'
 describe 'Dentaku::AST::Function::Round' do
   it 'returns the rounded value' do
     result = Dentaku('ROUNDDOWN(1.8)')
-    expect(result).to eq 1
+    expect(result).to eq(1)
   end
 
   it 'returns the rounded value to the given precision' do
     result = Dentaku('ROUNDDOWN(x, y)', x: 1.8453, y: 3)
-    expect(result).to eq 1.845
+    expect(result).to eq(1.845)
   end
 
   it 'returns the rounded value to the given precision, also with strings' do
     result = Dentaku('ROUNDDOWN(x, y)', x: '1.8453', y: '3')
-    expect(result).to eq 1.845
+    expect(result).to eq(1.845)
   end
 
   it 'returns the rounded value to the given precision, also with nil' do
     result = Dentaku('ROUNDDOWN(x, y)', x: '1.8453', y: nil)
-    expect(result).to eq 1
+    expect(result).to eq(1)
+  end
+
+  context 'checking errors' do
+    it 'raises an error if first argument is not numeric' do
+      expect { Dentaku!("ROUND(2020-1-1, 0)") }.to raise_error(Dentaku::ArgumentError)
+    end
+
+    it 'raises an error if places is not numeric' do
+      expect { Dentaku!("ROUND(1.8, 2020-1-1)") }.to raise_error(Dentaku::ArgumentError)
+    end
   end
 end

data/spec/ast/roundup_spec.rb

@@ -5,21 +5,31 @@ require 'dentaku'
 describe 'Dentaku::AST::Function::Round' do
   it 'returns the rounded value' do
     result = Dentaku('ROUNDUP(1.8)')
-    expect(result).to eq 2
+    expect(result).to eq(2)
   end
 
   it 'returns the rounded value to the given precision' do
     result = Dentaku('ROUNDUP(x, y)', x: 1.8453, y: 3)
-    expect(result).to eq 1.846
+    expect(result).to eq(1.846)
   end
 
   it 'returns the rounded value to the given precision, also with strings' do
     result = Dentaku('ROUNDUP(x, y)', x: '1.8453', y: '3')
-    expect(result).to eq 1.846
+    expect(result).to eq(1.846)
   end
 
   it 'returns the rounded value to the given precision, also with nil' do
     result = Dentaku('ROUNDUP(x, y)', x: '1.8453', y: nil)
-    expect(result).to eq 2
+    expect(result).to eq(2)
+  end
+
+  context 'checking errors' do
+    it 'raises an error if first argument is not numeric' do
+      expect { Dentaku!("ROUND(2020-1-1, 0)") }.to raise_error(Dentaku::ArgumentError)
+    end
+
+    it 'raises an error if places is not numeric' do
+      expect { Dentaku!("ROUND(1.8, 2020-1-1)") }.to raise_error(Dentaku::ArgumentError)
+    end
   end
 end