dentaku 2.0.11 → 3.0.0

data/spec/exceptions_spec.rb

@@ -4,6 +4,6 @@ require 'dentaku/exceptions'
 describe Dentaku::UnboundVariableError do
   it 'includes variable name(s) in message' do
     exception = described_class.new(['length'])
-    expect(exception.message).to match /length/
+    expect(exception.unbound_variables).to include('length')
   end
 end

data/spec/parser_spec.rb

@@ -14,7 +14,7 @@ describe Dentaku::Parser do
     plus = Dentaku::Token.new(:operator, :add)
     four = Dentaku::Token.new(:numeric, 4)
 
-    node  = described_class.new([five, plus, four]).parse
+    node = described_class.new([five, plus, four]).parse
     expect(node.value).to eq 9
   end
 
@@ -23,7 +23,7 @@ describe Dentaku::Parser do
     lt   = Dentaku::Token.new(:comparator, :lt)
     four = Dentaku::Token.new(:numeric, 4)
 
-    node  = described_class.new([five, lt, four]).parse
+    node = described_class.new([five, lt, four]).parse
     expect(node.value).to eq false
   end
 
@@ -31,7 +31,7 @@ describe Dentaku::Parser do
     five = Dentaku::Token.new(:numeric, 5)
     mod  = Dentaku::Token.new(:operator, :mod)
 
-    node  = described_class.new([five, mod]).parse
+    node = described_class.new([five, mod]).parse
     expect(node.value).to eq 0.05
   end
 
@@ -104,6 +104,17 @@ describe Dentaku::Parser do
     expect(node.value(x: 3)).to eq 15
   end
 
+  it 'evaluates access into data structures' do
+    a        = token(:a)
+    lbracket = token(:lbracket)
+    one      = token(1)
+    rbracket = token(:rbracket)
+
+    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
+
   it 'evaluates boolean expressions' do
     d_true  = Dentaku::Token.new(:logical, true)
     d_and   = Dentaku::Token.new(:combinator, :and)
@@ -160,6 +171,14 @@ describe Dentaku::Parser do
         described_class.new([this, also]).parse
       }.to raise_error(Dentaku::ParseError)
     end
+
+    it 'raises an exception when trying to access an undefined function' do
+      fn = Dentaku::Token.new(:function, 'non_exists_func')
+
+      expect {
+        described_class.new([fn]).parse
+      }.to raise_error(Dentaku::ParseError)
+    end
   end
 
   it "evaluates explicit 'NULL' as a Nil" do

data/spec/spec_helper.rb

@@ -1,4 +1,8 @@
 require 'pry'
+require 'coveralls'
+
+# Check the amount of testcoverage
+Coveralls.wear!
 
 # automatically create a token stream from bare values
 def token_stream(*args)
@@ -21,6 +25,8 @@ def type_for(value)
     :operator
   when :open, :close, :comma
     :grouping
+  when :lbracket, :rbracket
+    :access
   when :le, :ge, :ne, :ne, :lt, :gt, :eq
     :comparator
   when :and, :or
@@ -33,9 +39,13 @@ def type_for(value)
 end
 
 def identifier(name)
-  Dentaku::AST::Identifier.new(Dentaku::Token.new(:identifier, name))
+  Dentaku::AST::Identifier.new(token(name))
 end
 
 def literal(value)
-  Dentaku::AST::Literal.new(Dentaku::Token.new(type_for(value), value))
+  Dentaku::AST::Literal.new(token(value))
+end
+
+def token(value)
+  Dentaku::Token.new(type_for(value), value)
 end

data/spec/token_scanner_spec.rb

@@ -27,10 +27,6 @@ describe Dentaku::TokenScanner do
     expect(token.value).to eq(5)
   end
 
-  it 'returns a list of all configured scanners' do
-    expect(described_class.scanners.length).to eq 15
-  end
-
   it 'allows customizing available scanners' do
     described_class.scanners = [:whitespace, :numeric]
     expect(described_class.scanners.length).to eq 2

data/spec/tokenizer_spec.rb

@@ -7,6 +7,26 @@ describe Dentaku::Tokenizer do
     expect(tokenizer.tokenize('')).to be_empty
   end
 
+  it 'tokenizes numeric literal in decimal' do
+    token = tokenizer.tokenize('80').first
+    expect(token.category).to eq(:numeric)
+    expect(token.value).to eq(80)
+  end
+
+  it 'tokenizes numeric literal in hexadecimal' do
+    token = tokenizer.tokenize('0x80').first
+    expect(token.category).to eq(:numeric)
+    expect(token.value).to eq(128)
+  end
+
+  it 'tokenizes numeric literal in scientific notation' do
+    %w( 6.02e23 .602E+24 ).each do |s|
+      tokens = tokenizer.tokenize(s)
+      expect(tokens.map(&:category)).to eq([:numeric])
+      expect(tokens.map(&:value)).to eq([6.02e23])
+    end
+  end
+
   it 'tokenizes addition' do
     tokens = tokenizer.tokenize('1+1')
     expect(tokens.map(&:category)).to eq([:numeric, :operator, :numeric])
@@ -135,18 +155,36 @@ describe Dentaku::Tokenizer do
     expect(tokens.map(&:value)).to eq(['perimeter', :le, 7500])
   end
 
-  it 'matches "and" for logical expressions' do
+  it 'tokenizes "and" for logical expressions' do
     tokens = tokenizer.tokenize('octopi <= 7500 AND sharks > 1500')
     expect(tokens.map(&:category)).to eq([:identifier, :comparator, :numeric, :combinator, :identifier, :comparator, :numeric])
     expect(tokens.map(&:value)).to eq(['octopi', :le, 7500, :and, 'sharks', :gt, 1500])
   end
 
-  it 'matches "or" for logical expressions' do
+  it 'tokenizes "or" for logical expressions' do
     tokens = tokenizer.tokenize('size < 3 or admin = 1')
     expect(tokens.map(&:category)).to eq([:identifier, :comparator, :numeric, :combinator, :identifier, :comparator, :numeric])
     expect(tokens.map(&:value)).to eq(['size', :lt, 3, :or, 'admin', :eq, 1])
   end
 
+  it 'tokenizes "&&" for logical expressions' do
+    tokens = tokenizer.tokenize('octopi <= 7500 && sharks > 1500')
+    expect(tokens.map(&:category)).to eq([:identifier, :comparator, :numeric, :combinator, :identifier, :comparator, :numeric])
+    expect(tokens.map(&:value)).to eq(['octopi', :le, 7500, :and, 'sharks', :gt, 1500])
+  end
+
+  it 'tokenizes "||" for logical expressions' do
+    tokens = tokenizer.tokenize('size < 3 || admin = 1')
+    expect(tokens.map(&:category)).to eq([:identifier, :comparator, :numeric, :combinator, :identifier, :comparator, :numeric])
+    expect(tokens.map(&:value)).to eq(['size', :lt, 3, :or, 'admin', :eq, 1])
+  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))
+    expect(tokens.map(&:value)).to eq(['a', :lbracket, 1, :rbracket])
+  end
+
   it 'detects unbalanced parentheses' do
     expect { tokenizer.tokenize('(5+3') }.to raise_error(Dentaku::TokenizerError, /too many opening parentheses/)
     expect { tokenizer.tokenize(')')    }.to raise_error(Dentaku::TokenizerError, /too many closing parentheses/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dentaku
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 3.0.0
 platform: ruby
 authors:
 - Solomon White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  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'
 description: "    Dentaku is a parser and evaluator for mathematical formulas\n"
 email:
 - rubysolo@gmail.com
@@ -69,6 +83,7 @@ files:
 - dentaku.gemspec
 - lib/dentaku.rb
 - lib/dentaku/ast.rb
+- lib/dentaku/ast/access.rb
 - lib/dentaku/ast/arithmetic.rb
 - lib/dentaku/ast/bitwise.rb
 - lib/dentaku/ast/case.rb
@@ -82,15 +97,18 @@ files:
 - lib/dentaku/ast/datetime.rb
 - lib/dentaku/ast/function.rb
 - lib/dentaku/ast/function_registry.rb
+- lib/dentaku/ast/functions/and.rb
 - lib/dentaku/ast/functions/if.rb
 - lib/dentaku/ast/functions/max.rb
 - lib/dentaku/ast/functions/min.rb
 - lib/dentaku/ast/functions/not.rb
+- lib/dentaku/ast/functions/or.rb
 - lib/dentaku/ast/functions/round.rb
 - lib/dentaku/ast/functions/rounddown.rb
 - lib/dentaku/ast/functions/roundup.rb
 - lib/dentaku/ast/functions/ruby_math.rb
 - lib/dentaku/ast/functions/string_functions.rb
+- lib/dentaku/ast/functions/switch.rb
 - lib/dentaku/ast/grouping.rb
 - lib/dentaku/ast/identifier.rb
 - lib/dentaku/ast/literal.rb
@@ -113,13 +131,22 @@ files:
 - lib/dentaku/tokenizer.rb
 - lib/dentaku/version.rb
 - spec/ast/addition_spec.rb
+- spec/ast/and_function_spec.rb
 - spec/ast/and_spec.rb
+- spec/ast/arithmetic_spec.rb
 - spec/ast/case_spec.rb
 - spec/ast/division_spec.rb
 - spec/ast/function_spec.rb
+- spec/ast/max_spec.rb
+- spec/ast/min_spec.rb
 - spec/ast/node_spec.rb
 - spec/ast/numeric_spec.rb
+- spec/ast/or_spec.rb
+- spec/ast/round_spec.rb
+- spec/ast/rounddown_spec.rb
+- spec/ast/roundup_spec.rb
 - spec/ast/string_functions_spec.rb
+- spec/ast/switch_spec.rb
 - spec/benchmark.rb
 - spec/bulk_expression_solver_spec.rb
 - spec/calculator_spec.rb
@@ -152,19 +179,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: dentaku
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A formula language parser and evaluator
 test_files:
 - spec/ast/addition_spec.rb
+- spec/ast/and_function_spec.rb
 - spec/ast/and_spec.rb
+- spec/ast/arithmetic_spec.rb
 - spec/ast/case_spec.rb
 - spec/ast/division_spec.rb
 - spec/ast/function_spec.rb
+- spec/ast/max_spec.rb
+- spec/ast/min_spec.rb
 - spec/ast/node_spec.rb
 - spec/ast/numeric_spec.rb
+- spec/ast/or_spec.rb
+- spec/ast/round_spec.rb
+- spec/ast/rounddown_spec.rb
+- spec/ast/roundup_spec.rb
 - spec/ast/string_functions_spec.rb
+- spec/ast/switch_spec.rb
 - spec/benchmark.rb
 - spec/bulk_expression_solver_spec.rb
 - spec/calculator_spec.rb