dentaku 0.2.9 → 0.2.10

data/lib/dentaku/evaluator.rb

@@ -126,7 +126,7 @@ module Dentaku
       when :add      then Token.new(:numeric, l + r)
       when :subtract then Token.new(:numeric, l - r)
       when :multiply then Token.new(:numeric, l * r)
-      when :divide   then Token.new(:numeric, l / r)
+      when :divide   then Token.new(:numeric, divide(l, r))
 
       when :le       then Token.new(:logical, l <= r)
       when :ge       then Token.new(:logical, l >= r)
@@ -143,6 +143,12 @@ module Dentaku
       end
     end
 
+    def divide(numerator, denominator)
+      quotient, remainder = numerator.divmod(denominator)
+      return quotient if remainder == 0
+      numerator.to_f / denominator.to_f
+    end
+
     def expand_range(left, oper1, middle, oper2, right)
       [left, oper1, middle, Token.new(:combinator, :and), middle, oper2, right]
     end

data/lib/dentaku/version.rb

@@ -1,3 +1,3 @@
 module Dentaku
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
 end

data/spec/evaluator_spec.rb

@@ -53,6 +53,10 @@ describe Dentaku::Evaluator do
       it 'should respect explicit grouping' do
         evaluator.evaluate(token_stream(:open, 1, :add, 1, :close, :multiply, 5)).should eq(10)
       end
+
+      it 'should return floating point from division when there is a remainder' do
+        evaluator.evaluate(token_stream(5, :divide, 4)).should eq(1.25)
+      end
     end
 
     describe 'functions' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dentaku
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-17 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -87,7 +87,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4230531870219194848
+      hash: -662526630847863998
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4230531870219194848
+      hash: -662526630847863998
 requirements: []
 rubyforge_project: dentaku
 rubygems_version: 1.8.23