dentaku 0.1.3 → 0.2.1

data/lib/dentaku/evaluator.rb

@@ -3,6 +3,7 @@ require 'dentaku/token_matcher'
 
 module Dentaku
   class Evaluator
+    # tokens
     T_NUMERIC    = TokenMatcher.new(:numeric)
     T_STRING     = TokenMatcher.new(:string)
     T_ADDSUB     = TokenMatcher.new(:operator, [:add, :subtract])
@@ -15,7 +16,9 @@ module Dentaku
     T_LOGICAL    = TokenMatcher.new(:logical)
     T_COMBINATOR = TokenMatcher.new(:combinator)
     T_IF         = TokenMatcher.new(:function, :if)
+    T_ROUND      = TokenMatcher.new(:function, :round)
 
+    # patterns
     P_GROUP      = [T_OPEN,    T_NON_GROUP,  T_CLOSE]
     P_MATH_ADD   = [T_NUMERIC, T_ADDSUB,     T_NUMERIC]
     P_MATH_MUL   = [T_NUMERIC, T_MULDIV,     T_NUMERIC]
@@ -24,15 +27,20 @@ module Dentaku
     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]
+    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]
 
     RULES = [
+      [P_IF,         :if],
+      [P_ROUND_ONE,  :round],
+      [P_ROUND_TWO,  :round],
+
       [P_GROUP,      :evaluate_group],
       [P_MATH_MUL,   :apply],
       [P_MATH_ADD,   :apply],
       [P_NUM_COMP,   :apply],
       [P_STR_COMP,   :apply],
-      [P_COMBINE,    :apply],
-      [P_IF,         :if],
+      [P_COMBINE,    :apply]
     ]
 
     def evaluate(tokens)
@@ -111,5 +119,19 @@ module Dentaku
         false_value
       end
     end
+
+    def round(*args)
+      function = args.shift
+      open     = args.shift
+      input    = args.shift.value
+      places   = 0
+
+      if args.length > 1
+        comma  = args.shift
+        places = args.shift.value
+      end
+
+      Token.new(:numeric, input.round(places))
+    end
   end
 end

data/lib/dentaku/tokenizer.rb

@@ -36,7 +36,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(:function,   '(if|round)\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.3"
+  VERSION = "0.2.1"
 end

data/spec/calculator_spec.rb

@@ -60,5 +60,11 @@ describe Dentaku::Calculator do
       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
+
+    it 'should include ROUND' 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)
+    end
   end
 end

data/spec/tokenizer_spec.rb

@@ -86,5 +86,17 @@ describe Dentaku::Tokenizer do
       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
+
+    it 'include ROUND' do
+      tokens = tokenizer.tokenize('round(8.2)')
+      tokens.length.should eq(4)
+      tokens.map(&:category).should eq([:function, :grouping, :numeric, :grouping])
+      tokens.map(&:value).should eq([:round, :open, 8.2, :close])
+
+      tokens = tokenizer.tokenize('round(8.75, 1)')
+      tokens.length.should eq(6)
+      tokens.map(&:category).should eq([:function, :grouping, :numeric, :grouping, :numeric, :grouping])
+      tokens.map(&:value).should eq([:round, :open, 8.75, :comma, 1, :close])
+    end
   end
 end

metadata

@@ -1,47 +1,36 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dentaku
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
+version: !ruby/object:Gem::Version
+  version: 0.2.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Solomon White
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-31 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70160992097380 !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: *70160992097380
+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