ruby-macrodroid 0.6.0 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfb49da8914ecdd5cc21ca0223801fa0d432890a3df4c352ab7c3914c1bd63fe
-  data.tar.gz: 9f402e6d1c9dbd17f5cb7d3741bcc7c487461a5438adf3cba81a71df9feb50f9
+  metadata.gz: e28ec7303f297d90ed5edbbec3806c577d1fe3036851620c230b4620d4a8a98f
+  data.tar.gz: fd27b2da1d660144aae8bc85b3f392b10b385934d1a38f65817d53ff774e382c
 SHA512:
-  metadata.gz: 0753ef46f3cdbc1e5a8fb6539747e662a2e537089aa83e32ecf47c89334b1acb71ced47f77230e1fcae00314d8dd70e8e4d37380c27f25ebb0ccafe837121daa
-  data.tar.gz: e78f3fc06bcdbd1685de98d5473b2564d904a722053527505002f5a5bbfa43e51e99832d2a9a29eb5a12d3e9bab94d91429f78628625e74acbae6876b909f43a
+  metadata.gz: f727092bb6f96799f1cd288e5ebf822b189d70ef2b5bcdb5bab452b93b412b737229fa6fed2d982f1233aa5f21d35fb1791e834d8ea023474c1eac6a3d330fd5
+  data.tar.gz: 706f9423e28c7fda560bf059f4686834e4404dca9576d5682f3e43c82440a79c84e5ddeb65619a5410098993da1ee9574cc681912a94285147b40aba1468f8a8

data/lib/ruby-macrodroid.rb

@@ -2,11 +2,121 @@
 
 # file: ruby-macrodroid.rb
 
-require 'uuid'
+# This file contains the following classes:
+#
+#  ## Nlp classes
+#  
+#  TriggersNlp ActionsNlp ConstraintsNlp
+#  
+#  
+#  ## Macro class
+#  
+#  Macro
+#  
+#  
+#  ## Error class
+#  
+#  MacroDroidError
+#  
+#  
+#  ## Droid class
+#  
+#  MacroDroid
+#  
+#  
+#  ## Map class
+#  
+#  GeofenceMap
+#  
+#  
+#  ## Object class
+#  
+#  MacroObject
+#  
+#  
+#  ## Trigger classes
+#  
+#  Trigger WebHookTrigger WifiConnectionTrigger
+#  ApplicationInstalledRemovedTrigger ApplicationLaunchedTrigger
+#  BatteryLevelTrigger BatteryTemperatureTrigger PowerButtonToggleTrigger
+#  ExternalPowerTrigger CallActiveTrigger IncomingCallTrigger
+#  OutgoingCallTrigger CallEndedTrigger CallMissedTrigger IncomingSMSTrigger
+#  WebHookTrigger WifiConnectionTrigger BluetoothTrigger HeadphonesTrigger
+#  SignalOnOffTrigger UsbDeviceConnectionTrigger WifiSSIDTrigger
+#  CalendarTrigger TimerTrigger StopwatchTrigger DayTrigger
+#  RegularIntervalTrigger DeviceEventsTrigger AirplaneModeTrigger
+#  AutoSyncChangeTrigger DayDreamTrigger DockTrigger FailedLoginTrigger
+#  GPSEnabledTrigger MusicPlayingTrigger DeviceUnlockedTrigger
+#  AutoRotateChangeTrigger ClipboardChangeTrigger BootTrigger
+#  IntentReceivedTrigger NotificationTrigger ScreenOnOffTrigger
+#  SilentModeTrigger WeatherTrigger GeofenceTrigger SunriseSunsetTrigger
+#  SensorsTrigger ActivityRecognitionTrigger ProximityTrigger
+#  ShakeDeviceTrigger FlipDeviceTrigger OrientationTrigger
+#  FloatingButtonTrigger ShortcutTrigger VolumeButtonTrigger
+#  MediaButtonPressedTrigger SwipeTrigger
+#  
+#  
+#  ## Action classes
+#  
+#  Action LocationAction ShareLocationAction ApplicationAction
+#  LaunchActivityAction KillBackgroundAppAction OpenWebPageAction CameraAction
+#  UploadPhotoAction TakePictureAction ConnectivityAction SetWifiAction
+#  SetBluetoothAction SetBluetoothAction SendIntentAction DateTimeAction
+#  SetAlarmClockAction StopWatchAction SayTimeAction DeviceAction
+#  AndroidShortcutsAction ClipboardAction PressBackAction SpeakTextAction
+#  UIInteractionAction VoiceSearchAction DeviceSettingsAction
+#  ExpandCollapseStatusBarAction LaunchHomeScreenAction CameraFlashLightAction
+#  VibrateAction SetAutoRotateAction DayDreamAction SetKeyboardAction
+#  SetKeyguardAction CarModeAction ChangeKeyboardAction SetWallpaperAction
+#  FileAction OpenFileAction LocationAction ForceLocationUpdateAction
+#  ShareLocationAction SetLocationUpdateRateAction LoggingAction
+#  AddCalendarEntryAction LogAction ClearLogAction MediaAction
+#  RecordMicrophoneAction PlaySoundAction MessagingAction SendEmailAction
+#  SendSMSAction UDPCommandAction NotificationsAction ClearNotificationsAction
+#  MessageDialogAction AllowLEDNotificationLightAction
+#  SetNotificationSoundAction SetNotificationSoundAction
+#  SetNotificationSoundAction NotificationAction ToastAction PhoneAction
+#  AnswerCallAction ClearCallLogAction OpenCallLogAction RejectCallAction
+#  MakeCallAction SetRingtoneAction ScreenAction SetBrightnessAction
+#  ForceScreenRotationAction ScreenOnAction DimScreenAction KeepAwakeAction
+#  SetScreenTimeoutAction VolumeAction SilentModeVibrateOffAction
+#  SetVibrateAction VolumeIncrementDecrementAction SpeakerPhoneAction
+#  SetVolumeAction
+#  
+#  
+#  ## Constraint classes
+#  
+#  Constraint TimeOfDayConstraint BatteryLevelConstraint
+#  BatterySaverStateConstraint BatteryTemperatureConstraint
+#  ExternalPowerConstraint BluetoothConstraint GPSEnabledConstraint
+#  LocationModeConstraint SignalOnOffConstraint WifiConstraint
+#  CellTowerConstraint IsRoamingConstraint DataOnOffConstraint
+#  WifiHotSpotConstraint CalendarConstraint DayOfWeekConstraint
+#  TimeOfDayConstraint DayOfMonthConstraint MonthOfYearConstraint
+#  SunsetSunriseConstraint AirplaneModeConstraint AutoRotateConstraint
+#  DeviceLockedConstraint RoamingOnOffConstraint TimeSinceBootConstraint
+#  AutoSyncConstraint NFCStateConstraint IsRootedConstraint VpnConstraint
+#  MacroEnabledConstraint ModeConstraint TriggerThatInvokedConstraint
+#  LastRunTimeConstraint HeadphonesConnectionConstraint MusicActiveConstraint
+#  NotificationPresentConstraint PriorityModeConstraint
+#  NotificationVolumeConstraint InCallConstraint PhoneRingingConstraint
+#  BrightnessConstraint VolumeConstraint SpeakerPhoneConstraint
+#  DarkThemeConstraint ScreenOnOffConstraint VolumeLevelConstraint
+#  FaceUpDownConstraint LightLevelConstraint DeviceOrientationConstraint
+#  ProximitySensorConstraint
+
+
+
 require 'yaml'
-require 'glw'
-require 'geozone'
-require 'rxfhelper'
+require 'rowx'
+require 'uuid'
+#require 'glw'
+#require 'geozone'
+require 'subunit'
+#require 'rxfhelper'
+require 'requestor'
+eval Requestor.read('http://a0.jamesrobertson.eu/rorb/r/ruby'){|x| x.require 'rxfhelper' }
+
 require 'chronic_cron'
 
 
@@ -68,6 +178,20 @@ class TriggersNlp
       [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    
+
+    
+    
   end
 
   alias find_trigger run_route
@@ -153,6 +277,38 @@ class ActionsNlp
       [OpenWebPageAction, url_to_open: url]
       
     end
+    
+    # e.g. webhook entered_kitchen
+    #
+    get /webhook|HTTP GET/i do
+      [OpenWebPageAction, {}]
+    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    
 
 
   end
@@ -244,9 +400,9 @@ class Macro
   attr_reader :local_variables, :triggers, :actions, :constraints, :guid
   attr_accessor :title, :description
 
-  def initialize(name=nil, geofence: geofence, debug: false)
+  def initialize(name=nil, geofences: geofences, debug: false)
 
-    @title, @geofence, @debug = name, geofence, debug
+    @title, @geofences, @debug = name, geofences, debug
     
     puts 'inside Macro#initialize' if @debug    
           
@@ -337,19 +493,20 @@ class Macro
   end
   
   def import_xml(node)
-    
+
     if @debug then
       puts 'inside Macro#import_xml'
       puts 'node: ' + node.xml.inspect
     end
     
-    @title = node.attributes[:name]
-    @description = node.attributes[:description]
-
     if node.element('triggers') then
-      
+            
       # level 2
       
+      @title = node.attributes[:name]
+      @description = node.attributes[:description]
+      
+      
       # get all the triggers
       @triggers = node.xpath('triggers/*').map do |e|
         
@@ -385,6 +542,12 @@ class Macro
       
       # Level 1
       
+      puts 'import_xml: inside level 1' if @debug
+      
+      @title = node.text('macro') || node.attributes[:name]
+      
+      #@description = node.attributes[:description]      
+      
       tp = TriggersNlp.new      
       
       @triggers = node.xpath('trigger').map do |e|
@@ -394,7 +557,11 @@ class Macro
         puts 'found trigger ' + r.inspect if @debug
         
         if r then
-          r[0].new(r[1])
+          if r[0] == GeofenceTrigger then
+            GeofenceTrigger.new(r[1], geofences: @geofences)
+          else
+            r[0].new(r[1])
+          end
         end
         
       end
@@ -403,11 +570,21 @@ class Macro
       
       @actions = node.xpath('action').map do |e|
         
+        puts 'action e: ' + e.xml.inspect if @debug
         r = ap.find_action e.text
         puts 'found action ' + r.inspect if @debug
         
         if r then
-          r[0].new(r[1])
+          
+          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[0].new(r[1].merge(h))
         end
         
       end      
@@ -485,18 +662,56 @@ EOF
     
   def to_s()
     
+    indent = 0
+    actions = @actions.map do |x|
+
+      s = x.to_s
+      
+      r = if indent <= 0 then
+      
+        "a: %s" % s
+        
+      elsif indent > 0 
+      
+        if s =~ /^Else/ then
+          ('  ' * (indent-1)) + "%s" % s
+        elsif s =~ /^End/
+          indent -= 1
+          ('  ' * indent) + "%s" % s
+        else
+          ('  ' * indent) + "%s" % s
+        end        
+        
+      end
+      
+      if s =~ /^If/i then
+        if indent < 1 then
+          r = "a:\n  %s" % s
+          indent += 1
+        else
+          r = ('  ' * indent) + "%s" % s
+        end
+
+        indent += 1
+      end
+      
+      r
+      
+    end.join("\n")
+    
     a = [
       'm: ' + @title,
       @triggers.map {|x| "t: %s" % x}.join("\n"),
-      @actions.map {|x| "a: %s" % x}.join("\n"),
-      @constraints.map {|x| "a: %s" % x}.join("\n")
+      actions
     ]
     
+    a << @constraints.map {|x| "c: %s" % x}.join("\n") if @constraints.any?
+    
     if @description and @description.length >= 1 then
-      a.insert(1, 'd: ' + @description)
+      a.insert(1, 'd: ' + @description.gsub(/\n/,"\n  "))
     end
     
-    a.join("\n")
+    a.join("\n") + "\n"
     
   end
   
@@ -504,11 +719,11 @@ EOF
     
     a = [
       'm: ' + @title,
-      't: ' + @triggers.map(&:to_s).join(", "),
-      'a: ' + @actions.map(&:to_s).join(", "),
+      't: ' + @triggers.map(&:to_summary).join(", "),
+      'a: ' + @actions.map(&:to_summary).join(", "),
     ]
     
-    a <<  'c: ' + @constraints.map(&:to_s).join(", ") if @constraints.any?
+    a <<  'c: ' + @constraints.map(&:to_summary).join(", ") if @constraints.any?
     
     a.join("\n") + "\n"
     
@@ -528,7 +743,7 @@ EOF
     
     if klass == GeofenceTrigger then
       puts 'GeofenceTrigger found'.highlight if $debug
-      klass.new(@geofence, h)
+      GeofenceTrigger.new(h, geofences: @geofences)
     else
       klass.new h
     end
@@ -545,12 +760,14 @@ class MacroDroid
   using ColouredText
   using Params  
 
-  attr_reader :macros, :geofence
+  attr_reader :macros, :geofences, :yaml
 
   def initialize(obj=nil, debug: false)
 
     @debug = debug    
     
+    @geofences = {}
+    
     if obj then
       
       raw_s, _ = RXFHelper.read(obj)    
@@ -570,18 +787,37 @@ class MacroDroid
 
         puts 's: ' + s.inspect if @debug
         
-        xml = if s =~ /m:\s/ then
-          puts 'before text_to_xml' if @debug
-          text_to_xml(s)
+        if s =~ /m(?:acro)?:\s/ then
+          
+          puts 'before RowX.new' if @debug
+
+          s2 = s.gsub(/^g:/,'geofence:').gsub(/^m:/,'macro:')\
+              .gsub(/^t:/,'trigger:').gsub(/^a:/,'action:')\
+              .gsub(/^c:/,'constraint:').gsub(/^#.*/,'')
+          
+          raw_macros, raw_geofences = s2.split(/(?=^macro:)/,2).reverse
+          
+          if raw_geofences then
+            
+            geoxml = RowX.new(raw_geofences).to_xml
+            
+            geodoc = Rexle.new(geoxml)  
+            geofences = geodoc.root.xpath('item/geofence')        
+            @geofences = fetch_geofences(geofences) if geofences.any?          
+            
+          end
+          
+          xml = RowX.new(raw_macros).to_xml
+          import_rowxml(xml)
+          
         elsif s =~ /^# / 
-          pc_to_xml(s)
+          xml = pc_to_xml(s)
+          import_xml(xml)
         else
           raise MacroDroidError, 'invalid input'
         end
-        import_xml(xml)
-        @h = build_h
         
-
+        @h = build_h
         
       end
       
@@ -637,7 +873,13 @@ class MacroDroid
 
   def to_h()
 
-    @h.merge(macro_list:  @macros.map(&:to_h)).to_camel_case
+    h = {
+      geofence_data: {
+        geofence_map: @geofences.map {|key, value| [key, value.to_h] }.to_h
+      },
+      macro_list:  @macros.map(&:to_h)
+    }
+    @h.merge(h).to_camel_case
 
   end
   
@@ -648,7 +890,16 @@ class MacroDroid
   end
 
   def to_s()
-    @macros.map(&:to_s).join("\n")
+    
+    lines = []
+    
+    if @geofences.any? then
+      lines << @geofences.map {|_, value| 'g: ' + value.to_s}.join("\n\n") + "\n"
+    end
+    
+    lines << @macros.map(&:to_s).join("\n")
+    lines.join("\n")
+    
   end
   
   def to_summary()
@@ -657,10 +908,37 @@ class MacroDroid
   
   private
   
+  def fetch_geofences(nodes)
+    
+    nodes.map do |e|
+
+      name = e.text.to_s.strip
+      item = e.element('item')
+      coordinates = item.text('coordinates')
+      latitude, longitude = coordinates.split(/, */,2)
+      radius = item.text('radius') 
+      
+      id = UUID.new.generate
+
+      h = {
+        name: name, 
+        longitude: longitude, 
+        latitude: latitude, 
+        radius: radius, 
+        id: id
+      }
+      
+      [id.to_sym, GeofenceMap.new(h)]
+      
+    end.to_h
+
+  end
+  
   def import_json(s)
 
     h = JSON.parse(s, symbolize_names: true)
     puts 'json_to_yaml: ' + h.to_yaml if @debug
+    @yaml = h.to_yaml # helpful for debugging and testing
     
     @h = h.to_snake_case
     puts ('@h: ' + @h.inspect).debug if @debug
@@ -669,7 +947,7 @@ class MacroDroid
     # fetch the geofence data
     if @h[:geofence_data] then
       
-      @geofence = @h[:geofence_data][:geofence_map].map do |id, properties|
+      @geofences = @h[:geofence_data][:geofence_map].map do |id, properties|
         [id, GeofenceMap.new(properties)]
       end.to_h
       
@@ -678,9 +956,9 @@ class MacroDroid
     @macros = @h[:macro_list].map do |macro|
 
       puts ('macro: ' + macro.inspect).debug if @debug
-      puts '@geofence: ' + @geofence.inspect if @debug
+#       puts '@geofences: ' + @geofences.inspect if @debug
       
-      m = Macro.new(geofence: @geofence, debug: @debug )
+      m = Macro.new(geofences: @geofences.map(&:last), debug: @debug )
       m.import_h(macro)
       m
 
@@ -690,9 +968,30 @@ class MacroDroid
     
   end
   
+  def import_rowxml(raws)
+   
+    s = RXFHelper.read(raws).first
+    puts 's: ' + s.inspect if @debug
+    doc = Rexle.new(s)
+    puts 'after doc' if @debug    
+    puts 'import_rowxml: @geofences: ' + @geofences.inspect if @debug
+    geofences = @geofences
+    
+    @macros = doc.root.xpath('item').map do |node|
+      puts ('geofences: ' + geofences.inspect).highlight if @debug
+      Macro.new(geofences: geofences.map(&:last), debug: @debug).import_xml(node)
+      
+    end
+
+  end  
+  
   def import_xml(raws)
     
-    puts 'raws: ' + raws.inspect if @debug
+    if @debug then
+      puts 'inside import_xml' 
+      
+      puts 'raws: ' + raws.inspect 
+    end
     s = RXFHelper.read(raws).first
     puts 's: ' + s.inspect if @debug
     doc = Rexle.new(s)
@@ -700,14 +999,10 @@ class MacroDroid
     if @debug then
       puts 'doc: ' + doc.root.xml
     end
-    
-    debug = @debug
-    
+       
     @macros = doc.root.xpath('macro').map do |node|
           
-      macro = Macro.new @title, debug: debug
-      macro.import_xml(node)
-      macro
+      Macro.new(geofences: @geofences.map(&:last), debug: @debug).import_xml(node)
       
     end
   end
@@ -732,36 +1027,7 @@ class MacroDroid
     doc = Rexle.new([:macros, {}, '', *macros])
     doc.root.xml pretty: true    
     
-  end
-  
-  def text_to_xml(s)
-    
-    a = s.split(/.*(?=^m:)/)
-    puts 'a : ' + a.inspect if @debug
-    a.map!(&:chomp)
-
-    macros = a.map do |x|
-
-      lines = x.lines
-      puts 'lines: ' + lines.inspect if @debug
-      
-      name = lines.shift[/^m: +(.*)/,1]
-      h = {t: [], a: [], c: []}
-
-      lines.each {|line| h[line[0].to_sym] << line[/^\w: +(.*)/,1] }
-      triggers = h[:t].map {|text| [:trigger, {}, text]}
-      actions = h[:a].map {|text| [:action, {}, text]}
-      constraints = h[:c].map {|text| [:constraint, {}, text]}
-
-      [:macro, {name: name},'', *triggers, *actions, *constraints]
-
-    end
-
-    doc = Rexle.new([:macros, {}, '', *macros])
-    doc.root.xml pretty: true    
-    
-  end
-  
+  end  
 
 end
 
@@ -769,8 +1035,30 @@ class GeofenceMap
   
   attr_accessor :name, :longitude, :latitude, :radius, :id
   
-  def initialize(h)
-    @id, @latitude, @longitude, @name, @radius = h.values
+  def initialize(id: '', longitude: '', latitude: '', name: '', radius: '')
+    
+    @id, @latitude, @longitude, @name, @radius = id, latitude, \
+        longitude, name, radius    
+    
+  end
+  
+  def to_h()
+    
+    {
+      id: @id, 
+      longitude: @longitude, 
+      latitude: @latitude, 
+      name: @name, 
+      radius: @radius
+    }
+      
+  end
+  
+  def to_s()
+    
+    coordinates = "%s, %s" % [@longitude, @latitude]
+    "%s\n  coordinates: %s\n  radius: %s" % [@name, coordinates, @radius]
+    
   end
   
 end
@@ -817,6 +1105,8 @@ class MacroObject
   def to_s()
     "#<%s %s>" % [self.class, @h.inspect]
   end
+  
+  alias to_summary to_s
 
   protected
   
@@ -831,13 +1121,32 @@ class MacroObject
     UUID.new.generate
   end
   
+  def object(h={})
+
+    puts ('inside object h:'  + h.inspect).debug if @debug
+    klass = Object.const_get h[:class_type]
+    puts klass.inspect.highlight if $debug
+    
+    klass.new h
+    
+  end    
+  
 end
 
 class Trigger < MacroObject
-
+  using Params
+  
+  attr_reader :constraints
+  
   def initialize(h={})    
     super({fakeIcon: 0}.merge(h))
     @list << 'fakeIcon'
+        
+    # fetch the constraints                               
+    @constraints = @h[:constraint_list].map do |constraint|
+      object(constraint.to_snake_case)
+    end       
+    
   end
   
   def match?(detail={}, model=nil)
@@ -950,6 +1259,11 @@ class BatteryLevelTrigger < Trigger
     super(options.merge h)
 
   end
+  
+  def to_s()
+    operator = @h[:decreases_to] ? '<=' : '>='    
+    "Battery %s %s%%" % [operator, @h[:battery_level]]
+  end
 
 end
 
@@ -1597,6 +1911,10 @@ class DeviceUnlockedTrigger < DeviceEventsTrigger
     super(options.merge h)
 
   end
+  
+  def to_s()
+    'Screen Unlocked'
+  end
 
 end
 
@@ -1755,12 +2073,12 @@ end
 #
 class GeofenceTrigger < Trigger
 
-  def initialize(geofence, h={})
+  def initialize( h={}, geofences: {})
 
     if h[:name] then
-      
-      found = geofence.find {|x| x.name == h[:name]}
-      h[:geofence_id] = found.id
+      puts ('geofences2: ' + geofences.inspect)
+      found = geofences.find {|x| x.name.downcase == h[:name].downcase}
+      h[:geofence_id] = found.id if found
       
     end
     
@@ -1773,15 +2091,25 @@ class GeofenceTrigger < Trigger
     }
 
     super(options.merge filter(options, h))
-    @geofence = geofence
+    @geofences = geofences
 
   end
   
   def to_s()
     
-    puts ' @geofence: ' + @geofence.inspect if $debug   
+    if $debug then
+      puts ' @geofences: ' + @geofences.inspect
+      puts '@h: ' + @h.inspect
+      puts '@h[:geofence_id]: ' + @h[:geofence_id].inspect
+    end
+    
     direction = @h[:enter_area] ? 'Entry' : 'Exit'
-    "Geofence %s (%s)" % [direction, @geofence[@h[:geofence_id].to_sym].name]
+    
+    found = @geofences.find {|x| x.id == @h[:geofence_id]}
+    puts 'found: ' + found.inspect    if @debug 
+    label = found ? found.name : 'error: name not found'
+
+    "Geofence %s (%s)" % [direction, label]
     
   end
 
@@ -1826,8 +2154,28 @@ class ActivityRecognitionTrigger < SensorsTrigger
     }
 
     super(options.merge h)
+    
+    @activity = ['In Vehicle', 'On Bicycle', 'Running', 'Walking', 'Still']    
 
   end
+  
+  def to_s()
+    activity = @activity[@h[:selected_index]]
+    'Activity - ' + activity
+  end
+  
+  def to_summary
+    
+    activity = @activity[@h[:selected_index]]
+    s = if activity.length > 10 then
+      activity[0..7] + '..'
+    else
+      activity
+    end
+    
+    'Activity - ' + s
+    
+  end
 
 end
 
@@ -1837,14 +2185,33 @@ class ProximityTrigger < SensorsTrigger
 
   def initialize(h={})
 
+    if h[:distance] then
+      
+      case h[:distance].to_sym
+      when :near
+        options[:near] = true
+      end
+    end
+    
     options = {
       near: true,
       selected_option: 0
     }
 
-    super(options.merge h)
+    super(options.merge filter(options,h))
 
   end
+  
+  def to_s()
+    
+    distance = if @h[:near] then
+      'Near'
+    else
+      'Far'
+    end
+    
+    "Proximity Sensor (%s)" % distance
+  end
 
 end
 
@@ -2017,9 +2384,17 @@ end
 
 
 class Action < MacroObject
+  using Params
+  
+  attr_reader :constraints  
 
   def initialize(h={})    
     super(h)
+    
+    # fetch the constraints                               
+    @constraints = @h[:constraint_list].map do |constraint|
+      object(constraint.to_snake_case)
+    end       
   end
   
   def invoke(s='')    
@@ -2117,6 +2492,8 @@ end
 class OpenWebPageAction < ApplicationAction
 
   def initialize(h={})
+    
+    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},
@@ -2126,12 +2503,12 @@ class OpenWebPageAction < ApplicationAction
       block_next_action: false
     }
 
-    super(options.merge h)
+    super(options.merge filter(options,h))
 
   end
   
   def to_s()
-    'HTTP GET'
+    "HTTP GET\n  url: " + @h[:url_to_open]
   end
 
 end
@@ -2192,6 +2569,64 @@ class TakePictureAction < CameraAction
 
 end
 
+class IfConditionAction < Action
+  
+  def initialize(h={})
+
+    options = {
+      a: true,
+      constraint_list: ''
+    }
+
+    super(options.merge h)
+
+  end
+
+  def to_s()
+    
+    operator = @h[:is_or_condition] ? 'OR' : 'AND'
+    r = 'If ' + @constraints.map(&:to_s).join(" %s " % operator)
+    puts 'if ... @h ' + @h.inspect
+    r
+    
+  end
+end
+
+class ElseAction < Action
+  
+  def initialize(h={})
+
+    options = {
+      constraint_list: ''
+    }
+
+    super(options.merge h)
+
+  end  
+  
+  def to_s()
+    'Else'
+  end
+  
+end
+
+class EndIfAction < Action
+  
+  def initialize(h={})
+
+    options = {
+      constraint_list: ''
+    }
+
+    super(options.merge h)
+
+  end  
+  
+  def to_s()
+    'End If'
+  end
+  
+end
 
 class ConnectivityAction < Action
   
@@ -2446,6 +2881,10 @@ class SpeakTextAction < DeviceAction
     super(options.merge h)
 
   end
+  
+  def to_s()
+    "Speak Text (%s)" % @h[:text_to_say]
+  end
 
 end
 
@@ -2560,6 +2999,17 @@ class VibrateAction < DeviceSettingsAction
     super(options.merge h)
 
   end
+  
+  def to_s()
+    
+    pattern = [
+      'Blip', 'Short Buzz', 'Long Buzz', 'Rapid', 'Slow', 'Increasing', 
+      'Constant', 'Decreasing', 'Final Fantasy', 'Game Over', 'Star Wars',
+      'Mini Blip', 'Micro Blip'
+    ]
+    
+    'Vibrate ' + "(%s)" % pattern[@h[:vibrate_pattern].to_i]
+  end
 
 end
 
@@ -3347,6 +3797,10 @@ end
 
 # Category: Screen
 #
+# options:
+#   keep awake, screen on => enabled: true
+#   disable keep awake    => enabled: false
+#
 class KeepAwakeAction < ScreenAction
 
   def initialize(h={})
@@ -3361,7 +3815,30 @@ class KeepAwakeAction < ScreenAction
     super(options.merge h)
 
   end
-
+  
+  def to_s()
+    
+    screen = @h[:screen_option] == 0 ? 'Screen On' : 'Screen Off'
+    
+    if @h[:enabled] then
+    
+      whenx = if @h[:seconds_to_stay_awake_for] == 0 then
+    
+      'Until Disabled'
+      
+      else
+        scnds = @h[:seconds_to_stay_awake_for]
+        Subunit.new(units={minutes:60, hours:60}, seconds: scnds).strfunit("%x")
+      end
+      
+      'Keep Device Awake ' + screen + ' ' + whenx
+      
+    else
+      'Disable Keep Awake'
+    end
+    
+    
+  end
 end
 
 # Category: Screen
@@ -3542,6 +4019,21 @@ class BatteryLevelConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    
+    operator = if @h[:greater_than] then
+      '>'
+    elsif @h[:equals]
+      '='
+    else
+      '<'
+    end
+    
+    level = @h[:battery_level]
+    
+    "Battery %s %s%%" % [operator, level]
+  end
 
 end
 
@@ -3593,6 +4085,11 @@ class ExternalPowerConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    connection = @h[:external_power] ? 'Connected' : 'Disconnected'
+    'Power ' + connection
+  end
 
 end
 
@@ -3611,6 +4108,12 @@ class BluetoothConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    device = @h[:device_name] #== 'Any Device' ? 'Any' : @h[:device_name]
+    "Device Connected (%s)" % device
+  end
+  
 
 end
 
@@ -3935,6 +4438,10 @@ class DeviceLockedConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    'Device ' + (@h[:locked] ? 'Locked' : 'Unlocked')
+  end
 
 end
 
@@ -4121,6 +4628,11 @@ class HeadphonesConnectionConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    connection = @h[:connected] ? 'Connected' : 'Disconnected'
+    'Headphones ' + connection
+  end
 
 end
 
@@ -4310,6 +4822,10 @@ class ScreenOnOffConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    'Screen ' + (@h[:screen_on] ? 'On' : 'Off')
+  end
 
 end
 
@@ -4363,6 +4879,14 @@ class LightLevelConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    
+    operator = @h[:light_level] == -1 ? 'Less than' : 'Greater than'    
+    condition = operator + ' ' + @h[:light_level_float].to_s + 'lx'
+    'Light Sensor ' + condition
+    
+  end
 
 end
 
@@ -4395,5 +4919,9 @@ class ProximitySensorConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    'Proximity Sensor: ' + (@h[:near] ? 'Near' : 'Far')
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macrodroid
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.4
 platform: ruby
 authors:
 - James Robertson
@@ -35,8 +35,28 @@ cert_chain:
   NZ2kdBIUDnAM24e0/wXdVxg4HnsZbdymxyzMQ4P5pKYcpI6oisBxI37p/Xy+wAg3
   SBHno3GEuuD8ZWj24IMJpfbp
   -----END CERTIFICATE-----
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2020-09-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: glw
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
@@ -58,25 +78,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.3.9
 - !ruby/object:Gem::Dependency
-  name: glw
+  name: rowx
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
   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.2'
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: subunit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.6.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: geozone
   requirement: !ruby/object:Gem::Requirement