dentaku 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc147a87584da15958dfa99d62dcbc680333b21d2f9a35758ab11b4d7327787b
-  data.tar.gz: a3138608c305adc7ff88168e5379bc5f7da7fa0712b60d9f5d4afb8c63bfa2c3
+  metadata.gz: d7a7a3fa41f933a1f88a76e736c32e71dcf87f391a7a4ba09d37b2abad8269b2
+  data.tar.gz: 3045bd6715d486669c2fe015165a2bef31928fccdf4e6a07f59a67257b9f4867
 SHA512:
-  metadata.gz: 24da7dff044e4909cc1a6f900fb91c1aa30064e940ddf57e1c68112b0d61331b66fa066173012daeb302f757d10ea7ccec1cc505c95d6a8f32c019b2d7d219ff
-  data.tar.gz: 5745ef2e7896a3e0570d236e0b04bdd627659b15da2234855f81adde950c18c3b04d73eaeb34ae836756bfeb37f54bff9886d8730912a32c9e2700161807ac10
+  metadata.gz: 2f8b4a5d727ec64a0308a57570fc51ff09864174fd0669956acb6b26b0d6b5694d6a0ec563eb107b577db79dd37ddd383fc36ec47bd17ebb11008981e2d5c729
+  data.tar.gz: 1cb16ed5d1bbad1c896d3907761206178093531ef02fe27eabaa19e1b5187f66f1d9d6586d410107133c08c520596dd7b9a6d5b47f23decb47e80ed2cbdd0e28

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## [v3.3.0] 2018-12-04
+- add array literal syntax
+- return correct type from string function AST nodes
+
 ## [v3.2.1] 2018-10-24
 - make `evaluate` rescue more exceptions
 
@@ -162,7 +166,8 @@
 ## [v0.1.0] 2012-01-20
 - initial release
 
-[HEAD]:  https://github.com/rubysolo/dentaku/compare/v3.2.1...HEAD
+[HEAD]:  https://github.com/rubysolo/dentaku/compare/v3.3.0...HEAD
+[v3.3.0]:  https://github.com/rubysolo/dentaku/compare/v3.2.1...v3.3.0
 [v3.2.1]:  https://github.com/rubysolo/dentaku/compare/v3.2.0...v3.2.1
 [v3.2.0]:  https://github.com/rubysolo/dentaku/compare/v3.1.0...v3.2.0
 [v3.1.0]:  https://github.com/rubysolo/dentaku/compare/v3.0.0...v3.1.0

data/lib/dentaku/ast.rb

@@ -11,6 +11,7 @@ require_relative './ast/negation'
 require_relative './ast/comparators'
 require_relative './ast/combinators'
 require_relative './ast/access'
+require_relative './ast/array'
 require_relative './ast/grouping'
 require_relative './ast/case'
 require_relative './ast/function_registry'

data/lib/dentaku/ast/array.rb

@@ -0,0 +1,23 @@
+module Dentaku
+  module AST
+    class Array
+      def self.arity
+      end
+
+      def self.peek(*)
+      end
+
+      def initialize(*elements)
+        @elements = *elements
+      end
+
+      def value(context = {})
+        @elements.map { |el| el.value(context) }
+      end
+
+      def dependencies(context = {})
+        @elements.flat_map { |el| el.dependencies(context) }
+      end
+    end
+  end
+end

data/lib/dentaku/ast/functions/string_functions.rb

@@ -3,7 +3,20 @@ require_relative '../function'
 module Dentaku
   module AST
     module StringFunctions
-      class Left < Function
+      class Base < Function
+        def type
+          :string
+        end
+
+        def negative_argument_failure(fun, arg = 'length')
+          raise Dentaku::ArgumentError.for(
+            :invalid_value,
+            function_name: "#{fun}()"
+          ), "#{fun}() requires #{arg} to be positive"
+        end
+      end
+
+      class Left < Base
         def initialize(*args)
           super
           @string, @length = *@args
@@ -12,11 +25,12 @@ module Dentaku
         def value(context = {})
           string = @string.value(context).to_s
           length = @length.value(context)
+          negative_argument_failure('LEFT') if length < 0
           string[0, length]
         end
       end
 
-      class Right < Function
+      class Right < Base
         def initialize(*args)
           super
           @string, @length = *@args
@@ -25,11 +39,12 @@ module Dentaku
         def value(context = {})
           string = @string.value(context).to_s
           length = @length.value(context)
+          negative_argument_failure('RIGHT') if length < 0
           string[length * -1, length] || string
         end
       end
 
-      class Mid < Function
+      class Mid < Base
         def initialize(*args)
           super
           @string, @offset, @length = *@args
@@ -38,12 +53,14 @@ module Dentaku
         def value(context = {})
           string = @string.value(context).to_s
           offset = @offset.value(context)
+          negative_argument_failure('MID', 'offset') if offset < 0
           length = @length.value(context)
+          negative_argument_failure('MID') if length < 0
           string[offset - 1, length].to_s
         end
       end
 
-      class Len < Function
+      class Len < Base
         def initialize(*args)
           super
           @string = @args[0]
@@ -53,9 +70,13 @@ module Dentaku
           string = @string.value(context).to_s
           string.length
         end
+
+        def type
+          :numeric
+        end
       end
 
-      class Find < Function
+      class Find < Base
         def initialize(*args)
           super
           @needle, @haystack = *@args
@@ -68,9 +89,13 @@ module Dentaku
           pos = haystack.index(needle)
           pos && pos + 1
         end
+
+        def type
+          :numeric
+        end
       end
 
-      class Substitute < Function
+      class Substitute < Base
         def initialize(*args)
           super
           @original, @search, @replacement = *@args
@@ -85,7 +110,7 @@ module Dentaku
         end
       end
 
-      class Concat < Function
+      class Concat < Base
         def initialize(*args)
           super
         end
@@ -95,7 +120,7 @@ module Dentaku
         end
       end
 
-      class Contains < Function
+      class Contains < Base
         def initialize(*args)
           super
           @needle, @haystack = *args
@@ -104,6 +129,10 @@ module Dentaku
         def value(context = {})
           @haystack.value(context).to_s.include? @needle.value(context).to_s
         end
+
+        def type
+          :logical
+        end
       end
     end
   end

data/lib/dentaku/parser.rb

@@ -205,11 +205,28 @@ module Dentaku
             end
 
             unless operations.last == AST::Access
-              fail! :unbalanced_bracket, token
+              fail! :unbalanced_bracket, token: token
             end
             consume
           end
 
+        when :array
+          case token.value
+          when :array_start
+            operations.push AST::Array
+            arities.push 0
+          when :array_end
+            while operations.any? && operations.last != AST::Array
+              consume
+            end
+
+            unless operations.last == AST::Array
+              fail! :unbalanced_bracket, token: token
+            end
+
+            consume(arities.pop.succ)
+          end
+
         when :grouping
           case token.value
           when :open
@@ -237,7 +254,7 @@ module Dentaku
 
           when :comma
             arities[-1] += 1
-            while operations.any? && operations.last != AST::Grouping
+            while operations.any? && operations.last != AST::Grouping && operations.last != AST::Array
               consume
             end
 

data/lib/dentaku/token_scanner.rb

@@ -43,6 +43,7 @@ module Dentaku
           :combinator,
           :operator,
           :grouping,
+          :array,
           :access,
           :case_statement,
           :comparator,
@@ -129,6 +130,11 @@ module Dentaku
         new(:grouping, '\(|\)|,', lambda { |raw| names[raw] })
       end
 
+      def array
+        names = { array_start: '{', array_end: '}', }.invert
+        new(:array, '\{|\}|,', lambda { |raw| names[raw] })
+      end
+
       def access
         names = { lbracket: '[', rbracket: ']' }.invert
         new(:access, '\[|\]', lambda { |raw| names[raw] })

data/lib/dentaku/version.rb

@@ -1,3 +1,3 @@
 module Dentaku
-  VERSION = "3.2.1"
+  VERSION = "3.3.0"
 end

data/spec/ast/string_functions_spec.rb

@@ -25,6 +25,16 @@ describe Dentaku::AST::StringFunctions::Left do
   it 'handles size greater than input string length correctly' do
     expect(subject.value('string' => 'abcdefg', 'length' => 40)).to eq 'abcdefg'
   end
+
+  it 'has the proper type' do
+    expect(subject.type).to eq(:string)
+  end
+
+  it 'raises an error if given invalid length' do
+    expect {
+      subject.value('string' => 'abcdefg', 'length' => -2)
+    }.to raise_error(Dentaku::ArgumentError, /LEFT\(\) requires length to be positive/)
+  end
 end
 
 describe Dentaku::AST::StringFunctions::Right do
@@ -42,6 +52,10 @@ describe Dentaku::AST::StringFunctions::Right do
     subject = described_class.new(literal('abcdefg'), literal(40))
     expect(subject.value).to eq 'abcdefg'
   end
+
+  it 'has the proper type' do
+    expect(subject.type).to eq(:string)
+  end
 end
 
 describe Dentaku::AST::StringFunctions::Mid do
@@ -64,6 +78,10 @@ describe Dentaku::AST::StringFunctions::Mid do
     subject = described_class.new(literal('abcdefg'), literal(4), literal(40))
     expect(subject.value).to eq 'defg'
   end
+
+  it 'has the proper type' do
+    expect(subject.type).to eq(:string)
+  end
 end
 
 describe Dentaku::AST::StringFunctions::Len do
@@ -76,6 +94,10 @@ describe Dentaku::AST::StringFunctions::Len do
     subject = described_class.new(literal(''))
     expect(subject.value).to eq 0
   end
+
+  it 'has the proper type' do
+    expect(subject.type).to eq(:numeric)
+  end
 end
 
 describe Dentaku::AST::StringFunctions::Find do
@@ -93,6 +115,10 @@ describe Dentaku::AST::StringFunctions::Find do
     subject = described_class.new(literal('DE'), literal(''))
     expect(subject.value).to be_nil
   end
+
+  it 'has the proper type' do
+    expect(subject.type).to eq(:numeric)
+  end
 end
 
 describe Dentaku::AST::StringFunctions::Substitute do
@@ -110,6 +136,10 @@ describe Dentaku::AST::StringFunctions::Substitute do
     subject = described_class.new(literal('ABCDEFG'), literal('DE'), literal(''))
     expect(subject.value).to eq 'ABCFG'
   end
+
+  it 'has the proper type' do
+    expect(subject.type).to eq(:string)
+  end
 end
 
 describe Dentaku::AST::StringFunctions::Concat do
@@ -132,6 +162,10 @@ describe Dentaku::AST::StringFunctions::Concat do
     subject = described_class.new(literal(''), literal(''))
     expect(subject.value).to eq ''
   end
+
+  it 'has the proper type' do
+    expect(subject.type).to eq(:string)
+  end
 end
 
 describe Dentaku::AST::StringFunctions::Contains do
@@ -141,4 +175,8 @@ describe Dentaku::AST::StringFunctions::Contains do
     subject = described_class.new(literal('app'), literal('orange'))
     expect(subject.value).to be_falsy
   end
+
+  it 'has the proper type' do
+    expect(subject.type).to eq(:logical)
+  end
 end

data/spec/calculator_spec.rb

@@ -79,6 +79,7 @@ describe Dentaku::Calculator do
   describe 'evaluate!' do
     it 'raises exception when formula has error' do
       expect { calculator.evaluate!('1 + + 1') }.to raise_error(Dentaku::ParseError)
+      expect { calculator.evaluate!('(1 > 5) OR LEFT("abc", 1)') }.to raise_error(Dentaku::ParseError)
     end
 
     it 'raises unbound variable errors' do
@@ -149,6 +150,7 @@ describe Dentaku::Calculator do
 
     it 'evaluates arrays' do
       expect(calculator.evaluate([1, 2, 3])).to eq([1, 2, 3])
+      expect(calculator.evaluate!('{1,2,3}')).to eq([1, 2, 3])
     end
   end
 

data/spec/tokenizer_spec.rb

@@ -179,6 +179,12 @@ describe Dentaku::Tokenizer do
     expect(tokens.map(&:value)).to eq(['size', :lt, 3, :or, 'admin', :eq, 1])
   end
 
+  it 'tokenizes curly brackets for array literals' do
+    tokens = tokenizer.tokenize('{}')
+    expect(tokens.map(&:category)).to eq(%i(array array))
+    expect(tokens.map(&:value)).to eq(%i(array_start array_end))
+  end
+
   it 'tokenizes square brackets for data structure access' do
     tokens = tokenizer.tokenize('a[1]')
     expect(tokens.map(&:category)).to eq(%i(identifier access numeric access))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dentaku
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Solomon White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codecov
@@ -143,6 +143,7 @@ files:
 - lib/dentaku/ast.rb
 - lib/dentaku/ast/access.rb
 - lib/dentaku/ast/arithmetic.rb
+- lib/dentaku/ast/array.rb
 - lib/dentaku/ast/bitwise.rb
 - lib/dentaku/ast/case.rb
 - lib/dentaku/ast/case/case_conditional.rb