dentaku 0.2.7 → 0.2.8

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 .bundle
+.rbenv-version
 Gemfile.lock
 bin/*
 pkg/*

data/lib/dentaku/tokenizer.rb

@@ -37,8 +37,8 @@ module Dentaku
         end
       end),
       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 })
+      TokenScanner.new(:function,   '(if|round|not)\b', lambda {|raw| raw.strip.downcase.to_sym }),
+      TokenScanner.new(:identifier, '\w+\b',            lambda {|raw| raw.strip.downcase.to_sym })
     ]
 
     LPAREN = TokenMatcher.new(:grouping, :open)

data/lib/dentaku/version.rb

@@ -1,3 +1,3 @@
 module Dentaku
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/spec/calculator_spec.rb

@@ -78,6 +78,8 @@ describe Dentaku::Calculator do
       calculator.evaluate('round(8.2)').should eq(8)
       calculator.evaluate('round(8.8)').should eq(9)
       calculator.evaluate('round(8.75, 1)').should eq(8.8)
+
+      calculator.evaluate('ROUND(apples * 0.93)', { :apples => 10 }).should eq(9)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dentaku
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70128193331500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70128193331500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70128193330880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70128193330880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! '    Dentaku is a parser and evaluator for mathematical formulas
 
 '
@@ -75,15 +85,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4557179252548583095
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4557179252548583095
 requirements: []
 rubyforge_project: dentaku
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A formula language parser and evaluator