dentaku 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b760fc43a6d5745ea9c95827fb0ce03e8fef8453c2264ee1073e5754c2b8d402
-  data.tar.gz: 04e03adf0729e170babe62c8f91cc88ca8aa46932dacb694ccfc564696eed765
+  metadata.gz: 1166f2fd23824ca3950d6db37cbd48d0198e939311b69541d37a832ce4106904
+  data.tar.gz: 81452369184a17266465c58797ee4ff4643e7d47ab6762f4b38ac2a23cac6ad0
 SHA512:
-  metadata.gz: 006ec24c2c61758a1b7f5921e181ed49e2d54bf479091f9600ed31019fedd0a9411d744932e7dbf973b2e8fea098ff7299e58fd97851e5b2382a81e05043f8e4
-  data.tar.gz: 7f9d3735fc20e918d808158e8c618e11a0021762f102d9d5b32eec7d24f6a28845c01912fbc63c4cb835438f7f8d6d494fe811a5b01e373a5a6296a087c4edda
+  metadata.gz: d576e283f2381a8bf270981e1451f0668fd321e34c8a47f868a578411c82d1567402fc8d7dd264feb32fc82c1b722b01a931b439854c826d229e140419cf2d9c
+  data.tar.gz: bf601b8bdd70be48c02b801e05769bd8ce988552458d85512ef3445c39419f98d08e92915e6cc310cb772eb5d9c0b3db51c8dfec3dbe3665aa3533151110fbd8

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## [v3.3.2] 2019-06-10
+- add ability to pre-load AST cache
+- fix negation node bug
+
 ## [v3.3.1] 2019-03-26
 - better errors for parse failures and exceptions in internal functions
 - fix Ruby 2.6.0 deprecation warnings
@@ -171,7 +175,8 @@
 ## [v0.1.0] 2012-01-20
 - initial release
 
-[HEAD]:  https://github.com/rubysolo/dentaku/compare/v3.3.1...HEAD
+[HEAD]:  https://github.com/rubysolo/dentaku/compare/v3.3.2...HEAD
+[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
 [v3.2.1]:  https://github.com/rubysolo/dentaku/compare/v3.2.0...v3.2.1

data/lib/dentaku.rb

@@ -44,8 +44,6 @@ module Dentaku
     @aliases = hash
   end
 
-  private
-
   def self.calculator
     @calculator ||= Dentaku::Calculator.new
   end

data/lib/dentaku/ast/negation.rb

@@ -1,11 +1,13 @@
 module Dentaku
   module AST
     class Negation < Arithmetic
+      attr_reader :node
+
       def initialize(node)
         @node = node
 
         unless valid_node?(node)
-          raise NodeError.new(:numeric, left.type, :left),
+          raise NodeError.new(:numeric, node.type, :node),
                 "#{self.class} requires numeric operands"
         end
       end

data/lib/dentaku/calculator.rb

@@ -9,7 +9,8 @@ require 'dentaku/token'
 module Dentaku
   class Calculator
     include StringCasing
-    attr_reader :result, :memory, :tokenizer, :case_sensitive, :aliases, :nested_data_support
+    attr_reader :result, :memory, :tokenizer, :case_sensitive, :aliases,
+                :nested_data_support, :ast_cache
 
     def initialize(options = {})
       clear
@@ -97,6 +98,10 @@ module Dentaku
       }
     end
 
+    def load_cache(ast_cache)
+      @ast_cache = ast_cache
+    end
+
     def clear_cache(pattern = :all)
       case pattern
       when :all

data/lib/dentaku/version.rb

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

data/spec/ast/addition_spec.rb

@@ -9,6 +9,12 @@ describe Dentaku::AST::Addition do
 
   let(:t)    { Dentaku::AST::Numeric.new Dentaku::Token.new(:logical, true) }
 
+  it 'allows access to its sub-trees' do
+    node = described_class.new(five, six)
+    expect(node.left).to eq(five)
+    expect(node.right).to eq(six)
+  end
+
   it 'performs addition' do
     node = described_class.new(five, six)
     expect(node.value).to eq(11)

data/spec/ast/arithmetic_spec.rb

@@ -15,6 +15,7 @@ describe Dentaku::AST::Arithmetic do
     expect(sub(one, two)).to eq(-1)
     expect(mul(one, two)).to eq(2)
     expect(div(one, two)).to eq(0.5)
+    expect(neg(one)).to eq(-1)
   end
 
   it 'performs an arithmetic operation with one numeric operand and one string operand' do
@@ -34,6 +35,7 @@ describe Dentaku::AST::Arithmetic do
     expect(sub(x, y)).to eq(-1)
     expect(mul(x, y)).to eq(2)
     expect(div(x, y)).to eq(0.5)
+    expect(neg(x)).to eq(-1)
   end
 
   private
@@ -53,4 +55,8 @@ describe Dentaku::AST::Arithmetic do
   def div(left, right)
     Dentaku::AST::Division.new(left, right).value(ctx)
   end
+
+  def neg(node)
+    Dentaku::AST::Negation.new(node).value(ctx)
+  end
 end

data/spec/ast/division_spec.rb

@@ -9,6 +9,12 @@ describe Dentaku::AST::Division do
 
   let(:t)    { Dentaku::AST::Numeric.new Dentaku::Token.new(:logical, true) }
 
+  it 'allows access to its sub-trees' do
+    node = described_class.new(five, six)
+    expect(node.left).to eq(five)
+    expect(node.right).to eq(six)
+  end
+
   it 'performs division' do
     node = described_class.new(five, six)
     expect(node.value.round(4)).to eq(0.8333)

data/spec/ast/negation_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+require 'dentaku/ast/arithmetic'
+
+require 'dentaku/token'
+
+describe Dentaku::AST::Negation do
+  let(:five) { Dentaku::AST::Logical.new Dentaku::Token.new(:numeric, 5) }
+  let(:t)    { Dentaku::AST::Numeric.new Dentaku::Token.new(:logical, true) }
+
+  it 'allows access to its sub-node' do
+    node = described_class.new(five)
+    expect(node.node).to eq(five)
+  end
+
+  it 'performs negation' do
+    node = described_class.new(five)
+    expect(node.value).to eq(-5)
+  end
+
+  it 'requires numeric operands' do
+    expect {
+      described_class.new(t)
+    }.to raise_error(Dentaku::NodeError, /requires numeric operands/)
+
+    expression = Dentaku::AST::Negation.new(five)
+    group = Dentaku::AST::Grouping.new(expression)
+
+    expect {
+      described_class.new(group)
+    }.not_to raise_error
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dentaku
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Solomon White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2019-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codecov
@@ -208,6 +208,7 @@ files:
 - spec/ast/max_spec.rb
 - spec/ast/min_spec.rb
 - spec/ast/mul_spec.rb
+- spec/ast/negation_spec.rb
 - spec/ast/node_spec.rb
 - spec/ast/numeric_spec.rb
 - spec/ast/or_spec.rb
@@ -267,6 +268,7 @@ test_files:
 - spec/ast/max_spec.rb
 - spec/ast/min_spec.rb
 - spec/ast/mul_spec.rb
+- spec/ast/negation_spec.rb
 - spec/ast/node_spec.rb
 - spec/ast/numeric_spec.rb
 - spec/ast/or_spec.rb