dentaku 3.5.3 → 3.5.5

data/spec/ast/division_spec.rb

@@ -20,16 +20,16 @@ describe Dentaku::AST::Division do
     expect(node.value.round(4)).to eq(0.8333)
   end
 
-  it 'requires numeric operands' do
+  it 'requires operands that respond to /' do
     expect {
-      described_class.new(five, t)
-    }.to raise_error(Dentaku::NodeError, /requires numeric operands/)
+      described_class.new(five, t).value
+    }.to raise_error(Dentaku::ArgumentError, /requires operands that respond to \//)
 
     expression = Dentaku::AST::Multiplication.new(five, five)
     group = Dentaku::AST::Grouping.new(expression)
 
     expect {
-      described_class.new(group, five)
+      described_class.new(group, five).value
     }.not_to raise_error
   end
 
@@ -44,17 +44,21 @@ describe Dentaku::AST::Division do
           value + other
         end
       end
+
+      def zero?
+        value.zero?
+      end
     end
 
     operand_five = Dentaku::AST::Numeric.new Dentaku::Token.new(:numeric, Divisible.new(5))
     operand_six = Dentaku::AST::Numeric.new Dentaku::Token.new(:numeric, Divisible.new(6))
 
     expect {
-      described_class.new(operand_five, operand_six)
+      described_class.new(operand_five, operand_six).value
     }.not_to raise_error
 
     expect {
-      described_class.new(operand_five, six)
+      described_class.new(operand_five, six).value
     }.not_to raise_error
   end
 end

data/spec/ast/map_spec.rb

@@ -4,6 +4,7 @@ require 'dentaku'
 
 describe Dentaku::AST::Map do
   let(:calculator) { Dentaku::Calculator.new }
+
   it 'operates on each value in an array' do
     result = Dentaku('SUM(MAP(vals, val, val + 1))', vals: [1, 2, 3])
     expect(result).to eq(9)
@@ -24,4 +25,16 @@ describe Dentaku::AST::Map do
       Dentaku::ParseError,  'MAP() requires second argument to be an identifier'
     )
   end
+
+  it 'treats missing keys in hashes as NULL in permissive mode' do
+    expect(
+      calculator.evaluate('MAP(items, item, item.value)', items: [{value: 1}, {}])
+    ).to eq([1, nil])
+  end
+
+  it 'raises an error if accessing a missing key in a hash in strict mode' do
+    expect {
+      calculator.evaluate!('MAP(items, item, item.value)', items: [{value: 1}, {}])
+    }.to raise_error(Dentaku::UnboundVariableError)
+  end
 end

data/spec/ast/pluck_spec.rb

@@ -4,6 +4,7 @@ require 'dentaku'
 
 describe Dentaku::AST::Pluck do
   let(:calculator) { Dentaku::Calculator.new }
+
   it 'operates on each value in an array' do
     result = Dentaku('PLUCK(users, age)', users: [
       {name: "Bob",  age: 44},
@@ -12,6 +13,22 @@ describe Dentaku::AST::Pluck do
     expect(result).to eq([44, 27])
   end
 
+  it 'allows specifying a default for missing values' do
+    result = Dentaku!('PLUCK(users, age, -1)', users: [
+      {name: "Bob"},
+      {name: "Jane", age: 27}
+    ])
+    expect(result).to eq([-1, 27])
+  end
+
+  it 'returns nil if pluck key is missing from a hash' do
+    result = Dentaku!('PLUCK(users, age)', users: [
+      {name: "Bob"},
+      {name: "Jane", age: 27}
+    ])
+    expect(result).to eq([nil, 27])
+  end
+
   it 'works with an empty array' do
     result = Dentaku('PLUCK(users, age)', users: [])
     expect(result).to eq([])

data/spec/bulk_expression_solver_spec.rb

@@ -33,13 +33,20 @@ RSpec.describe Dentaku::BulkExpressionSolver do
       }.to raise_error(Dentaku::UnboundVariableError)
     end
 
-    it "lets you know if the result is a div/0 error" do
+    it "lets you know if the result is a div/0 error when dividing" do
       expressions = {more_apples: "1/0"}
       expect {
         described_class.new(expressions, calculator).solve!
       }.to raise_error(Dentaku::ZeroDivisionError)
     end
 
+    it "lets you know if the result is a div/0 error when taking modulo" do
+      expressions = {more_apples: "1%0"}
+      expect {
+        described_class.new(expressions, calculator).solve!
+      }.to raise_error(Dentaku::ZeroDivisionError)
+    end
+
     it "does not require keys to be parseable" do
       expressions = { "the value of x, incremented" => "x + 1" }
       solver = described_class.new(expressions, calculator.store("x" => 3))
@@ -107,6 +114,22 @@ RSpec.describe Dentaku::BulkExpressionSolver do
   end
 
   describe "#solve" do
+    it 'resolves capitalized keys when they are declared out of order' do
+      expressions = {
+        FIRST: "SECOND * 2",
+        SECOND: "THIRD * 2",
+        THIRD: 2,
+      }
+
+      result = described_class.new(expressions, calculator).solve
+
+      expect(result).to eq(
+        FIRST: 8,
+        SECOND: 4,
+        THIRD: 2
+      )
+    end
+
     it "returns :undefined when variables are unbound" do
       expressions = {more_apples: "apples + 1"}
       expect(described_class.new(expressions, calculator).solve)

data/spec/calculator_spec.rb

@@ -30,7 +30,6 @@ describe Dentaku::Calculator do
     expect(calculator.evaluate('0 * 10 ^ -5')).to eq(0)
     expect(calculator.evaluate('3 + 0 * -3')).to eq(3)
     expect(calculator.evaluate('3 + 0 / -3')).to eq(3)
-    expect(calculator.evaluate('15 % 8')).to eq(7)
     expect(calculator.evaluate('(((695759/735000)^(1/(1981-1991)))-1)*1000').round(4)).to eq(5.5018)
     expect(calculator.evaluate('0.253/0.253')).to eq(1)
     expect(calculator.evaluate('0.253/d', d: 0.253)).to eq(1)
@@ -40,11 +39,20 @@ describe Dentaku::Calculator do
     expect(calculator.evaluate('t + 1*24*60*60', t: Time.local(2017, 1, 1))).to eq(Time.local(2017, 1, 2))
     expect(calculator.evaluate("2 | 3 * 9")).to eq (27)
     expect(calculator.evaluate("2 & 3 * 9")).to eq (2)
-    expect(calculator.evaluate("5%")).to eq (0.05)
     expect(calculator.evaluate('1 << 3')).to eq (8)
     expect(calculator.evaluate('0xFF >> 6')).to eq (3)
   end
 
+  it "differentiates between percentage and modulo operators" do
+    expect(calculator.evaluate('15 % 8')).to eq(7)
+    expect(calculator.evaluate('15 % (4 * 2)')).to eq(7)
+    expect(calculator.evaluate("5%")).to eq (0.05)
+    expect(calculator.evaluate("400/60%").round(2)).to eq (666.67)
+    expect(calculator.evaluate("(400/60%)*1").round(2)).to eq (666.67)
+    expect(calculator.evaluate("60% * 1").round(2)).to eq (0.60)
+    expect(calculator.evaluate("50% + 50%")).to eq (1.0)
+  end
+
   describe 'evaluate' do
     it 'returns nil when formula has error' do
       expect(calculator.evaluate('1 + + 1')).to be_nil
@@ -165,7 +173,6 @@ describe Dentaku::Calculator do
       expect(calculator.solve(diff: "d1 - d2")).to eq(diff: -4)
     end
 
-
     it 'stores nested hashes' do
       calculator.store(a: {basket: {of: 'apples'}}, b: 2)
       expect(calculator.evaluate!('a.basket.of')).to eq('apples')
@@ -516,6 +523,17 @@ describe Dentaku::Calculator do
       expect(calculator.evaluate!('value - duration(1, month)', { value: value }).to_date).to eq(Date.parse('2022-12-01'))
       expect(calculator.evaluate!('value - value2', { value: value, value2: value2 })).to eq(1)
     end
+
+    it 'from time object' do
+      value = Time.local(2023, 7, 13, 10, 42, 11)
+      value2 = Time.local(2023, 12, 1, 9, 42, 10)
+
+      expect(calculator.evaluate!('value + duration(1, month)', { value: value })).to eq(Time.local(2023, 8, 13, 10, 42, 11))
+      expect(calculator.evaluate!('value - duration(1, day)', { value: value })).to eq(Time.local(2023, 7, 12, 10, 42, 11))
+      expect(calculator.evaluate!('value - duration(1, year)', { value: value })).to eq(Time.local(2022, 7, 13, 10, 42, 11))
+      expect(calculator.evaluate!('value2 - value', { value: value, value2: value2 })).to eq(value2 - value)
+      expect(calculator.evaluate!('value - 7200', { value: value })).to eq(Time.local(2023, 7, 13, 8, 42, 11))
+    end
   end
 
   describe 'functions' do

data/spec/dependency_resolver_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+require 'dentaku/dependency_resolver'
+
+describe Dentaku::DependencyResolver do
+  it 'sorts expressions in dependency order' do
+    dependencies = {"first" => ["second"], "second" => ["third"], "third" => []}
+    expect(described_class.find_resolve_order(dependencies)).to eq(
+      ["third", "second", "first"]
+    )
+  end
+
+  it 'handles case differences' do
+    dependencies = {"FIRST" => ["second"], "SeCoNd" => ["third"], "THIRD" => []}
+    expect(described_class.find_resolve_order(dependencies)).to eq(
+      ["THIRD", "SeCoNd", "FIRST"]
+    )
+  end
+end

data/spec/external_function_spec.rb

@@ -166,7 +166,7 @@ describe Dentaku::Calculator do
       it 'adds multiple functions to default/global function registry' do
         described_class.add_functions([
           [:cube, :numeric, ->(x) { x**3 }],
-          [:spongebob, :string, ->(x) { x.split("").each_with_index().map { |c,i| i.even? ? c.upcase : c.downcase }.join() }],
+          [:spongebob, :string, ->(x) { x.split("").each_with_index().map { |c, i| i.even? ? c.upcase : c.downcase }.join() }],
         ])
 
         expect(described_class.new.evaluate("1 + cube(3)")).to eq(28)

data/spec/parser_spec.rb

@@ -27,6 +27,9 @@ describe Dentaku::Parser do
   it 'calculates bitwise OR' do
     node = parse('2|3')
     expect(node.value).to eq(3)
+
+    node = parse('(5 | 2) + 1')
+    expect(node.value).to eq(8)
   end
 
   it 'performs multiple operations in one stream' do
@@ -77,11 +80,17 @@ describe Dentaku::Parser do
   end
 
   it 'evaluates arrays' do
+    node = parse('{}')
+    expect(node.value).to eq([])
+
     node = parse('{1, 2, 3}')
     expect(node.value).to eq([1, 2, 3])
 
-    node = parse('{}')
-    expect(node.value).to eq([])
+    node = parse('{1, 2, 3} + {4,5,6}')
+    expect(node.value).to eq([1, 2, 3, 4, 5, 6])
+
+    node = parse('{1, 2, 3} - {2,3}')
+    expect(node.value).to eq([1])
   end
 
   context 'invalid expression' do

data/spec/print_visitor_spec.rb

@@ -59,6 +59,11 @@ describe Dentaku::PrintVisitor do
     expect(repr).to eq('2017-12-24 23:59:59')
   end
 
+  it 'handles a percentage in a formula' do
+    repr = roundtrip('((3*4%) * 0.001)')
+    expect(repr).to eq('3 * 4% * 0.001')
+  end
+
   private
 
   def roundtrip(string)

data/spec/spec_helper.rb

@@ -1,14 +1,12 @@
 require 'pry'
 require 'simplecov'
-require 'codecov'
 
 SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new([
   SimpleCov::Formatter::HTMLFormatter,
-  SimpleCov::Formatter::Codecov,
 ])
 
 SimpleCov.minimum_coverage 90
-SimpleCov.minimum_coverage_by_file 80
+# SimpleCov.minimum_coverage_by_file 80
 
 SimpleCov.start do
   add_filter "spec/"

data/spec/visitor_spec.rb

@@ -108,7 +108,7 @@ describe TestVisitor do
   it 'visits all concrete AST node types' do
     @visited = Set.new
 
-    visit_nodes('(1 + 7) * (8 ^ 2) / - 3.0 - apples')
+    visit_nodes('(1 + 7) * (8 ^ 2) / - 3.0 - apples * 5%')
     visit_nodes('1 < 2 and 3 <= 4 or 5 > 6 AND 7 >= 8 OR 9 != 10 and true')
     visit_nodes('IF(a[0] = NULL, "five", \'seven\')')
     visit_nodes('case (a % 5) when 0 then a else b end')

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: dentaku
 version: !ruby/object:Gem::Version
-  version: 3.5.3
+  version: 3.5.5
 platform: ruby
 authors:
 - Solomon White
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-04 00:00:00.000000000 Z
+date: 2025-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,13 +24,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codecov
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -143,6 +142,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rspec.yml"
+- ".github/workflows/rubocop.yml"
 - ".gitignore"
 - ".pryrc"
 - ".rubocop.yml"
@@ -259,6 +260,7 @@ files:
 - spec/bulk_expression_solver_spec.rb
 - spec/calculator_spec.rb
 - spec/dentaku_spec.rb
+- spec/dependency_resolver_spec.rb
 - spec/exceptions_spec.rb
 - spec/external_function_spec.rb
 - spec/parser_spec.rb
@@ -274,7 +276,6 @@ homepage: http://github.com/rubysolo/dentaku
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -289,8 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A formula language parser and evaluator
 test_files:
@@ -330,6 +330,7 @@ test_files:
 - spec/bulk_expression_solver_spec.rb
 - spec/calculator_spec.rb
 - spec/dentaku_spec.rb
+- spec/dependency_resolver_spec.rb
 - spec/exceptions_spec.rb
 - spec/external_function_spec.rb
 - spec/parser_spec.rb