dentaku 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7a7a3fa41f933a1f88a76e736c32e71dcf87f391a7a4ba09d37b2abad8269b2
-  data.tar.gz: 3045bd6715d486669c2fe015165a2bef31928fccdf4e6a07f59a67257b9f4867
+  metadata.gz: b760fc43a6d5745ea9c95827fb0ce03e8fef8453c2264ee1073e5754c2b8d402
+  data.tar.gz: 04e03adf0729e170babe62c8f91cc88ca8aa46932dacb694ccfc564696eed765
 SHA512:
-  metadata.gz: 2f8b4a5d727ec64a0308a57570fc51ff09864174fd0669956acb6b26b0d6b5694d6a0ec563eb107b577db79dd37ddd383fc36ec47bd17ebb11008981e2d5c729
-  data.tar.gz: 1cb16ed5d1bbad1c896d3907761206178093531ef02fe27eabaa19e1b5187f66f1d9d6586d410107133c08c520596dd7b9a6d5b47f23decb47e80ed2cbdd0e28
+  metadata.gz: 006ec24c2c61758a1b7f5921e181ed49e2d54bf479091f9600ed31019fedd0a9411d744932e7dbf973b2e8fea098ff7299e58fd97851e5b2382a81e05043f8e4
+  data.tar.gz: 7f9d3735fc20e918d808158e8c618e11a0021762f102d9d5b32eec7d24f6a28845c01912fbc63c4cb835438f7f8d6d494fe811a5b01e373a5a6296a087c4edda

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.6
   # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
   # to ignore them, so only the ones explicitly set in this file are enabled.
   DisabledByDefault: true
@@ -110,7 +110,7 @@ Style/UnneededPercentQ:
 
 # Align `end` with the matching keyword or starting expression except for
 # assignments, where it should be aligned with the LHS.
-Lint/EndAlignment:
+Layout/EndAlignment:
   Enabled: true
   EnforcedStyleAlignWith: variable
 

data/.travis.yml

@@ -1,12 +1,10 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.0.0-p648
-  - 2.1.10
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
+  - 2.3.8
+  - 2.4.4
+  - 2.5.3
+  - 2.6.0
 before_install:
   - gem update bundler
   - gem update --system

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## [v3.3.1] 2019-03-26
+- better errors for parse failures and exceptions in internal functions
+- fix Ruby 2.6.0 deprecation warnings
+- fix issue with functions in nested case statements
+
 ## [v3.3.0] 2018-12-04
 - add array literal syntax
 - return correct type from string function AST nodes
@@ -166,7 +171,8 @@
 ## [v0.1.0] 2012-01-20
 - initial release
 
-[HEAD]:  https://github.com/rubysolo/dentaku/compare/v3.3.0...HEAD
+[HEAD]:  https://github.com/rubysolo/dentaku/compare/v3.3.1...HEAD
+[v3.3.1]:  https://github.com/rubysolo/dentaku/compare/v3.3.0...v3.3.1
 [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

data/lib/dentaku/ast/arithmetic.rb

@@ -40,7 +40,7 @@ module Dentaku
       end
 
       def numeric(val, prefer_integer)
-        v = BigDecimal.new(val, Float::DIG + 1)
+        v = BigDecimal(val, Float::DIG + 1)
         v = v.to_i if prefer_integer && v.frac.zero?
         v
       rescue ::TypeError

data/lib/dentaku/ast/case.rb

@@ -3,6 +3,7 @@ require_relative './case/case_when'
 require_relative './case/case_then'
 require_relative './case/case_switch_variable'
 require_relative './case/case_else'
+require 'dentaku/exceptions'
 
 module Dentaku
   module AST
@@ -11,16 +12,17 @@ module Dentaku
         @switch = nodes.shift
 
         unless @switch.is_a?(AST::CaseSwitchVariable)
-          raise 'Case missing switch variable'
+          raise ParseError.for(:node_invalid), 'Case missing switch variable'
         end
 
         @conditions = nodes
 
+        @else = nil
         @else = @conditions.pop if @conditions.last.is_a?(AST::CaseElse)
 
         @conditions.each do |condition|
           unless condition.is_a?(AST::CaseConditional)
-            raise "#{condition} is not a CaseConditional"
+            raise ParseError.for(:node_invalid), "#{condition} is not a CaseConditional"
           end
         end
       end
@@ -36,7 +38,7 @@ module Dentaku
         if @else
           return @else.value(context)
         else
-          raise "No block matched the switch value '#{switch_value}'"
+          raise ArgumentError.for(:invalid_value), "No block matched the switch value '#{switch_value}'"
         end
       end
 

data/lib/dentaku/ast/case/case_conditional.rb

@@ -1,3 +1,5 @@
+require 'dentaku/exceptions'
+
 module Dentaku
   module AST
     class CaseConditional < Node
@@ -7,11 +9,12 @@ module Dentaku
       def initialize(when_statement, then_statement)
         @when = when_statement
         unless @when.is_a?(AST::CaseWhen)
-          raise 'Expected first argument to be a CaseWhen'
+          raise ParseError.for(:node_invalid), 'Expected first argument to be a CaseWhen'
         end
+
         @then = then_statement
         unless @then.is_a?(AST::CaseThen)
-          raise 'Expected second argument to be a CaseThen'
+          raise ParseError.for(:node_invalid), 'Expected second argument to be a CaseThen'
         end
       end
 

data/lib/dentaku/ast/function.rb

@@ -38,7 +38,7 @@ module Dentaku
 
         if value.is_a?(::String)
           number = value[/\A-?\d*\.?\d+\z/]
-          return number.include?('.') ? ::BigDecimal.new(number, DIG) : number.to_i if number
+          return number.include?('.') ? BigDecimal(number, DIG) : number.to_i if number
         end
 
         raise Dentaku::ArgumentError.for(:incompatible_type, value: value, for: Numeric),

data/lib/dentaku/flat_hash.rb

@@ -19,8 +19,8 @@ module Dentaku
       key
     end
 
-    def self.expand(h)
-      h.each_with_object({}) do |(k, v), r|
+    def self.expand(hash)
+      hash.each_with_object({}) do |(k, v), r|
         hash_levels = k.to_s.split('.')
         hash_levels = hash_levels.map(&:to_sym) if k.is_a?(Symbol)
         child_hash = hash_levels[0...-1].reduce(r) { |h, n| h[n] ||= {} }

data/lib/dentaku/parser.rb

@@ -46,6 +46,8 @@ module Dentaku
       args = Array.new(args_size) { output.pop }.reverse
 
       output.push operator.new(*args)
+    rescue ::ArgumentError => e
+      raise Dentaku::ArgumentError, e.message
     rescue NodeError => e
       fail! :node_invalid, operator: operator, child: e.child, expect: e.expect, actual: e.actual
     end
@@ -111,17 +113,19 @@ module Dentaku
               open_cases = 0
               case_end_index = nil
 
-              input.each_with_index do |token, index|
-                if token.category == :case && token.value == :open
-                  open_cases += 1
-                end
+              input.each_with_index do |input_token, index|
+                if input_token.category == :case
+                  if input_token.value == :open
+                    open_cases += 1
+                  end
 
-                if token.category == :case && token.value == :close
-                  if open_cases > 0
-                    open_cases -= 1
-                  else
-                    case_end_index = index
-                    break
+                  if input_token.value == :close
+                    if open_cases > 0
+                      open_cases -= 1
+                    else
+                      case_end_index = index
+                      break
+                    end
                   end
                 end
               end
@@ -129,7 +133,8 @@ module Dentaku
               subparser = Parser.new(
                 inner_case_inputs,
                 operations: [AST::Case],
-                arities: [0]
+                arities: [0],
+                function_registry: @function_registry
               )
               subparser.parse
               output.concat(subparser.output)
@@ -253,6 +258,7 @@ module Dentaku
             end
 
           when :comma
+            fail! :invalid_statement if arities.empty?
             arities[-1] += 1
             while operations.any? && operations.last != AST::Grouping && operations.last != AST::Array
               consume

data/lib/dentaku/token_matcher.rb

@@ -16,7 +16,7 @@ module Dentaku
       @range = (@min..@max)
     end
 
-    def | (other_matcher)
+    def |(other_matcher)
       self.class.new(:nomatch, :nomatch, leaf_matchers + other_matcher.leaf_matchers)
     end
 

data/lib/dentaku/token_scanner.rb

@@ -91,7 +91,7 @@ module Dentaku
 
       def numeric
         new(:numeric, '((?:\d+(\.\d+)?|\.\d+)(?:(e|E)(\+|-)?\d+)?)\b', lambda { |raw|
-          raw =~ /\./ ? BigDecimal.new(raw) : raw.to_i
+          raw =~ /\./ ? BigDecimal(raw) : raw.to_i
         })
       end
 

data/lib/dentaku/tokenizer.rb

@@ -12,7 +12,7 @@ module Dentaku
     def tokenize(string, options = {})
       @nesting = 0
       @tokens  = []
-      @aliases = options.fetch(:aliases, Dentaku.aliases)
+      @aliases = options.fetch(:aliases, global_aliases)
       input    = strip_comments(string.to_s.dup)
       input    = replace_aliases(input)
       @case_sensitive = options.fetch(:case_sensitive, false)
@@ -84,6 +84,11 @@ module Dentaku
 
     private
 
+    def global_aliases
+      return {} unless Dentaku.respond_to?(:aliases)
+      Dentaku.aliases
+    end
+
     def fail!(reason, **meta)
       message =
         case reason

data/lib/dentaku/version.rb

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

data/spec/ast/addition_spec.rb

@@ -11,7 +11,7 @@ describe Dentaku::AST::Addition do
 
   it 'performs addition' do
     node = described_class.new(five, six)
-    expect(node.value).to eq 11
+    expect(node.value).to eq(11)
   end
 
   it 'requires numeric operands' do

data/spec/ast/and_function_spec.rb

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

data/spec/ast/and_spec.rb

@@ -11,7 +11,7 @@ describe Dentaku::AST::And do
 
   it 'performs logical AND' do
     node = described_class.new(t, f)
-    expect(node.value).to eq false
+    expect(node.value).to eq(false)
   end
 
   it 'requires logical operands' do

data/spec/ast/arithmetic_spec.rb

@@ -11,29 +11,29 @@ describe Dentaku::AST::Arithmetic do
   let(:ctx) { {'x' => 1, 'y' => 2} }
 
   it 'performs an arithmetic operation with numeric operands' do
-    expect(add(one, two)).to eq 3
-    expect(sub(one, two)).to eq -1
-    expect(mul(one, two)).to eq  2
-    expect(div(one, two)).to eq  0.5
+    expect(add(one, two)).to eq(3)
+    expect(sub(one, two)).to eq(-1)
+    expect(mul(one, two)).to eq(2)
+    expect(div(one, two)).to eq(0.5)
   end
 
   it 'performs an arithmetic operation with one numeric operand and one string operand' do
-    expect(add(one, x)).to eq 2
-    expect(sub(one, x)).to eq 0
-    expect(mul(one, x)).to eq 1
-    expect(div(one, x)).to eq 1
-
-    expect(add(y, two)).to eq 4
-    expect(sub(y, two)).to eq 0
-    expect(mul(y, two)).to eq 4
-    expect(div(y, two)).to eq 1
+    expect(add(one, x)).to eq(2)
+    expect(sub(one, x)).to eq(0)
+    expect(mul(one, x)).to eq(1)
+    expect(div(one, x)).to eq(1)
+
+    expect(add(y, two)).to eq(4)
+    expect(sub(y, two)).to eq(0)
+    expect(mul(y, two)).to eq(4)
+    expect(div(y, two)).to eq(1)
   end
 
   it 'performs an arithmetic operation with string operands' do
-    expect(add(x, y)).to eq  3
-    expect(sub(x, y)).to eq -1
-    expect(mul(x, y)).to eq  2
-    expect(div(x, y)).to eq  0.5
+    expect(add(x, y)).to eq(3)
+    expect(sub(x, y)).to eq(-1)
+    expect(mul(x, y)).to eq(2)
+    expect(div(x, y)).to eq(0.5)
   end
 
   private

data/spec/ast/avg_spec.rb

@@ -5,29 +5,29 @@ require 'dentaku'
 describe 'Dentaku::AST::Function::Avg' do
   it 'returns the average of an array of Numeric values' do
     result = Dentaku('AVG(1, x, 1.8)', x: 2.3)
-    expect(result).to eq 1.7
+    expect(result).to eq(1.7)
   end
 
   it 'returns the average of a single entry array of a Numeric value' do
     result = Dentaku('AVG(x)', x: 2.3)
-    expect(result).to eq 2.3
+    expect(result).to eq(2.3)
   end
 
   it 'returns the average even if a String is passed' do
     result = Dentaku('AVG(1, x, 1.8)', x: '2.3')
-    expect(result).to eq 1.7
+    expect(result).to eq(1.7)
   end
 
   it 'returns the average even if an array is passed' do
     result = Dentaku('AVG(1, x, 2.3)', x: [4, 5])
-    expect(result).to eq 3.075
+    expect(result).to eq(3.075)
   end
 
   context 'checking errors' do
     let(:calculator) { Dentaku::Calculator.new }
 
     it 'raises an error if no arguments are passed' do
-      expect { calculator.evaluate!('AVG()') }.to raise_error(ArgumentError)
+      expect { calculator.evaluate!('AVG()') }.to raise_error(Dentaku::ArgumentError)
     end
   end
 end

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

@@ -11,7 +11,7 @@ describe Dentaku::AST::Division do
 
   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