ruby-macrodroid 0.5.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc528ce6042bfe75807bb76fcc73cc255b45b6fe0bf138d4a643a5facd7fdaf1
-  data.tar.gz: 294fed6fbe1ff71b05ea4384f9070e5795ceb1c41979bba419f89a4273164124
+  metadata.gz: a2f43b1d737df8ffc21bb31f9a7df56964963ba3b88a6e51e008c45ca0d4e5f6
+  data.tar.gz: 6e587a62b683867b37f28dfba70728971e19647cfa803a804ea123c1eb0955b3
 SHA512:
-  metadata.gz: 76925a5b3cba1509ec62635c04d5d796ded37f2e8cee958748a59c88938876129853adc91df55281e594b6c9043ba5f8fdaba2307a9ff4727d70cf611f4a2d8f
-  data.tar.gz: 55f01e2512265e988d14cc63f576d18a5cc6fdee2a3d109ed47b0ef54bf3d4947ca4064696e405619bb5c2b5e545866fa771d040a13964e205bd343c7b111325
+  metadata.gz: b247e2d22eac6c837d9bcacf38697b63ab80a41c2affca2adb7389b39423813c9d1816f9c9dd697a013ad75b5417ca2143ca4e040be819a09a67a939765aae2f
+  data.tar.gz: 1a91db74afbbfbe1622d3e19241c9a99ddd05c0ef975e7ac037102104497d12a191c305a4ceb9ab0f5d7d7d476060398b4648ea927bc3135ab52b5633f562e0f

data/lib/ruby-macrodroid.rb

@@ -2,11 +2,126 @@
 
 # file: ruby-macrodroid.rb
 
+# 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'
 require 'chronic_cron'
 
 
+MODEL =<<EOF
+device
+  connectivity
+    airplane_mode is disabled
+EOF
+
 class TriggersNlp
   include AppRoutes
 
@@ -20,11 +135,50 @@ class TriggersNlp
 
   def triggers(params) 
 
-    get /^at (\d+:\d+(?:[ap]m)?) on (.*)/i do |time, days|
+    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     
+    
   end
 
   alias find_trigger run_route
@@ -44,10 +198,79 @@ class ActionsNlp
 
   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. say current time
+    get /^say current[ _]time/i do
+      [SayTimeAction, {}]
+    end    
+    
+    get /^Torch :?(.*)/i do |onoffstate|
+      state = onoffstate.downcase == 'on' ? 0 : 1
+      [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
+      [OpenWebPageAction, {}]
+    end       
+
 
   end
 
@@ -136,11 +359,11 @@ class Macro
   using Params
 
   attr_reader :local_variables, :triggers, :actions, :constraints, :guid
-  attr_accessor :title
+  attr_accessor :title, :description
 
-  def initialize(name=nil, debug: false)
+  def initialize(name=nil, geofences: geofences, debug: false)
 
-    @title, @debug = name, debug
+    @title, @geofences, @debug = name, geofences, debug
     
     puts 'inside Macro#initialize' if @debug    
           
@@ -178,7 +401,7 @@ class Macro
       m_action_list: @actions.map(&:to_h),
       m_constraint_list: @constraints.map(&:to_h),
       m_description: '',
-      m_name: @title,
+      m_name: title(),
       m_excludeLog: false,
       m_GUID: guid(),
       m_isOrCondition: false,
@@ -194,6 +417,14 @@ class Macro
 
   def import_h(h)
 
+    if @debug then
+      puts 'inside import_h'
+      puts 'h:' + h.inspect
+    end
+    
+    @title = h[:name]
+    @description = h[:description]
+    
     # fetch the local variables
     @local_variables = h['local_variables']
     
@@ -223,18 +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]
-
     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|
         
@@ -270,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|
@@ -279,7 +518,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
@@ -288,11 +531,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      
@@ -316,16 +569,16 @@ class Macro
     
   end
   
-  def match?(triggerx, detail={time: $env[:time]} )
+  def match?(triggerx, detail={time: $env[:time]}, model=nil )
                 
-    if @triggers.any? {|x| x.type == triggerx and x.match?(detail) } then
+    if @triggers.any? {|x| x.type == triggerx and x.match?(detail, model) } then
       
       if @debug then
         puts 'checking constraints ...' 
         puts '@constraints: ' + @constraints.inspect
       end
       
-      if @constraints.all? {|x| x.match?($env.merge(detail)) } then
+      if @constraints.all? {|x| x.match?($env.merge(detail), model) } then
       
         true
         
@@ -339,9 +592,65 @@ class Macro
     
   end
   
+  # invokes the actions
+  #
   def run()
     @actions.map(&:invoke)
-  end  
+  end
+  
+  # prepares the environment in order for triggers to test fire successfully
+  # Used for testing
+  #
+  def set_env()
+    @triggers.each(&:set_env)
+  end
+
+  def to_pc()
+    
+    heading = '# ' + @title
+    heading += '\n# ' + @description if @description
+    condition = @triggers.first.to_pc
+    actions = @actions.map(&:to_pc).join("\n")
+    
+<<EOF
+#{heading}
+
+if #{condition} then
+  #{actions}
+end
+EOF
+  end
+    
+  def to_s()
+    
+    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")
+    ]
+    
+    if @description and @description.length >= 1 then
+      a.insert(1, 'd: ' + @description)
+    end
+    
+    a.join("\n")
+    
+  end
+  
+  def to_summary()
+    
+    a = [
+      'm: ' + @title,
+      't: ' + @triggers.map(&:to_s).join(", "),
+      'a: ' + @actions.map(&:to_s).join(", "),
+    ]
+    
+    a <<  'c: ' + @constraints.map(&:to_s).join(", ") if @constraints.any?
+    
+    a.join("\n") + "\n"
+    
+  end
 
   private
   
@@ -353,34 +662,86 @@ class Macro
 
     puts ('inside object h:'  + h.inspect).debug if @debug
     klass = Object.const_get h[:class_type]
-    klass.new h
+    puts klass.inspect.highlight if $debug
+    
+    if klass == GeofenceTrigger then
+      puts 'GeofenceTrigger found'.highlight if $debug
+      GeofenceTrigger.new(h, geofences: @geofences)
+    else
+      klass.new h
+    end
+    
   end
 
 end
 
 
+class MacroDroidError < Exception
+end
+
 class MacroDroid
   using ColouredText
   using Params  
 
-  attr_reader :macros
+  attr_reader :macros, :geofences
 
   def initialize(obj=nil, debug: false)
 
     @debug = debug    
     
+    @geofences = {}
+    
     if obj then
       
-      s, _ = RXFHelper.read(obj)    
+      raw_s, _ = RXFHelper.read(obj)    
+      
+      s = raw_s.strip
       
       if s[0] == '{' then
+        
         import_json(s) 
+        
       elsif  s[0] == '<'
+        
         import_xml(s)
         @h = build_h
+        
       else
-        import_xml(text_to_xml(s))
+
+        puts 's: ' + s.inspect if @debug
+        
+        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 =~ /^# / 
+          xml = pc_to_xml(s)
+          import_xml(xml)
+        else
+          raise MacroDroidError, 'invalid input'
+        end
+        
         @h = build_h
+        
       end
       
     else
@@ -432,15 +793,85 @@ class MacroDroid
 
   alias to_json export_json
 
-  def import_json(s)
 
-    @h = JSON.parse(s, symbolize_names: true).to_snake_case
-    puts ('@h: ' + @h.pretty_inspect).debug if @debug
+  def to_h()
+
+    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
+  
+  # returns pseudocode
+  #
+  def to_pc()
+    @macros.map(&:to_pc).join("\n\n")
+  end
+
+  def to_s()
+    @macros.map(&:to_s).join("\n")
+  end
+  
+  def to_summary()
+    @macros.map(&:to_summary).join("\n")
+  end  
+  
+  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
+    
+    @h = h.to_snake_case
+    puts ('@h: ' + @h.inspect).debug if @debug
+    
+    
+    # fetch the geofence data
+    if @h[:geofence_data] then
+      
+      @geofences = @h[:geofence_data][:geofence_map].map do |id, properties|
+        [id, GeofenceMap.new(properties)]
+      end.to_h
+      
+    end
+    
     @macros = @h[:macro_list].map do |macro|
 
-      puts ('macro: ' + macro.pretty_inspect).debug if @debug
-      m = Macro.new(debug: @debug)
+      puts ('macro: ' + macro.inspect).debug if @debug
+#       puts '@geofences: ' + @geofences.inspect if @debug
+      
+      m = Macro.new(geofences: @geofences.map(&:last), debug: @debug )
       m.import_h(macro)
       m
 
@@ -450,57 +881,92 @@ 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)
     
+    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)
-    puts 'after doc' if @debug
     
+    if @debug then
+      puts 'doc: ' + doc.root.xml
+    end
+       
     @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
   
-  def text_to_xml(s)
+  def pc_to_xml(s)
     
-    a = s.split(/.*(?=^m:)/); a.shift
-    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: []}
+    macros = s.strip.split(/(?=#)/).map do |raw_macro|
 
-      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]}
+      a = raw_macro.lines
+      name = a.shift[/(?<=# ).*/]
+      description = a.shift[/(?<=# ).*/] if a[0][/^# /]
+      body = a.join.strip
 
-      [:macro, {name: name},'', *triggers, *actions, *constraints]
+      a2 = body.lines
+      # get the trigger
+      trigger = [:trigger, {}, a2[0][/^if (.*) then/,1]]
+      action = [:action, {}, a2[1].strip]
+      [:macro, {name: name, description: description}, trigger, action, []]
 
     end
 
     doc = Rexle.new([:macros, {}, '', *macros])
     doc.root.xml pretty: true    
     
-  end
-
-  def to_h()
+  end  
 
-    @h.merge(macro_list:  @macros.map(&:to_h)).to_camel_case
+end
 
+class GeofenceMap
+  
+  attr_accessor :name, :longitude, :latitude, :radius, :id
+  
+  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
+  
 end
 
 class MacroObject
@@ -511,6 +977,8 @@ class MacroObject
 
   def initialize(h={})
     
+    $env ||= {}
+    
     @h = {constraint_list: [], is_or_condition: false, 
           is_disabled: false}.merge(h)
     @list = []
@@ -539,6 +1007,10 @@ class MacroObject
     h2.merge('m_classType' => self.class.to_s)
 
   end
+  
+  def to_s()
+    "#<%s %s>" % [self.class, @h.inspect]
+  end
 
   protected
   
@@ -562,10 +1034,11 @@ class Trigger < MacroObject
     @list << 'fakeIcon'
   end
   
-  def match?(detail={})    
+  def match?(detail={}, model=nil)
+
+    # only match where the key exists in the trigger object
+    detail.select {|k,v| @h.include? k }.all? {|key,value| @h[key] == value}
 
-    detail.all? {|key,value| @h[key] == value}
-    
   end
 
 end
@@ -1052,27 +1525,50 @@ class TimerTrigger < Trigger
       use_alarm: false
     }
             
-    super(options.merge filter(options,h))
+    super(options.merge filter(options, h))
 
   end
   
-  def match?(detail={time: $env[:time]})
+  def match?(detail={time: $env[:time]}, model=nil)
+    
+   time() == detail[:time]
 
-    a = @h[:days_of_week]
-    a.unshift a.pop
+  end
+  
+  # sets the environmental conditions for this trigger to fire
+  #
+  def set_env()
+    $env[:time] = time()
+  end
+  
+  def to_pc()    
+    "time.is? '%s'" % self.to_s.gsub(',', ' or')
+  end
+  
+  def to_s()
+    
+    dow = @h[:days_of_week]
 
-    dow = a.map.with_index {|x, i| x ? i : nil }.compact.join(',')
+    a = Date::ABBR_DAYNAMES
 
-    s = "%s %s * * %s" % [@h[:minute], @h[:hour], dow]
+    time = Time.parse("%s:%s" % [@h[:hour], @h[:minute]]).strftime("%-H:%M%P")
+    days = (a[1..-1] << a.first).zip(dow).select {|_,b| b}.map(&:first)
     
-    if $debug then
-      puts 's: ' + s.inspect 
-      puts 'detail: ' + detail.inspect
-      puts '@h: ' + @h.inspect
-    end
+    "at %s on %s" % [time, days.join(', ')]
+  end
+  
+  private
+  
+  def time()
     
-    ChronicCron.new(s, detail[:time]).to_time == detail[:time]
+    a = @h[:days_of_week].clone
+    a.unshift a.pop
 
+    dow = a.map.with_index {|x, i| x ? i : nil }.compact.join(',')
+    s = "%s %s * * %s" % [@h[:minute], @h[:hour], dow]        
+    recent_time = ($env && $env[:time]) ? $env[:time] : Time.now
+    ChronicCron.new(s, recent_time).to_time
+    
   end
 
 end
@@ -1145,6 +1641,15 @@ class RegularIntervalTrigger < Trigger
 
 end
 
+class DeviceEventsTrigger < Trigger
+  
+  def initialize(h={})
+    super(h)
+    @group = 'device_events'
+  end  
+  
+end
+
 # Category: Device Events
 #
 # Airplane Mode Changed
@@ -1156,7 +1661,7 @@ end
 # shorthand example:
 #   airplanemode: enabled
 #
-class AirplaneModeTrigger < Trigger
+class AirplaneModeTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1172,7 +1677,7 @@ end
 
 # Category: Device Events
 #
-class AutoSyncChangeTrigger < Trigger
+class AutoSyncChangeTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1188,7 +1693,7 @@ end
 
 # Category: Device Events
 #
-class DayDreamTrigger < Trigger
+class DayDreamTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1204,7 +1709,7 @@ end
 
 # Category: Device Events
 #
-class DockTrigger < Trigger
+class DockTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1220,7 +1725,30 @@ end
 
 # Category: Device Events
 #
-class GPSEnabledTrigger < Trigger
+class FailedLoginTrigger < DeviceEventsTrigger
+  
+  def initialize(h={})
+
+    options = {
+      num_failures: 1
+    }
+
+    super(options.merge h)
+
+  end
+  
+  def to_pc()
+    'failed_login?'
+  end
+
+  def to_s()
+    'Failed Login Attempt'
+  end
+end
+
+# Category: Device Events
+#
+class GPSEnabledTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1236,7 +1764,7 @@ end
 
 # Category: Device Events
 #
-class MusicPlayingTrigger < Trigger
+class MusicPlayingTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1253,7 +1781,7 @@ end
 
 # Category: Device Events
 #
-class DeviceUnlockedTrigger < Trigger
+class DeviceUnlockedTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1268,7 +1796,7 @@ end
 
 # Category: Device Events
 #
-class AutoRotateChangeTrigger < Trigger
+class AutoRotateChangeTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1284,7 +1812,7 @@ end
 
 # Category: Device Events
 #
-class ClipboardChangeTrigger < Trigger
+class ClipboardChangeTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1301,7 +1829,7 @@ end
 
 # Category: Device Events
 #
-class BootTrigger < Trigger
+class BootTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1316,7 +1844,7 @@ end
 
 # Category: Device Events
 #
-class IntentReceivedTrigger < Trigger
+class IntentReceivedTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1336,7 +1864,7 @@ end
 
 # Category: Device Events
 #
-class NotificationTrigger < Trigger
+class NotificationTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1362,7 +1890,7 @@ end
 
 # Category: Device Events
 #
-class ScreenOnOffTrigger < Trigger
+class ScreenOnOffTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1378,7 +1906,7 @@ end
 
 # Category: Device Events
 #
-class SilentModeTrigger < Trigger
+class SilentModeTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1421,8 +1949,15 @@ end
 #
 class GeofenceTrigger < Trigger
 
-  def initialize(h={})
+  def initialize( h={}, geofences: {})
 
+    if h[:name] then
+      puts ('geofences2: ' + geofences.inspect)
+      found = geofences.find {|x| x.name.downcase == h[:name].downcase}
+      h[:geofence_id] = found.id if found
+      
+    end
+    
     options = {
       update_rate_text: '5 Minutes',
       geofence_id: '',
@@ -1431,8 +1966,27 @@ class GeofenceTrigger < Trigger
       enter_area: true
     }
 
-    super(options.merge h)
+    super(options.merge filter(options, h))
+    @geofences = geofences
+
+  end
+  
+  def to_s()
+    
+    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'
+    
+    found = @geofences.find {|x| x.id == @h[:geofence_id]}
+    puts 'found: ' + found.inspect    
+    label = found ? found.name : 'error: name not found'
 
+    "Geofence %s (%s)" % [direction, label]
+    
   end
 
 end
@@ -1454,9 +2008,19 @@ class SunriseSunsetTrigger < Trigger
 
 end
 
+
+class SensorsTrigger < Trigger
+  
+  def initialize(h={})
+    super(h)
+    @group = 'sensors'
+  end
+  
+end
+
 # Category: Sensors
 #
-class ActivityRecognitionTrigger < Trigger
+class ActivityRecognitionTrigger < SensorsTrigger
 
   def initialize(h={})
 
@@ -1473,7 +2037,7 @@ end
 
 # Category: Sensors
 #
-class ProximityTrigger < Trigger
+class ProximityTrigger < SensorsTrigger
 
   def initialize(h={})
 
@@ -1490,7 +2054,7 @@ end
 
 # Category: Sensors
 #
-class ShakeDeviceTrigger < Trigger
+class ShakeDeviceTrigger < SensorsTrigger
 
   def initialize(h={})
 
@@ -1500,12 +2064,25 @@ class ShakeDeviceTrigger < Trigger
     super(options.merge h)
 
   end
+  
+  def to_pc()
+    'shake_device?'
+  end
+  
+  def to_s()
+    'Shake Device'
+  end
 
 end
 
 # Category: Sensors
 #
-class FlipDeviceTrigger < Trigger
+# options:
+#   Face Up -> Face Down
+#   Face Down -> Face Up
+#   Any -> Face Down
+#
+class FlipDeviceTrigger < SensorsTrigger
 
   def initialize(h={})
 
@@ -1517,13 +2094,23 @@ class FlipDeviceTrigger < Trigger
 
     super(options.merge h)
 
+  end  
+  
+  def to_pc()
+    @h[:face_down] ? 'flip_device_down?' : 'flip_device_up?'
   end
+  
+  def to_s()
+    
+    action = @h[:face_down] ? 'Face Up -> Face Down' : 'Face Down -> Face Up'
+    'Flip Device ' + action
+  end  
 
 end
 
 # Category: Sensors
 #
-class OrientationTrigger < Trigger
+class OrientationTrigger < SensorsTrigger
 
   def initialize(h={})
 
@@ -1705,6 +2292,10 @@ class LaunchActivityAction < ApplicationAction
     super(options.merge h)
 
   end
+  
+  def to_s()
+    'Launch ' + @h[:application_name]
+  end
 
 end
 
@@ -1730,6 +2321,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},
@@ -1739,9 +2332,13 @@ class OpenWebPageAction < ApplicationAction
       block_next_action: false
     }
 
-    super(options.merge h)
+    super(options.merge filter(options,h))
 
   end
+  
+  def to_s()
+    "HTTP GET\n  url: " + @h[:url_to_open]
+  end
 
 end
 
@@ -1789,6 +2386,15 @@ class TakePictureAction < CameraAction
     super(options.merge h)
 
   end
+  
+  def to_pc()
+    camera = @h[:use_front_camera] ? :front : :back
+    'take_photo :' + camera.to_s
+  end
+
+  def to_s()
+    'Take Picture'
+  end  
 
 end
 
@@ -1817,6 +2423,11 @@ class SetWifiAction < ConnectivityAction
     super(options.merge h)
 
   end
+  
+  def to_s()
+    action = @h[:state] == 0 ? 'Enable' : 'Disable'
+    action + ' Wifi'
+  end
 
 end
 
@@ -1947,6 +2558,20 @@ class SayTimeAction < DateTimeAction
     super(options.merge h)
 
   end
+  
+  def invoke()
+    time = ($env and $env[:time]) ? $env[:time] : Time.now
+    tformat = @h['12_hour'] ? "%-I:%M%P" : "%H:%M"
+    super(time.strftime(tformat))
+  end
+  
+  def to_pc()
+    'say current_time()'
+  end
+  
+  def to_s()
+    'Say Current Time'
+  end  
 
 end
 
@@ -2118,6 +2743,14 @@ class CameraFlashLightAction < DeviceSettingsAction
 
   end
 
+  def to_pc()
+    'torch :on'
+  end
+  
+  def to_s()
+    'Torch On'
+  end  
+
 end
 
 # Category: Device Settings
@@ -2455,6 +3088,10 @@ class PlaySoundAction < MediaAction
     super(options.merge h)
 
   end
+  
+  def to_s()
+    'Play: ' + @h[:file_path]
+  end
 
 end
 
@@ -2659,6 +3296,9 @@ end
 class NotificationAction < NotificationsAction
 
   def initialize(h={})
+    
+    h[:notification_subject] = h[:subject] if h[:subject] 
+    h[:notification_text] = h[:text] if h[:text]
 
     options = {
       ringtone_name: 'Default',
@@ -2674,9 +3314,13 @@ class NotificationAction < NotificationsAction
       run_macro_when_pressed: false
     }
 
-    super(options.merge h)
+    super(options.merge filter(options, h))
 
   end
+  
+  def to_s()
+    'Display Notification: ' + "%s: %s" % [@h[:notification_subject], @h[:notification_text]]
+  end
 
 end
 
@@ -2709,6 +3353,14 @@ class ToastAction < NotificationsAction
   def invoke()
     super(@h[:message_text])
   end
+  
+  def to_pc()
+    "popup_message '%s'" % @h[:message_text]
+  end
+  
+  def to_s()
+    "Popup Message '%s'" % @h[:message_text]
+  end
 
 end
 
@@ -3037,6 +3689,30 @@ class Constraint < MacroObject
   def initialize(h={})    
     super(h)
   end
+  
+  def match?(detail={}, model=nil)
+
+    detail.select {|k,v| @h.include? k }.all? {|key,value| @h[key] == value}
+
+  end
+  
+  #def to_s()
+  #  ''
+  #end
+  
+  protected
+  
+  def toggle_match?(key, val)
+    
+    if @h[key] == true and val == key.to_s then
+      true
+    elsif @h[key] == false and val != key.to_s 
+      true
+    else
+      false
+    end
+    
+  end
 
 end
 
@@ -3398,6 +4074,41 @@ class AirplaneModeConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def match?(detail={}, model=nil)
+    
+    puts 'inside airplaneModeConstraint#match?' if $debug
+    
+    if detail.has_key? :enabled then
+      
+      puts 'detail has the key' if $debug
+      super(detail)
+      
+    elsif model
+      
+      if $debug then
+        puts 'checking the model'
+        switch = model.connectivity.airplane_mode.switch
+        puts 'switch: ' + switch.inspect
+      end
+      
+      toggle_match?(:enabled, switch)
+      
+    end
+    
+  end
+  
+  def to_pc()
+    status = @h[:enabled] ? 'enabled?' : 'disabled?'
+    'airplane_mode.' + status
+  end
+  
+  def to_s()
+    
+    status = @h[:enabled] ? 'Enabled' : 'Disabled'
+    'Airplane Mode ' + status
+    
+  end
 
 end