expressive 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    expressive (0.0.1)
+    expressive (0.0.2)
       awesome_print (~> 1.0.2)
       polyglot (~> 0.3.3)
       treetop (~> 1.4.10)

data/lib/expressive/version.rb

@@ -1,3 +1,3 @@
 module Expressive
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/scope.rb

@@ -43,11 +43,11 @@ class TopLevel < Scope
       scope[cells.first.text_value] = cells[1].eval(scope)
     end
 
-    define('+') {|a,b| a + b }
-    define('-') {|a,b| a - b }
-    define('*') {|a,b| a * b }
-    define('/') {|a,b| a / b }
+    define('+') {|a,b| a.to_f + b.to_f }
+    define('-') {|a,b| a.to_f - b.to_f }
+    define('*') {|a,b| a.to_f * b.to_f }
+    define('/') {|a,b| a.to_f / b.to_f }
     define('=') {|a,b| a == b }
-    define('sum') {|*args| args.flatten.reduce(:+) }
+    define('sum') {|*args| args.flatten.map(&:to_f).reduce(:+) }
   end
 end

data/spec/expressive_spec.rb

@@ -21,11 +21,11 @@ describe "Expressive" do
   end
 
   describe "understands arithmetic" do
-    it { Expressive.run("(+ 4 2)").should eql 6 }
-    it { Expressive.run("(- 4 2)").should eql 2 }
-    it { Expressive.run("(* 4 2)").should eql 8 }
-    it { Expressive.run("(/ 4 2)").should eql 2 }
-    it { Expressive.run("(sum 1 2 3)").should eql 6}
+    it { Expressive.run("(+ 4 2)").should eql 6.0 }
+    it { Expressive.run("(- 4 2)").should eql 2.0 }
+    it { Expressive.run("(* 4 2)").should eql 8.0 }
+    it { Expressive.run("(/ 4 2)").should eql 2.0 }
+    it { Expressive.run("(sum 1 2 3)").should eql 6.0}
   end
 
   describe "understands compound statements" do
@@ -45,11 +45,11 @@ describe "Expressive" do
       @scope["order_no"].should eql 1234
     end
     it "should reuse set properties" do
-      Expressive.run("(set order_no 1234)(+ order_no 11)", @scope).should eql 1245
+      Expressive.run("(set order_no 1234)(+ order_no 11)", @scope).should eql 1245.0
     end
     it "should sum scoped arrays" do
       @scope["sub_totals"] = [100, 200, 300]
-      Expressive.run("(sum sub_totals)", @scope).should eql 600
+      Expressive.run("(sum sub_totals)", @scope).should eql 600.0
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expressive
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-03 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
@@ -193,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3389860880342306290
+      hash: -3233629507963509909
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3389860880342306290
+      hash: -3233629507963509909
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23