dentaku 2.0.9 → 2.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc6a362189b735fe68596e1b94e28787d7290ac8
-  data.tar.gz: cec7635943905eaa4cb8cd888649f5c34a0c1871
+  metadata.gz: c2b19bb69372e3700ffb09ca14b5f3fbcb630b06
+  data.tar.gz: 4a67960044c94875d8a0ab2487e9464c820af5ca
 SHA512:
-  metadata.gz: d82af702ad0a2b009680e7a3292388174915408f7d8e67c5b5cb0d545bd24544edd40a66a0611268bbb5614920c2de386784f8c7132c420802a1577d30b67a43
-  data.tar.gz: 417cd814e7f46973c312568e8dcd9dd4bbe9fe1dfa27abcb8ac178c58e78850c477d99f9a76abd285abd8141d1e647dceb52b40edcb54681743d9af95cde9684
+  metadata.gz: 017f2d92d2b8110151d51ea2c93abe8964a82a662b40ce1f38a8133b75dea64b51ba774f64d06ffb24353024046eeb59457d239527560a57eeb0671b6dff8cc1
+  data.tar.gz: cd39bb1acee73e4b05d65940310749601bf758c8797c2cca5ed4e45f6850b59a0637b132a8c4eafd0b60ac52a8714ad5b6933ca38fe3dcc0e60ef9588d2565c0

data/.travis.yml

@@ -10,4 +10,3 @@ rvm:
   - 2.2.2
   - 2.2.3
   - 2.3.0
-  - rbx-2

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## [v2.0.10] 2016-12-30
+- fix string function initialization bug
+- fix issues with CASE statements
+- allow injecting AST cache
+
 ## [v2.0.9] 2016-09-19
 - namespace tokenization errors
 - automatically coerce arguments to string functions as strings
@@ -111,6 +116,7 @@
 ## [v0.1.0] 2012-01-20
 - initial release
 
+[HEAD]:  https://github.com/rubysolo/dentaku/compare/v2.0.9...HEAD
 [v2.0.9]:  https://github.com/rubysolo/dentaku/compare/v2.0.8...v2.0.9
 [v2.0.8]:  https://github.com/rubysolo/dentaku/compare/v2.0.7...v2.0.8
 [v2.0.7]:  https://github.com/rubysolo/dentaku/compare/v2.0.6...v2.0.7

data/lib/dentaku/ast/case.rb

@@ -43,9 +43,8 @@ module Dentaku
       def dependencies(context={})
         # TODO: should short-circuit
         @switch.dependencies(context) +
-          @conditions.flat_map do |condition|
-            condition.dependencies(context)
-          end
+          @conditions.flat_map { |condition| condition.dependencies(context) } +
+          @else.dependencies(context)
       end
     end
   end

data/lib/dentaku/ast/function.rb

@@ -46,7 +46,7 @@ module Dentaku
         end
 
         function_class = name.to_s.capitalize
-        Dentaku::AST.send(:remove_const, function_class) if Dentaku::AST.const_defined?(function_class)
+        Dentaku::AST.send(:remove_const, function_class) if Dentaku::AST.const_defined?(function_class, false)
         Dentaku::AST.const_set(function_class, function)
 
         function.implementation = implementation

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

@@ -4,9 +4,9 @@ module Dentaku
   module AST
     module StringFunctions
       class Left < Function
-        def initialize(string, length)
-          @string = string
-          @length = length
+        def initialize(*args)
+          super
+          @string, @length = *@args
         end
 
         def value(context={})
@@ -17,9 +17,9 @@ module Dentaku
       end
 
       class Right < Function
-        def initialize(string, length)
-          @string = string
-          @length = length
+        def initialize(*args)
+          super
+          @string, @length = *@args
         end
 
         def value(context={})
@@ -30,10 +30,9 @@ module Dentaku
       end
 
       class Mid < Function
-        def initialize(string, offset, length)
-          @string = string
-          @offset = offset
-          @length = length
+        def initialize(*args)
+          super
+          @string, @offset, @length = *@args
         end
 
         def value(context={})
@@ -45,8 +44,9 @@ module Dentaku
       end
 
       class Len < Function
-        def initialize(string)
-          @string = string
+        def initialize(*args)
+          super
+          @string = @args[0]
         end
 
         def value(context={})
@@ -56,9 +56,9 @@ module Dentaku
       end
 
       class Find < Function
-        def initialize(needle, haystack)
-          @needle = needle
-          @haystack = haystack
+        def initialize(*args)
+          super
+          @needle, @haystack = *@args
         end
 
         def value(context={})
@@ -71,10 +71,9 @@ module Dentaku
       end
 
       class Substitute < Function
-        def initialize(original, search, replacement)
-          @original = original
-          @search = search
-          @replacement = replacement
+        def initialize(*args)
+          super
+          @original, @search, @replacement = *@args
         end
 
         def value(context={})
@@ -87,9 +86,9 @@ module Dentaku
       end
 
       class Concat < Function
-        def initialize(left, right)
-          @left  = left
-          @right = right
+        def initialize(*args)
+          super
+          @left, @right = *@args
         end
 
         def value(context={})

data/lib/dentaku/calculator.rb

@@ -8,10 +8,10 @@ module Dentaku
   class Calculator
     attr_reader :result, :memory, :tokenizer
 
-    def initialize
+    def initialize(ast_cache={})
       clear
       @tokenizer = Tokenizer.new
-      @ast_cache = {}
+      @ast_cache = ast_cache
       @disable_ast_cache = false
     end
 

data/lib/dentaku/parser.rb

@@ -67,15 +67,24 @@ module Dentaku
             # special handling for case nesting: strip out inner case
             # statements and parse their AST segments recursively
             if operations.include?(AST::Case)
-              last_case_close_index = nil
-              first_nested_case_close_index = nil
+              open_cases = 0
+              case_end_index = nil
+
               input.each_with_index do |token, index|
-                first_nested_case_close_index = last_case_close_index
+                if token.category == :case && token.value == :open
+                  open_cases += 1
+                end
+
                 if token.category == :case && token.value == :close
-                  last_case_close_index = index
+                  if open_cases > 0
+                    open_cases -= 1
+                  else
+                    case_end_index = index
+                    break
+                  end
                 end
               end
-              inner_case_inputs = input.slice!(0..first_nested_case_close_index)
+              inner_case_inputs = input.slice!(0..case_end_index)
               subparser = Parser.new(
                 inner_case_inputs,
                 operations: [AST::Case],

data/lib/dentaku/version.rb

@@ -1,3 +1,3 @@
 module Dentaku
-  VERSION = "2.0.9"
+  VERSION = "2.0.10"
 end

data/spec/ast/case_spec.rb

@@ -67,14 +67,18 @@ describe Dentaku::AST::Case do
     let!(:tax) do
       Dentaku::AST::Identifier.new(Dentaku::Token.new(:identifier, :tax))
     end
+    let!(:fallback) do
+      Dentaku::AST::Identifier.new(Dentaku::Token.new(:identifier, :fallback))
+    end
     let!(:addition) { Dentaku::AST::Addition.new(two, tax) }
     let!(:when2) { Dentaku::AST::CaseWhen.new(banana) }
     let!(:then2) { Dentaku::AST::CaseThen.new(addition) }
+    let!(:else2) { Dentaku::AST::CaseElse.new(fallback) }
     let!(:conditional2) { Dentaku::AST::CaseConditional.new(when2, then2) }
 
     it 'gathers dependencies from switch and conditionals' do
-      node = described_class.new(switch, conditional1, conditional2)
-      expect(node.dependencies).to eq([:fruit, :tax])
+      node = described_class.new(switch, conditional1, conditional2, else2)
+      expect(node.dependencies).to eq([:fruit, :tax, :fallback])
     end
   end
 end

data/spec/ast/function_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 require 'dentaku/ast/function'
 
+class Clazz; end
+
 describe Dentaku::AST::Function do
   it 'maintains a function registry' do
     expect(described_class).to respond_to(:get)
@@ -18,4 +20,8 @@ describe Dentaku::AST::Function do
     function = described_class.get("flarble").new
     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
+    expect { described_class.register("clazz", :string, -> { "clazzified" }) }.not_to raise_error
+  end
 end

data/spec/calculator_spec.rb

@@ -66,6 +66,12 @@ describe Dentaku::Calculator do
       expect(calculator.dependencies("bob + dole / 3")).to eq(['bob', 'dole'])
     end
 
+    it "finds dependencies in formula arguments" do
+      allow(Dentaku).to receive(:cache_ast?) { true }
+
+      expect(calculator.dependencies("CONCAT(bob, dole)")).to eq(['bob', 'dole'])
+    end
+
     it "doesn't consider variables in memory as dependencies" do
       expect(with_memory.dependencies("apples + oranges")).to eq(['oranges'])
     end
@@ -379,6 +385,34 @@ describe Dentaku::Calculator do
         fruit: 'banana')
       expect(value).to eq(5)
     end
+
+    it 'handles multiple nested case statements' do
+      formula = <<-FORMULA
+      CASE fruit
+      WHEN 'apple'
+        THEN
+        CASE quantity
+        WHEN 2 THEN 3
+        END
+      WHEN 'banana'
+        THEN
+        CASE quantity
+        WHEN 1 THEN 2
+        END
+      END
+      FORMULA
+      value = calculator.evaluate(
+        formula,
+        quantity: 1,
+        fruit: 'banana')
+      expect(value).to eq(2)
+
+      value = calculator.evaluate(
+        formula,
+        quantity: 2,
+        fruit: 'apple')
+      expect(value).to eq(3)
+    end
   end
 
   describe 'math functions' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dentaku
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.0.10
 platform: ruby
 authors:
 - Solomon White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake