dentaku 0.2.5 → 0.2.6

data/lib/dentaku/evaluator.rb

@@ -20,6 +20,7 @@ module Dentaku
     T_COMBINATOR = TokenMatcher.new(:combinator)
     T_IF         = TokenMatcher.new(:function, :if)
     T_ROUND      = TokenMatcher.new(:function, :round)
+    T_NOT        = TokenMatcher.new(:function, :not)
 
     T_NON_GROUP_STAR = TokenMatcher.new(:grouping).invert.star
 
@@ -37,11 +38,13 @@ module Dentaku
     P_IF         = [T_IF, T_OPEN, T_NON_GROUP, T_COMMA, T_NON_GROUP, T_COMMA, T_NON_GROUP, T_CLOSE]
     P_ROUND_ONE  = [T_ROUND, T_OPEN, T_NUMERIC, T_CLOSE]
     P_ROUND_TWO  = [T_ROUND, T_OPEN, T_NUMERIC, T_COMMA, T_NUMERIC, T_CLOSE]
+    P_NOT        = [T_NOT, T_OPEN, T_NON_GROUP_STAR, T_CLOSE]
 
     RULES = [
       [P_IF,         :if],
       [P_ROUND_ONE,  :round],
       [P_ROUND_TWO,  :round],
+      [P_NOT,        :not],
 
       [P_GROUP,      :evaluate_group],
       [P_MATH_POW,   :apply],
@@ -167,5 +170,9 @@ module Dentaku
 
       Token.new(:numeric, value)
     end
+
+    def not(*args)
+      Token.new(:logical, ! evaluate_token_stream(args[2..-2]).value)
+    end
   end
 end

data/lib/dentaku/tokenizer.rb

@@ -36,9 +36,9 @@ module Dentaku
         when '='  then :eq
         end
       end),
-      TokenScanner.new(:combinator, '(and|or)\b',   lambda {|raw| raw.strip.downcase.to_sym }),
-      TokenScanner.new(:function,   '(if|round)\b', lambda {|raw| raw.strip.to_sym }),
-      TokenScanner.new(:identifier, '\w+\b',        lambda {|raw| raw.downcase.to_sym })
+      TokenScanner.new(:combinator, '(and|or)\b',       lambda {|raw| raw.strip.downcase.to_sym }),
+      TokenScanner.new(:function,   '(if|round|not)\b', lambda {|raw| raw.strip.to_sym }),
+      TokenScanner.new(:identifier, '\w+\b',            lambda {|raw| raw.downcase.to_sym })
     ]
 
     LPAREN = TokenMatcher.new(:grouping, :open)

data/lib/dentaku/version.rb

@@ -1,3 +1,3 @@
 module Dentaku
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/spec/evaluator_spec.rb

@@ -75,6 +75,11 @@ describe Dentaku::Evaluator do
         evaluator.evaluate(token_stream(5, :gt, 1, :or, :false)).should be_true
         evaluator.evaluate(token_stream(5, :gt, 1, :and, :false)).should be_false
       end
+
+      it 'should support negation of a logical value' do
+        evaluator.evaluate(token_stream(:not, :open, 5, :gt, 1, :or,  :false, :close)).should be_false
+        evaluator.evaluate(token_stream(:not, :open, 5, :gt, 1, :and, :false, :close)).should be_true
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -22,6 +22,8 @@ def type_for(value)
     :combinator
   when :true, :false
     :logical
+  when :if, :round, :not
+    :function
   else
     :identifier
   end

data/spec/tokenizer_spec.rb

@@ -98,5 +98,12 @@ describe Dentaku::Tokenizer do
       tokens.map(&:category).should eq([:function, :grouping, :numeric, :grouping, :numeric, :grouping])
       tokens.map(&:value).should eq([:round, :open, 8.75, :comma, 1, :close])
     end
+
+    it 'include NOT' do
+      tokens = tokenizer.tokenize('not(8 < 5)')
+      tokens.length.should eq(6)
+      tokens.map(&:category).should eq([:function, :grouping, :numeric, :comparator, :numeric, :grouping])
+      tokens.map(&:value).should eq([:not, :open, 8, :lt, 5, :close])
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dentaku
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70124074683860 !ruby/object:Gem::Requirement
+  requirement: &70134892086100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124074683860
+  version_requirements: *70134892086100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70124074683380 !ruby/object:Gem::Requirement
+  requirement: &70134892085420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124074683380
+  version_requirements: *70134892085420
 description: ! '    Dentaku is a parser and evaluator for mathematical formulas
 
 '
@@ -75,18 +75,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2332951367847572293
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2332951367847572293
 requirements: []
 rubyforge_project: dentaku
 rubygems_version: 1.8.11