ruby-macrodroid 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f4d8a484f60935d656a2ac7973ca917709201955fe55897ce27d2430cb8ec93
-  data.tar.gz: d886539a6623877a521969d869d8d4b5690191795ffa6710dc0df5149b123707
+  metadata.gz: 37e8014bb2ccd71ffd2da90197a1dd1a89c7e8e6bbbfc7ed88e9cfbff07925a1
+  data.tar.gz: f2d4910bb6893249e33eb7c4326ea733188ecef67ec94f808cd25ef6c97760d0
 SHA512:
-  metadata.gz: 5d6251c0656a7ff30a252bc3ef38dcdd27da42ef278f34e07d4d03d07a2d11a7bab346e39330d76d17d69dd5f8d2d6091f89a81e691b1c47d7513013781e0524
-  data.tar.gz: bd12b85b6ef51759358f4c7e44e5671a1f69119d156ba25806eeb287e67da4f6cd50aca09940e6b4e5c0e3b9b96475be4dde49ce7f8a01694634e764e45fe343
+  metadata.gz: 06015fe764a0450838ad49b6dbebba46afc32ec49673dbf4e1bce9b07e04aaea1850153cf2c0b1d56e740dd2cbcf4653f92878ee99680d7c3f2eaacf1fffb69e
+  data.tar.gz: df0c2950bcae690d137b294825c95579f8530fea24cabfe371809efff64343d4e9ffd71b5f2378c7938bc214dfc0e409892947ad03a86ef4438816fafa11000a

data/lib/ruby-macrodroid.rb

@@ -44,275 +44,6 @@ device
     airplane_mode is disabled
 EOF
 
-class TriggersNlp
-  include AppRoutes
-
-  def initialize(macro=nil)
-
-    super()
-    params = {macro: macro}
-    triggers(params)
-
-  end
-
-  def triggers(params) 
-    
-    # e.g. at 7:30pm daily
-    get /^(?:at )?(\d+:\d+(?:[ap]m)?) daily/i do |time, days|
-      [TimerTrigger, {time: time, 
-                      days: %w(Mon Tue Wed Thu Fri Sat Sun).join(', ')}]
-    end       
-
-    get /^(?:at )?(\d+:\d+(?:[ap]m)?) (?:on )?(.*)/i do |time, days|
-      [TimerTrigger, {time: time, days: days}]
-    end
-
-    # time.is? 'at 18:30pm on Mon or Tue'
-    get /^time.is\? ['"](?:at )?(\d+:\d+(?:[ap]m)?) (?:on )?(.*)['"]/i do |time, days|      
-      [TimerTrigger, {time: time, days: days.gsub(' or ',', ')}]
-    end     
-    
-    get /^shake[ _]device\??$/i do 
-      [ShakeDeviceTrigger, {}]
-    end
-    
-    get /^Flip Device (.*)$/i do |motion|
-       facedown = motion =~ /Face Up (?:->|to) Face Down/i
-      [FlipDeviceTrigger, {face_down: facedown }]
-    end
-    
-    get /^flip_device_down\?$/i do
-      [FlipDeviceTrigger, {face_down: true }]
-    end
-
-    get /^flip_device_up\?$/i do
-      [FlipDeviceTrigger, {face_down: false }]
-    end        
-    
-    get /^Failed Login Attempt$/i do
-      [FailedLoginTrigger, {}]
-    end
-    
-    get /^failed_login?$/i do
-      [FailedLoginTrigger, {}]
-    end         
-
-    get /^Geofence (Entry|Exit) \(([^\)]+)/i do |direction, name|
-      enter_area = direction.downcase.to_sym == :entry
-      [GeofenceTrigger, {name: name, enter_area: enter_area}]
-    end     
-    
-    get /^location (entered|exited) \(([^\)]+)/i do |direction, name|
-      enter_area = direction.downcase.to_sym == :entered
-      [GeofenceTrigger, {name: name, enter_area: enter_area}]
-    end
-    
-    # eg. Proximity Sensor (Near)
-    #
-    get /^Proximity Sensor \(([^\)]+)\)/i do |distance|
-      
-      [ProximityTrigger, {distance: distance}]
-    end    
-    
-    get /^WebHook \(Url\)/i do       
-      [WebHookTrigger, params]
-    end      
-
-    get /^WebHook/i do       
-      [WebHookTrigger, params]
-    end
-    
-    get /^wh/i do       
-      [WebHookTrigger, params]
-    end          
-    
-    
-  end
-
-  alias find_trigger run_route
-
-  def to_s(colour: false)
-    'TriggersNlp ' + @h.inspect
-  end
-
-  alias to_summary to_s
-end
-
-class ActionsNlp
-  include AppRoutes
-
-  def initialize(macro=nil)
-
-    super()
-    params = {macro: macro}
-    actions(params)
-
-  end
-
-  def actions(params) 
-
-    # e.g. message popup: hello world!
-    get /^message popup: (.*)/i do |msg|
-      [ToastAction, {msg: msg}]
-    end
-
-    # e.g. Popup Message 'hello world!'
-    get /^Popup[ _]Message ['"]([^'"]+)/i do |msg|
-      [ToastAction, {msg: msg}]
-    end
-    
-    # e.g. Popup Message\n  hello world!
-    get /^Popup Message\n\s+(.*)/im do |msg|
-      [ToastAction, {msg: msg}]
-    end    
-            
-    # e.g. Popup Message
-    get /^Popup Message$/i do
-      [ToastAction, {}]
-    end    
-    
-    # e.g. say current time
-    get /^say current[ _]time/i do
-      [SayTimeAction, {}]
-    end    
-    
-    get /^Torch :?(.*)/i do |onoffstate|
-      state = %w(on off toggle).index onoffstate.downcase
-      [CameraFlashLightAction, {state: state}]
-    end    
-    
-    get /^Take Picture/i do
-      [TakePictureAction, {}]
-    end
-    
-    get /^take_picture/i do
-      [TakePictureAction, {}]
-    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}]
-    end           
-    
-    
-    # e.g. Enable Wifi
-    get /^(Enable|Disable) Wifi$/i do |raw_state|
-      
-      state = raw_state.downcase.to_sym == :enable ? 0 : 1
-      [SetWifiAction, {state: state}]
-      
-    end    
-    
-    # e.g. Play: Altair
-    get /^Play: (.*)$/i do |name|
-
-      [PlaySoundAction, {file_path: name}]
-      
-    end     
-    
-    # e.g. Launch Settings
-    get /^Launch (.*)$/i do |application|
-
-      h = {
-        application_name: application,
-        package_to_launch: 'com.android.' + application.downcase
-      }
-      [LaunchActivityAction, h]
-      
-    end
-    
-    # e.g. HTTP GET http://someurl.com/something
-    get /^HTTP GET ([^$]+)$/i do |url|
-
-      [OpenWebPageAction, url_to_open: url]
-      
-    end
-    
-    # e.g. webhook entered_kitchen
-    #
-    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
-    #
-    get /Keep Device Awake Screen On Until Disabled/i do
-      [KeepAwakeAction, {enabled: true, permanent: true, screen_option: 0}]
-    end
-    
-    
-    #a: Keep Device Awake Screen On 1h 1m 1s
-    #
-    get /Keep Device Awake Screen On ([^$]+)/i do |duration|
-      
-      a = duration.split.map(&:to_i)
-      secs = Subunit.new(units={minutes:60, hours:60, seconds: 60}, a).to_i
-      
-      h = {
-        permanent: true, screen_option: 0, seconds_to_stay_awake_for: secs
-      }
-      [KeepAwakeAction, h]
-    end
-    
-    #a: Disable Keep Awake
-    #
-    get /Disable Keep Awake/i do
-      [KeepAwakeAction, {enabled: false, screen_option: 0}]
-    end    
-
-    #e.g a: if Airplane mode enabled
-    #
-    get /if (.*)/i do
-      [IfConditionAction, {}]
-    end
-    
-    get /End If/i do
-      [EndIfAction, {}]
-    end          
-
-  end
-
-  alias find_action run_route
-
-
-end
-
-class ConstraintsNlp
-  include AppRoutes
-
-  def initialize()
-
-    super()
-    params = {}
-    constraints(params)
-
-  end
-
-  def constraints(params) 
-
-    get /^airplane mode (.*)/i do |state|
-      [AirplaneModeConstraint, {enabled: (state =~ /^enabled|on$/i) == 0}]
-    end
-
-  end
-
-  alias find_constraint run_route
-
-end
-
-
 module Params
 
   refine Hash do
@@ -368,8 +99,6 @@ end
 
 
 
-
-
 class MacroDroidError < Exception
 end
 

data/lib/ruby-macrodroid/actions.rb

@@ -143,17 +143,32 @@ end
 #
 class OpenWebPageAction < ApplicationAction
 
-  def initialize(obj={})
+  def initialize(obj={}, macro=nil)
     
     h = if obj.is_a? Hash then
+    
       obj
+      
     elsif obj.is_a? Array
+      puts 'obj: ' + obj.inspect if @debug
       e, macro = obj
-      txt = e.text('item/description')
-      {url: (txt || e.text)}
-    end    
+      
+      a = e.xpath('item/*')
+
+      h2 = if a.any? then
+        a.map {|node| [node.name.to_sym, node.text.to_s]}.to_h
+      else
+        txt = e.text('item/description')
+        {url: (txt || e.text)}
+      end      
+      
+      h2.merge(macro: macro)
+
+    end
+
+    puts 'h:' + h.inspect if @debug
     
-    h[:url_to_open] = h[:url] if h[:url]
+    h[:url_to_open] = h[:url] if h[:url] and h[:url].length > 1
 
     options = {
       variable_to_save_response: {:m_stringValue=>"", :m_name=>"", 
@@ -165,20 +180,35 @@ class OpenWebPageAction < ApplicationAction
       block_next_action: false
     }
     
-    if h[:macro].remote_url.nil? then
+    if h[:macro].remote_url.nil? and (h[:url_to_open].nil? or 
+                                      h[:url_to_open].empty?) 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
+      
+    elsif h2 and h[:macro].remote_url and h[:identifier]
+      
+      url = "%s/%s" % [h[:macro].remote_url.sub(/\/$/,''), h[:identifier]]
+      h2.delete :identifier
+      url += '?' + \
+            URI.escape(h2.map {|key,value| "%s=%s" % [key, value]}.join('&'))      
+      h[:url_to_open] = url
+      
+    end        
     
     super(options.merge h)
 
   end
   
+  def invoke()
+    super(url: @h[:url_to_open])
+  end
+  
   def to_s(colour: false, indent: 0)
     @s = "HTTP GET\nurl: " + @h[:url_to_open]
     super()
@@ -355,9 +385,10 @@ class IfConditionAction < Action
       h2 = options.merge(filter(options,h).merge(macro: macro))
       super(h2)      
       
-    elsif obj.is_a? Rexle::Element
+    elsif obj.is_a? Array
+      e, macro = obj
       super() 
-      raw_txt = obj.text('item/description') || obj.text.to_s
+      raw_txt = e.text('item/description') || e.text.to_s
       puts 'raw_txt: ' + raw_txt.inspect if $debug
       
       clause = raw_txt[/^if (.*)/i,1]
@@ -391,7 +422,7 @@ class IfConditionAction < Action
   def to_s(colour: false, indent: 0)
     
     h = @h.clone    
-    h.delete :macro
+    #h.delete :macro
     @s = 'If '
     operator = @h[:is_or_condition] ? 'OR' : 'AND'
     constraints = @constraints.map \
@@ -471,6 +502,8 @@ class EndIfAction < Action
       obj
     elsif obj.is_a? Rexle::Element    
       {}
+    else
+      {}
     end
     
   
@@ -478,7 +511,7 @@ class EndIfAction < Action
       constraint_list: []
     }
 
-    super(options.merge h)
+    super()
 
   end  
   
@@ -723,9 +756,10 @@ class SayTimeAction < DateTimeAction
   end
   
   def invoke()
-    time = ($env and $env[:time]) ? $env[:time] : Time.now
+    #time = ($env and $env[:time]) ? $env[:time] : Time.now
+    time = Time.now
     tformat = @h['12_hour'] ? "%-I:%M%P" : "%H:%M"
-    super(time.strftime(tformat))
+    super(txt: time.strftime(tformat))
   end
   
   def to_pc()
@@ -814,10 +848,18 @@ end
 #
 class SpeakTextAction < DeviceAction
 
-  def initialize(h={})
-
+  def initialize(obj=nil)
+    
+    h = if obj.is_a? Hash then
+      obj
+    elsif obj.is_a? Array
+      e, macro = obj
+      txt = e.text('item/description')
+      {text: (txt || e.text)}
+    end     
+  
     options = {
-      text_to_say: '',
+      text_to_say: h[:text] || '',
       queue: false,
       read_numbers_individually: false,
       specify_audio_stream: false,
@@ -831,8 +873,13 @@ class SpeakTextAction < DeviceAction
 
   end
   
+  def invoke()
+    super(text: @h[:text_to_say])
+  end  
+  
   def to_s(colour: false, indent: 0)
-    "Speak Text (%s)" % @h[:text_to_say]
+    @s = "Speak Text (%s)" % @h[:text_to_say]
+    super()
   end
 
 end
@@ -984,6 +1031,9 @@ class CameraFlashLightAction < DeviceSettingsAction
     super(options.merge h)
 
   end
+  def invoke()
+    super(state: @h[:state])
+  end
 
   def to_pc()
     ['torch :on', 'torch :off', 'torch :toggle'][@h[:state]]

data/lib/ruby-macrodroid/triggers.rb

@@ -1393,8 +1393,21 @@ end
 #
 class ProximityTrigger < SensorsTrigger
 
-  def initialize(h={})
+  def initialize(obj=nil)
 
+    h = if obj.is_a? Hash then
+      obj
+    elsif obj.is_a? Array
+      e, macro = obj
+      txt = e.text('item/description')
+      {option: (txt || e.text), macro: macro}
+    end 
+    
+    options = {
+      near: true,
+      selected_option: 0
+    }
+    
     if h[:distance] then
       
       case h[:distance].to_sym
@@ -1403,15 +1416,14 @@ class ProximityTrigger < SensorsTrigger
       end
     end
     
-    options = {
-      near: true,
-      selected_option: 0
-    }
-
     super(options.merge h)
 
   end
   
+  def match?(detail={}, model=nil)
+    @h[:selected_option] == detail[:option].to_i
+  end
+  
   def to_s(colour: false)
     
     distance = if @h[:near] then

metadata

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