dentaku 3.0.0 → 3.1.0

data/spec/parser_spec.rb

@@ -110,7 +110,7 @@ describe Dentaku::Parser do
     one      = token(1)
     rbracket = token(:rbracket)
 
-    node  = described_class.new([a, lbracket, one, rbracket]).parse
+    node = described_class.new([a, lbracket, one, rbracket]).parse
     expect { node.value }.to raise_error(Dentaku::UnboundVariableError)
     expect(node.value(a: [1, 2, 3])).to eq 2
   end
@@ -120,24 +120,24 @@ describe Dentaku::Parser do
     d_and   = Dentaku::Token.new(:combinator, :and)
     d_false = Dentaku::Token.new(:logical, false)
 
-    node  = described_class.new([d_true, d_and, d_false]).parse
+    node = described_class.new([d_true, d_and, d_false]).parse
     expect(node.value).to eq false
   end
 
   it 'evaluates a case statement' do
-    case_start  = Dentaku::Token.new(:case, :open)
-    x     = Dentaku::Token.new(:identifier, :x)
+    case_start = Dentaku::Token.new(:case, :open)
+    x = Dentaku::Token.new(:identifier, :x)
     case_when1 = Dentaku::Token.new(:case, :when)
-    one  = Dentaku::Token.new(:numeric, 1)
+    one = Dentaku::Token.new(:numeric, 1)
     case_then1 = Dentaku::Token.new(:case, :then)
-    two  = Dentaku::Token.new(:numeric, 2)
+    two = Dentaku::Token.new(:numeric, 2)
     case_when2 = Dentaku::Token.new(:case, :when)
-    three  = Dentaku::Token.new(:numeric, 3)
+    three = Dentaku::Token.new(:numeric, 3)
     case_then2 = Dentaku::Token.new(:case, :then)
-    four  = Dentaku::Token.new(:numeric, 4)
-    case_close  = Dentaku::Token.new(:case, :close)
+    four = Dentaku::Token.new(:numeric, 4)
+    case_close = Dentaku::Token.new(:case, :close)
 
-    node  = described_class.new(
+    node = described_class.new(
       [case_start,
        x,
        case_when1,
@@ -182,7 +182,7 @@ describe Dentaku::Parser do
   end
 
   it "evaluates explicit 'NULL' as a Nil" do
-    null  = Dentaku::Token.new(:null, nil)
+    null = Dentaku::Token.new(:null, nil)
     node = described_class.new([null]).parse
     expect(node.value).to eq(nil)
   end

data/spec/spec_helper.rb

@@ -1,8 +1,26 @@
 require 'pry'
-require 'coveralls'
+require 'simplecov'
+require 'codecov'
 
-# Check the amount of testcoverage
-Coveralls.wear!
+SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new([
+  SimpleCov::Formatter::HTMLFormatter,
+  SimpleCov::Formatter::Codecov,
+])
+
+SimpleCov.minimum_coverage 90
+SimpleCov.minimum_coverage_by_file 80
+
+SimpleCov.start do
+  add_filter "spec/"
+end
+
+RSpec.configure do |c|
+  c.before(:all) {
+    # add example for alias because we can set aliases just once
+    # before `calculator` method called
+    Dentaku.aliases = { roundup: ['roundupup'] }
+  }
+end
 
 # automatically create a token stream from bare values
 def token_stream(*args)

data/spec/token_matcher_spec.rb

@@ -132,4 +132,3 @@ describe Dentaku::TokenMatcher do
     end
   end
 end
-

data/spec/token_spec.rb

@@ -7,4 +7,10 @@ describe Dentaku::Token do
     expect(token.value).to eq(5)
     expect(token.is?(:numeric)).to be_truthy
   end
+
+  it 'compares category and value to determine equality' do
+    t1 = Dentaku::Token.new(:numeric, 5)
+    t2 = Dentaku::Token.new(:numeric, 5)
+    expect(t1 == t2).to be_truthy
+  end
 end

data/spec/tokenizer_spec.rb

@@ -276,4 +276,41 @@ describe Dentaku::Tokenizer do
       expect(tokens.map(&:value)).to eq([:exp!, :open, 5, :multiply, 3, :close])
     end
   end
+
+  describe 'aliases' do
+    let(:aliases) {
+      {
+        round: ['rrrrround!', 'redond'],
+        roundup: ['округлвверх'],
+        rounddown: ['округлвниз'],
+        if: ['если', 'cuando', '如果'],
+        max: ['макс', 'maximo'],
+        min: ['мин', 'minimo']
+      }
+    }
+
+    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)'
+    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)'
+    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())'
+    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)'
+    end
+  end
 end

metadata

@@ -1,15 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: dentaku
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Solomon White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: codecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-stack_explorer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -75,9 +131,11 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".pryrc"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - dentaku.gemspec
@@ -108,6 +166,7 @@ files:
 - lib/dentaku/ast/functions/roundup.rb
 - lib/dentaku/ast/functions/ruby_math.rb
 - lib/dentaku/ast/functions/string_functions.rb
+- lib/dentaku/ast/functions/sum.rb
 - lib/dentaku/ast/functions/switch.rb
 - lib/dentaku/ast/grouping.rb
 - lib/dentaku/ast/identifier.rb
@@ -123,7 +182,9 @@ files:
 - lib/dentaku/calculator.rb
 - lib/dentaku/dependency_resolver.rb
 - lib/dentaku/exceptions.rb
+- lib/dentaku/flat_hash.rb
 - lib/dentaku/parser.rb
+- lib/dentaku/string_casing.rb
 - lib/dentaku/token.rb
 - lib/dentaku/token_matcher.rb
 - lib/dentaku/token_matchers.rb
@@ -135,6 +196,7 @@ files:
 - spec/ast/and_spec.rb
 - spec/ast/arithmetic_spec.rb
 - spec/ast/case_spec.rb
+- spec/ast/comparator_spec.rb
 - spec/ast/division_spec.rb
 - spec/ast/function_spec.rb
 - spec/ast/max_spec.rb
@@ -146,6 +208,7 @@ files:
 - spec/ast/rounddown_spec.rb
 - spec/ast/roundup_spec.rb
 - spec/ast/string_functions_spec.rb
+- spec/ast/sum_spec.rb
 - spec/ast/switch_spec.rb
 - spec/benchmark.rb
 - spec/bulk_expression_solver_spec.rb
@@ -179,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: dentaku
-rubygems_version: 2.6.13
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: A formula language parser and evaluator
@@ -189,6 +252,7 @@ test_files:
 - spec/ast/and_spec.rb
 - spec/ast/arithmetic_spec.rb
 - spec/ast/case_spec.rb
+- spec/ast/comparator_spec.rb
 - spec/ast/division_spec.rb
 - spec/ast/function_spec.rb
 - spec/ast/max_spec.rb
@@ -200,6 +264,7 @@ test_files:
 - spec/ast/rounddown_spec.rb
 - spec/ast/roundup_spec.rb
 - spec/ast/string_functions_spec.rb
+- spec/ast/sum_spec.rb
 - spec/ast/switch_spec.rb
 - spec/benchmark.rb
 - spec/bulk_expression_solver_spec.rb