dentaku 3.3.0 → 3.4.0

data/spec/tokenizer_spec.rb

@@ -231,43 +231,62 @@ describe Dentaku::Tokenizer do
     ])
   end
 
-  describe 'functions' do
-    it 'include IF' do
+  describe 'tokenizing function calls' do
+    it 'handles IF' do
       tokens = tokenizer.tokenize('if(x < 10, y, z)')
       expect(tokens.length).to eq(10)
       expect(tokens.map(&:category)).to eq([:function, :grouping, :identifier, :comparator, :numeric, :grouping, :identifier, :grouping, :identifier, :grouping])
       expect(tokens.map(&:value)).to eq([:if, :open, 'x', :lt, 10, :comma, 'y', :comma, 'z', :close])
     end
 
-    it 'include ROUND/UP/DOWN' do
+    it 'handles ROUND/UP/DOWN' do
       tokens = tokenizer.tokenize('round(8.2)')
       expect(tokens.length).to eq(4)
       expect(tokens.map(&:category)).to eq([:function, :grouping, :numeric, :grouping])
-      expect(tokens.map(&:value)).to eq([:round, :open, BigDecimal.new('8.2'), :close])
+      expect(tokens.map(&:value)).to eq([:round, :open, BigDecimal('8.2'), :close])
 
       tokens = tokenizer.tokenize('round(8.75, 1)')
       expect(tokens.length).to eq(6)
       expect(tokens.map(&:category)).to eq([:function, :grouping, :numeric, :grouping, :numeric, :grouping])
-      expect(tokens.map(&:value)).to eq([:round, :open, BigDecimal.new('8.75'), :comma, 1, :close])
+      expect(tokens.map(&:value)).to eq([:round, :open, BigDecimal('8.75'), :comma, 1, :close])
 
       tokens = tokenizer.tokenize('ROUNDUP(8.2)')
       expect(tokens.length).to eq(4)
       expect(tokens.map(&:category)).to eq([:function, :grouping, :numeric, :grouping])
-      expect(tokens.map(&:value)).to eq([:roundup, :open, BigDecimal.new('8.2'), :close])
+      expect(tokens.map(&:value)).to eq([:roundup, :open, BigDecimal('8.2'), :close])
 
       tokens = tokenizer.tokenize('RoundDown(8.2)')
       expect(tokens.length).to eq(4)
       expect(tokens.map(&:category)).to eq([:function, :grouping, :numeric, :grouping])
-      expect(tokens.map(&:value)).to eq([:rounddown, :open, BigDecimal.new('8.2'), :close])
+      expect(tokens.map(&:value)).to eq([:rounddown, :open, BigDecimal('8.2'), :close])
     end
 
-    it 'include NOT' do
+    it 'handles NOT' do
       tokens = tokenizer.tokenize('not(8 < 5)')
       expect(tokens.length).to eq(6)
       expect(tokens.map(&:category)).to eq([:function, :grouping, :numeric, :comparator, :numeric, :grouping])
       expect(tokens.map(&:value)).to eq([:not, :open, 8, :lt, 5, :close])
     end
 
+    it 'handles ANY/ALL' do
+      %i( any all ).each do |fn|
+        tokens = tokenizer.tokenize("#{fn}(users, u, u.age > 18)")
+        expect(tokens.length).to eq(10)
+        expect(tokens.map { |t| [t.category, t.value] }).to eq([
+          [:function,   fn     ], # function call (any/all)
+          [:grouping,   :open  ], # (
+          [:identifier, "users"], # users
+          [:grouping,   :comma ], # ,
+          [:identifier, "u"    ], # u
+          [:grouping,   :comma ], # ,
+          [:identifier, "u.age"], # u.age
+          [:comparator, :gt    ], # >
+          [:numeric,    18     ], # 18
+          [:grouping,   :close ]  # )
+        ])
+      end
+    end
+
     it 'handles whitespace after function name' do
       tokens = tokenizer.tokenize('not (8 < 5)')
       expect(tokens.length).to eq(6)
@@ -275,7 +294,7 @@ describe Dentaku::Tokenizer do
       expect(tokens.map(&:value)).to eq([:not, :open, 8, :lt, 5, :close])
     end
 
-    it 'can end with a bang' do
+    it 'handles when function ends with a bang' do
       tokens = tokenizer.tokenize('exp!(5 * 3)')
       expect(tokens.length).to eq(6)
       expect(tokens.map(&:category)).to eq([:function, :grouping, :numeric, :operator, :numeric, :grouping])
@@ -298,25 +317,25 @@ describe Dentaku::Tokenizer do
     it 'replaced with function name' do
       input = 'rrrrround!(8.2) + minimo(4,6,2)'
       tokenizer.tokenize(input, aliases: aliases)
-      expect(tokenizer.replace_aliases(input)).to eq 'round(8.2) + min(4,6,2)'
+      expect(tokenizer.replace_aliases(input)).to eq('round(8.2) + min(4,6,2)')
     end
 
     it 'case insensitive' do
       input = 'MinImO(4,6,2)'
       tokenizer.tokenize(input, aliases: aliases)
-      expect(tokenizer.replace_aliases(input)).to eq 'min(4,6,2)'
+      expect(tokenizer.replace_aliases(input)).to eq('min(4,6,2)')
     end
 
     it 'replace only whole aliases without word parts' do
       input = 'maximo(2,minimoooo())' # `minimoooo` doesn't match `minimo`
       tokenizer.tokenize(input, aliases: aliases)
-      expect(tokenizer.replace_aliases(input)).to eq 'max(2,minimoooo())'
+      expect(tokenizer.replace_aliases(input)).to eq('max(2,minimoooo())')
     end
 
     it 'work with non-latin symbols' do
       input = '如果(1,2,3)'
       tokenizer.tokenize(input, aliases: aliases)
-      expect(tokenizer.replace_aliases(input)).to eq 'if(1,2,3)'
+      expect(tokenizer.replace_aliases(input)).to eq('if(1,2,3)')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dentaku
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Solomon White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codecov
@@ -156,15 +156,20 @@ files:
 - lib/dentaku/ast/datetime.rb
 - lib/dentaku/ast/function.rb
 - lib/dentaku/ast/function_registry.rb
+- lib/dentaku/ast/functions/all.rb
 - lib/dentaku/ast/functions/and.rb
+- lib/dentaku/ast/functions/any.rb
 - lib/dentaku/ast/functions/avg.rb
 - lib/dentaku/ast/functions/count.rb
+- lib/dentaku/ast/functions/duration.rb
 - lib/dentaku/ast/functions/if.rb
+- lib/dentaku/ast/functions/map.rb
 - lib/dentaku/ast/functions/max.rb
 - lib/dentaku/ast/functions/min.rb
 - lib/dentaku/ast/functions/mul.rb
 - lib/dentaku/ast/functions/not.rb
 - lib/dentaku/ast/functions/or.rb
+- lib/dentaku/ast/functions/pluck.rb
 - lib/dentaku/ast/functions/round.rb
 - lib/dentaku/ast/functions/rounddown.rb
 - lib/dentaku/ast/functions/roundup.rb
@@ -184,6 +189,7 @@ files:
 - lib/dentaku/ast/string.rb
 - lib/dentaku/bulk_expression_solver.rb
 - lib/dentaku/calculator.rb
+- lib/dentaku/date_arithmetic.rb
 - lib/dentaku/dependency_resolver.rb
 - lib/dentaku/exceptions.rb
 - lib/dentaku/flat_hash.rb
@@ -208,6 +214,7 @@ files:
 - spec/ast/max_spec.rb
 - spec/ast/min_spec.rb
 - spec/ast/mul_spec.rb
+- spec/ast/negation_spec.rb
 - spec/ast/node_spec.rb
 - spec/ast/numeric_spec.rb
 - spec/ast/or_spec.rb
@@ -248,8 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: dentaku
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A formula language parser and evaluator
@@ -267,6 +273,7 @@ test_files:
 - spec/ast/max_spec.rb
 - spec/ast/min_spec.rb
 - spec/ast/mul_spec.rb
+- spec/ast/negation_spec.rb
 - spec/ast/node_spec.rb
 - spec/ast/numeric_spec.rb
 - spec/ast/or_spec.rb