ruby-macrodroid 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73bd85e05b55cb8139d501f96e7f0692a052d4544dcd518b73e4e1168ffcb0dd
-  data.tar.gz: 92d7670d08882e34f16085ca22da3a5affc8aa84c3eb89b3f6ec2800c4172501
+  metadata.gz: 341332647c11b1d70151aab4625ffefced825585c4814eed7d7aefaf7c96703e
+  data.tar.gz: ac8f26a27b1f9d394174f1d887e8af27a6c551dc55d4cffa89b8fb04f6b1927d
 SHA512:
-  metadata.gz: 7361a05b044e4d759728a91d86952f6273a8bfbfc72ff1ac9965f97cd858dd8ad3902cb4cb72f4e0557a291627a631a75d7f4ef0a04481969b8ac91bcd3eb48e
-  data.tar.gz: b7ef1815fe2b3e4ff42de13e34c8a663e58a55681aba9e38533c5175ab9a9b197755205175abfe2a013331150bb2f19d4949e41de4f9e3874ea6a4a3981172e2
+  metadata.gz: debe33514bbcd6cbc508c6d6a3d647cd37861bc61168743ed15cb1f1d7cf142cd883fb6059b2b7ad901659314f1dadee8f7610dbc03074f79fc3b95c8abc2f27
+  data.tar.gz: 50e36ff27c737d50b0686610398feae034f21a4cfab3a15b0c6367e278305a5bdc4ed6f699c0a220f0794dcf89cd3a2ec5ae0bdaf25f0d18aa49309206c03659

data.tar.gz.sig

@@ -1 +1 @@
-����ժ�+j��h�������m.����wL�w;4�C�.g|���9�)���h�!��J�K�|]�������/���X��_p�k�:�h��I�H-�F���$��;B���C';���ʛe��>�%9�ﾍ���"tҨ�(��uaOk\��"�hf�b�+���d೉�\�[+��1K95s�^�q�*e5��Y���]�O.eT���,9ɩ&I�g��9�G�p)�m��7?Z^&�?�ڜ+��[J$����Se�`>jnz���!��g�-7�	�ϝ�u��P`#��_ɕy���B�D���}6+��[�0��ۨЮ�U�b�.�NX���M�69]S���ٗY'L�3������4zL�JH`|S��+���"��Q���rA@��`BG
+��ocA���Q��.�'�s_�����ߑ(u��:�l�������&���,�_�Y

data/lib/ruby-macrodroid/actions.rb

@@ -34,6 +34,7 @@
 
 class Action < MacroObject
   using Params
+  include ObjectX
   
   attr_reader :constraints  
 
@@ -393,6 +394,7 @@ class IfConditionAction < Action
       a: true,
       constraint_list: []
     }  
+    puts 'obj: ' + obj.inspect #if $debug
     
     if obj.is_a? Hash then
       
@@ -402,13 +404,18 @@ class IfConditionAction < Action
       super(h2)      
       
     elsif obj.is_a? Array
+      
       e, macro = obj
-      super() 
-      raw_txt = e.text('item/description') || e.text.to_s
-      puts 'raw_txt: ' + raw_txt.inspect if $debug
+      super()
+      puts 'e.xml: ' + e.xml
+      puts 'e.text: ' + e.text.to_s.strip
+      raw_txt = e.text.to_s.strip[/^if [^$]+/i] || e.text('item/description')
+      puts 'raw_txt: ' + raw_txt.inspect #if $debug
       
-      clause = raw_txt[/^if (.*)/i,1]
+      clause = raw_txt[/^If (.*)/i,1]
+      puts 'clause: ' + clause.inspect
       conditions = clause.split(/\s+\b(?:AND|OR)\b\s+/i)
+      puts 'conditions: ' + conditions.inspect
       
       cp = ConstraintsNlp.new      
       
@@ -421,6 +428,19 @@ class IfConditionAction < Action
         
       end         
       puts '@constraints: ' + @constraints.inspect if $debug
+      
+      # find any nested actions
+      item = e.element('item')
+      
+      if item then
+        
+        ap = ActionsNlp.new
+        obj2 = action_to_object(ap, item, item, macro)      
+        puts 'obj2: ' + obj2.inspect
+        #macro.add obj2
+        
+      end
+  
       {}
     else
       # get the constraints
@@ -450,7 +470,8 @@ class IfConditionAction < Action
     out << s + constraints
     out.join("\n")
     
-  end  
+  end 
+  
 end
 
 class ElseAction < Action

data/lib/ruby-macrodroid/base.rb

@@ -7,7 +7,95 @@
 #  MacroObject
 #  
 
+module ObjectX
+  
+  def action_to_object(ap, e, item, macro)
+    
+    debug = true
+    
+    puts 'inside action_to_object: item.xml: ' + item.xml if debug
+        
+    if item.element('description') then
+      
+      item.xpath('description').map do |description|
+        
+        inner_lines = description.text.to_s.strip.lines
+        puts 'inner_lines: ' + inner_lines.inspect if debug
+        
+        action = if e.text.to_s.strip.empty? then
+          inner_lines.shift.strip
+        else
+          e.text.strip
+        end
+        
+        puts 'action: ' + action.inspect if debug
+        
+        r = ap.find_action action          
+        puts 'r: ' + r.inspect if debug
+        puts 'description: ' + description.xml.inspect if debug
+        #o = r[0].new([description, self]) if r
+        index = macro.actions.length
+        macro.add Action.new        
+        o = object_create(r[0],[description, macro]) if r
+        macro.actions[index] = o
+        puts 'after o' if debug
+        o
+        
+      end
+      
+    else
+      
+      action = e.text.strip
+      puts 'action: ' + action.inspect if @debug
+      r = ap.find_action action
+
+      a = e.xpath('item/*')
+
+      h = if a.any? then
+        a.map {|node| [node.name.to_sym, node.text.to_s]}.to_h
+      else
+        {}
+      end
+      puts 'h: ' + h.inspect if @debug
+
+      #r = ap.find_action action          
+      #r[0].new(h.merge(macro: self)) if r
+      o = object_create(r[0], h.merge(macro: macro)) if r
+      macro.add o
+      o
+      
+    end
+      
+  
+  end
 
+  def object_create(klass, *args)
+
+    begin
+      klass.new(*args)
+    rescue
+      raise MacroError, klass.to_s + ': ' + ($!).to_s
+    end
+  end
+  
+  def varify(label, value='')
+                        
+    type = VAR_TYPES[value.class.to_s.to_sym]
+
+    h = {
+      boolean_value: false,
+      decimal_value: 0.0,
+      int_value: 0,
+      name: label,
+      string_value: '',
+      type: type[0]
+    }
+    h[type[1]] = value
+    h
+    
+  end
+  
+end
 
 class MacroObject
   using ColouredText

data/lib/ruby-macrodroid/constraints.rb

@@ -794,6 +794,13 @@ class MacroDroidVariableConstraint < Constraint
 
   def initialize(h={})
 
+    if h[:loperand] then
+      h[:variable] = {}
+      h[:variable][:name] = h[:loperand]
+      h[:variable][:type] = 2
+      h[:string_value] = h[:roperand]
+    end
+        
     options = {
       
       :enable_regex=>false, 
@@ -825,11 +832,24 @@ class MacroDroidVariableConstraint < Constraint
 
   def to_s(colour: false, indent: 0)
     
-      a = [:int_greater_than, :int_less_than, :int_not_equal, 
-                :string_equal].zip(['>','<','!=', '='])
-      operator = a.find {|label,_| @h[label]}.last
+    a = [:int_greater_than, :int_less_than, :int_not_equal, 
+              :string_equal].zip(['>','<','!=', '='])
+    operator = a.find {|label,_| @h[label]}.last
+    
+    var = @h[:variable]
+    
+    type = case var[:type]
+    when 0 # boolean
+      :boolean_value
+    when 1 # integer
+      :int_value
+    when 2 # string
+      :string_value
+    when 3 # decimal
+      :decimal_Value
+    end  
     
-    @s = "%s %s %s" % [@h[:variable][:name], operator, @h[:int_value]]
+    @s = "%s %s %s" % [@h[:variable][:name], operator, @h[type]]
     super()
   end
 

data/lib/ruby-macrodroid/macro.rb

@@ -21,6 +21,8 @@ VAR_TYPES = {
   Float: [3, :decimal_value]
 }
 
+
+
 class TriggersNlp
   include AppRoutes
 
@@ -347,6 +349,20 @@ class ConstraintsNlp
     
     # 
     
+    # -- MacroDroid specific -----------------------------------------------------------------------
+    
+    get /^(\w+) (=) (\[?\w+\]?)/i do |loperand, operator, roperand|
+      
+      h = {
+        loperand: loperand, 
+        operator: operator, 
+        roperand: roperand
+      }
+      
+      [MacroDroidVariableConstraint, h]
+      
+    end
+    
     # -- Sensors -----------------------------------
     #
     get /^Light Sensor (Less|Greater) than (50.0)lx/i do |operator, val|
@@ -386,6 +402,7 @@ end
 class Macro
   using ColouredText
   using Params
+  include ObjectX
 
   attr_reader :local_variables, :triggers, :actions, :constraints, 
       :guid, :deviceid
@@ -405,6 +422,8 @@ class Macro
   end
   
   def add(obj)
+    puts 'inside add; ' + obj.inspect
+    puts '@actions: ' + @actions.inspect
 
     if obj.kind_of? Trigger then
       
@@ -663,68 +682,25 @@ class Macro
       
       ap = ActionsNlp.new self    
       
-      @actions = node.xpath('action').flat_map do |e|
+      node.xpath('action').each do |e|
         
         puts 'action e: ' + e.xml.inspect if @debug
         puts 'e.text ' + e.text if @debug
         
         item = e.element('item')
+        
         if item then
           
-          if item.element('description') then
-            
-            item.xpath('description').map do |description|
-              
-              inner_lines = description.text.to_s.strip.lines
-              puts 'inner_lines: ' + inner_lines.inspect if @debug
-              
-              action = if e.text.to_s.strip.empty? then
-                inner_lines.shift.strip
-              else
-                e.text.strip
-              end
-              
-              puts 'action: ' + action.inspect if @debug
-              
-              r = ap.find_action action          
-              puts 'r: ' + r.inspect if @debug
-              puts 'description: ' + description.xml.inspect if @debug
-              #o = r[0].new([description, self]) if r
-              o = object_create(r[0],[description, self]) if r
-              puts 'after o' if @debug
-              o
-              
-            end
-            
-          else
-            
-            action = e.text.strip
-            puts 'action: ' + action.inspect if @debug
-            r = ap.find_action action
-
-            a = e.xpath('item/*')
-
-            h = if a.any? then
-              a.map {|node| [node.name.to_sym, node.text.to_s]}.to_h
-            else
-              {}
-            end
-            puts 'h: ' + h.inspect if @debug
-
-            #r = ap.find_action action          
-            #r[0].new(h.merge(macro: self)) if r
-            object_create(r[0], h.merge(macro: self)) if r
-            
-          end
+          action_to_object(ap, e, item, self)
           
         else
           
           action = e.text.strip
           r = ap.find_action action          
           #r[0].new(r[1]) if r
-          object_create(r[0],r[1]) if r
+          self.add object_create(r[0],r[1]) if r
           
-        end
+        end  
 
       end      
                                
@@ -1012,31 +988,7 @@ EOF
     
   end
   
-  def object_create(klass, *args)
 
-    begin
-      klass.new(*args)
-    rescue
-      raise MacroError, klass.to_s + ': ' + ($!).to_s
-    end
-  end
-  
-  def varify(label, value='')
-                        
-
-    type = VAR_TYPES[value.class.to_s.to_sym]
 
-    h = {
-      boolean_value: false,
-      decimal_value: 0.0,
-      int_value: 0,
-      name: label,
-      string_value: '',
-      type: type[0]
-    }
-    h[type[1]] = value
-    h
-    
-  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macrodroid
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   NZ2kdBIUDnAM24e0/wXdVxg4HnsZbdymxyzMQ4P5pKYcpI6oisBxI37p/Xy+wAg3
   SBHno3GEuuD8ZWj24IMJpfbp
   -----END CERTIFICATE-----
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2020-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glw