ruby-macrodroid 0.9.2 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d378de53e069fe32854e621ab9b72b08a0785f99957f57cf4933d650287be069
-  data.tar.gz: 856870eab31f6fffd85f55f1a61315dbec075f9bcbe89b8111e15eca5a064b54
+  metadata.gz: 3784001df302ddb9f8389ea019f860925803b96913f4531839df140f48634857
+  data.tar.gz: 686838c12129f1cd329d72745f37a7cb81ed91d98cdea059a5b59938d6d8b9e3
 SHA512:
-  metadata.gz: 42ec4a29e2a2976767cd62eaa3630388acd4777a07ea72ba95549d2ba0f184d8e8e8fb433385d1610c796c4bcecd9dc613372f702fe9c15e626c0717d26a13ab
-  data.tar.gz: 7fec30fda5d214a892b703ba5cf9ea3e1c9d0b6a5d7bf72221c6fa286558807d7f629c7fc0f6c0b858161873dc2e1a3323c7598fc3c61788848f72e848cabea8
+  metadata.gz: 948ceb9a759bf97fd4e4786fe35f95aee1a76d971ced0553c3984a885bae87155a18747a77c27d2daf7e928847cd503e19820e648956b0a93a62ef056a5992a9
+  data.tar.gz: d9ae51714a522375bd2aa92410f4a9412d83903d29ca33892cdd55a61dfab08faf7d02da292bdda2506715ca6948cdd308e0be4a03eb16b8010f5b56dd291ce0

data/lib/ruby-macrodroid.rb

@@ -38,6 +38,7 @@ require 'rxfhelper'
 require 'chronic_cron'
 
 
+# PASTE_START
 
 MODEL =<<EOF
 device
@@ -145,8 +146,9 @@ class MacroDroid
           puts 'before RowX.new' if @debug
 
           s2 = s.gsub(/^g:/,'geofence:').gsub(/^m:/,'macro:')\
-              .gsub(/^v:/,'variable:').gsub(/^t:/,'trigger:')\
-              .gsub(/^a:/,'action:').gsub(/^c:/,'constraint:').gsub(/^#.*/,'')
+              .gsub(/^d:/,'description:').gsub(/^v:/,'variable:')\
+              .gsub(/^t:/,'trigger:').gsub(/^a:/,'action:')\
+              .gsub(/^c:/,'constraint:').gsub(/^#.*/,'')
           
           a = s2.split(/(?=^macro:)/)
           
@@ -577,6 +579,7 @@ class DroidSim
 
 end
 
+# PASTE_END
 
 require 'ruby-macrodroid/base'
 require 'ruby-macrodroid/triggers'

data/lib/ruby-macrodroid/actions.rb

@@ -33,7 +33,9 @@
 
 
 class Action < MacroObject
+  using ColouredText
   using Params
+  include ObjectX
   
   attr_reader :constraints  
 
@@ -141,25 +143,39 @@ end
 
 # Category: Applications
 #
+
+
 class OpenWebPageAction < ApplicationAction
+  using ColouredText
 
   def initialize(obj={}, macro=nil)
-    
-   # puts 'obj: ' + obj[0].xml.inspect
+
+    $debug = true    
+    puts ('obj: ' + obj.inspect).debug if $debug
     
     h = if obj.is_a? Hash then
     
-      obj
+      obj.merge({macro: macro})
       
     elsif obj.is_a? Array
       
-      puts 'obj: ' + obj.inspect if $debug
+      puts ('obj: ' + obj.inspect).debug if $debug
       e, macro = obj
       
       a = e.xpath('item/*')
 
       h2 = if a.any? then
-        a.map {|node| [node.name.to_sym, node.text.to_s]}.to_h
+      
+        a.map do |node|
+          
+          if node.name == 'description' and node.text.to_s =~ /: / then
+            node.text.to_s.split(/: +/,2).map(&:strip)
+          else
+            [node.name.to_sym, node.text.to_s.strip]
+          end
+          
+        end.to_h
+        
       else
         txt = e.text('item/description')
         {url: (txt || e.text)}
@@ -169,7 +185,7 @@ class OpenWebPageAction < ApplicationAction
 
     end
 
-    puts 'h:' + h.inspect if $debug
+    puts ('h:' + h.inspect).debug if $debug
     
     #h[:url_to_open] = h[:url] if h[:url] and h[:url].length > 1
 
@@ -393,6 +409,7 @@ class IfConditionAction < Action
       a: true,
       constraint_list: []
     }  
+    puts 'obj: ' + obj.inspect if $debug
     
     if obj.is_a? Hash then
       
@@ -402,18 +419,23 @@ class IfConditionAction < Action
       super(h2)      
       
     elsif obj.is_a? Array
+      
       e, macro = obj
-      super() 
-      raw_txt = e.text('item/description') || e.text.to_s
+      super()
+      puts 'e.xml: ' + e.xml if $debug
+      puts 'e.text: ' + e.text.to_s.strip if $debug
+      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 if $debug
       conditions = clause.split(/\s+\b(?:AND|OR)\b\s+/i)
+      puts 'conditions: ' + conditions.inspect if $debug
       
       cp = ConstraintsNlp.new      
       
       @constraints = conditions.map do |c|
-        puts 'c: ' + c.inspect 
+        puts 'c: ' + c.inspect  if $debug
         r = cp.find_constraint c
         puts 'found constraint ' + r.inspect if $debug
         
@@ -421,7 +443,24 @@ 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 if $debug
+        #macro.add obj2
+        
+      end
+      
+      h = {
+        constraint_list: @constraints.map(&:to_h)
+      }
+      super(h)        {}
+      
     else
       # get the constraints
 
@@ -450,21 +489,47 @@ class IfConditionAction < Action
     out << s + constraints
     out.join("\n")
     
-  end  
+  end 
+  
 end
 
 class ElseAction < Action
   
-  def initialize(h={})
+  def initialize(obj=[])
 
     options = {
-      constraint_list: ''
+      constraint_list: []
     }
+    
+    if obj.is_a? Hash then
+      
+      h = obj
 
-    super(options.merge h)
+      super(options.merge h)      
+      
+    elsif obj.is_a? Array
+      
+      e, macro = obj
+      
+      # 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 if $debug
+        #macro.add obj2
+        
+      end
+      
+      super(options)
+    end
+    
     
 
-  end  
+
+  end    
   
   def to_s(colour: false, indent: 0)
     'Else'
@@ -644,6 +709,9 @@ class SetHotspotAction < ConnectivityAction
   
   def initialize(h={})
 
+    # to-do: check when *disable hotspot*, is the 
+    #        *enable wifi* option selected?
+    
     options = {
       device_name: "", state: 0, turn_wifi_on: true, use_legacy_mechanism: false, mechanism: 0
 
@@ -654,8 +722,15 @@ class SetHotspotAction < ConnectivityAction
   end
   
   def to_s(colour: false, indent: 0)
-    action = @h[:turn_wifi_on] ? 'Enable' : 'Disable'
-    action + ' HotSpot'
+    
+    @s =  "%s HotSpot" % [@h[:state] == 0 ? 'Enable' : 'Disable']
+    
+    if @h[:state] == 1 then
+      @s += "\n" + (@h[:turn_wifi_on] ? 'Enable WiFi' : 'Don\'t Enable Wifi')
+    end
+    
+    super()
+    
   end
 end
 
@@ -1066,7 +1141,17 @@ end
 class VibrateAction < DeviceSettingsAction
 
   def initialize(h={})
-
+    
+    pattern = [
+      'Blip', 'Short Buzz', 'Long Buzz', 'Rapid', 'Slow', 'Increasing', 
+      'Constant', 'Decreasing', 'Final Fantasy', 'Game Over', 'Star Wars',
+      'Mini Blip', 'Micro Blip'
+    ]    
+    
+    if h[:pattern] then
+      h[:vibrate_pattern] = pattern.map(&:downcase).index h[:pattern]
+    end
+    
     options = {
       vibrate_pattern: 1
     }
@@ -1596,6 +1681,7 @@ end
 # MacroDroid Specific
 #
 class SetVariableAction < Action
+  using ColouredText
   
   def initialize(obj=nil)
     
@@ -1604,7 +1690,14 @@ class SetVariableAction < Action
     elsif obj.is_a? Array
       e, macro = obj
       node = e.element('item/*')
-      macro.set_var node.name, node.value.to_s
+      #puts ("node.name: %s node.value: %s" % [node.name, node.value]).debug
+      r = macro.set_var node.name, node.value.to_s
+      puts ('r: ' + r.inspect).debug if $debug
+      r
+      if r[:type] == 2 then
+        { variable: {name: r[:name], type: r[:type]}, new_string_value: r[:string_value]
+          }
+      end
     end    
     
     options = {
@@ -2324,8 +2417,31 @@ end
 # Category: Screen
 #
 class ScreenOnAction < ScreenAction
+  using ColouredText
 
-  def initialize(h={})
+  def initialize(obj=nil)
+    
+    debug = false
+    
+    h = if obj.is_a? Hash then
+    
+      obj
+      
+    elsif obj.is_a? Array
+=begin      
+      puts 'obj: ' + obj.inspect if debug
+      e, macro = obj
+      puts ('e: ' + e.xml.inspect).debug if debug
+      a = e.xpath('item/*')
+
+      txt = e.text.to_s
+      puts ('txt: ' + txt.inspect).debug if debug
+      state = txt[/Screen (On|Off)/i,1]
+      
+      {screen_off: state.downcase == 'off'}
+=end      
+      {}
+    end    
 
     options = {
       pie_lock_screen: false,
@@ -2381,8 +2497,46 @@ end
 #   disable keep awake    => enabled: false
 #
 class KeepAwakeAction < ScreenAction
+  using ColouredText
 
-  def initialize(h={})
+  def initialize(obj=nil)
+    
+    
+    h = if obj.is_a? Hash then
+    
+      obj
+      
+    elsif obj.is_a? Array
+      
+      puts 'obj: ' + obj.inspect if $debug
+      e, macro = obj
+      
+      a = e.xpath('item/*')
+
+      txt = e.text('item/description')      
+      
+      h2 = if txt then
+      
+        raw_duration = (txt || e.text).to_s
+        puts 'raw_duration: ' + raw_duration.inspect  if $debug
+        duration = raw_duration[/Screen On - ([^$]+)/i]
+        {duration: duration}
+        
+      elsif a.any? then
+        a.map {|node| [node.name.to_sym, node.text.to_s]}.to_h
+      end      
+      
+      h2.merge(macro: macro)
+
+    end
+    
+    puts ('h: ' + h.inspect).debug if $debug
+    
+    if h[:duration] then
+            
+      h[:seconds_to_stay_awake_for] =  Subunit.hms_to_seconds(h[:duration])
+      
+    end
 
     options = {
       enabled: true,

data/lib/ruby-macrodroid/base.rb

@@ -7,7 +7,104 @@
 #  MacroObject
 #  
 
+module ObjectX
+  
+  
+  def action_to_object(ap, e, item, macro)
+    
+    debug = false
+    
+    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
+        
+        if r[1].any? then
+          
+          macro.add r[0].new(r[1])
+          
+        else
+          
+          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
+      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
@@ -97,11 +194,11 @@ class MacroObject
   private
   
   def hashify(h)
-    
+    puts 'h: ' + h.inspect
     h2 = h.inject({}) do |r,x|
-      puts 'x: ' + x.inspect if $debug
+      puts 'x: ' + x.inspect #if $debug
       key, value = x
-      puts 'key: ' + key.inspect if $debug
+      puts 'key: ' + key.inspect #if $debug
       new_key = key.to_s.gsub(/\w_\w/){|x| x[0] + x[-1].upcase}
       new_key = new_key.prepend 'm_' unless @list.include? new_key
       new_key = 'm_SIGUID' if new_key == 'm_siguid'

data/lib/ruby-macrodroid/constraints.rb

@@ -794,6 +794,24 @@ class MacroDroidVariableConstraint < Constraint
 
   def initialize(h={})
 
+    if h[:loperand] then
+      h[:variable] = {}
+      h[:variable][:name] = h[:loperand]
+      h[:variable][:type] = 2
+      
+      if h[:roperand] =~ /true|false/i then
+        
+        val = h[:roperand].downcase == 'true'
+        h[:boolean_value] = val
+        h[:variable][:type] = 0
+        h[:variable][:boolean_value] = val
+        h[:string_value] = h[:roperand].capitalize
+      else
+        h[:string_value] = h[:roperand]
+      end
+
+    end
+        
     options = {
       
       :enable_regex=>false, 
@@ -825,11 +843,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
 
@@ -888,7 +919,7 @@ class TriggerThatInvokedConstraint < Constraint
   
   def initialize(h={})
 
-    puts ('h: ' + h.inspect).green
+    puts ('h: ' + h.inspect).green if $debug
     @trigger = h[:macro].triggers.find {|x| x.siguid == h[:si_guid_that_invoked] }
     
     options = {

data/lib/ruby-macrodroid/macro.rb

@@ -21,8 +21,11 @@ VAR_TYPES = {
   Float: [3, :decimal_value]
 }
 
+
+
 class TriggersNlp
   include AppRoutes
+  using ColouredText
 
   def initialize(macro=nil)
 
@@ -32,8 +35,40 @@ class TriggersNlp
 
   end
 
-  def triggers(params) 
+  def triggers(params)
+    
+    # -- Battery/Power ---------------------------------------------
     
+    get /^Power Connected: (Wired \([^\)]+\))/i do |s|
+      
+      h = {
+        power_connected_options: [true, true, true],
+        has_set_usb_option: true,
+        power_connected: true
+      }
+        
+      a = ['Wired (Fast Charge)', 'Wireless', 'Wired (Slow Charge)']
+
+      puts ('s: ' + s.inspect).debug
+      
+      options = s.downcase.split(/ \+ /)
+      puts ('options: ' + options.inspect).debug
+      
+      h[:power_connected_options] = a.map {|x| options.include? x.downcase }
+      
+      [ExternalPowerTrigger, h]
+    end
+    
+    get /^Power Connected: Any/i do |s|
+      
+      h = {
+        power_connected_options: [true, true, true],
+        has_set_usb_option: true,
+        power_connected: true
+      }
+      
+      [ExternalPowerTrigger, h]
+    end    
     # e.g. at 7:30pm daily
     get /^(?:at )?(\d+:\d+(?:[ap]m)?) daily/i do |time, days|
       [TimerTrigger, {time: time, 
@@ -133,13 +168,25 @@ class ActionsNlp
   def initialize(macro=nil)
 
     super()
+
     params = {macro: macro}
     actions(params)
 
   end
 
   def actions(params) 
-
+    
+    # -- Connectivity ------------------------------------------------------
+    
+    get /^(Enable|Disable) HotSpot/i do |state|
+      enable, state = if state.downcase == 'enable' then
+        [true, 0]
+      else
+        [false, 1]
+      end
+      [SetHotspotAction, {turn_wifi_on: enable, state: state }]
+    end   
+    
     # e.g. message popup: hello world!
     get /^message popup: (.*)/i do |msg|
       [ToastAction, {msg: msg}]
@@ -192,6 +239,14 @@ class ActionsNlp
       [SpeakTextAction, {}]
     end     
     
+    get /^Vibrate \(([^\)]+)/i do |pattern|
+      [VibrateAction, {pattern: pattern}]
+    end     
+    
+    get /^Vibrate$/i do |pattern|
+      [VibrateAction, {pattern: 'short buzz'}]
+    end       
+    
     # e.g. Display Notification: Hi there: This is the body of the message
     get /^Display Notification: ([^:]+): [^$]+$/i do |subject, text|
       [NotificationAction, {subject: subject, text: text}]
@@ -246,13 +301,13 @@ class ActionsNlp
     
     #
     get /^WebHook \(Url\)/i do
-      [OpenWebPageAction, params]
+      [OpenWebPageAction, {}]
     end
     
     # e.g. webhook entered_kitchen
     #
     get /^webhook$/i do
-      [OpenWebPageAction, params]
+      [OpenWebPageAction, {}, params[:macro]]
     end
     
     # -- Location ---------------------------------------------------------
@@ -262,7 +317,7 @@ class ActionsNlp
     end    
     
     get /^Share Location$/i do
-      [ShareLocationAction, params]
+      [ShareLocationAction, {}]
     end    
     
     #a: Keep Device Awake Screen On Until Disabled
@@ -285,6 +340,10 @@ class ActionsNlp
       [KeepAwakeAction, h]
     end
     
+    get /Keep Device Awake$/i do
+      [KeepAwakeAction, {}]
+    end    
+    
     #a: Disable Keep Awake
     #
     get /Disable Keep Awake/i do
@@ -297,6 +356,10 @@ class ActionsNlp
       [IfConditionAction, {}]
     end
     
+    get /else/i do
+      [ElseAction, {}]
+    end    
+    
     get /End If/i do
       [EndIfAction, {}]
     end          
@@ -306,6 +369,12 @@ class ActionsNlp
     get /^Set Variable$/i do
       [SetVariableAction, {}]
     end        
+    
+    # -- Screen ------------------------------------------------
+    #
+    get /^Screen (On|Off)$/i do |state|
+      [ScreenOnAction, {screen_off: state.downcase == 'off'}]
+    end       
 
   end
 
@@ -326,10 +395,58 @@ class ConstraintsNlp
   end
 
   def constraints(params) 
+    
+    # Device State        
+    
+    get /^Device (locked|unlocked)/i do |state|
+      [DeviceLockedConstraint, {locked: state.downcase == 'locked'}]
+    end
 
     get /^airplane mode (.*)/i do |state|
       [AirplaneModeConstraint, {enabled: (state =~ /^enabled|on$/i) == 0}]
     end
+    
+    # 
+    
+    # -- 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|
+
+      level, option = operator.downcase == 'less' ? [-1,0] : [1,1]
+      
+      h = {
+        light_level: level,
+        light_level_float: val,
+        option: option
+      }
+      
+      [LightLevelConstraint, h]
+    end
+    
+    get /^Proximity Sensor: (Near|Far)/i do |distance|      
+      [ProximitySensorConstraint, {near: distance.downcase == 'near'}]
+    end
+    
+    
+    # -- Screen and Speaker ---------------------------
+    #
+    get /^Screen (On|Off)/i do |state|      
+      [ScreenOnOffConstraint, {screen_on: state.downcase == 'on'}]
+    end    
 
   end
 
@@ -344,6 +461,7 @@ end
 class Macro
   using ColouredText
   using Params
+  include ObjectX
 
   attr_reader :local_variables, :triggers, :actions, :constraints, 
       :guid, :deviceid
@@ -363,6 +481,8 @@ class Macro
   end
   
   def add(obj)
+    puts 'inside add; ' + obj.inspect if @debug
+    puts '@actions: ' + @actions.inspect if @debug
 
     if obj.kind_of? Trigger then
       
@@ -523,6 +643,21 @@ class Macro
       
       @title = node.text('macro') || node.attributes[:name]
       
+      d = node.element('description')
+      
+      if d then
+        
+        desc = []
+        desc << d.text.strip
+        
+        if d.element('item/description') then
+          desc <<  d.text('item/description').strip
+        end
+        
+        @description = desc.join("\n")
+
+      end
+      
       node.xpath('variable').each {|e| set_var(*e.text.to_s.split(/: */,2)) }
       
       #@description = node.attributes[:description]      
@@ -606,68 +741,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..-1]) if r
           
-        end
+        end  
 
       end      
                                
@@ -741,7 +833,10 @@ class Macro
     if not @local_variables.has_key? label.to_sym then
       @local_variables.merge!({label.to_sym => value}) 
     end
-
+    
+    if @debug then
+      puts ("before varify; label: %s value: %s" % [label, value]).debug
+    end
     varify(label, value)
   end
 
@@ -955,31 +1050,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

data/lib/ruby-macrodroid/triggers.rb

@@ -244,7 +244,7 @@ class ExternalPowerTrigger < Trigger
     
     return 'Power Disconnected' unless @h[:power_connected]
     
-    status = 'Power Connectd'
+    status = 'Power Connected'
     options = if @h[:power_connected_options].all? then
       'Any'
     else

metadata

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