ruby-macrodroid 0.8.12 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35ba502f49880d0b2036510866095ff532a03311c4b503099305b943ed5dd77f
-  data.tar.gz: c604614f382e0bdf812ca7426fc74cd5339e16b821e272b3d31c85663a5f34fe
+  metadata.gz: 6f4d8a484f60935d656a2ac7973ca917709201955fe55897ce27d2430cb8ec93
+  data.tar.gz: d886539a6623877a521969d869d8d4b5690191795ffa6710dc0df5149b123707
 SHA512:
-  metadata.gz: c36b8205504f1e76b467fe13e3e752213a0bff61e1312f507ce30ecc79904070e3004e5f82efb3e3dae9e0c22edfe5e5c7f19c421d87119ede851ab103f5d64e
-  data.tar.gz: ab08df04436246ea37ade91f8a3509749923c1e017fb33163b591cc72f78410f3a4dcf78715669217897032362ed0a17935d4eb8858133d766a2bb712465232e
+  metadata.gz: 5d6251c0656a7ff30a252bc3ef38dcdd27da42ef278f34e07d4d03d07a2d11a7bab346e39330d76d17d69dd5f8d2d6091f89a81e691b1c47d7513013781e0524
+  data.tar.gz: bd12b85b6ef51759358f4c7e44e5671a1f69119d156ba25806eeb287e67da4f6cd50aca09940e6b4e5c0e3b9b96475be4dde49ce7f8a01694634e764e45fe343

data/lib/ruby-macrodroid.rb

@@ -141,10 +141,10 @@ end
 class ActionsNlp
   include AppRoutes
 
-  def initialize()
+  def initialize(macro=nil)
 
     super()
-    params = {}
+    params = {macro: macro}
     actions(params)
 
   end
@@ -230,8 +230,20 @@ class ActionsNlp
     
     # e.g. webhook entered_kitchen
     #
-    get /webhook|HTTP GET/i do
-      [OpenWebPageAction, {}]
+    get /(?:webhook|HTTP GET) ([^$]+)$/i do |s|
+      key = s =~ /^http/ ? :url_to_open : :identifier      
+      [OpenWebPageAction, {key => s}]
+    end
+    
+    #
+    get /^WebHook \(Url\)/i do
+      [OpenWebPageAction, params]
+    end
+    
+    # e.g. webhook entered_kitchen
+    #
+    get /^webhook$/i do
+      [OpenWebPageAction, params]
     end
     
     #a: Keep Device Awake Screen On Until Disabled
@@ -367,14 +379,14 @@ class MacroDroid
   using Params  
 
   attr_reader :macros, :geofences, :yaml
-  attr_accessor :deviceid
+  attr_accessor :deviceid, :remote_url
   
   # note: The deviceid can only be found from an existing Webhook trigger, 
   #       generated from MacroDroid itself.
 
-  def initialize(obj=nil, deviceid: nil, debug: false)
+  def initialize(obj=nil, deviceid: nil, remote_url: nil, debug: false)
 
-    @deviceid, @debug = deviceid, debug    
+    @deviceid, @remote_url, @debug = deviceid, remote_url, debug    
     
     @geofences = {}
     
@@ -590,7 +602,7 @@ class MacroDroid
 #       puts '@geofences: ' + @geofences.inspect if @debug
       
       m = Macro.new(geofences: @geofences.map(&:last), deviceid: @deviceid, 
-                    debug: @debug )
+                    remote_url: @remote_url, debug: @debug )
       m.import_h(macro)
       m
 
@@ -612,7 +624,7 @@ class MacroDroid
     @macros = doc.root.xpath('item').map do |node|
       puts ('geofences: ' + geofences.inspect).highlight if @debug
       Macro.new(geofences: geofences.map(&:last), deviceid: @deviceid, 
-                debug: @debug).import_xml(node)
+                remote_url: @remote_url, debug: @debug).import_xml(node)
       
     end
 
@@ -835,65 +847,6 @@ class DroidSim
 
 end
 
-RD_MACROS =<<EOF
-m: Torch
-t: webhook
-a: Torch toggle
-EOF
-
-module RemoteDroid
-
-  class Service
-    def initialize(callback)
-      @callback = callback
-    end
-  end
-  
-  class Bluetooth
-    def enable()
-    end
-  end
-  
-  class Torch < Service
-        
-    def toggle()
-      @callback.call :torch      
-    end
-    
-  end
-
-  class Control        
-    
-    def initialize(deviceid: nil)
-      @deviceid = deviceid
-      @torch = Torch.new(self)
-    end
-    
-    def bluetooth()
-      @bluetooth
-    end
-    
-    def call(command)
-      url = "https://trigger.macrodroid.com/%s/%s" % [@deviceid, command]
-      puts 'url: ' + url.inspect
-      s = open(url).read      
-    end
-    
-    def torch()
-      @torch
-    end
-
-    def write(s)
-      
-      MacroDroid.new(RD_MACROS, deviceid: @deviceid).export s
-      
-    end
-    
-    alias export write
-    
-  end
-
-end
 
 require 'ruby-macrodroid/base'
 require 'ruby-macrodroid/triggers'

data/lib/ruby-macrodroid/actions.rb

@@ -49,8 +49,8 @@ class Action < MacroObject
     
   end
   
-  def invoke(s='')    
-    "%s/%s: %s" % [@group, @type, s]
+  def invoke(h={})    
+    "%s/%s: %s" % [@group, @type, h.to_json]
   end  
   
   
@@ -136,23 +136,46 @@ class LaunchShortcutAction < ApplicationAction
 
 end
 
+class OpenWebPageActionError < Exception
+end
+
 # Category: Applications
 #
 class OpenWebPageAction < ApplicationAction
 
-  def initialize(h={})
+  def initialize(obj={})
+    
+    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)}
+    end    
     
     h[:url_to_open] = h[:url] if h[:url]
 
     options = {
-      variable_to_save_response: {:m_stringValue=>"", :m_name=>"", :m_decimalValue=>0.0, :isLocal=>true, :m_booleanValue=>false, :excludeFromLog=>false, :m_intValue=>0, :m_type=>2},
+      variable_to_save_response: {:m_stringValue=>"", :m_name=>"", 
+      m_decimalValue: 0.0, isLocal: true, m_booleanValue: false, 
+      excludeFromLog: false, m_intValue: 0, m_type: 2},
       url_to_open: '',
       http_get: true,
       disable_url_encode: false,
       block_next_action: false
     }
-
-    super(options.merge filter(options,h))
+    
+    if h[:macro].remote_url.nil? then
+      raise OpenWebPageActionError, 'remote_url not found'
+    end
+    
+    if (h[:identifier].nil? or h[:identifier].empty?) and 
+        (h[:url_to_open].nil? or h[:url_to_open].empty?) then
+      h[:url_to_open] = h[:macro].remote_url.sub(/\/$/,'') + '/' + 
+          h[:macro].title.downcase.gsub(/ +/,'-')
+    end
+    
+    super(options.merge h)
 
   end
   
@@ -1971,11 +1994,10 @@ class ToastAction < NotificationsAction
     
     h = if obj.is_a? Hash then
       obj
-    elsif obj.is_a? Rexle::Element
-      txt = obj.text('item/description')
-      {msg: (txt || obj.text)}
-    else
-      {msg: obj}
+    elsif obj.is_a? Array
+      e, macro = obj
+      txt = e.text('item/description')
+      {msg: (txt || e.text)}
     end
 
     if h[:msg] then
@@ -1999,7 +2021,7 @@ class ToastAction < NotificationsAction
   end
   
   def invoke()
-    super(@h[:message_text])
+    super(msg: @h[:message_text])
   end
   
   def to_pc()

data/lib/ruby-macrodroid/macro.rb

@@ -24,11 +24,13 @@ class Macro
 
   attr_reader :local_variables, :triggers, :actions, :constraints, 
       :guid, :deviceid
-  attr_accessor :title, :description
+  attr_accessor :title, :description, :remote_url
 
-  def initialize(name=nil, geofences: nil, deviceid: nil, debug: false)
+  def initialize(name=nil, geofences: nil, deviceid: nil, remote_url: nil, 
+                 debug: false)
 
     @title, @geofences, @deviceid, @debug = name, geofences, deviceid, debug
+    @remote_url = remote_url
     
     puts 'inside Macro#initialize' if @debug    
           
@@ -195,30 +197,89 @@ class Macro
       @title = node.text('macro') || node.attributes[:name]
       
       @local_variables = node.xpath('variable').map do |e|
-        e.text.split(/: +/,2)
+        
+        label, v = e.text.to_s.split(/: */,2)
+        
+        value = if v.to_f.to_s == v
+          v.to_f
+        elsif v.downcase == 'true'
+          true
+        elsif v.downcase == 'false' 
+          false
+        elsif v.to_i.to_s == v
+          v.to_i
+        else
+          v
+        end
+        
+        [label, value]
       end
       
       #@description = node.attributes[:description]      
       
       tp = TriggersNlp.new(self)      
       
-      @triggers = node.xpath('trigger').map do |e|
+      @triggers = node.xpath('trigger').flat_map do |e|
         
         r = tp.find_trigger e.text
         
         puts 'found trigger ' + r.inspect if @debug
         
-        if r then
-          if r[0] == GeofenceTrigger then
-            GeofenceTrigger.new(r[1], geofences: @geofences)
+        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
+              
+              trigger = if e.text.to_s.strip.empty? then
+                inner_lines.shift.strip
+              else
+                e.text.strip
+              end
+              
+              puts 'trigger: ' + trigger.inspect if @debug
+              
+              r = tp.find_trigger trigger          
+              puts 'r: ' + r.inspect if @debug
+              o = r[0].new([description, self]) if r              
+              puts 'after o' if @debug
+              o
+              
+            end
+            
           else
-            r[0].new(r[1])
+            
+            trigger = e.text.strip
+            r = tp.find_trigger trigger
+
+            a = e.xpath('item/*')
+
+            h = if a.any? then
+              a.map {|node| [node.name.to_sym, node.text.to_s]}.to_h
+            else
+              {}
+            end
+
+            r = tp.find_trigger trigger          
+            r[0].new(h) if r
+            
           end
+          
+        else
+          
+          trigger = e.text.strip
+          r = tp.find_trigger trigger
+          r[0].new(r[1]) if r
+          
         end
         
       end
       
-      ap = ActionsNlp.new      
+      ap = ActionsNlp.new self    
       
       @actions = node.xpath('action').flat_map do |e|
         
@@ -245,8 +306,8 @@ class Macro
               
               r = ap.find_action action          
               puts 'r: ' + r.inspect if @debug
-              o = r[0].new(description) if r              
-              puts 'after o'
+              o = r[0].new([description, self]) if r
+              puts 'after o' if @debug
               o
               
             end
@@ -378,13 +439,20 @@ EOF
     puts 'before triggers' if @debug
     
     a << @triggers.map do |x|
+      
+      puts 'x: ' + x.inspect if @debug
+      
       s =-x.to_s(colour: colour)
+      puts 's: ' + s.inspect if @debug
       
       s2 = if s.lines.length > 1 then        
         "\n" + s.lines.map {|x| x.prepend ('  ' * (indent+1)) }.join
       else
         ' ' + s
       end         
+      
+      puts 's2: ' + s2.inspect if @debug
+      
       #s.lines > 1 ? "\n" + x : x
       (colour ? "t".bg_red.gray.bold : 't') + ":" + s2
     end.join("\n")
@@ -540,10 +608,11 @@ EOF
     
         
     local_variables.map do |key, value|
-      
-      
+            
+      puts 'value ' + value.class.to_s.to_sym.inspect
+      puts 'VAR_TYPES: ' + VAR_TYPES.inspect
       type = VAR_TYPES[value.class.to_s.to_sym]
-      
+      puts 'type: ' + type.inspect
       h = {
         boolean_value: false,
         decimal_value: 0.0,

data/lib/ruby-macrodroid/triggers.rb

@@ -416,19 +416,33 @@ end
 #
 class WebHookTrigger < Trigger
 
-  def initialize(h={})
+  def initialize(obj={})
+    
+    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}
+    end        
+    
+    if h[:url] then
+      h[:identifier] = h[:url][/https:\/\/trigger.macrodroid.com\/(?:\w+\-){4}\w+\/([^$]+)/,1]
+    end
+
 
     options = {
       identifier: ''
     }
+    
     @deviceid = h[:macro].deviceid
 
     
     if h[:identifier].nil? or h[:identifier].empty? then
-      h[:identifier] = h[:macro].title.downcase
+      h[:identifier] = h[:macro].title.downcase.gsub(/ +/,'-')
     end
     
-    super(options.merge h)
+    super(options.merge filter(options,h))
     @list << 'identifier'
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macrodroid
 version: !ruby/object:Gem::Version
-  version: 0.8.12
+  version: 0.9.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   NZ2kdBIUDnAM24e0/wXdVxg4HnsZbdymxyzMQ4P5pKYcpI6oisBxI37p/Xy+wAg3
   SBHno3GEuuD8ZWj24IMJpfbp
   -----END CERTIFICATE-----
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glw
@@ -81,22 +81,22 @@ dependencies:
   name: rowx
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: subunit
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -156,7 +156,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: chronic_cron
   requirement: !ruby/object:Gem::Requirement