dentaku 0.2.1 → 0.2.2

data/lib/dentaku/evaluator.rb

@@ -131,7 +131,13 @@ module Dentaku
         places = args.shift.value
       end
 
-      Token.new(:numeric, input.round(places))
+      begin
+        value = input.round(places)
+      rescue ArgumentError
+        value = (input * 10 ** places).round / (10 ** places).to_f
+      end
+
+      Token.new(:numeric, value)
     end
   end
 end

data/lib/dentaku/token_scanner.rb

@@ -4,7 +4,7 @@ module Dentaku
   class TokenScanner
     def initialize(category, regexp, converter=nil)
       @category  = category
-      @regexp    = %r{\A(#{ regexp })}
+      @regexp    = %r{\A(#{ regexp })}i
       @converter = converter
     end
 

data/lib/dentaku/tokenizer.rb

@@ -7,8 +7,8 @@ module Dentaku
     SCANNERS = [
       TokenScanner.new(:whitespace, '\s+'),
       TokenScanner.new(:numeric,    '(\d+(\.\d+)?|\.\d+)', lambda{|raw| raw =~ /\./ ? raw.to_f : raw.to_i }),
-      TokenScanner.new(:string,     '"[^"]*"', lambda{|raw| raw.gsub(/^"|"$/, '') }),
-      TokenScanner.new(:string,     "'[^']*'", lambda{|raw| raw.gsub(/^'|'$/, '') }),
+      TokenScanner.new(:string,     '"[^"]*"',    lambda{|raw| raw.gsub(/^"|"$/, '') }),
+      TokenScanner.new(:string,     "'[^']*'",    lambda{|raw| raw.gsub(/^'|'$/, '') }),
       TokenScanner.new(:operator,   '\+|-|\*|\/', lambda do |raw|
         case raw
         when '+' then :add
@@ -35,9 +35,9 @@ module Dentaku
         when '='  then :eq
         end
       end),
-      TokenScanner.new(:combinator, '(and|or)\b', lambda {|raw| raw.strip.to_sym }),
+      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, '[A-Za-z_]+', lambda {|raw| raw.to_sym })
+      TokenScanner.new(:identifier, '[a-z_]+',      lambda {|raw| raw.downcase.to_sym })
     ]
 
     LPAREN = TokenMatcher.new(:grouping, :open)
@@ -46,7 +46,7 @@ module Dentaku
     def tokenize(string)
       nesting = 0
       tokens  = []
-      input   = string.dup.downcase
+      input   = string.dup
 
       until input.empty?
         raise "parse error at: '#{ input }'" unless SCANNERS.any? do |scanner|

data/lib/dentaku/version.rb

@@ -1,3 +1,3 @@
 module Dentaku
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/calculator_spec.rb

@@ -55,6 +55,11 @@ describe Dentaku::Calculator do
     calculator.evaluate('fruit = "apple"', :fruit => 'pear').should be_false
   end
 
+  it 'should do case-sensitive comparison' do
+    calculator.evaluate('fruit = "Apple"', :fruit => 'apple').should be_false
+    calculator.evaluate('fruit = "Apple"', :fruit => 'Apple').should be_true
+  end
+
   describe 'functions' do
     it 'should include IF' do
       calculator.evaluate('if (foo < 8, 10, 20)', :foo => 2).should eq(10)

metadata

@@ -1,36 +1,46 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: dentaku
-version: !ruby/object:Gem::Version
-  version: 0.2.1
+version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 2
+  version: 0.2.2
 platform: ruby
-authors:
+authors: 
 - Solomon White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-02-22 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70160992097380 !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: *70160992097380
-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
@@ -53,29 +63,38 @@ files:
 - spec/tokenizer_spec.rb
 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.8.15
 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