dentaku 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 568297af6c05c99fdd87b6a2d70cd78b4d1f5828
-  data.tar.gz: 9e7668dd3998237a5fe6aaf50370dadfb6941bee
+  metadata.gz: 91e1c068c1ad4f4399eece3c6ac66ab9c17591cf
+  data.tar.gz: 2df26e17bb06fa076d30e56e880b5d5797df1dc3
 SHA512:
-  metadata.gz: 51685ec73f241afaed1bf66961b55837792100a0ecf06c2d5b283eca227fdb3129c76045fe676b8416fa40d54e11d1ef0da8ef298c504faeace2f77caf168955
-  data.tar.gz: a9a6914b90950b7616e3c82c704ab58921d0107045a3f440f5de2848acbf056ee95fefd8f2f63b663cb33f71f72f3733d94f13b7dd1f0895c1285f5bcab9181c
+  metadata.gz: 83222ea1e9505e2cdfa692f37142776fdb7be70cf39098d536b6a0c85958272421800f04e7876f9d7ba39bfe4d3eb19a49f2efa5b631b0ecddea4ed858c3e4ca
+  data.tar.gz: 32dc26ce15c748d7091c775356735fabf5abdf3f391db3407b663769e56c361247478edae5f3b3dc725aa97cb44b3a635e5212b293dc97af9940dedab83852a8

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## [v2.0.5] 2015-09-03
+- fix bug with detecting unbound nodes
+- silence warnings
+- allow registration of custom token scanners
+
 ## [v2.0.4] 2015-09-03
 - fix BigDecimal conversion bug
 - add caching for bulk expression solving dependency order
@@ -85,6 +90,7 @@
 ## [v0.1.0] 2012-01-20
 - initial release
 
+[v2.0.5]:  https://github.com/rubysolo/dentaku/compare/v2.0.4...v2.0.5
 [v2.0.4]:  https://github.com/rubysolo/dentaku/compare/v2.0.3...v2.0.4
 [v2.0.3]:  https://github.com/rubysolo/dentaku/compare/v2.0.1...v2.0.3
 [v2.0.1]:  https://github.com/rubysolo/dentaku/compare/v2.0.0...v2.0.1

data/lib/dentaku.rb

@@ -3,6 +3,9 @@ require "dentaku/calculator"
 require "dentaku/version"
 
 module Dentaku
+  @enable_ast_caching = false
+  @enable_dependency_order_caching = false
+
   def self.evaluate(expression, data={})
     calculator.evaluate(expression, data)
   end

data/lib/dentaku/ast/arithmetic.rb

@@ -29,7 +29,7 @@ module Dentaku
       end
 
       def valid_node?(node)
-        node.is_a?(Identifier) || node.type == :numeric
+        node.dependencies.any? || node.type == :numeric
       end
     end
 

data/lib/dentaku/ast/combinators.rb

@@ -15,7 +15,7 @@ module Dentaku
       private
 
       def valid_node?(node)
-        node.is_a?(Identifier) || node.type == :logical
+        node.dependencies.any? || node.type == :logical
       end
     end
 

data/lib/dentaku/ast/grouping.rb

@@ -12,6 +12,10 @@ module Dentaku
       def type
         @node.type
       end
+
+      def dependencies(context={})
+        @node.dependencies(context)
+      end
     end
   end
 end

data/lib/dentaku/ast/negation.rb

@@ -26,10 +26,14 @@ module Dentaku
         40
       end
 
+      def dependencies(context={})
+        @node.dependencies(context)
+      end
+
       private
 
       def valid_node?(node)
-        node.is_a?(Identifier) || node.type == :numeric
+        node.dependencies.any? || node.type == :numeric
       end
     end
   end

data/lib/dentaku/ast/node.rb

@@ -8,6 +8,10 @@ module Dentaku
       def self.arity
         nil
       end
+
+      def dependencies(context={})
+        []
+      end
     end
   end
 end

data/lib/dentaku/token_scanner.rb

@@ -41,16 +41,26 @@ module Dentaku
         ]
       end
 
-      def scanners=(token_scanners)
-        @scanners = (token_scanners & available_scanners).map { |scanner|
-          self.send(scanner)
-        }
+      def register_default_scanners
+        register_scanners(available_scanners)
+      end
+
+      def register_scanners(scanner_ids)
+        @scanners = scanner_ids.each_with_object({}) do |id, scanners|
+          scanners[id] = self.send(id)
+        end
+      end
+
+      def register_scanner(id, scanner)
+        @scanners[id] = scanner
+      end
+
+      def scanners=(scanner_ids)
+        @scanners.select! { |k,v| scanner_ids.include?(k) }
       end
 
       def scanners
-        @scanners ||= available_scanners.map { |scanner|
-          self.send(scanner)
-        }
+        @scanners.values
       end
 
       def whitespace
@@ -112,8 +122,10 @@ module Dentaku
       end
 
       def identifier
-        new(:identifier, '\w+\b', lambda { |raw| raw.strip.downcase.to_s })
+        new(:identifier, '\w+\b', lambda { |raw| raw.strip.downcase })
       end
     end
+
+    register_default_scanners
   end
 end

data/lib/dentaku/version.rb

@@ -1,3 +1,3 @@
 module Dentaku
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
 end

data/spec/ast/node_spec.rb

@@ -22,6 +22,9 @@ describe Dentaku::AST::Node do
 
     node = make_node('if(x > 5, y, z)')
     expect(node.dependencies('x' => 7)).to eq ['y', 'z']
+
+    node = make_node('')
+    expect(node.dependencies).to eq []
   end
 
   it 'returns unique list of dependencies' do

data/spec/calculator_spec.rb

@@ -221,6 +221,12 @@ describe Dentaku::Calculator do
       expect(calculator.evaluate('round(-1.23, 1)')).to eq(BigDecimal.new('-1.2'))
       expect(calculator.evaluate('NOT(some_boolean) AND -1 > 3', some_boolean: true)).to be_falsey
     end
+
+    it 'evaluates functions with stored variables' do
+      calculator.store("multi_color" => true, "number_of_sheets" => 5000, "sheets_per_minute_black" => 2000, "sheets_per_minute_color" => 1000)
+      result = calculator.evaluate('number_of_sheets / if(multi_color, sheets_per_minute_color, sheets_per_minute_black)')
+      expect(result).to eq(5)
+    end
   end
 
   describe 'math functions' do

data/spec/token_scanner_spec.rb

@@ -3,8 +3,13 @@ require 'dentaku/token_scanner'
 describe Dentaku::TokenScanner do
   let(:whitespace) { described_class.new(:whitespace, '\s') }
   let(:numeric)    { described_class.new(:numeric,    '(\d+(\.\d+)?|\.\d+)',
-    lambda { |raw| raw =~ /\./ ? BigDecimal.new(raw) : raw.to_i })
+    ->(raw) { raw =~ /\./ ? BigDecimal.new(raw) : raw.to_i })
   }
+  let(:custom)     { described_class.new(:identifier, '#\w+\b',
+    ->(raw) { raw.gsub('#', '').to_sym })
+  }
+
+  after { described_class.register_default_scanners }
 
   it 'returns a token for a matching string' do
     token = whitespace.scan(' ').first
@@ -29,12 +34,20 @@ describe Dentaku::TokenScanner do
   it 'allows customizing available scanners' do
     described_class.scanners = [:whitespace, :numeric]
     expect(described_class.scanners.length).to eq 2
-    described_class.scanners = described_class.available_scanners
   end
 
   it 'ignores invalid scanners' do
     described_class.scanners = [:whitespace, :numeric, :fake]
     expect(described_class.scanners.length).to eq 2
-    described_class.scanners = described_class.available_scanners
+  end
+
+  it 'uses a custom scanner' do
+    described_class.scanners = [:whitespace, :numeric]
+    described_class.register_scanner(:custom, custom)
+    expect(described_class.scanners.length).to eq 3
+
+    token = custom.scan('#apple + #pear').first
+    expect(token.category).to eq(:identifier)
+    expect(token.value).to eq(:apple)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dentaku
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Solomon White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: dentaku
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A formula language parser and evaluator