ruby-macrodroid 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfb49da8914ecdd5cc21ca0223801fa0d432890a3df4c352ab7c3914c1bd63fe
-  data.tar.gz: 9f402e6d1c9dbd17f5cb7d3741bcc7c487461a5438adf3cba81a71df9feb50f9
+  metadata.gz: f4d111f7d953dba3eeb6940e3e1f31af4410765fbd4c739de9b53c0d84bac137
+  data.tar.gz: 2d8a574b96647abb40194e3885f38153e1de3b50d3f8f86541698b766981f9d8
 SHA512:
-  metadata.gz: 0753ef46f3cdbc1e5a8fb6539747e662a2e537089aa83e32ecf47c89334b1acb71ced47f77230e1fcae00314d8dd70e8e4d37380c27f25ebb0ccafe837121daa
-  data.tar.gz: e78f3fc06bcdbd1685de98d5473b2564d904a722053527505002f5a5bbfa43e51e99832d2a9a29eb5a12d3e9bab94d91429f78628625e74acbae6876b909f43a
+  metadata.gz: 5184ff198c42f2e75dbfd232a9b5e7ef18bd37e0484aa697983f9cf950e0811659cbdc6936d1b5f622f719de1b8bee9ba7c10c5ec22e06be5aac34530ed5d4a2
+  data.tar.gz: 8f3020868a714825f8e06a04b461761039048e86ecbc22cd70413cbf860bfebb4b61d9c10315530037d1248dcfc3dc8d2d0ccb7be62fe25a625a5045c3a2bade

data/lib/ruby-macrodroid.rb

@@ -2,8 +2,114 @@
 
 # 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 'rowx'
+require 'uuid'
 require 'glw'
 require 'geozone'
 require 'rxfhelper'
@@ -68,6 +174,11 @@ 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     
+    
   end
 
   alias find_trigger run_route
@@ -153,6 +264,12 @@ class ActionsNlp
       [OpenWebPageAction, url_to_open: url]
       
     end
+    
+    # e.g. webhook entered_kitchen
+    #
+    get /webhook|HTTP GET/i do
+      [OpenWebPageAction, {}]
+    end       
 
 
   end
@@ -337,19 +454,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 +503,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|
@@ -403,11 +527,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      
@@ -570,15 +704,21 @@ 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(/^m:/,'macro:').gsub(/^t:/,'trigger:')\
+              .gsub(/^a:/,'action:').gsub(/^c:/,'constraint:')
+          xml = RowX.new(s2.gsub(/^#.*/,'')).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
         
 
@@ -690,9 +830,28 @@ 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
+    
+    @macros = doc.root.xpath('item').map do |node|
+          
+      Macro.new.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 +859,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.import_xml(node)
       
     end
   end
@@ -732,36 +887,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
 
@@ -2117,6 +2243,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 +2254,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macrodroid
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 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-05 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,25 @@ 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.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: geozone
   requirement: !ruby/object:Gem::Requirement