ruby-macrodroid 0.3.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f4e1e8fee18ccf4731c38c61f67b673888872ffa5b33349a6f2da8e9e51535f
-  data.tar.gz: a3fe55c967182a61cf50514a38e7c3b8521e3efda4ce93d2b99c41e89540408b
+  metadata.gz: 8b105d3fc8c1fe8e43ad4ea6b8b9018a26e376949c94c1623a11540ba8d5850c
+  data.tar.gz: 22b28e9b200b82fe6c048a0781845c032502c9b24e8ff566e455b8f2193d97f1
 SHA512:
-  metadata.gz: 22ec4d0d3b94072c272817def3167dd5b6c8d2874572028bb0f3629dfb0b86e00cbd5779e0f3f99344182819abe556f5ab2440c18621cc50302b35aff40a16bf
-  data.tar.gz: b61d5d2efe7d8e47d1c99438a837f85d25af466c49c34eb3979d7204c600c4ca017262ba3f311311904abb78973713a8f53db9a17b6dce3c802ca8a651cacd21
+  metadata.gz: c09be84265a4961e278e378c346a6152924848f3cf2a347aa3c52c2b87dab6711092c07be1dbb3820576e5779e73818c96b34958c1e2044edf29b24a973c5e35
+  data.tar.gz: 333fc854bc4ce0ff61b1921a971835a1f4d1f75d65ae8608de0990c710f5060ecc7bfedb0468baba7f575ca73b3df96e9036d93a64339ba0e08a73d9c9612ecc

data/lib/ruby-macrodroid.rb

@@ -2,14 +2,17 @@
 
 # file: ruby-macrodroid.rb
 
-require 'pp'
-require 'json'
 require 'uuid'
-require 'date'
+require 'yaml'
 require 'rxfhelper'
-require 'app-routes'
+require 'chronic_cron'
 
 
+MODEL =<<EOF
+device
+  connectivity
+    airplane_mode is disabled
+EOF
 
 class TriggersNlp
   include AppRoutes
@@ -24,11 +27,41 @@ 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         
+        
+    
   end
 
   alias find_trigger run_route
@@ -52,6 +85,26 @@ class ActionsNlp
       [ToastAction, {msg: msg}]
     end
 
+    get /^Popup[ _]Message ['"]([^'"]+)/i do |msg|
+      [ToastAction, {msg: msg}]
+    end
+    
+    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           
 
   end
 
@@ -59,6 +112,29 @@ class ActionsNlp
 
 end
 
+class ConstraintsNlp
+  include AppRoutes
+
+  def initialize()
+
+    super()
+    params = {}
+    constraints(params)
+
+  end
+
+  def constraints(params) 
+
+    get /^airplane mode (.*)/i do |state|
+      [AirplaneModeConstraint, {enabled: (state =~ /^enabled|on$/) == 0}]
+    end
+
+  end
+
+  alias find_constraint run_route
+
+end
+
 module Params
 
   refine Hash do
@@ -70,7 +146,7 @@ module Params
       h.inject({}) do |r, x|
 
         key, value = x
-        puts 'value: ' + value.inspect
+        #puts 'value: ' + value.inspect
         
         val = if value.is_a?(Hash) then
           to_snake_case(value)
@@ -116,16 +192,16 @@ class Macro
   using ColouredText
   using Params
 
-  attr_reader :local_variables, :triggers, :actions, :guid
-  attr_accessor :name
+  attr_reader :local_variables, :triggers, :actions, :constraints, :guid
+  attr_accessor :title, :description
 
   def initialize(name=nil, debug: false)
 
-    @name, @debug = name, debug
-    lv=[], triggers=[], actions=[]
-    @local_variables, @triggers, @actions = lv, triggers, actions
+    @title, @debug = name, debug
+    
+    puts 'inside Macro#initialize' if @debug    
           
-    @triggers, @actions = [], []
+    @local_variables, @triggers, @actions, @constraints = [], [], [], []
     @h = {}
     
   end
@@ -157,9 +233,9 @@ class Macro
       local_variables: @local_variables,
       m_trigger_list: @triggers.map(&:to_h),
       m_action_list: @actions.map(&:to_h),
-      m_constraint_list: [], 
+      m_constraint_list: @constraints.map(&:to_h),
       m_description: '',
-      m_name: @name,
+      m_name: title(),
       m_excludeLog: false,
       m_GUID: guid(),
       m_isOrCondition: false,
@@ -175,6 +251,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']
     
@@ -189,13 +273,15 @@ class Macro
       object(action.to_snake_case)
     end
 
-    # fetch the constraints (not yet implemented)
+    # fetch the constraints                               
+    @constraints = h[:constraint_list].map do |constraint|
+      object(constraint.to_snake_case)
+    end                               
     
     @h = h
 
-    %i(local_variables m_trigger_list m_action_list).each do |x|
-      @h[x] = []
-    end
+    %i(local_variables m_trigger_list m_action_list m_constraint_list)\
+      .each {|x| @h[x] = [] }
 
     @h
 
@@ -203,7 +289,13 @@ class Macro
   
   def import_xml(node)
     
-    @name = node.attributes[:name]
+    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
       
@@ -231,6 +323,14 @@ class Macro
         end
 
       end    
+                               
+      # get all the constraints
+      @constraints = node.xpath('constraints/*').map do |e|
+        
+        puts 'e.name: ' + e.name.inspect if @debug
+        {airplanemode: AirplaneModeConstraint}[e.name.to_sym].new(e.attributes.to_h)
+
+      end                                  
       
     else
       
@@ -242,6 +342,8 @@ class Macro
         
         r = tp.find_trigger e.text
         
+        puts 'found trigger ' + r.inspect if @debug
+        
         if r then
           r[0].new(r[1])
         end
@@ -253,18 +355,86 @@ class Macro
       @actions = node.xpath('action').map do |e|
         
         r = ap.find_action e.text
+        puts 'found action ' + r.inspect if @debug
         
         if r then
           r[0].new(r[1])
         end
         
       end      
+                               
+      cp = ConstraintsNlp.new      
+      
+      @constraints = node.xpath('constraint').map do |e|
+        
+        r = cp.find_constraint e.text
+        puts 'found constraint ' + r.inspect if @debug
+        
+        if r then
+          r[0].new(r[1])
+        end
+        
+      end                                   
       
     end
     
     self
     
   end
+  
+  def match?(triggerx, detail={time: $env[:time]}, model=nil )
+                
+    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), model) } then
+      
+        true
+        
+      else
+
+        return false
+        
+      end
+      
+    end
+    
+  end
+  
+  def run()
+    @actions.map(&:invoke)
+  end
+
+  def to_pc()
+    
+    heading = '# ' + @title + "\n"
+    heading += '# ' + @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")
+    ]
+    a.insert(1, 'd: ' + @description) if @description
+    a.join("\n")
+  end
 
   private
   
@@ -282,6 +452,9 @@ class Macro
 end
 
 
+class MacroDroidError < Exception
+end
+
 class MacroDroid
   using ColouredText
   using Params  
@@ -294,14 +467,33 @@ class MacroDroid
     
     if obj then
       
-      s, _ = RXFHelper.read(obj)    
+      raw_s, _ = RXFHelper.read(obj)    
+      
+      s = raw_s.strip
       
       if s[0] == '{' then
+        
         import_json(s) 
-      else
-        s[0] == '<'
+        
+      elsif  s[0] == '<'
+        
         import_xml(s)
         @h = build_h
+        
+      else
+        
+        xml = if s =~ /^m: / then
+          text_to_xml(s)
+        elsif s =~ /^# / 
+          pc_to_xml(s)
+        else
+          raise MacroDroidError, 'invalid input'
+        end
+        import_xml(xml)
+        @h = build_h
+        
+
+        
       end
       
     else
@@ -319,6 +511,7 @@ class MacroDroid
 
   def build_h()
     
+    puts 'inside Macro#build_h' if @debug
     {
       cell_tower_groups: [],
       cell_towers_ignore: [],
@@ -354,12 +547,15 @@ class MacroDroid
 
   def import_json(s)
 
-    @h = JSON.parse(s, symbolize_names: true).to_snake_case
-    puts ('@h: ' + @h.pretty_inspect).debug if @debug
+    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
 
     @macros = @h[:macro_list].map do |macro|
 
-      puts ('macro: ' + macro.pretty_inspect).debug if @debug
+      puts ('macro: ' + macro.inspect).debug if @debug
       m = Macro.new(debug: @debug)
       m.import_h(macro)
       m
@@ -372,37 +568,110 @@ class MacroDroid
   
   def import_xml(raws)
     
+    puts 'raws: ' + raws.inspect if @debug
     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
+    
+    debug = @debug
     
     @macros = doc.root.xpath('macro').map do |node|
           
-      macro = Macro.new @name
+      macro = Macro.new @title, debug: debug
       macro.import_xml(node)
       macro
       
     end
   end
+  
+  def pc_to_xml(s)
+    
+    macros = s.strip.split(/(?=#)/).map do |raw_macro|
+
+      a = raw_macro.lines
+      name = a.shift[/(?<=# ).*/]
+      description = a.shift[/(?<=# ).*/] if a[0][/^# /]
+      body = a.join.strip
+
+      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 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
+
+    doc = Rexle.new([:macros, {}, '', *macros])
+    doc.root.xml pretty: true    
+    
+  end
 
   def to_h()
 
     @h.merge(macro_list:  @macros.map(&:to_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
 
 end
 
 class MacroObject
+  using ColouredText
+  
+  attr_reader :type
+  attr_accessor :options
 
   def initialize(h={})
     
     @h = {constraint_list: [], is_or_condition: false, 
           is_disabled: false}.merge(h)
     @list = []
+    
+    # fetch the class name and convert from camelCase to snake_eyes
+    @type = self.class.to_s.sub(/Trigger|Action$/,'')\
+        .gsub(/\B[A-Z][a-z]/){|x| '_' + x.downcase}\
+        .gsub(/[a-z][A-Z]/){|x| x[0] + '_' + x[1].downcase}\
+        .downcase.to_sym
   end
 
   def to_h()
@@ -425,6 +694,13 @@ class MacroObject
 
   protected
   
+  def filter(options, h)
+    
+    (h.keys - options.keys).each {|key| h.delete key }    
+    return h
+    
+  end
+  
   def uuid()
     UUID.new.generate
   end
@@ -437,11 +713,19 @@ class Trigger < MacroObject
     super({fakeIcon: 0}.merge(h))
     @list << 'fakeIcon'
   end
+  
+  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}
+
+  end
 
 end
 
 
-
+# Category: Applications
+#
 class WebHookTrigger < Trigger
 
   def initialize(h={})
@@ -456,6 +740,22 @@ class WebHookTrigger < Trigger
 
 end
 
+# Category: Applications
+#
+# Also known as Wifi State Change
+#
+# wifi_state options:
+#   0 - Wifi Enabled
+#   1 - Wifi Disabled
+#   2 - Connected to network
+#     ssid_list options:
+#       ["Any Network"] 
+#       ["some Wifi SSID"] - 1 or more SSID can be supplied
+#   3 - Disconnected from network
+#     ssid_list options:
+#       ["Any Network"] 
+#       ["some Wifi SSID"] - 1 or more SSID can be supplied
+
 class WifiConnectionTrigger < Trigger
 
   def initialize(h={})
@@ -471,6 +771,8 @@ class WifiConnectionTrigger < Trigger
 
 end
 
+# Category: Applications
+#
 class ApplicationInstalledRemovedTrigger < Trigger
 
   def initialize(h={})
@@ -489,6 +791,8 @@ class ApplicationInstalledRemovedTrigger < Trigger
 
 end
 
+# Category: Applications
+#
 class ApplicationLaunchedTrigger < Trigger
 
   def initialize(h={})
@@ -505,6 +809,8 @@ class ApplicationLaunchedTrigger < Trigger
 
 end
 
+# Category: Battery/Power
+#
 class BatteryLevelTrigger < Trigger
 
   def initialize(h={})
@@ -521,6 +827,8 @@ class BatteryLevelTrigger < Trigger
 
 end
 
+# Category: Battery/Power
+#
 class BatteryTemperatureTrigger < Trigger
 
   def initialize(h={})
@@ -537,6 +845,8 @@ class BatteryTemperatureTrigger < Trigger
 
 end
 
+# Category: Battery/Power
+#
 class PowerButtonToggleTrigger < Trigger
 
   def initialize(h={})
@@ -551,6 +861,9 @@ class PowerButtonToggleTrigger < Trigger
 
 end
 
+
+# Category: Battery/Power
+#
 class ExternalPowerTrigger < Trigger
 
   def initialize(h={})
@@ -568,6 +881,8 @@ class ExternalPowerTrigger < Trigger
 
 end
 
+# Category: Call/SMS
+#
 class CallActiveTrigger < Trigger
 
   def initialize(h={})
@@ -584,6 +899,8 @@ class CallActiveTrigger < Trigger
 
 end
 
+# Category: Call/SMS
+#
 class IncomingCallTrigger < Trigger
 
   def initialize(h={})
@@ -602,6 +919,8 @@ class IncomingCallTrigger < Trigger
 
 end
 
+# Category: Call/SMS
+#
 class OutgoingCallTrigger < Trigger
 
   def initialize(h={})
@@ -620,6 +939,8 @@ class OutgoingCallTrigger < Trigger
 
 end
 
+# Category: Call/SMS
+#
 class CallEndedTrigger < Trigger
 
   def initialize(h={})
@@ -638,6 +959,8 @@ class CallEndedTrigger < Trigger
 
 end
 
+# Category: Call/SMS
+#
 class CallMissedTrigger < Trigger
 
   def initialize(h={})
@@ -652,6 +975,8 @@ class CallMissedTrigger < Trigger
 
 end
 
+# Category: Call/SMS
+#
 class IncomingSMSTrigger < Trigger
 
   def initialize(h={})
@@ -674,6 +999,8 @@ class IncomingSMSTrigger < Trigger
 
 end
 
+# Category: Connectivity
+#
 class WebHookTrigger < Trigger
 
   def initialize(h={})
@@ -688,6 +1015,8 @@ class WebHookTrigger < Trigger
 
 end
 
+# Category: Connectivity
+#
 class WifiConnectionTrigger < Trigger
 
   def initialize(h={})
@@ -703,6 +1032,8 @@ class WifiConnectionTrigger < Trigger
 
 end
 
+# Category: Connectivity
+#
 class BluetoothTrigger < Trigger
 
   def initialize(h={})
@@ -719,6 +1050,8 @@ class BluetoothTrigger < Trigger
 
 end
 
+# Category: Connectivity
+#
 class HeadphonesTrigger < Trigger
 
   def initialize(h={})
@@ -734,6 +1067,8 @@ class HeadphonesTrigger < Trigger
 
 end
 
+# Category: Connectivity
+#
 class SignalOnOffTrigger < Trigger
 
   def initialize(h={})
@@ -748,6 +1083,8 @@ class SignalOnOffTrigger < Trigger
 
 end
 
+# Category: Connectivity
+#
 class UsbDeviceConnectionTrigger < Trigger
 
   def initialize(h={})
@@ -762,22 +1099,45 @@ class UsbDeviceConnectionTrigger < Trigger
 
 end
 
+# Category: Connectivity
+#
+# Also known as Wifi SSID Transition
+#
+# options:
+#   in_range: true | false
+#   wifi_cell_info: {display_name: "some Wifi SSID", 
+#                    ssid: "some Wifi SSID"} - 1 or more allowed
+#
 class WifiSSIDTrigger < Trigger
 
   def initialize(h={})
 
     options = {
-      wifi_cell_info_list: [{:displayName=>"", :ssid=>""}],
+      wifi_cell_info_list: [{:display_name=>"", :ssid=>""}],
       ssid_list: [],
-      _in_range: true
+      in_range: true
     }
 
     super(options.merge h)
 
   end
+  
+  def to_h()
+    
+    h = super()
+    val = h[:m_inRange]
+    
+    h[:m_InRange] = val
+    h.delete :m_inRange
+    
+    return h
+    
+  end
 
 end
 
+# Category: Date/Time
+#
 class CalendarTrigger < Trigger
 
   def initialize(h={})
@@ -802,15 +1162,21 @@ class CalendarTrigger < Trigger
 
 end
 
+# Category: Date/Time
+#
 class TimerTrigger < Trigger
+  using ColouredText
+  
 
   def initialize(h={})
+
+    puts 'TimerTrigger h: ' + h.inspect if $debug
     
     if h[:days] then
       
       days = [false] * 7
-
-      h[:days].split(/, +/).each do |x|
+      
+      h[:days].split(/, */).each do |x|
 
         r = Date::DAYNAMES.grep /#{x}/i
         i = Date::DAYNAMES.index(r.first)
@@ -819,7 +1185,6 @@ class TimerTrigger < Trigger
       end      
       
       h[:days_of_week] = days
-      h.delete :days
       
     end
     
@@ -827,24 +1192,62 @@ class TimerTrigger < Trigger
       
       t = Time.parse(h[:time])
       h[:hour], h[:minute] = t.hour, t.min
-      h.delete :time
       
     end
+    
+    #puts ('h: ' + h.inspect).debug
 
     options = {
       alarm_id: uuid(),
-      days_of_week: [false, true, false, false, false, false, false],
+      days_of_week: [false, false, false, false, false, false, false],
       minute: 10,
       hour: 7,
       use_alarm: false
     }
+            
+    super(options.merge filter(options,h))
 
-    super(options.merge 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]
+
+  end
+  
+  def to_pc()    
+    "time.is? '%s'" % self.to_s.gsub(',', ' or')
+  end
+  
+  def to_s()
+    
+    dow = @h[:days_of_week]
+
+    a = Date::ABBR_DAYNAMES
 
+    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)
+    
+    "at %s on %s" % [time, days.join(', ')]
   end
 
 end
 
+# Category: Date/Time
+#
 class StopwatchTrigger < Trigger
 
   def initialize(h={})
@@ -860,6 +1263,13 @@ class StopwatchTrigger < Trigger
 
 end
 
+# Category: Date/Time
+#
+# Also known as Day of Week/Month
+#
+# month_of_year equal to 0 means it occurs every month
+# day_of_week starts with a Monday (value is 0)
+# 
 class DayTrigger < Trigger
 
   def initialize(h={})
@@ -881,6 +1291,10 @@ class DayTrigger < Trigger
 
 end
 
+# Category: Date/Time
+#
+# Regular Interval
+#
 class RegularIntervalTrigger < Trigger
 
   def initialize(h={})
@@ -900,7 +1314,27 @@ class RegularIntervalTrigger < Trigger
 
 end
 
-class AirplaneModeTrigger < Trigger
+class DeviceEventsTrigger < Trigger
+  
+  def initialize(h={})
+    super(h)
+    @group = 'device_events'
+  end  
+  
+end
+
+# Category: Device Events
+#
+# Airplane Mode Changed
+#
+# options: 
+#   Airplane Mode Enabled
+#   Airplane Mode Disabled
+#
+# shorthand example:
+#   airplanemode: enabled
+#
+class AirplaneModeTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -914,7 +1348,9 @@ class AirplaneModeTrigger < Trigger
 
 end
 
-class AutoSyncChangeTrigger < Trigger
+# Category: Device Events
+#
+class AutoSyncChangeTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -928,7 +1364,9 @@ class AutoSyncChangeTrigger < Trigger
 
 end
 
-class DayDreamTrigger < Trigger
+# Category: Device Events
+#
+class DayDreamTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -942,7 +1380,9 @@ class DayDreamTrigger < Trigger
 
 end
 
-class DockTrigger < Trigger
+# Category: Device Events
+#
+class DockTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -956,26 +1396,37 @@ class DockTrigger < Trigger
 
 end
 
-class GPSEnabledTrigger < Trigger
-
+# Category: Device Events
+#
+class FailedLoginTrigger < DeviceEventsTrigger
+  
   def initialize(h={})
 
     options = {
-      gps_mode_enabled: true
+      num_failures: 1
     }
 
     super(options.merge h)
 
   end
+  
+  def to_pc()
+    'failed_login?'
+  end
 
+  def to_s()
+    'Failed Login Attempt'
+  end
 end
 
-class MusicPlayingTrigger < Trigger
+# Category: Device Events
+#
+class GPSEnabledTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
     options = {
-      option: 0
+      gps_mode_enabled: true
     }
 
     super(options.merge h)
@@ -984,11 +1435,14 @@ class MusicPlayingTrigger < Trigger
 
 end
 
-class DeviceUnlockedTrigger < Trigger
+# Category: Device Events
+#
+class MusicPlayingTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
     options = {
+      option: 0
     }
 
     super(options.merge h)
@@ -997,7 +1451,10 @@ class DeviceUnlockedTrigger < Trigger
 
 end
 
-class DeviceUnlockedTrigger < Trigger
+
+# Category: Device Events
+#
+class DeviceUnlockedTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1010,7 +1467,9 @@ class DeviceUnlockedTrigger < Trigger
 
 end
 
-class AutoRotateChangeTrigger < Trigger
+# Category: Device Events
+#
+class AutoRotateChangeTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1024,7 +1483,9 @@ class AutoRotateChangeTrigger < Trigger
 
 end
 
-class ClipboardChangeTrigger < Trigger
+# Category: Device Events
+#
+class ClipboardChangeTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1039,20 +1500,9 @@ class ClipboardChangeTrigger < Trigger
 
 end
 
-class BootTrigger < Trigger
-
-  def initialize(h={})
-
-    options = {
-    }
-
-    super(options.merge h)
-
-  end
-
-end
-
-class BootTrigger < Trigger
+# Category: Device Events
+#
+class BootTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1065,7 +1515,9 @@ class BootTrigger < Trigger
 
 end
 
-class IntentReceivedTrigger < Trigger
+# Category: Device Events
+#
+class IntentReceivedTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1083,7 +1535,9 @@ class IntentReceivedTrigger < Trigger
 
 end
 
-class NotificationTrigger < Trigger
+# Category: Device Events
+#
+class NotificationTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1107,7 +1561,9 @@ class NotificationTrigger < Trigger
 
 end
 
-class ScreenOnOffTrigger < Trigger
+# Category: Device Events
+#
+class ScreenOnOffTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1121,7 +1577,9 @@ class ScreenOnOffTrigger < Trigger
 
 end
 
-class SilentModeTrigger < Trigger
+# Category: Device Events
+#
+class SilentModeTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1135,6 +1593,8 @@ class SilentModeTrigger < Trigger
 
 end
 
+# Category: Location
+#
 class WeatherTrigger < Trigger
 
   def initialize(h={})
@@ -1158,6 +1618,8 @@ class WeatherTrigger < Trigger
 
 end
 
+# Category: Location
+#
 class GeofenceTrigger < Trigger
 
   def initialize(h={})
@@ -1176,6 +1638,8 @@ class GeofenceTrigger < Trigger
 
 end
 
+# Category: Location
+#
 class SunriseSunsetTrigger < Trigger
 
   def initialize(h={})
@@ -1192,7 +1656,18 @@ class SunriseSunsetTrigger < Trigger
 end
 
 
-class ActivityRecognitionTrigger < Trigger
+class SensorsTrigger < Trigger
+  
+  def initialize(h={})
+    super(h)
+    @group = 'sensors'
+  end
+  
+end
+
+# Category: Sensors
+#
+class ActivityRecognitionTrigger < SensorsTrigger
 
   def initialize(h={})
 
@@ -1207,8 +1682,9 @@ class ActivityRecognitionTrigger < Trigger
 
 end
 
-
-class ProximityTrigger < Trigger
+# Category: Sensors
+#
+class ProximityTrigger < SensorsTrigger
 
   def initialize(h={})
 
@@ -1223,7 +1699,9 @@ class ProximityTrigger < Trigger
 
 end
 
-class ShakeDeviceTrigger < Trigger
+# Category: Sensors
+#
+class ShakeDeviceTrigger < SensorsTrigger
 
   def initialize(h={})
 
@@ -1233,10 +1711,25 @@ class ShakeDeviceTrigger < Trigger
     super(options.merge h)
 
   end
+  
+  def to_pc()
+    'shake_device?'
+  end
+  
+  def to_s()
+    'Shake Device'
+  end
 
 end
 
-class FlipDeviceTrigger < Trigger
+# Category: Sensors
+#
+# options:
+#   Face Up -> Face Down
+#   Face Down -> Face Up
+#   Any -> Face Down
+#
+class FlipDeviceTrigger < SensorsTrigger
 
   def initialize(h={})
 
@@ -1248,11 +1741,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
 
-class OrientationTrigger < Trigger
+# Category: Sensors
+#
+class OrientationTrigger < SensorsTrigger
 
   def initialize(h={})
 
@@ -1267,6 +1772,8 @@ class OrientationTrigger < Trigger
 
 end
 
+# Category: User Input
+#
 class FloatingButtonTrigger < Trigger
 
   def initialize(h={})
@@ -1290,6 +1797,8 @@ class FloatingButtonTrigger < Trigger
 
 end
 
+# Category: User Input
+#
 class ShortcutTrigger < Trigger
 
   def initialize(h={})
@@ -1303,6 +1812,8 @@ class ShortcutTrigger < Trigger
 
 end
 
+# Category: User Input
+#
 class VolumeButtonTrigger < Trigger
 
   def initialize(h={})
@@ -1320,6 +1831,8 @@ class VolumeButtonTrigger < Trigger
 
 end
 
+# Category: User Input
+#
 class MediaButtonPressedTrigger < Trigger
 
   def initialize(h={})
@@ -1335,6 +1848,8 @@ class MediaButtonPressedTrigger < Trigger
 
 end
 
+# Category: User Input
+#
 class SwipeTrigger < Trigger
 
   def initialize(h={})
@@ -1357,14 +1872,30 @@ class Action < MacroObject
   def initialize(h={})    
     super(h)
   end
+  
+  def invoke(s='')    
+    "%s/%s: %s" % [@group, @type, s]
+  end  
 
 end
 
 
+class LocationAction < Action
+  
+  def initialize(h={})
+    super(h)
+    @group = 'location'
+  end
+  
+end
 
-class ShareLocationAction < Action
+# Category: Location
+#
+class ShareLocationAction < LocationAction
 
   def initialize(h={})
+    
+    super()
 
     options = {
       email: '',
@@ -1382,39 +1913,19 @@ class ShareLocationAction < Action
 
 end
 
-class UDPCommandAction < Action
-
-  def initialize(h={})
-
-    options = {
-      destination: '',
-      message: '',
-      port: 1024
-    }
-
-    super(options.merge h)
-
-  end
-
-end
-
-class UDPCommandAction < Action
 
+class ApplicationAction < Action
+  
   def initialize(h={})
-
-    options = {
-      destination: '',
-      message: '',
-      port: 1024
-    }
-
-    super(options.merge h)
-
+    super(h)
+    @group = 'application'
   end
-
+  
 end
 
-class LaunchActivityAction < Action
+# Category: Applications
+#
+class LaunchActivityAction < ApplicationAction
 
   def initialize(h={})
 
@@ -1431,7 +1942,9 @@ class LaunchActivityAction < Action
 
 end
 
-class KillBackgroundAppAction < Action
+# Category: Applications
+#
+class KillBackgroundAppAction < ApplicationAction
 
   def initialize(h={})
 
@@ -1446,7 +1959,9 @@ class KillBackgroundAppAction < Action
 
 end
 
-class OpenWebPageAction < Action
+# Category: Applications
+#
+class OpenWebPageAction < ApplicationAction
 
   def initialize(h={})
 
@@ -1464,12 +1979,24 @@ class OpenWebPageAction < Action
 
 end
 
-class UploadPhotoAction < Action
 
+class CameraAction < Action
+  
   def initialize(h={})
+    super(h)
+    @group = 'camera'
+  end
+  
+end
 
-    options = {
-      option: 'Via Intent',
+# Category: Camera/Photo
+#
+class UploadPhotoAction < CameraAction
+
+  def initialize(h={})
+
+    options = {
+      option: 'Via Intent',
       use_smtp_email: false
     }
 
@@ -1479,7 +2006,9 @@ class UploadPhotoAction < Action
 
 end
 
-class TakePictureAction < Action
+# Category: Camera/Photo
+#
+class TakePictureAction < CameraAction
 
   def initialize(h={})
 
@@ -1494,10 +2023,31 @@ class TakePictureAction < Action
     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
 
-class SetWifiAction < Action
+
+class ConnectivityAction < Action
+  
+  def initialize(h={})
+    super(h)
+    @group = 'connectivity'
+  end
+  
+end
+
+# Category: Connectivity
+#
+class SetWifiAction < ConnectivityAction
 
   def initialize(h={})
 
@@ -1513,7 +2063,9 @@ class SetWifiAction < Action
 
 end
 
-class SetBluetoothAction < Action
+# Category: Connectivity
+#
+class SetBluetoothAction < ConnectivityAction
 
   def initialize(h={})
 
@@ -1528,7 +2080,9 @@ class SetBluetoothAction < Action
 
 end
 
-class SetBluetoothAction < Action
+# Category: Connectivity
+#
+class SetBluetoothAction < ConnectivityAction
 
   def initialize(h={})
 
@@ -1543,7 +2097,9 @@ class SetBluetoothAction < Action
 
 end
 
-class SendIntentAction < Action
+# Category: Connectivity
+#
+class SendIntentAction < ConnectivityAction
 
   def initialize(h={})
 
@@ -1569,7 +2125,19 @@ class SendIntentAction < Action
 
 end
 
-class SetAlarmClockAction < Action
+
+class DateTimeAction < Action
+  
+  def initialize(h={})
+    super(h)
+    @group = 'datetime'
+  end
+  
+end
+
+# Category: Date/Time
+#
+class SetAlarmClockAction < DateTimeAction
 
   def initialize(h={})
 
@@ -1592,7 +2160,9 @@ class SetAlarmClockAction < Action
 
 end
 
-class StopWatchAction < Action
+# Category: Date/Time
+#
+class StopWatchAction < DateTimeAction
 
   def initialize(h={})
 
@@ -1607,7 +2177,9 @@ class StopWatchAction < Action
 
 end
 
-class SayTimeAction < Action
+# Category: Date/Time
+#
+class SayTimeAction < DateTimeAction
 
   def initialize(h={})
 
@@ -1618,10 +2190,36 @@ class SayTimeAction < Action
     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
+
 
+class DeviceAction < Action
+  
+  def initialize(h={})
+    super(h)
+    @group = 'device'
+  end
+  
 end
 
-class AndroidShortcutsAction < Action
+# Category: Device Actions
+#
+class AndroidShortcutsAction < DeviceAction
 
   def initialize(h={})
 
@@ -1635,7 +2233,9 @@ class AndroidShortcutsAction < Action
 
 end
 
-class ClipboardAction < Action
+# Category: Device Actions
+#
+class ClipboardAction < DeviceAction
 
   def initialize(h={})
 
@@ -1649,7 +2249,9 @@ class ClipboardAction < Action
 
 end
 
-class PressBackAction < Action
+# Category: Device Actions
+#
+class PressBackAction < DeviceAction
 
   def initialize(h={})
 
@@ -1662,7 +2264,9 @@ class PressBackAction < Action
 
 end
 
-class SpeakTextAction < Action
+# Category: Device Actions
+#
+class SpeakTextAction < DeviceAction
 
   def initialize(h={})
 
@@ -1683,7 +2287,9 @@ class SpeakTextAction < Action
 
 end
 
-class UIInteractionAction < Action
+# Category: Device Actions
+#
+class UIInteractionAction < DeviceAction
 
   def initialize(h={})
 
@@ -1698,7 +2304,9 @@ class UIInteractionAction < Action
 
 end
 
-class VoiceSearchAction < Action
+# Category: Device Actions
+#
+class VoiceSearchAction < DeviceAction
 
   def initialize(h={})
 
@@ -1711,7 +2319,19 @@ class VoiceSearchAction < Action
 
 end
 
-class ExpandCollapseStatusBarAction < Action
+
+class DeviceSettingsAction < Action
+  
+  def initialize(h={})
+    super(h)
+    @group = 'devicesettings'
+  end
+  
+end
+
+# Category: Device Settings
+#
+class ExpandCollapseStatusBarAction < DeviceSettingsAction
 
   def initialize(h={})
 
@@ -1725,7 +2345,9 @@ class ExpandCollapseStatusBarAction < Action
 
 end
 
-class LaunchHomeScreenAction < Action
+# Category: Device Settings
+#
+class LaunchHomeScreenAction < DeviceSettingsAction
 
   def initialize(h={})
 
@@ -1738,7 +2360,9 @@ class LaunchHomeScreenAction < Action
 
 end
 
-class CameraFlashLightAction < Action
+# Category: Device Settings
+#
+class CameraFlashLightAction < DeviceSettingsAction
 
   def initialize(h={})
 
@@ -1751,9 +2375,19 @@ class CameraFlashLightAction < Action
 
   end
 
+  def to_pc()
+    'torch :on'
+  end
+  
+  def to_s()
+    'Torch On'
+  end  
+
 end
 
-class VibrateAction < Action
+# Category: Device Settings
+#
+class VibrateAction < DeviceSettingsAction
 
   def initialize(h={})
 
@@ -1767,7 +2401,9 @@ class VibrateAction < Action
 
 end
 
-class SetAutoRotateAction < Action
+# Category: Device Settings
+#
+class SetAutoRotateAction < DeviceSettingsAction
 
   def initialize(h={})
 
@@ -1781,7 +2417,9 @@ class SetAutoRotateAction < Action
 
 end
 
-class DayDreamAction < Action
+# Category: Device Settings
+#
+class DayDreamAction < DeviceSettingsAction
 
   def initialize(h={})
 
@@ -1794,7 +2432,9 @@ class DayDreamAction < Action
 
 end
 
-class SetKeyboardAction < Action
+# Category: Device Settings
+#
+class SetKeyboardAction < DeviceSettingsAction
 
   def initialize(h={})
 
@@ -1807,7 +2447,9 @@ class SetKeyboardAction < Action
 
 end
 
-class SetKeyguardAction < Action
+# Category: Device Settings
+#
+class SetKeyguardAction < DeviceSettingsAction
 
   def initialize(h={})
 
@@ -1821,7 +2463,9 @@ class SetKeyguardAction < Action
 
 end
 
-class CarModeAction < Action
+# Category: Device Settings
+#
+class CarModeAction < DeviceSettingsAction
 
   def initialize(h={})
 
@@ -1835,7 +2479,9 @@ class CarModeAction < Action
 
 end
 
-class ChangeKeyboardAction < Action
+# Category: Device Settings
+#
+class ChangeKeyboardAction < DeviceSettingsAction
 
   def initialize(h={})
 
@@ -1850,7 +2496,9 @@ class ChangeKeyboardAction < Action
 
 end
 
-class SetWallpaperAction < Action
+# Category: Device Settings
+#
+class SetWallpaperAction < DeviceSettingsAction
 
   def initialize(h={})
 
@@ -1869,7 +2517,18 @@ class SetWallpaperAction < Action
 
 end
 
-class OpenFileAction < Action
+class FileAction < Action
+  
+  def initialize(h={})
+    super(h)
+    @group = 'file'
+  end
+  
+end
+
+# Category: Files
+#
+class OpenFileAction < FileAction
 
   def initialize(h={})
 
@@ -1886,7 +2545,19 @@ class OpenFileAction < Action
 
 end
 
-class ForceLocationUpdateAction < Action
+
+class LocationAction < Action
+  
+  def initialize(h={})
+    super(h)
+    @group = 'location'
+  end
+  
+end
+
+# Category: Location
+#
+class ForceLocationUpdateAction < LocationAction
 
   def initialize(h={})
 
@@ -1899,7 +2570,9 @@ class ForceLocationUpdateAction < Action
 
 end
 
-class ShareLocationAction < Action
+# Category: Location
+#
+class ShareLocationAction < LocationAction
 
   def initialize(h={})
 
@@ -1917,7 +2590,9 @@ class ShareLocationAction < Action
 
 end
 
-class SetLocationUpdateRateAction < Action
+# Category: Location
+#
+class SetLocationUpdateRateAction < LocationAction
 
   def initialize(h={})
 
@@ -1932,7 +2607,18 @@ class SetLocationUpdateRateAction < Action
 
 end
 
-class AddCalendarEntryAction < Action
+class LoggingAction < Action
+  
+  def initialize(h={})
+    super(h)
+    @group = 'logging'
+  end
+  
+end
+
+# Category: Logging
+#
+class AddCalendarEntryAction < LoggingAction
 
   def initialize(h={})
 
@@ -1959,7 +2645,9 @@ class AddCalendarEntryAction < Action
 
 end
 
-class LogAction < Action
+# Category: Logging
+#
+class LogAction < LoggingAction
 
   def initialize(h={})
 
@@ -1974,7 +2662,9 @@ class LogAction < Action
 
 end
 
-class ClearLogAction < Action
+# Category: Logging
+#
+class ClearLogAction < LoggingAction
 
   def initialize(h={})
 
@@ -1988,24 +2678,18 @@ class ClearLogAction < Action
 
 end
 
-class RecordMicrophoneAction < Action
-
+class MediaAction < Action
+  
   def initialize(h={})
-
-    options = {
-      path: '',
-      record_time_string: 'Until Cancelled',
-      recording_format: 0,
-      seconds_to_record_for: -1
-    }
-
-    super(options.merge h)
-
+    super(h)
+    @group = 'media'
   end
-
+  
 end
 
-class RecordMicrophoneAction < Action
+# Category: Media
+#
+class RecordMicrophoneAction < MediaAction
 
   def initialize(h={})
 
@@ -2022,7 +2706,9 @@ class RecordMicrophoneAction < Action
 
 end
 
-class PlaySoundAction < Action
+# Category: Media
+#
+class PlaySoundAction < MediaAction
 
   def initialize(h={})
 
@@ -2038,7 +2724,18 @@ class PlaySoundAction < Action
 end
 
 
-class SendEmailAction < Action
+class MessagingAction < Action
+  
+  def initialize(h={})
+    super(h)
+    @group = 'messaging'
+  end
+  
+end
+
+# Category: Messaging
+#
+class SendEmailAction < MessagingAction
 
   def initialize(h={})
 
@@ -2058,7 +2755,9 @@ class SendEmailAction < Action
 
 end
 
-class SendSMSAction < Action
+# Category: Messaging
+#
+class SendSMSAction < MessagingAction
 
   def initialize(h={})
 
@@ -2077,7 +2776,9 @@ class SendSMSAction < Action
 
 end
 
-class UDPCommandAction < Action
+# Category: Messaging
+#
+class UDPCommandAction < MessagingAction
 
   def initialize(h={})
 
@@ -2093,7 +2794,19 @@ class UDPCommandAction < Action
 
 end
 
-class ClearNotificationsAction < Action
+
+class NotificationsAction < Action
+  
+  def initialize(h={})
+    super(h)
+    @group = 'notifications'
+  end
+  
+end
+
+# Category: Notifications
+#
+class ClearNotificationsAction < NotificationsAction
 
   def initialize(h={})
 
@@ -2115,7 +2828,9 @@ class ClearNotificationsAction < Action
 
 end
 
-class MessageDialogAction < Action
+# Category: Notifications
+#
+class MessageDialogAction < NotificationsAction
 
   def initialize(h={})
 
@@ -2140,7 +2855,9 @@ class MessageDialogAction < Action
 
 end
 
-class AllowLEDNotificationLightAction < Action
+# Category: Notifications
+#
+class AllowLEDNotificationLightAction < NotificationsAction
 
   def initialize(h={})
 
@@ -2154,7 +2871,9 @@ class AllowLEDNotificationLightAction < Action
 
 end
 
-class SetNotificationSoundAction < Action
+# Category: Notifications
+#
+class SetNotificationSoundAction < NotificationsAction
 
   def initialize(h={})
 
@@ -2168,7 +2887,9 @@ class SetNotificationSoundAction < Action
 
 end
 
-class SetNotificationSoundAction < Action
+# Category: Notifications
+#
+class SetNotificationSoundAction < NotificationsAction
 
   def initialize(h={})
 
@@ -2182,7 +2903,9 @@ class SetNotificationSoundAction < Action
 
 end
 
-class SetNotificationSoundAction < Action
+# Category: Notifications
+#
+class SetNotificationSoundAction < NotificationsAction
 
   def initialize(h={})
 
@@ -2196,7 +2919,9 @@ class SetNotificationSoundAction < Action
 
 end
 
-class NotificationAction < Action
+# Category: Notifications
+#
+class NotificationAction < NotificationsAction
 
   def initialize(h={})
 
@@ -2220,7 +2945,9 @@ class NotificationAction < Action
 
 end
 
-class ToastAction < Action
+# Category: Notifications
+#
+class ToastAction < NotificationsAction
 
   def initialize(h={})
 
@@ -2243,10 +2970,34 @@ class ToastAction < Action
     super(options.merge h)
 
   end
+  
+  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
+
 
+class PhoneAction < Action
+  
+  def initialize(h={})
+    super(h)
+    @group = 'phone'
+  end
+  
 end
 
-class AnswerCallAction < Action
+# Category: Phone
+#
+class AnswerCallAction < PhoneAction
 
   def initialize(h={})
 
@@ -2260,7 +3011,9 @@ class AnswerCallAction < Action
 
 end
 
-class ClearCallLogAction < Action
+# Category: Phone
+#
+class ClearCallLogAction < PhoneAction
 
   def initialize(h={})
 
@@ -2276,7 +3029,9 @@ class ClearCallLogAction < Action
 
 end
 
-class OpenCallLogAction < Action
+# Category: Phone
+#
+class OpenCallLogAction < PhoneAction
 
   def initialize(h={})
 
@@ -2289,7 +3044,9 @@ class OpenCallLogAction < Action
 
 end
 
-class RejectCallAction < Action
+# Category: Phone
+#
+class RejectCallAction < PhoneAction
 
   def initialize(h={})
 
@@ -2302,7 +3059,9 @@ class RejectCallAction < Action
 
 end
 
-class MakeCallAction < Action
+# Category: Phone
+#
+class MakeCallAction < PhoneAction
 
   def initialize(h={})
 
@@ -2317,7 +3076,10 @@ class MakeCallAction < Action
 
 end
 
-class SetRingtoneAction < Action
+
+# Category: Phone
+#
+class SetRingtoneAction < PhoneAction
 
   def initialize(h={})
 
@@ -2331,7 +3093,18 @@ class SetRingtoneAction < Action
 
 end
 
-class SetBrightnessAction < Action
+class ScreenAction < Action
+  
+  def initialize(h={})
+    super(h)
+    @group = 'screen'
+  end
+  
+end
+
+# Category: Screen
+#
+class SetBrightnessAction < ScreenAction
 
   def initialize(h={})
 
@@ -2347,7 +3120,9 @@ class SetBrightnessAction < Action
 
 end
 
-class ForceScreenRotationAction < Action
+# Category: Screen
+#
+class ForceScreenRotationAction < ScreenAction
 
   def initialize(h={})
 
@@ -2361,7 +3136,9 @@ class ForceScreenRotationAction < Action
 
 end
 
-class ScreenOnAction < Action
+# Category: Screen
+#
+class ScreenOnAction < ScreenAction
 
   def initialize(h={})
 
@@ -2378,7 +3155,9 @@ class ScreenOnAction < Action
 
 end
 
-class DimScreenAction < Action
+# Category: Screen
+#
+class DimScreenAction < ScreenAction
 
   def initialize(h={})
 
@@ -2393,7 +3172,9 @@ class DimScreenAction < Action
 
 end
 
-class KeepAwakeAction < Action
+# Category: Screen
+#
+class KeepAwakeAction < ScreenAction
 
   def initialize(h={})
 
@@ -2410,7 +3191,9 @@ class KeepAwakeAction < Action
 
 end
 
-class SetScreenTimeoutAction < Action
+# Category: Screen
+#
+class SetScreenTimeoutAction < ScreenAction
 
   def initialize(h={})
 
@@ -2427,8 +3210,18 @@ class SetScreenTimeoutAction < Action
 end
 
 
+class VolumeAction < Action
+  
+  def initialize(h={})
+    super(h)
+    @group = 'volume'
+  end
+  
+end
 
-class SilentModeVibrateOffAction < Action
+# Category: Volume
+#
+class SilentModeVibrateOffAction < VolumeAction
 
   def initialize(h={})
 
@@ -2442,7 +3235,9 @@ class SilentModeVibrateOffAction < Action
 
 end
 
-class SetVibrateAction < Action
+# Category: Volume
+#
+class SetVibrateAction < VolumeAction
 
   def initialize(h={})
 
@@ -2457,7 +3252,9 @@ class SetVibrateAction < Action
 
 end
 
-class VolumeIncrementDecrementAction < Action
+# Category: Volume
+#
+class VolumeIncrementDecrementAction < VolumeAction
 
   def initialize(h={})
 
@@ -2471,7 +3268,9 @@ class VolumeIncrementDecrementAction < Action
 
 end
 
-class SpeakerPhoneAction < Action
+# Category: Volume
+#
+class SpeakerPhoneAction < VolumeAction
 
   def initialize(h={})
 
@@ -2486,8 +3285,9 @@ class SpeakerPhoneAction < Action
 
 end
 
-
-class SetVolumeAction < Action
+# Category: Volume
+#
+class SetVolumeAction < VolumeAction
 
   def initialize(h={})
 
@@ -2510,5 +3310,917 @@ 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
+
+class TimeOfDayConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      end_hour: 8,
+      end_minute: 0,
+      start_hour: 22,
+      start_minute: 0
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Battery/Power
+#
+class BatteryLevelConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      battery_level: 23,
+      equals: false,
+      greater_than: false
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Battery/Power
+#
+class BatterySaverStateConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      option: 0
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Battery/Power
+#
+class BatteryTemperatureConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      equals: false,
+      greater_than: false,
+      temperature: 30
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Battery/Power
+#
+class ExternalPowerConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      external_power: true,
+      power_connected_options: [false, true, false]
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Connectivity
+#
+class BluetoothConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      any_device: false,
+      bt_state: 0,
+      device_name: 'Any Device'
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Connectivity
+#
+class GPSEnabledConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      enabled: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Connectivity
+#
+class LocationModeConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      options: [false, false, false, true]
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Connectivity
+#
+class SignalOnOffConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      option: 0
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Connectivity
+#
+class WifiConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      ssid_list: [],
+      wifi_state: 0
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Connectivity
+#
+class CellTowerConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      cell_group_name: 'test group',
+      cell_ids: ["524,14,41070731"],
+      in_range: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Connectivity
+#
+class IsRoamingConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      is_roaming: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Connectivity
+#
+class DataOnOffConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      data_on: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Connectivity
+#
+class WifiHotSpotConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      check_connections: false,
+      comparison_value: 0,
+      connected_count: 0,
+      enabled: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Date/Time
+#
+class CalendarConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      enable_regex: false,
+      availability: 0,
+      calendar_id: '1',
+      calendar_name: 'PC Sync',
+      detail_text: '',
+      entry_set: true,
+      ignore_all_day: false,
+      title_text: ''
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Date/Time
+#
+class DayOfWeekConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      days_of_week: [false, false, true, false, false, false, false]
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Date/Time
+#
+class TimeOfDayConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      end_hour: 1,
+      end_minute: 1,
+      start_hour: 21,
+      start_minute: 58
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Date/Time
+#
+class DayOfMonthConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      day_names: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31"],
+      days_of_month: [false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false]
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Date/Time
+#
+class MonthOfYearConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      months: [false, false, false, false, false, false, false, true, false, false, false, false]
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Date/Time
+#
+class SunsetSunriseConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      option: 0
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Device State
+#
+class AirplaneModeConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      enabled: true
+    }
+
+    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
+
+# Category: Device State
+#
+class AutoRotateConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      enabled: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Device State
+#
+class DeviceLockedConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      locked: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Device State
+#
+class RoamingOnOffConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      roaming_on: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Device State
+#
+class TimeSinceBootConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      less_than: true,
+      time_period_seconds: 10921
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Device State
+#
+class AutoSyncConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      enabled: false
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Device State
+#
+class NFCStateConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      enabled: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Device State
+#
+class IsRootedConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      rooted: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Device State
+#
+class VpnConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      option: 0
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: MacroDroid Specific
+#
+class MacroEnabledConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      enabled: true,
+      macro_ids: [-8016812002629322290],
+      macro_names: ["Intruder photo "]
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: MacroDroid Specific
+#
+class ModeConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      mode: 'Away',
+      mode_selected: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: MacroDroid Specific
+#
+class TriggerThatInvokedConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      not: false,
+      si_guid_that_invoked: -4951291100076165433,
+      trigger_name: 'Shake Device'
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: MacroDroid Specific
+#
+class LastRunTimeConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      check_this_macro: false,
+      invoked: true,
+      macro_ids: [-6922688338672048267],
+      macro_names: ["Opendoor"],
+      time_period_seconds: 7260
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Media
+#
+class HeadphonesConnectionConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      connected: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Media
+#
+class MusicActiveConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      music_active: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Notification
+#
+class NotificationPresentConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      enable_regex: false,
+      application_name_list: ["All applications"],
+      exact_match: false,
+      excludes: false,
+      excludes_apps: -1,
+      option: 0,
+      package_name_list: ["allApplications"],
+      text_content: ''
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Notification
+#
+class PriorityModeConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      in_mode: true,
+      selected_index: 0
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Notification
+#
+class NotificationVolumeConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      option: 1
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Phone
+#
+class InCallConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      in_call: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Phone
+#
+class PhoneRingingConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      ringing: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Screen and Speaker
+#
+class BrightnessConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      brightness: 35,
+      equals: false,
+      force_pie_mode: false,
+      greater_than: false,
+      is_auto_brightness: false
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Screen and Speaker
+#
+class VolumeConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      option: 0
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Screen and Speaker
+#
+class SpeakerPhoneConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      enabled: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Screen and Speaker
+#
+class DarkThemeConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      option: 0
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Screen and Speaker
+#
+class ScreenOnOffConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      a: true,
+      screen_on: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Screen and Speaker
+#
+class VolumeLevelConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      comparison: 0,
+      stream_index_array: [false, true, false, false, false, false, false],
+      volume: 42
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Sensors
+#
+class FaceUpDownConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      option: -1,
+      selected_options: [true, false, true, false, false, false]
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Sensors
+#
+class LightLevelConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      light_level: -1,
+      light_level_float: 5000.0,
+      option: 1
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Sensors
+#
+class DeviceOrientationConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      portrait: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Sensors
+#
+class ProximitySensorConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      near: true
+    }
+
+    super(options.merge h)
+
+  end
 
 end