expressive 0.0.24 → 0.0.25

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    expressive (0.0.24)
+    expressive (0.0.25)
       awesome_print (~> 1.0.2)
       json
       polyglot (~> 0.3.3)
@@ -14,10 +14,11 @@ GEM
     addressable (2.3.4)
     awesome_print (1.0.2)
     coderay (1.0.9)
-    crack (0.3.2)
+    crack (0.4.0)
+      safe_yaml (~> 0.9.0)
     diff-lcs (1.1.3)
-    ffi (1.8.1)
-    ffi (1.8.1-java)
+    ffi (1.9.0)
+    ffi (1.9.0-java)
     guard (1.3.3)
       listen (>= 0.4.2)
       thor (>= 0.14.6)
@@ -25,7 +26,7 @@ GEM
       guard (>= 1.1)
     json (1.8.0)
     json (1.8.0-java)
-    listen (1.1.2)
+    listen (1.1.6)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
@@ -60,12 +61,13 @@ GEM
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.3)
     ruby_gntp (0.3.4)
+    safe_yaml (0.9.3)
     slop (3.4.5)
     spoon (0.0.4)
       ffi
     thor (0.18.1)
     timecop (0.5.9.2)
-    treetop (1.4.12)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
     webmock (1.8.11)

data/lib/expressive/version.rb

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

data/lib/scope.rb

@@ -127,8 +127,7 @@ module Expressive
       define('and') {|a,b| !!a && !!b }
       define('or') {|a,b| !!a || !!b }
       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('$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 }

data/spec/expressive_spec.rb

@@ -37,7 +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("($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}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expressive
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
   prerelease: 
 platform: ruby
 authors:
@@ -294,7 +294,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 419564563370159517
+      hash: -1947057546795348556
 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: 419564563370159517
+      hash: -1947057546795348556
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24