ruby-macrodroid 0.9.1 → 0.9.6

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
@@ -421,27 +421,33 @@ class WebHookTrigger < Trigger
     h = if obj.is_a? Hash then
       obj
     elsif obj.is_a? Array
+      
       e, macro = obj
       txt = e.text('item/description')
-      {url: (txt || e.text), macro: macro}
+      
+      h2 = if txt then
+        {url: (txt || e.text)}
+      else                
+        a = e.xpath('item/*')
+        a.map {|node| [node.name.to_sym, node.text.to_s]}.to_h        
+      end      
+      
+      h2.merge(macro: macro)
     end        
     
     if h[:url] then
-      h[:identifier] = h[:url][/https:\/\/trigger.macrodroid.com\/(?:\w+\-){4}\w+\/([^$]+)/,1]
+      h[:identifier] = h[:url]\
+          [/https:\/\/trigger.macrodroid.com\/(?:\w+\-){4}\w+\/([^$]+)/,1]
+    elsif h[:identifier].nil? or h[:identifier].empty? then
+      h[:identifier] = h[:macro].title.downcase.gsub(/ +/,'-')
     end
 
-
     options = {
       identifier: ''
     }
     
     @deviceid = h[:macro].deviceid
-
-    
-    if h[:identifier].nil? or h[:identifier].empty? then
-      h[:identifier] = h[:macro].title.downcase.gsub(/ +/,'-')
-    end
-    
+        
     super(options.merge filter(options,h))
     @list << 'identifier'
 

metadata

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