dentaku 0.1.0 → 0.1.1

data/README.md

@@ -36,10 +36,10 @@ evaluate expressions against those stored values:
 
 For maximum CS geekery, `bind` is an alias of `store`.
 
-If you're too lazy to be building calculator objects, there's a module-method
-shortcut just for you:
+If you're too lazy to be building calculator objects, there's a shortcut just
+for you:
 
-    Dentaku['plums * 1.5', {:plums => 2}]
+    Dentaku('plums * 1.5', {:plums => 2})
     => 3.0
 
 

data/Rakefile

@@ -8,3 +8,6 @@ task :spec do
     t.pattern = 'spec/*_spec.rb'
   end
 end
+
+desc "Default: run specs."
+task :default => :spec

data/lib/dentaku.rb

@@ -2,7 +2,7 @@ require "dentaku/calculator"
 require "dentaku/version"
 
 module Dentaku
-  def self.[](expression, data={})
+  def self.evaluate(expression, data={})
     calculator.evaluate(expression, data)
   end
 
@@ -12,3 +12,7 @@ module Dentaku
     @calculator ||= Dentaku::Calculator.new
   end
 end
+
+def Dentaku(expression, data={})
+  Dentaku.evaluate(expression, data)
+end

data/lib/dentaku/evaluator.rb

@@ -9,9 +9,11 @@ module Dentaku
     T_COMPARATOR = TokenMatcher.new(:comparator)
     T_OPEN       = TokenMatcher.new(:grouping, :open)
     T_CLOSE      = TokenMatcher.new(:grouping, :close)
+    T_COMMA      = TokenMatcher.new(:grouping, :comma)
     T_NON_GROUP  = TokenMatcher.new(:grouping).invert
     T_LOGICAL    = TokenMatcher.new(:logical)
     T_COMBINATOR = TokenMatcher.new(:combinator)
+    T_IF         = TokenMatcher.new(:function, :if)
 
     P_GROUP      = [T_OPEN,    T_NON_GROUP,  T_CLOSE]
     P_MATH_ADD   = [T_NUMERIC, T_ADDSUB,     T_NUMERIC]
@@ -19,12 +21,15 @@ module Dentaku
     P_COMPARISON = [T_NUMERIC, T_COMPARATOR, T_NUMERIC]
     P_COMBINE    = [T_LOGICAL, T_COMBINATOR, T_LOGICAL]
 
+    P_IF         = [T_IF, T_OPEN, T_NON_GROUP, T_COMMA, T_NON_GROUP, T_COMMA, T_NON_GROUP, T_CLOSE]
+
     RULES = [
       [P_GROUP,      :evaluate_group],
       [P_MATH_MUL,   :apply],
       [P_MATH_ADD,   :apply],
       [P_COMPARISON, :apply],
-      [P_COMBINE,    :apply]
+      [P_COMBINE,    :apply],
+      [P_IF,         :if],
     ]
 
     def evaluate(tokens)
@@ -93,5 +98,15 @@ module Dentaku
         raise "unknown comparator '#{ comparator }'"
       end
     end
+
+    def if(*args)
+      _, open, cond, _, true_value, _, false_value, close = args
+
+      if evaluate_token_stream([cond])
+        evaluate_token_stream([true_value])
+      else
+        evaluate_token_stream([false_value])
+      end
+    end
   end
 end

data/lib/dentaku/tokenizer.rb

@@ -15,8 +15,12 @@ module Dentaku
         when '/' then :divide
         end
       end),
-      TokenScanner.new(:grouping,   '\(|\)', lambda do |raw|
-        raw == '(' ? :open : :close
+      TokenScanner.new(:grouping,   '\(|\)|,', lambda do |raw|
+        case raw
+        when '(' then :open
+        when ')' then :close
+        when ',' then :comma
+        end
       end),
       TokenScanner.new(:comparator, '<=|>=|!=|<>|<|>|=', lambda do |raw|
         case raw
@@ -30,6 +34,7 @@ module Dentaku
         end
       end),
       TokenScanner.new(:combinator, '(and|or)\b', lambda {|raw| raw.strip.to_sym }),
+      TokenScanner.new(:function,   '(if)\b',     lambda {|raw| raw.strip.to_sym }),
       TokenScanner.new(:identifier, '[A-Za-z_]+', lambda {|raw| raw.to_sym })
     ]
 

data/lib/dentaku/version.rb

@@ -1,3 +1,3 @@
 module Dentaku
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/calculator_spec.rb

@@ -49,4 +49,10 @@ describe Dentaku::Calculator do
     calculator.evaluate('foo * 2', :foo => 2).should eq(4)
     calculator.evaluate('foo * 2', 'foo' => 4).should eq(8)
   end
+
+  describe 'functions' do
+    it 'should include IF' do
+      calculator.evaluate('if (foo < 10, 10, 20)', :foo => 2).should eq(10)
+    end
+  end
 end

data/spec/dentaku_spec.rb

@@ -2,10 +2,10 @@ require 'dentaku'
 
 describe Dentaku do
   it 'should evaulate an expression' do
-    Dentaku['5+3'].should eql(8)
+    Dentaku('5+3').should eql(8)
   end
 
   it 'should bind values to variables' do
-    Dentaku['oranges > 7', {:oranges => 10}].should be_true
+    Dentaku('oranges > 7', {:oranges => 10}).should be_true
   end
 end

data/spec/tokenizer_spec.rb

@@ -66,4 +66,13 @@ describe Dentaku::Tokenizer do
     tokens.map(&:category).should eq([:identifier, :comparator, :numeric])
     tokens.map(&:value).should eq([:andover, :lt, 10])
   end
+
+  describe 'functions' do
+    it 'include IF' do
+      tokens = tokenizer.tokenize('if(x < 10, y, z)')
+      tokens.length.should eq(10)
+      tokens.map(&:category).should eq([:function, :grouping, :identifier, :comparator, :numeric, :grouping, :identifier, :grouping, :identifier, :grouping])
+      tokens.map(&:value).should eq([:if, :open, :x, :lt, 10, :comma, :y, :comma, :z, :close])
+    end
+  end
 end

metadata

@@ -1,36 +1,47 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: dentaku
-version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 25
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
-authors:
+authors: 
 - Solomon White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-20 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-24 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70125220014660 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70125220014660
-description: ! '    Dentaku is a parser and evaluator for mathematical formulas
-
-'
-email:
+  version_requirements: *id001
+description: "    Dentaku is a parser and evaluator for mathematical formulas\n"
+email: 
 - rubysolo@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - README.md
@@ -51,31 +62,41 @@ files:
 - spec/token_scanner_spec.rb
 - spec/token_spec.rb
 - spec/tokenizer_spec.rb
+has_rdoc: true
 homepage: http://github.com/rubysolo/dentaku
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: dentaku
-rubygems_version: 1.8.10
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A formula language parser and evaluator
-test_files:
+test_files: 
 - spec/calculator_spec.rb
 - spec/dentaku_spec.rb
 - spec/evaluator_spec.rb