ruby-macrodroid 0.5.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b105d3fc8c1fe8e43ad4ea6b8b9018a26e376949c94c1623a11540ba8d5850c
-  data.tar.gz: 22b28e9b200b82fe6c048a0781845c032502c9b24e8ff566e455b8f2193d97f1
+  metadata.gz: cd79e55449071a3fd0ed864f58fc606dedd69059413876c7466cb071f651fef4
+  data.tar.gz: 70dbc1fd844ff449d0ef1ca680e9b47e5233ff82148ab93063b65d9a87e5f70c
 SHA512:
-  metadata.gz: c09be84265a4961e278e378c346a6152924848f3cf2a347aa3c52c2b87dab6711092c07be1dbb3820576e5779e73818c96b34958c1e2044edf29b24a973c5e35
-  data.tar.gz: 333fc854bc4ce0ff61b1921a971835a1f4d1f75d65ae8608de0990c710f5060ecc7bfedb0468baba7f575ca73b3df96e9036d93a64339ba0e08a73d9c9612ecc
+  metadata.gz: 1912e55be98c1236a2df6f17e5e19aa1de75e89854ca3be343821133e841656bb45c116e195237a313726b590c31bb7c898f8cf54f868f37c26f3dd9b11f4694
+  data.tar.gz: fdc3adcb802125e4346bbed8fc089e57a303d2f5624e20fe6b597b03a594ae50ca388b13c54bcb43da3bfb265e6fabc1b46f00119a48f199645ee5d8bdcf0c24

data/lib/ruby-macrodroid.rb

@@ -2,9 +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 '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'
 
 
@@ -60,7 +172,25 @@ class TriggersNlp
     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    
+
+    
     
   end
 
@@ -81,14 +211,17 @@ 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    
@@ -105,6 +238,78 @@ class ActionsNlp
     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
+    
+    #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
 
@@ -195,9 +400,9 @@ class Macro
   attr_reader :local_variables, :triggers, :actions, :constraints, :guid
   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    
           
@@ -288,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|
         
@@ -336,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|
@@ -345,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
@@ -354,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      
@@ -405,14 +631,23 @@ class Macro
     
   end
   
+  # invokes the actions
+  #
   def run()
     @actions.map(&:invoke)
   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 + "\n"
-    heading += '# ' + @description if @description
+    heading = '# ' + @title
+    heading += '\n# ' + @description if @description
     condition = @triggers.first.to_pc
     actions = @actions.map(&:to_pc).join("\n")
     
@@ -426,14 +661,71 @@ EOF
   end
     
   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"),
+      actions,
       @constraints.map {|x| "a: %s" % x}.join("\n")
     ]
-    a.insert(1, 'd: ' + @description) if @description
-    a.join("\n")
+    
+    if @description and @description.length >= 1 then
+      a.insert(1, 'd: ' + @description.gsub(/\n/,"\n  "))
+    end
+    
+    a.join("\n") + "\n"
+    
+  end
+  
+  def to_summary()
+    
+    a = [
+      'm: ' + @title,
+      't: ' + @triggers.map(&:to_summary).join(", "),
+      'a: ' + @actions.map(&:to_summary).join(", "),
+    ]
+    
+    a <<  'c: ' + @constraints.map(&:to_summary).join(", ") if @constraints.any?
+    
+    a.join("\n") + "\n"
+    
   end
 
   private
@@ -446,7 +738,15 @@ EOF
 
     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
@@ -459,12 +759,14 @@ class MacroDroid
   using ColouredText
   using Params  
 
-  attr_reader :macros
+  attr_reader :macros, :geofences, :yaml
 
   def initialize(obj=nil, debug: false)
 
     @debug = debug    
     
+    @geofences = {}
+    
     if obj then
       
       raw_s, _ = RXFHelper.read(obj)    
@@ -481,18 +783,40 @@ class MacroDroid
         @h = build_h
         
       else
+
+        puts 's: ' + s.inspect if @debug
         
-        xml = if s =~ /^m: / then
-          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
       
@@ -545,18 +869,95 @@ class MacroDroid
 
   alias to_json export_json
 
+
+  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()
+    
+    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()
+    @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
+    @yaml = h.to_yaml # helpful for debugging and testing
     
     @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.inspect).debug if @debug
-      m = Macro.new(debug: @debug)
+#       puts '@geofences: ' + @geofences.inspect if @debug
+      
+      m = Macro.new(geofences: @geofences.map(&:last), debug: @debug )
       m.import_h(macro)
       m
 
@@ -566,9 +967,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)
@@ -576,14 +998,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
@@ -608,51 +1026,40 @@ class MacroDroid
     doc = Rexle.new([:macros, {}, '', *macros])
     doc.root.xml pretty: true    
     
-  end
-  
-  def text_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: []}
-
-      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  
 
-    end
+end
 
-    doc = Rexle.new([:macros, {}, '', *macros])
-    doc.root.xml pretty: true    
+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()
-
-    @h.merge(macro_list:  @macros.map(&:to_h)).to_camel_case
-
+    
+    {
+      id: @id, 
+      longitude: @longitude, 
+      latitude: @latitude, 
+      name: @name, 
+      radius: @radius
+    }
+      
   end
   
-  # returns pseudocode
-  #
-  def to_pc()
-    @macros.map(&:to_pc).join("\n\n")
-  end
-
   def to_s()
-    @macros.map(&:to_s).join("\n")
+    
+    coordinates = "%s, %s" % [@longitude, @latitude]
+    "%s\n  coordinates: %s\n  radius: %s" % [@name, coordinates, @radius]
+    
   end
-
+  
 end
 
 class MacroObject
@@ -663,6 +1070,8 @@ class MacroObject
 
   def initialize(h={})
     
+    $env ||= {}
+    
     @h = {constraint_list: [], is_or_condition: false, 
           is_disabled: false}.merge(h)
     @list = []
@@ -691,6 +1100,12 @@ class MacroObject
     h2.merge('m_classType' => self.class.to_s)
 
   end
+  
+  def to_s()
+    "#<%s %s>" % [self.class, @h.inspect]
+  end
+  
+  alias to_summary to_s
 
   protected
   
@@ -705,13 +1120,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)
@@ -824,6 +1258,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
 
@@ -1205,29 +1644,22 @@ 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]}, model=nil)
-
-    a = @h[:days_of_week]
-    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]
-    
-    if $debug then
-      puts 's: ' + s.inspect 
-      puts 'detail: ' + detail.inspect
-      puts '@h: ' + @h.inspect
-    end
     
-    ChronicCron.new(s, detail[:time]).to_time == detail[:time]
+   time() == detail[:time]
 
   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
@@ -1243,6 +1675,20 @@ class TimerTrigger < Trigger
     
     "at %s on %s" % [time, days.join(', ')]
   end
+  
+  private
+  
+  def 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
 
@@ -1464,6 +1910,10 @@ class DeviceUnlockedTrigger < DeviceEventsTrigger
     super(options.merge h)
 
   end
+  
+  def to_s()
+    'Screen Unlocked'
+  end
 
 end
 
@@ -1622,8 +2072,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: '',
@@ -1632,9 +2089,28 @@ 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    if @debug 
+    label = found ? found.name : 'error: name not found'
+
+    "Geofence %s (%s)" % [direction, label]
+    
+  end
 
 end
 
@@ -1677,8 +2153,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
 
@@ -1688,14 +2184,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
 
@@ -1868,9 +2383,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='')    
@@ -1939,6 +2462,10 @@ class LaunchActivityAction < ApplicationAction
     super(options.merge h)
 
   end
+  
+  def to_s()
+    'Launch ' + @h[:application_name]
+  end
 
 end
 
@@ -1964,6 +2491,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},
@@ -1973,9 +2502,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
 
@@ -2035,6 +2568,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
   
@@ -2060,6 +2651,11 @@ class SetWifiAction < ConnectivityAction
     super(options.merge h)
 
   end
+  
+  def to_s()
+    action = @h[:state] == 0 ? 'Enable' : 'Disable'
+    action + ' Wifi'
+  end
 
 end
 
@@ -2284,6 +2880,10 @@ class SpeakTextAction < DeviceAction
     super(options.merge h)
 
   end
+  
+  def to_s()
+    "Speak Text (%s)" % @h[:text_to_say]
+  end
 
 end
 
@@ -2398,6 +2998,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
 
@@ -2720,6 +3331,10 @@ class PlaySoundAction < MediaAction
     super(options.merge h)
 
   end
+  
+  def to_s()
+    'Play: ' + @h[:file_path]
+  end
 
 end
 
@@ -2924,6 +3539,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',
@@ -2939,9 +3557,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
 
@@ -3174,6 +3796,10 @@ end
 
 # Category: Screen
 #
+# options:
+#   keep awake, screen on => enabled: true
+#   disable keep awake    => enabled: false
+#
 class KeepAwakeAction < ScreenAction
 
   def initialize(h={})
@@ -3188,7 +3814,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
@@ -3369,6 +4018,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
 
@@ -3420,6 +4084,11 @@ class ExternalPowerConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    connection = @h[:external_power] ? 'Connected' : 'Disconnected'
+    'Power ' + connection
+  end
 
 end
 
@@ -3438,6 +4107,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
 
@@ -3762,6 +4437,10 @@ class DeviceLockedConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    'Device ' + (@h[:locked] ? 'Locked' : 'Unlocked')
+  end
 
 end
 
@@ -3948,6 +4627,11 @@ class HeadphonesConnectionConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    connection = @h[:connected] ? 'Connected' : 'Disconnected'
+    'Headphones ' + connection
+  end
 
 end
 
@@ -4137,6 +4821,10 @@ class ScreenOnOffConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    'Screen ' + (@h[:screen_on] ? 'On' : 'Off')
+  end
 
 end
 
@@ -4190,6 +4878,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
 
@@ -4222,5 +4918,9 @@ class ProximitySensorConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    'Proximity Sensor: ' + (@h[:near] ? 'Near' : 'Far')
+  end
 
 end