dentaku 0.1.2 → 0.1.3

data/README.md

@@ -60,11 +60,12 @@ for you:
     => 3.0
 
 
-SUPPORTED OPERATORS
--------------------
+SUPPORTED OPERATORS AND FUNCTIONS
+---------------------------------
 
-Math: `+ - * /`
-Logic: `< > <= >= <> != = AND OR`
+Math: `+ - * /`  
+Logic: `< > <= >= <> != = AND OR`  
+Functions: `IF`
 
 THANKS
 ------

data/lib/dentaku/calculator.rb

@@ -58,11 +58,18 @@ module Dentaku
     def replace_identifiers_with_values
       @tokens.map do |token|
         if token.is?(:identifier)
-          Token.new(:numeric, memory(token.value))
+          value = memory(token.value)
+          type  = type_for_value(value)
+
+          Token.new(type, value)
         else
           token
         end
       end
     end
+
+    def type_for_value(value)
+      value.is_a?(String) ? :string : :numeric
+    end
   end
 end

data/lib/dentaku/evaluator.rb

@@ -4,6 +4,7 @@ require 'dentaku/token_matcher'
 module Dentaku
   class Evaluator
     T_NUMERIC    = TokenMatcher.new(:numeric)
+    T_STRING     = TokenMatcher.new(:string)
     T_ADDSUB     = TokenMatcher.new(:operator, [:add, :subtract])
     T_MULDIV     = TokenMatcher.new(:operator, [:multiply, :divide])
     T_COMPARATOR = TokenMatcher.new(:comparator)
@@ -18,7 +19,8 @@ module Dentaku
     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]
-    P_COMPARISON = [T_NUMERIC, T_COMPARATOR, T_NUMERIC]
+    P_NUM_COMP   = [T_NUMERIC, T_COMPARATOR, T_NUMERIC]
+    P_STR_COMP   = [T_STRING,  T_COMPARATOR, T_STRING]
     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]
@@ -27,7 +29,8 @@ module Dentaku
       [P_GROUP,      :evaluate_group],
       [P_MATH_MUL,   :apply],
       [P_MATH_ADD,   :apply],
-      [P_COMPARISON, :apply],
+      [P_NUM_COMP,   :apply],
+      [P_STR_COMP,   :apply],
       [P_COMBINE,    :apply],
       [P_IF,         :if],
     ]

data/lib/dentaku/tokenizer.rb

@@ -7,6 +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(:operator,   '\+|-|\*|\/', lambda do |raw|
         case raw
         when '+' then :add

data/lib/dentaku/version.rb

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

data/spec/calculator_spec.rb

@@ -50,6 +50,11 @@ describe Dentaku::Calculator do
     calculator.evaluate('foo * 2', 'foo' => 4).should eq(8)
   end
 
+  it 'should compare string literals with string variables' do
+    calculator.evaluate('fruit = "apple"', :fruit => 'apple').should be_true
+    calculator.evaluate('fruit = "apple"', :fruit => 'pear').should be_false
+  end
+
   describe 'functions' do
     it 'should include IF' do
       calculator.evaluate('if (foo < 8, 10, 20)', :foo => 2).should eq(10)

data/spec/evaluator_spec.rb

@@ -22,6 +22,7 @@ describe Dentaku::Evaluator do
 
     it 'single numeric should return value' do
       evaluator.evaluate([Dentaku::Token.new(:numeric, 10)]).should eq(10)
+      evaluator.evaluate([Dentaku::Token.new(:string,  'a')]).should eq('a')
     end
 
     it 'should evaluate one apply step' do

data/spec/tokenizer_spec.rb

@@ -37,6 +37,18 @@ describe Dentaku::Tokenizer do
     tokens.map(&:value).should eq([:monkeys, :gt, 1500])
   end
 
+  it 'should recognize double-quoted strings' do
+    tokens = tokenizer.tokenize('animal = "giraffe"')
+    tokens.map(&:category).should eq([:identifier, :comparator, :string])
+    tokens.map(&:value).should eq([:animal, :eq, 'giraffe'])
+  end
+
+  it 'should recognize single-quoted strings' do
+    tokens = tokenizer.tokenize("animal = 'giraffe'")
+    tokens.map(&:category).should eq([:identifier, :comparator, :string])
+    tokens.map(&:value).should eq([:animal, :eq, 'giraffe'])
+  end
+
   it 'should match "<=" before "<"' do
     tokens = tokenizer.tokenize('perimeter <= 7500')
     tokens.map(&:category).should eq([:identifier, :comparator, :numeric])

metadata

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