dentaku 0.1.1 → 0.1.2

data/README.md

@@ -36,6 +36,23 @@ evaluate expressions against those stored values:
 
 For maximum CS geekery, `bind` is an alias of `store`.
 
+Dentaku understands precedence order and using parentheses to group expressions
+to ensure proper evaluation:
+
+    calculator.evaluate('5 + 3 * 2')
+    => 11
+    calculator.evaluate('(5 + 3) * 2')
+    => 16
+
+A number of functions are also supported.  Okay, the number is currently one,
+but more will be added soon.  The current function is `if`, which works like
+Excel's `if`:
+
+    calculator.evaluate('if (pears < 10, 10, 20)', :pears => 5)
+    => 10
+    calculator.evaluate('if (pears < 10, 10, 20)', :pears => 15)
+    => 20
+
 If you're too lazy to be building calculator objects, there's a shortcut just
 for you:
 

data/lib/dentaku/evaluator.rb

@@ -100,12 +100,12 @@ module Dentaku
     end
 
     def if(*args)
-      _, open, cond, _, true_value, _, false_value, close = args
+      _, open, condition, _, true_value, _, false_value, close = args
 
-      if evaluate_token_stream([cond])
-        evaluate_token_stream([true_value])
+      if condition.value
+        true_value
       else
-        evaluate_token_stream([false_value])
+        false_value
       end
     end
   end

data/lib/dentaku/version.rb

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

data/spec/calculator_spec.rb

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

metadata

@@ -1,47 +1,36 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dentaku
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+version: !ruby/object:Gem::Version
+  version: 0.1.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Solomon White
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-24 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70323614305400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-description: "    Dentaku is a parser and evaluator for mathematical formulas\n"
-email: 
+  prerelease: false
+  version_requirements: *70323614305400
+description: ! '    Dentaku is a parser and evaluator for mathematical formulas
+
+'
+email:
 - rubysolo@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
@@ -62,41 +51,31 @@ 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: dentaku
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 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