expressive 0.0.23 → 0.0.24

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    expressive (0.0.23)
+    expressive (0.0.24)
       awesome_print (~> 1.0.2)
       json
       polyglot (~> 0.3.3)

data/lib/expressive.rb

@@ -20,7 +20,7 @@ module Expressive
   end
 
   def self.all_symbols
-    %w(+ - * / = set sum post >= > < <= and or if date get put lookup $lookup $head $tail $reverse round $round $days_ago $hours_ago $minutes_ago $append $id)
+    %w(+ - * / = set sum $sub post >= > < <= and or if date get put lookup $lookup $head $tail $reverse round $round $days_ago $hours_ago $minutes_ago $append $id)
   end
 
   module Boolean

data/lib/expressive/version.rb

@@ -1,3 +1,3 @@
 module Expressive
-  VERSION = "0.0.23"
+  VERSION = "0.0.24"
 end

data/lib/scope.rb

@@ -126,8 +126,10 @@ module Expressive
       define('<=') {|a,b| a.to_f <= b.to_f }
       define('and') {|a,b| !!a && !!b }
       define('or') {|a,b| !!a || !!b }
-      define('sum') { |*args| args.flatten.map(&:to_f).reduce(:+) || 0 }
-      define('if') { |*args| args.compact!; args[0] ? args[1] : args[2] }
+      define('sum') {|*args| args.flatten.map(&:to_f).reduce(:+) || 0 }
+      define('$sum') {|*args| args.flatten.map(&:to_f).reduce(:+) || 0 }
+      define('sub') {|*args| result = args.flatten.map(&:to_f).reduce(:-) || 0 }
+      define('if') {|*args| args.compact!; args[0] ? args[1] : args[2] }
       define('$days_ago'){|*args| Time.now - args[0].to_i * 86400 }
       define('$hours_ago'){|*args| Time.now - args[0].to_i * 3600 }
       define('$minutes_ago'){|*args| Time.now - args[0].to_i * 60 }

data/spec/expressive_spec.rb

@@ -6,7 +6,7 @@ describe "Expressive" do
   end
 
   describe "all_symbols" do
-    it { Expressive.all_symbols.should =~ %w(+ - * / = set sum get put post >= > < <= and or if date lookup round $round $days_ago $hours_ago $minutes_ago $append $id $head $lookup $reverse $tail) }
+    it { Expressive.all_symbols.should =~ %w(+ - * / = set sum $sub get put post >= > < <= and or if date lookup round $round $days_ago $hours_ago $minutes_ago $append $id $head $lookup $reverse $tail) }
   end
 
   describe "understands booleans" do
@@ -37,6 +37,7 @@ describe "Expressive" do
     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 }
+    it { Expressive.run("(sub 1 2 3)").should eql -4.0 }
     it { Expressive.run("(sum )").should eql 0 }
     it { Expressive.run("(- (sum 1 5 7) 3)").should eql 10.0}
     it { Expressive.run("(round 0.12345 2)").should eql 0.12}
@@ -79,6 +80,59 @@ describe "Expressive" do
       it { Expressive.run('(if (<= nil_value 4) "greater" "not so greater")', @scope).should eql "greater" }
       it { Expressive.run('(if (>= 4 nil_value) "greater" "not so greater")', @scope).should eql "greater" }
     end
+
+    context "multiple if statements" do
+      before do
+        @scope["depth"] = "4mm"
+        @statement = <<-EOH
+          (if (= depth "8mm") 1
+            (if (= depth "7mm") 0.8
+              (if (= depth "6mm") 0.65
+                (if (= depth "5mm") 0.5
+                  (if (= depth "4mm") 0.35
+                    (if (= depth "3mm") 0.2
+                      (if (= depth "2mm") 0.05 0)
+                    )
+                  )
+                )
+              )
+            )
+          )
+EOH
+      end
+      it do
+        @scope["depth"] = "8mm"
+        Expressive.run(@statement, @scope).should eql 1
+      end
+      it do
+        @scope["depth"] = "7mm"
+        Expressive.run(@statement, @scope).should eql 0.8
+      end
+      it do
+        @scope["depth"] = "6mm"
+        Expressive.run(@statement, @scope).should eql 0.65
+      end
+      it do
+        @scope["depth"] = "5mm"
+        Expressive.run(@statement, @scope).should eql 0.5
+      end
+      it do
+        @scope["depth"] = "4mm"
+        Expressive.run(@statement, @scope).should eql 0.35
+      end
+      it do
+        @scope["depth"] = "3mm"
+        Expressive.run(@statement, @scope).should eql 0.2
+      end
+      it do
+        @scope["depth"] = "2mm"
+        Expressive.run(@statement, @scope).should eql 0.05
+      end
+      it do
+        @scope["depth"] = "1.6mm"
+        Expressive.run(@statement, @scope).should eql 0
+      end
+    end
   end
 
   describe "understands logical statements" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expressive
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
@@ -294,7 +294,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1273434099019022077
+      hash: 419564563370159517
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -303,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1273434099019022077
+      hash: 419564563370159517
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24