expressive 0.0.18 → 0.0.20

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    expressive (0.0.18)
+    expressive (0.0.20)
       awesome_print (~> 1.0.2)
       json
       polyglot (~> 0.3.3)
@@ -17,23 +17,30 @@ GEM
     crack (0.3.1)
     diff-lcs (1.1.3)
     ffi (1.1.5)
+    ffi (1.1.5-java)
     guard (1.3.2)
       listen (>= 0.4.2)
       thor (>= 0.14.6)
     guard-rspec (1.2.1)
       guard (>= 1.1)
     json (1.7.4)
+    json (1.7.4-java)
     listen (0.4.7)
       rb-fchange (~> 0.0.5)
       rb-fsevent (~> 0.9.1)
       rb-inotify (~> 0.8.8)
     method_source (0.8)
-    mime-types (1.21)
+    mime-types (1.22)
     polyglot (0.3.3)
     pry (0.9.10)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.3.1)
+    pry (0.9.10-java)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
+      spoon (~> 0.0)
     rake (10.0.0)
     rb-fchange (0.0.5)
       ffi
@@ -54,6 +61,8 @@ GEM
     rspec-mocks (2.11.2)
     ruby_gntp (0.3.4)
     slop (3.3.2)
+    spoon (0.0.3)
+      ffi
     thor (0.16.0)
     timecop (0.5.3)
     treetop (1.4.12)
@@ -64,6 +73,7 @@ GEM
       crack (>= 0.1.7)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

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 round $days_ago $hours_ago $minutes_ago $append $id)
+    %w(+ - * / = set sum post >= > < <= and or if date get put lookup $lookup $head $tail $reverse 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.18"
+  VERSION = "0.0.20"
 end

data/lib/scope.rb

@@ -88,19 +88,9 @@ module Expressive
         end
       end
 
-      syntax('lookup') do |scope, cells|
-        lookup_result = scope.lookups[cells.first.text_value]
-        if lookup_result
-          key = cells[1] ? cells[1].text_value[1..-2] : nil
-          if lookup_result.is_a?(Hash)
-            lookup_result[key]
-          elsif lookup_result.is_a?(Array)
-            options = lookup_result.first
-            the_proc = lookup_result.last
-            the_proc.call(options, key, *Array(cells[2..-1]).map {|cell| cell.eval(scope)})
-          end
-        end
-      end
+
+      syntax('$lookup') {|scope, cells| perform_lookup(scope, cells)}
+      syntax('lookup') {|scope, cells| perform_lookup(scope, cells)}
 
       syntax('post') do |scope, cells|
         perform_webhook(:post, scope, cells)
@@ -138,10 +128,16 @@ module Expressive
       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('round'){|*args| args[0].to_f.round(args[1]) }
       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 }
+      define('$head'){|*args| args.flatten.first }
+      define('$tail'){|*args| args.flatten[1..-1] }
+      define('$reverse'){|*args| args.flatten.reverse }
+
+      define('$round'){|*args| perform_round(args) }
+      define('round'){|*args| perform_round(args) }
+
     end
 
     def to_hash
@@ -153,6 +149,24 @@ module Expressive
 
     #(post "http://example.com" "*" (headers "AUTH-TOKEN=13415") )
     #(post "http://example.com" name email john smith (headers "AUTH-TOKEN=13415") )
+    def perform_round(*args)
+      tuple = args.first
+      tuple[0].to_f.round(tuple[1])
+    end
+
+    def perform_lookup(scope, cells)
+      lookup_result = scope.lookups[cells.first.text_value]
+      if lookup_result
+        key = cells[1] ? cells[1].text_value[1..-2] : nil
+        if lookup_result.is_a?(Hash)
+          lookup_result[key]
+        elsif lookup_result.is_a?(Array)
+          options = lookup_result.first
+          the_proc = lookup_result.last
+          the_proc.call(options, key, *Array(cells[2..-1]).map {|cell| cell.eval(scope)})
+        end
+      end      
+    end
 
     def perform_webhook(verb, scope, cells)
       #convert cells to array so it can manipulated easily

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 $days_ago $hours_ago $minutes_ago $append $id) }
+    it { Expressive.all_symbols.should =~ %w(+ - * / = set sum get put post >= > < <= and or if date lookup round $days_ago $hours_ago $minutes_ago $append $id $head $lookup $reverse $tail) }
   end
 
   describe "understands booleans" do
@@ -53,6 +53,12 @@ describe "Expressive" do
     it { Expressive.run("(<= 4 4)").should eql true }
   end
 
+  describe "understands list operations" do
+    it { Expressive.run("($head (1 2 3))").should eql 1 }
+    it { Expressive.run("($tail (1 2 3))").should eql [2, 3] }
+    it { Expressive.run("($reverse (1 2 3))").should eql [3 ,2 ,1] }
+  end
+
   describe "understands compound statements" do
     it { Expressive.run("(= (+ 4 2) 6)").should eql true }
     it { Expressive.run("(if (and (< 3 9) (> 2 1)), true, false)").should eql true }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expressive
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-04-23 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: -2330211989650066237
+      hash: -973593716025882143
 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: -2330211989650066237
+      hash: -973593716025882143
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23