expressive 0.0.30 → 0.0.31

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDExOTI2N2Y5ZGUwNTgyMmYzZjE4N2E1NDcxZDZmNjI2NjhlNjk4OQ==
+    M2NkNDAxY2NhMmU4NjU2ZDAwNGYxZDQwYzExMWNkZDVjNTIxZTRjMw==
   data.tar.gz: !binary |-
-    ODFkMmRkYzljNmFmZjU1NmYwNTllZDg3NTNhZDZhYTY2OWQyZTAxNA==
+    MWY3NzkwOGYyNTc2ZWQ3ODU3ZjdmOTY2OTQ0ZDliMWFlMTc0ZTMxZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmQ3YTBmOWEyZjYyN2YwZGZiOTRjYzY1YjFhYTU2YjJlY2JhZDhjZWI4MWRk
-    ZGU3MzhkZjYzOTcwM2ZmOTk3OWUwMDFmNmJiYmJjMmU2MmViZGMwNzA1MTBj
-    MmU3MDI2MjdiYTRlYTk3MmQ3MWZiNDQ3OTJiNWNmMGFkMTViMzU=
+    MGI4MTUwNjcwMDk4OTI4OWYxNDhmMDE5OTg0OWU1NmRjOWVjMjI5MDQ2NDE5
+    NTc0NjgwYWNlZWQxNjVhMzljMzY1MDI3YjBiNTcwMTdiODY1YWQ2NzUyNDI0
+    NDViNTc5MzFkMjc0MDQ2OWYwYzY4MDQ4MWZhZTVhNDNmYjY4MGQ=
   data.tar.gz: !binary |-
-    ODBjNmMwNTFhMzVlZWE1YzE3NDIxMTNlNDdkOGIyNTZkNWNjMWIzZDdkNWFh
-    NjE3MzlmZTNhZGQ0YTU5NmJjMWNlM2I0NjA0NzcxYTk5OTQzYzVmNjE1NGQ0
-    Y2I4NTlhM2Y4NTNjM2RlMDgxODVjNzJkOTg1MWJhY2NhNDEwMGE=
+    ZmE0Yjc5NTFmOTI3NTA1YjU1NjcyYjNkOThhOTZmZDZlZWQ0YzBjOTVhMzlj
+    M2FiZDY0OGRiNTQ3NTA5OTEwNGNiOWVjMjQ0ZDE3NzdlYTZlN2Q1NDJjM2Jh
+    ZjIxNDQ5ODUzNjM5ZDlkMGZjZGFhYWI4MWMxMzVlNTRmNTM2OTg=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    expressive (0.0.30)
+    expressive (0.0.31)
       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 $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)
+    %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)
   end
 
   module Boolean

data/lib/expressive/version.rb

@@ -1,3 +1,3 @@
 module Expressive
-  VERSION = "0.0.30"
+  VERSION = "0.0.31"
 end

data/lib/scope.rb

@@ -126,10 +126,18 @@ module Expressive
         perform_concat(scope, cells)
       end
 
+      syntax('$join') do |scope, cells|
+        perform_join(scope, cells)
+      end
+
       syntax('$sms') do |scope, cells|
         perform_sms(scope, cells)
       end
 
+      syntax('$random') do |scope, cells|
+        perform_random(scope, cells)
+      end
+
       syntax('$split') do |scope, cells|
         perform_split(scope, cells)
       end
@@ -198,6 +206,10 @@ module Expressive
       return cells[0].eval(scope).to_s + cells[1].eval(scope).to_s
     end
 
+    def perform_join(scope, cells)
+      return cells[0].eval(scope).to_s + " " + cells[1].eval(scope).to_s
+    end
+
     def perform_sms(scope, cells)
       uri = URI.parse("http://api.clickatell.com/http/sendmsg")
 
@@ -223,6 +235,12 @@ module Expressive
 
     end
 
+    def perform_random(scope, cells)
+      evaluated_cells = cells.map{|cell| cell.eval(scope)}
+      chosen_cell = rand(Range.new(0,evaluated_cells.count-1))
+      evaluated_cells[chosen_cell]
+    end
+
     def perform_split(scope, cells)
       return cells[0].elements[1].text_value.split(cells[1].elements[1].text_value)
     end

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) }
+    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) }
   end
 
   describe "understands booleans" do
@@ -27,6 +27,7 @@ describe "Expressive" do
 
     context "string manipulation" do
       it {Expressive.run('($concat "hello" " world")').should eql "hello world" }
+      it {Expressive.run('($join "hello" "world")').should eql "hello world" }
       it {
         @scope["scope_value"] = "world"
         Expressive.run('($concat "hello " scope_value)', @scope).should eql "hello world"
@@ -251,6 +252,34 @@ EOH
     it { Expressive.run('(or true true)').should eql true }
     it { Expressive.run('(or true false)').should eql true }
     it { Expressive.run('(or false false)').should eql false }
+    it { Expressive.run('(or false (or false false))').should eql false }
+    it { Expressive.run('(or false (or false true))').should eql true }
+    it { Expressive.run('(or false (or true false))').should eql true }
+    it { Expressive.run('(or true (or false false))').should eql true }
+
+    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 == ""
+
+      @scope["answer_2"] = "Unemployed"
+      result = Expressive.run(expressive, @scope)
+      result.should == 2
+
+      @scope["answer_2"] = "Self-employed"
+      result = Expressive.run(expressive, @scope)
+      result.should == 2
+
+      @scope["answer_2"] = "Retired"
+      result = Expressive.run(expressive, @scope)
+      result.should == 2
+
+      @scope["answer_2"] = "Student"
+      result = Expressive.run(expressive, @scope)
+      result.should == 2
+    end
 
     context "nil values" do
       it { Expressive.run('(and true nil_value)', @scope).should eql false }
@@ -260,6 +289,19 @@ EOH
     end
   end
 
+  describe "generates random values" do
+    it "generates random literal values" do
+      [1, 2, 3, 4].include?(Expressive.run('($random 1 2 3 4)', @scope)).should be_true
+    end
+    it "generates random values from scope" do
+      @scope["field1"] = "value1"
+      @scope["field2"] = "value2"
+      @scope["field3"] = "value3"
+      @scope["field4"] = "value4"
+      %W(value1 value2 value3 value4).include?(Expressive.run('($random field1 field2 field3 field4)', @scope)).should be_true
+    end
+  end
+
   describe "understands the modification of scope" do
 
     it "sets scope based off rounded equality calculation" do
@@ -279,11 +321,46 @@ EOH
       Expressive.run('(if (= ($round total_payment_amount 2) ($round refund_amount 2)) true, false)', @scope).should eql false
       Expressive.run('(= (- ($round total_payment_amount 2) ($round refund_amount 2)) 0)', @scope).should eql false
       Expressive.run('(set payment_reconciled (if (= ($round total_payment_amount 2) ($round refund_amount 2)) true false))', @scope)
-      puts @scope['payment_reconciled']
       @scope['payment_reconciled'].should eql false
 
     end
 
+    describe "set field only if value of other fields equate" do
+      before(:each) do
+        @scope.add_lookup_function("state_by_name") do |options, name, additional_query_specs = []|
+          if name == "Reconciled"
+            2
+          else
+            3
+          end
+        end
+
+        @scope["number_of_related_matters"] = "asdf"
+        @scope["x_current_state"] = 3
+      end
+
+      it "when value matches" do
+        @scope.add_lookup_function("related_matters_count") do |options, additional_query_specs = []|
+          1
+        end
+        result = Expressive.run("(set x_current_state (if (= (lookup related_matters_count) 1) (lookup state_by_name 'Reconciled') x_current_state)) (lookup related_matters_count)", @scope)
+
+        result.should eql 1
+        @scope["x_current_state"].should eql 2
+      end
+
+      it "when value does not match" do
+        @scope.add_lookup_function("related_matters_count") do |options, additional_query_specs = []|
+          0
+        end
+        result = Expressive.run("(set x_current_state (if (= (lookup related_matters_count) 1) (lookup state_by_name 'Reconciled') x_current_state)) (lookup related_matters_count)", @scope)
+
+        result.should eql 0
+        @scope["x_current_state"].should eql 3
+      end
+
+    end
+
     it "using single set commands" do
       @scope['vsi'] = 'oldvalue'
       Expressive.run('(set vsi "vsi1234")', @scope).should eql "vsi1234"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressive
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors:
 - Ijonas Kisselbach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_gntp