expressive 0.0.35 → 0.0.36

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yzg1YTRmMzc4ZWE0Y2YzNmFiODRjNGViZGZlYTk0ZDA0YWE3ODE2Mg==
+    NTZiZTNjOTMzNmUwOTA5ODg1NmE0MGViMmIxZTA4YWQ1NTQyOTE0Mw==
   data.tar.gz: !binary |-
-    NTcyM2M0NjRiMjJjODBhZTcyYjNiZjQwYzdhNjNmNWEyMmEzZDZlZQ==
+    MDVhNDA4NzJhNzBhODM1NDg2NzU2ZjYyODkxYjQxMTc3YzlhODMxYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWFkMmNlZjRjM2QyYWJlOWUxNGQyNGY1YTZkZmRhZTdlZGFlZTcxZmE2ODU4
-    M2VkNjk2NTkyZDJhZDlmNDg1NjcyZTIwM2IyYTM0MWYwYmY1Mjk3NTYxZjY5
-    NWJiMTQ3NWNkNjQwM2YxNmQyYWFmMDI0OGY0MzM3NmE0ZmI2YWE=
+    ZWY0NTM0NmNhZGYyNzRlMDQ2M2FmZTAzOWNhMWI0YTljZTY4YjYzNTQwNWFj
+    MmE2ZjgyNTI1OTc3NzA1OGRlYjA1ODI2NWQyYThiNDc1OTQzZDMzNmMzZjlj
+    MTQxMzlkMTdkOTcyM2ZiZWUxY2IxZmY4ZjkyNGE5ZGZjMjdmMGE=
   data.tar.gz: !binary |-
-    YjlkMGZhNDkxYzc2ODVlMGRiNTViMjFlZjM1MjQzMWUyOTIyNDBlN2I2YWQy
-    YzgxNGMxNTNlN2YwYTdhZWZmMTZiZmM5NWE4ZjE2ZGExZDljMzBlYmNlYjVj
-    NTY1ZjAzYzM5ZmFmMzBkNDUxMWI3ZDNiMjZlZmE3M2NiMDBmZGU=
+    ZjVmZTE5YTRkMjljY2ZlYzBlN2QzZDYzYmFhZjQ4NmM5ZDliZWE2NTA1ZTk0
+    ZmVmMmExNGVmMDFkNjYxMGJmOGFkYTA4MzNhOGMyZjlmMTZkNWE0YmFmMmFm
+    ZDZmY2ExMDI3ODQzNWJlZDEwNDgzNzEyMjU5YzcyZWVmMGQ3NjA=

data/Gemfile.lock

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

data/lib/expressive/version.rb

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

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 $include)
+    %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 $string $float $integer)
   end
 
   module Boolean

data/lib/scope.rb

@@ -191,6 +191,9 @@ module Expressive
       define('$tail'){|*args| args.flatten[1..-1] }
       define('$reverse'){|*args| args.flatten.reverse }
       define('$not'){|*args| not args.first }
+      define('$string'){|*args| args.first.to_s}
+      define('$float'){|*args| args.first.to_f}
+      define('$integer'){|*args| args.first.to_i}
 
       define('$round'){|*args| perform_round(args) }
       define('round'){|*args| perform_round(args) }
@@ -244,7 +247,7 @@ module Expressive
     end
 
     def perform_split(scope, cells)
-      return cells[0].elements[1].text_value.split(cells[1].elements[1].text_value)
+      return cells[0].eval(scope).split(cells[1].eval(scope))
     end
 
     #(post "http://example.com" "*" (headers "AUTH-TOKEN=13415") )

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 $include) }
+    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 $string $float $integer) }
   end
 
   describe "understands booleans" do
@@ -33,8 +33,21 @@ describe "Expressive" do
         Expressive.run('($concat "hello " scope_value)', @scope).should eql "hello world"
        }
       it {Expressive.run('($split "a,b,c,d,e" ",")').should eql ['a', 'b', 'c', 'd', 'e'] }
+      it {
+        @scope["scope_value"] = "a,b,c,d,e"
+        Expressive.run('($split scope_value ",")', @scope).should eql ['a', 'b', 'c', 'd', 'e']
+       }
+
     end
+  end
 
+  describe "understands literals" do
+    it {
+          @scope["test_value"] = 1
+          @scope["test_1_value"] = 3
+          Expressive.run('test_value', @scope).should eql 1
+          Expressive.run('test_1_value', @scope).should eql 3
+       }
   end
 
   describe "hash manipulation" do
@@ -263,7 +276,7 @@ EOH
 
     it "handles compound ors" do
       expressive = "(if (or (= answer_2 \"Unemployed\") (or (= answer_2 \"Self-employed\") (or (= answer_2 \"Retired\") (= answer_2 \"Student\")))) 2 \"\")"
-      
+
       @scope["answer_2"] = "asdf"
       result = Expressive.run(expressive, @scope)
       result.should == ""
@@ -539,6 +552,16 @@ EOH
     it { Expressive.run("($minutes_ago 12)").should eql (@now - 12 * 60)  }
   end
 
+  describe "string" do
+    it {Expressive.run("($string 7)").should eql "7"  }
+  end
+  describe "integer" do
+    it {Expressive.run("($integer 7)").should eql 7  }
+  end
+  describe "float" do
+    it {Expressive.run("($float 7)").should eql 7.0  }
+  end
+
   describe "concat" do
     it "string and number values" do
       Expressive.run('($concat "ref-" 3)').should eql "ref-3"
@@ -752,7 +775,7 @@ EOH
       end
     end
   end
-  
+
   describe "parse error handling" do
     it "should raise parse exceptions" do
       expect{ Expressive.run(nil) }.to raise_error Expressive::ParseError, "Error parsing nil expression:  undefined method `length' for nil:NilClass"

metadata

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