expressive 0.0.34 → 0.0.35

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODlkZmFjOWNhM2Q1NGNkYzA0ZTMyNjQ2MDljMDlhMGEwNGYwNmE0OQ==
+    Yzg1YTRmMzc4ZWE0Y2YzNmFiODRjNGViZGZlYTk0ZDA0YWE3ODE2Mg==
   data.tar.gz: !binary |-
-    YWE4MDQ0ZWQ0YzI1NDJmODQ4MzlmOTViYTkxNWRiNWE2NDMzYjI4Ng==
+    NTcyM2M0NjRiMjJjODBhZTcyYjNiZjQwYzdhNjNmNWEyMmEzZDZlZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmNmODRiZGU3ZTE3ZTVmMGY0NWZmMzY1MTlkMjdmNDM1MmJjOWU4ZTE3ZWVk
-    M2FjOTg1NWI2MDc5YmZiZDQ4Mzg5OGMwNjFmNjQ5NGRlMWEyMWYyNzZiNzk0
-    NjY5MGUzYWQ5NGMxYmJjNjkxMTljYjk2OWMwODg4ZjQxZDY0ZDY=
+    MWFkMmNlZjRjM2QyYWJlOWUxNGQyNGY1YTZkZmRhZTdlZGFlZTcxZmE2ODU4
+    M2VkNjk2NTkyZDJhZDlmNDg1NjcyZTIwM2IyYTM0MWYwYmY1Mjk3NTYxZjY5
+    NWJiMTQ3NWNkNjQwM2YxNmQyYWFmMDI0OGY0MzM3NmE0ZmI2YWE=
   data.tar.gz: !binary |-
-    OTFiMDQ4NTFkMTAzZWRlZmUyMWFlYjcyNmFhMjM4OGI1YTQ5ODRkZTE4ZTA4
-    Y2VhNmNjYTExYmQ0YWE1MmIyZjQ4NDhiYzRjOTU2NDZhNmU4OTY0NGQ2MWE1
-    MGMzNTEzOTc4NWRhZDRjNTZiNTIyMzEzOGY0ZTUyNTljZDZhZjU=
+    YjlkMGZhNDkxYzc2ODVlMGRiNTViMjFlZjM1MjQzMWUyOTIyNDBlN2I2YWQy
+    YzgxNGMxNTNlN2YwYTdhZWZmMTZiZmM5NWE4ZjE2ZGExZDljMzBlYmNlYjVj
+    NTY1ZjAzYzM5ZmFmMzBkNDUxMWI3ZDNiMjZlZmE3M2NiMDBmZGU=

data/lib/expressive.rb

@@ -35,7 +35,7 @@ module Expressive
   end
 
   def self.all_symbols
-    %w(+ - * / = set sum $sub post >= > < <= and or if date datetime get put lookup $lookup $head $tail $reverse round $round $days_ago $hours_ago $minutes_ago $append $id $hash $concat $split $sms $hval $index $random $join $not)
+    %w(+ - * / = set sum $sub post >= > < <= and or if date datetime get put lookup $lookup $head $tail $reverse round $round $days_ago $hours_ago $minutes_ago $append $id $hash $concat $split $sms $hval $index $random $join $not $include)
   end
 
   module Boolean

data/lib/expressive/version.rb

@@ -1,3 +1,3 @@
 module Expressive
-  VERSION = "0.0.34"
+  VERSION = "0.0.35"
 end

data/lib/scope.rb

@@ -187,6 +187,7 @@ module Expressive
       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('$include'){|val, arr| arr.include?(val) }
       define('$tail'){|*args| args.flatten[1..-1] }
       define('$reverse'){|*args| args.flatten.reverse }
       define('$not'){|*args| not args.first }

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 $sub get put post >= > < <= and or if date datetime lookup round $round $days_ago $hours_ago $minutes_ago $append $id $head $lookup $reverse $tail $hash $concat $split $sms $hval $index $random $join $not) }
+    it { Expressive.all_symbols.should =~ %w(+ - * / = set sum $sub get put post >= > < <= and or if date datetime lookup round $round $days_ago $hours_ago $minutes_ago $append $id $head $lookup $reverse $tail $hash $concat $split $sms $hval $index $random $join $not $include) }
   end
 
   describe "understands booleans" do
@@ -84,6 +84,10 @@ describe "Expressive" do
 
   describe "understands list operations" do
     it { Expressive.run("($head (1 2 3))").should eql 1 }
+    it { Expressive.run("($include 3 (1 2 3))").should eql true }
+    it { Expressive.run("($include 4 (1 2 3))").should eql false }
+    it { Expressive.run("($include ADAM001 (ADAM001 AIBO001 AMBR001 BARC002 BARC003))").should eql true}
+    it { Expressive.run("($include BDAM001 (ADAM001 AIBO001 AMBR001 BARC002 BARC003))").should eql true}
     it { Expressive.run("($tail (1 2 3))").should eql [2, 3] }
     it { Expressive.run("($reverse (1 2 3))").should eql [3 ,2 ,1] }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressive
 version: !ruby/object:Gem::Version
-  version: 0.0.34
+  version: 0.0.35
 platform: ruby
 authors:
 - Ijonas Kisselbach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_gntp