dentaku 3.3.3 → 3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3028783062dbbe592ef71ed7bc388e57fb3af383e8cb897893dc858c4b772f63
-  data.tar.gz: c940b16dcfdc9e0d1658a6b38b7521e7a17882c9519a1771d4117600a614100a
+  metadata.gz: 59795943c781e4fff4c3ea5a33a0035e6c9ac2cf3a4671ac9105201301601b3e
+  data.tar.gz: cfc61c4b4e522b54754dd6c960a82bc0cddcedebe160ed111d8d68e4334b5752
 SHA512:
-  metadata.gz: 7e9633152d5e43e11b52db3a91e8c012816c2cf956e5e3906ce2c058c44d5733fc2668d57049dbc3c44d07155c12bd3bcd8f416e4012986ddcd937bd46cae49c
-  data.tar.gz: bf89bf9096af4720832a7c904ce981a98beb69388996a1d29b190ce279fb8248eddc56175c5cc77646a36c65a0acc78dcd6c98fffb04ad0773cae22630eb3fdd
+  metadata.gz: c3d96b80d7a90ecbf946311743f92ce84e04d77bbb7e0c6ac44724e0f0b479b3ce27d19d6b191381c46c27b12bd352dd8881d786500c5c666eef923126c7e577
+  data.tar.gz: 93a8ab932fda06e5121c98c39a8561b728da48fef9501127a218776c18d18cfd4086b5d3db938e6f8bc1bbdad59e8c3ba258b84e4d22c0ffcdd39d0d8aa20d54

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Change Log
 
-## [Unreleased]
+## [v3.3.4] 2019-11-21
+- bugfix release
+
+## [v3.3.3] 2019-11-20
 - date / duration addition and subtraction
 - validate arity for custom functions with variable arity
 - make AST serializable with Marshal.dump
@@ -184,7 +187,8 @@
 ## [v0.1.0] 2012-01-20
 - initial release
 
-[Unreleased]:  https://github.com/rubysolo/dentaku/compare/v3.3.2...HEAD
+[v3.3.4]:  https://github.com/rubysolo/dentaku/compare/v3.3.3...v3.3.4
+[v3.3.3]:  https://github.com/rubysolo/dentaku/compare/v3.3.2...v3.3.3
 [v3.3.2]:  https://github.com/rubysolo/dentaku/compare/v3.3.1...v3.3.2
 [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

data/README.md

@@ -284,7 +284,7 @@ using Calculator#add_functions.
 FUNCTION ALIASES
 ----------------
 
-Every function can be aliased by synonyms. For example, it can be useful if 
+Every function can be aliased by synonyms. For example, it can be useful if
 your application is multilingual.
 
 ```ruby
@@ -321,7 +321,7 @@ LICENSE
 
 (The MIT License)
 
-Copyright © 2012-2018 Solomon White
+Copyright © 2012-2019 Solomon White
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the ‘Software’), to deal in

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

@@ -1,10 +1,6 @@
 module Dentaku
   module AST
     class CaseElse < Node
-      def self.arity
-        1
-      end
-
       def initialize(node)
         @node = node
       end
@@ -16,6 +12,18 @@ module Dentaku
       def dependencies(context = {})
         @node.dependencies(context)
       end
+
+      def self.arity
+        1
+      end
+
+      def self.min_param_count
+        1
+      end
+
+      def self.max_param_count
+        1
+      end
     end
   end
 end

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

@@ -16,6 +16,14 @@ module Dentaku
       def self.arity
         1
       end
+
+      def self.min_param_count
+        1
+      end
+
+      def self.max_param_count
+        1
+      end
     end
   end
 end

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

@@ -1,10 +1,6 @@
 module Dentaku
   module AST
     class CaseThen < Node
-      def self.arity
-        1
-      end
-
       def initialize(node)
         @node = node
       end
@@ -16,6 +12,18 @@ module Dentaku
       def dependencies(context = {})
         @node.dependencies(context)
       end
+
+      def self.arity
+        1
+      end
+
+      def self.min_param_count
+        1
+      end
+
+      def self.max_param_count
+        1
+      end
     end
   end
 end

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

@@ -1,10 +1,6 @@
 module Dentaku
   module AST
     class CaseWhen < Operation
-      def self.arity
-        1
-      end
-
       def initialize(node)
         @node = node
       end
@@ -16,6 +12,18 @@ module Dentaku
       def dependencies(context = {})
         @node.dependencies(context)
       end
+
+      def self.arity
+        1
+      end
+
+      def self.min_param_count
+        1
+      end
+
+      def self.max_param_count
+        1
+      end
     end
   end
 end

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

@@ -39,6 +39,14 @@ module Dentaku
       end
 
       class Right < Base
+        def self.min_param_count
+          2
+        end
+
+        def self.max_param_count
+          2
+        end
+
         def initialize(*args)
           super
           @string, @length = *@args
@@ -53,6 +61,14 @@ module Dentaku
       end
 
       class Mid < Base
+        def self.min_param_count
+          3
+        end
+
+        def self.max_param_count
+          3
+        end
+
         def initialize(*args)
           super
           @string, @offset, @length = *@args
@@ -69,6 +85,14 @@ module Dentaku
       end
 
       class Len < Base
+        def self.min_param_count
+          1
+        end
+
+        def self.max_param_count
+          1
+        end
+
         def initialize(*args)
           super
           @string = @args[0]
@@ -85,6 +109,14 @@ module Dentaku
       end
 
       class Find < Base
+        def self.min_param_count
+          2
+        end
+
+        def self.max_param_count
+          2
+        end
+
         def initialize(*args)
           super
           @needle, @haystack = *@args
@@ -104,6 +136,14 @@ module Dentaku
       end
 
       class Substitute < Base
+        def self.min_param_count
+          3
+        end
+
+        def self.max_param_count
+          3
+        end
+
         def initialize(*args)
           super
           @original, @search, @replacement = *@args
@@ -137,6 +177,14 @@ module Dentaku
       end
 
       class Contains < Base
+        def self.min_param_count
+          2
+        end
+
+        def self.max_param_count
+          2
+        end
+
         def initialize(*args)
           super
           @needle, @haystack = *args

data/lib/dentaku/version.rb

@@ -1,3 +1,3 @@
 module Dentaku
-  VERSION = "3.3.3"
+  VERSION = "3.3.4"
 end

data/spec/calculator_spec.rb

@@ -663,6 +663,16 @@ describe Dentaku::Calculator do
         calculator.evaluate('CONCAT(s1, s2, s3)', 's1' => 'ab', 's2' => 'cd', 's3' => 'ef')
       ).to eq('abcdef')
     end
+
+    it 'manipulates string arguments' do
+      expect(calculator.evaluate("left('ABCD', 2)")).to eq('AB')
+      expect(calculator.evaluate("right('ABCD', 2)")).to eq('CD')
+      expect(calculator.evaluate("mid('ABCD', 2, 2)")).to eq('BC')
+      expect(calculator.evaluate("len('ABCD')")).to eq(4)
+      expect(calculator.evaluate("find('BC', 'ABCD')")).to eq(2)
+      expect(calculator.evaluate("substitute('ABCD', 'BC', 'XY')")).to eq('AXYD')
+      expect(calculator.evaluate("contains('BC', 'ABCD')")).to be_truthy
+    end
   end
 
   describe 'zero-arity functions' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dentaku
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.4
 platform: ruby
 authors:
 - Solomon White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2019-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codecov