expressive 0.0.29 → 0.0.30

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjBiY2RjOWUzNTlmYmQzMGQzMWM5YzQ4NWQ2NTJiN2FlMTZkNjE3Zg==
+    NDExOTI2N2Y5ZGUwNTgyMmYzZjE4N2E1NDcxZDZmNjI2NjhlNjk4OQ==
   data.tar.gz: !binary |-
-    NTIzMjJhNGYxMDBhN2M0ZDYyM2UwYzFiYjZlOGQ2N2UzMDA5NmU2Yw==
+    ODFkMmRkYzljNmFmZjU1NmYwNTllZDg3NTNhZDZhYTY2OWQyZTAxNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDA0ODU0NzI4OTM5Y2Q5OTdmY2YzM2I3YThiNjE3ODY5MDg3MTNiMzYzNTM3
-    MmE1OGE4ZTcxYmE0MzFiZDhkYTZhNDc3YzIwOWYyZGY2YjZmY2QyZjliZjUy
-    Mzk2ZDc0MzcwYTllNGJkY2IyZDhmOTgwMDI5Mjk0MjAyYThhYjI=
+    ZmQ3YTBmOWEyZjYyN2YwZGZiOTRjYzY1YjFhYTU2YjJlY2JhZDhjZWI4MWRk
+    ZGU3MzhkZjYzOTcwM2ZmOTk3OWUwMDFmNmJiYmJjMmU2MmViZGMwNzA1MTBj
+    MmU3MDI2MjdiYTRlYTk3MmQ3MWZiNDQ3OTJiNWNmMGFkMTViMzU=
   data.tar.gz: !binary |-
-    ZGQ2ZGJkNmM4ZGFlMzZkY2Y1Y2NjMTZiYWNhNWNmZGFiZWVlZGQ4YTNkZmU5
-    M2MxMTYzZjBkZjlmNTdlOGNhOWU0NDE2ZDExYmJmNzRmM2Q0MGI3YmM5MjA5
-    YTA0NjZiZTA2OTk2NmQ3NWUyZGFiYTRmOTE0NzQzMDVkNjc4NWY=
+    ODBjNmMwNTFhMzVlZWE1YzE3NDIxMTNlNDdkOGIyNTZkNWNjMWIzZDdkNWFh
+    NjE3MzlmZTNhZGQ0YTU5NmJjMWNlM2I0NjA0NzcxYTk5OTQzYzVmNjE1NGQ0
+    Y2I4NTlhM2Y4NTNjM2RlMDgxODVjNzJkOTg1MWJhY2NhNDEwMGE=

data/Gemfile.lock

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

data/lib/expressive/version.rb

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

data/lib/scope.rb

@@ -103,6 +103,12 @@ module Expressive
         hash
       end
 
+      syntax('$index') do |scope, cell|
+        data = cell[0].eval(scope)
+        index = cell[1].eval(scope)
+        data[index]
+      end
+
       syntax('$hval') do |scope, cells|
         key = cells[0].eval(scope)
         hash = cells[1].eval(scope)
@@ -189,7 +195,7 @@ module Expressive
     private
 
     def perform_concat(scope, cells)
-      return cells[0].eval(scope) + cells[1].eval(scope)
+      return cells[0].eval(scope).to_s + cells[1].eval(scope).to_s
     end
 
     def perform_sms(scope, cells)

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) }
+    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) }
   end
 
   describe "understands booleans" do
@@ -91,6 +91,7 @@ describe "Expressive" do
     it { Expressive.run("(= (+ 4 2) 6)").should eql true }
     it { Expressive.run("(if (and (< 3 9) (> 2 1)), true, false)").should eql true }
     it { Expressive.run("(if (and (< 10 9) (> 2 1)), true, false)").should eql false }
+
   end
 
   describe "understands conditional statements" do
@@ -261,7 +262,7 @@ EOH
 
   describe "understands the modification of scope" do
 
-    it "works" do
+    it "sets scope based off rounded equality calculation" do
       @scope['total_payment_amount'] = 2.32
       @scope['refund_amount'] = 2.32
       @scope['payment_reconciled'] = "asdf"
@@ -359,6 +360,49 @@ EOH
 
   end
 
+  describe "$index" do
+    it "generates an array" do
+      Expressive.run('(2 3)').should eql [2,3]
+    end
+    it "picks out correct field" do
+      Expressive.run('($index (2 3) 1)').should eql 3
+    end
+
+    it "picks correct result from calculations" do
+      @scope["total_payment_amount"] = 56
+      @scope.add_lookup_function("related_payments_count") do |options, additional_query_specs = []|
+        2
+      end
+
+      @scope.add_lookup_function("related_payments_summed") do |options, select_field, additional_query_specs = []|
+        200.50
+      end
+
+      result = Expressive.run('($index ((set total_payment_amount ($round (lookup related_payments_summed \"total_amount\") 2)) (lookup related_payments_count)) 1)', @scope)
+
+      @scope["total_payment_amount"].should == 200.50
+      result.should == 2
+
+    end
+  end
+
+
+  it "sets value and then looksup another" do
+    @scope["total_payment_amount"] = 56
+    @scope.add_lookup_function("related_payments_count") do |options, additional_query_specs = []|
+      2
+    end
+
+    @scope.add_lookup_function("related_payments_summed") do |options, select_field, additional_query_specs = []|
+      200.50
+    end
+
+    result = Expressive.run('(set total_payment_amount ($round (lookup related_payments_summed \"total_amount\") 2)) (lookup related_payments_count)', @scope)
+
+    @scope["total_payment_amount"].should == 200.50
+    result.should == 2
+  end
+
   describe "understands adding values to lists" do
     it "add a single value to a list of values" do
       Expressive.run('($append participating_teams 1)', @scope)
@@ -394,6 +438,19 @@ EOH
     it { Expressive.run("($minutes_ago 12)").should eql (@now - 12 * 60)  }
   end
 
+  describe "concat" do
+    it "string and number values" do
+      Expressive.run('($concat "ref-" 3)').should eql "ref-3"
+    end
+
+    it "concats from lookups" do
+      @scope.add_lookup_function("related_matter", case_type: "matter_case_type") do |options, select_field, additional_query_specs = []|
+        "value1"
+      end
+      Expressive.run('($concat "matter-" (lookup related_matter "field1"))', @scope).should eql "matter-value1"
+    end
+
+  end
 
   describe "understands using lookup functions" do
     it "should perform  the lookup function (add account and reverse login)" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expressive
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
 platform: ruby
 authors:
 - Ijonas Kisselbach