ruby-macrodroid 0.2.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b99b0c3579e50a88577a63d143082eff0b705e5431b9b603ccfb94e5d88b91e
-  data.tar.gz: 708e38f8855c2ae5c2b4bb48db2699483fc68266123d9fab0bf3cf15fe2f7c98
+  metadata.gz: fc528ce6042bfe75807bb76fcc73cc255b45b6fe0bf138d4a643a5facd7fdaf1
+  data.tar.gz: 294fed6fbe1ff71b05ea4384f9070e5795ceb1c41979bba419f89a4273164124
 SHA512:
-  metadata.gz: 405cd2d5766b93e57ef1401569407f66b508504afbc383f1044c8a81d44a7bf291cff4072b6b49cfd88ecfbc046f3fe5dba2e1bdf659f82e84359cd28751a857
-  data.tar.gz: '086f03ab70ac608e89bf5e1ed29464e2757de3abdae7f60fa67a65d8b0cc5160006f7dec7acdad83a5b9547469f12c92affe86f939020ccd1d997a5c785d83bd'
+  metadata.gz: 76925a5b3cba1509ec62635c04d5d796ded37f2e8cee958748a59c88938876129853adc91df55281e594b6c9043ba5f8fdaba2307a9ff4727d70cf611f4a2d8f
+  data.tar.gz: 55f01e2512265e988d14cc63f576d18a5cc6fdee2a3d109ed47b0ef54bf3d4947ca4064696e405619bb5c2b5e545866fa771d040a13964e205bd343c7b111325

data/lib/ruby-macrodroid.rb

@@ -2,12 +2,82 @@
 
 # file: ruby-macrodroid.rb
 
-require 'pp'
-require 'json'
 require 'uuid'
 require 'rxfhelper'
+require 'chronic_cron'
 
 
+class TriggersNlp
+  include AppRoutes
+
+  def initialize()
+
+    super()
+    params = {}
+    triggers(params)
+
+  end
+
+  def triggers(params) 
+
+    get /^at (\d+:\d+(?:[ap]m)?) on (.*)/i do |time, days|
+      [TimerTrigger, {time: time, days: days}]
+    end
+
+
+  end
+
+  alias find_trigger run_route
+
+end
+
+class ActionsNlp
+  include AppRoutes
+
+  def initialize()
+
+    super()
+    params = {}
+    actions(params)
+
+  end
+
+  def actions(params) 
+
+    get /^message popup: (.*)/i do |msg|
+      [ToastAction, {msg: msg}]
+    end
+
+
+  end
+
+  alias find_action run_route
+
+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
@@ -19,7 +89,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)
@@ -65,15 +135,16 @@ class Macro
   using ColouredText
   using Params
 
-  attr_reader :local_variables, :triggers, :actions, :guid
+  attr_reader :local_variables, :triggers, :actions, :constraints, :guid
+  attr_accessor :title
 
-  def initialize(debug: false)
+  def initialize(name=nil, debug: false)
 
-    @debug = 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
@@ -105,7 +176,15 @@ 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: @title,
+      m_excludeLog: false,
+      m_GUID: guid(),
+      m_isOrCondition: false,
+      m_enabled: false,
+      m_descriptionOpen: false,
+      m_headingColor: 0
     }
     
     puts 'h: ' + h.inspect if @debug
@@ -129,19 +208,146 @@ 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
 
   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
+      
+      # get all the triggers
+      @triggers = node.xpath('triggers/*').map do |e|
+        
+        puts 'e.name: ' + e.name.inspect if @debug
+        {timer: TimerTrigger}[e.name.to_sym].new(e.attributes.to_h)
+        
+      end
+
+      # get all the actions
+      @actions = node.xpath('actions/*').map do |e|
+        
+        if e.name == 'notification' then
+          
+          case e.attributes[:type].to_sym
+          when :popup          
+            e.attributes.delete :type
+            ToastAction.new e.attributes.to_h
+          end
+          
+        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
+      
+      # Level 1
+      
+      tp = TriggersNlp.new      
+      
+      @triggers = node.xpath('trigger').map do |e|
+        
+        r = tp.find_trigger e.text
+        
+        puts 'found trigger ' + r.inspect if @debug
+        
+        if r then
+          r[0].new(r[1])
+        end
+        
+      end
+      
+      ap = ActionsNlp.new      
+      
+      @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]} )
+                
+    if @triggers.any? {|x| x.type == triggerx and x.match?(detail) } then
+      
+      if @debug then
+        puts 'checking constraints ...' 
+        puts '@constraints: ' + @constraints.inspect
+      end
+      
+      if @constraints.all? {|x| x.match?($env.merge(detail)) } then
+      
+        true
+        
+      else
+
+        return false
+        
+      end
+      
+    end
+    
+  end
+  
+  def run()
+    @actions.map(&:invoke)
+  end  
 
   private
+  
+  def guid()
+    '-' + rand(1..9).to_s + 18.times.map { rand 9 }.join    
+  end
 
   def object(h={})
 
@@ -166,33 +372,20 @@ class MacroDroid
     if obj then
       
       s, _ = RXFHelper.read(obj)    
-      import_json(s) if s[0] == '{'
+      
+      if s[0] == '{' then
+        import_json(s) 
+      elsif  s[0] == '<'
+        import_xml(s)
+        @h = build_h
+      else
+        import_xml(text_to_xml(s))
+        @h = build_h
+      end
       
     else
       
-      @h = {
-        cell_tower_groups: [],
-        cell_towers_ignore: [],
-        drawer_configuration: {
-          drawer_items: [],
-          background_color: -1,
-          header_color: 12692882,
-          left_side: false,
-          swipe_area_color: -7829368,
-          swipe_area_height: 20,
-          swipe_area_offset: 40,
-          swipe_area_opacity: 80,
-          swipe_area_width: 14,
-          visible_swipe_area_width: 0
-        },
-        variables: [],
-        user_icons: [],
-        geofence_data: {
-          geofence_map: {}
-        },
-        macro_list: []
-
-      }
+      @h = build_h()
       
       @macros = []
       
@@ -203,6 +396,34 @@ class MacroDroid
     @macros << macro
   end
 
+  def build_h()
+    
+    puts 'inside Macro#build_h' if @debug
+    {
+      cell_tower_groups: [],
+      cell_towers_ignore: [],
+      drawer_configuration: {
+        drawer_items: [],
+        background_color: -1,
+        header_color: 12692882,
+        left_side: false,
+        swipe_area_color: -7829368,
+        swipe_area_height: 20,
+        swipe_area_offset: 40,
+        swipe_area_opacity: 80,
+        swipe_area_width: 14,
+        visible_swipe_area_width: 0
+      },
+      variables: [],
+      user_icons: [],
+      geofence_data: {
+        geofence_map: {}
+      },
+      macro_list: []
+
+    }    
+  end
+
   def export_json()
 
     to_h.to_json
@@ -226,6 +447,50 @@ class MacroDroid
     end
 
     @h[:macro_list] = []
+    
+  end
+  
+  def import_xml(raws)
+    
+    s = RXFHelper.read(raws).first
+    puts 's: ' + s.inspect if @debug
+    doc = Rexle.new(s)
+    puts 'after doc' if @debug
+    
+    @macros = doc.root.xpath('macro').map do |node|
+          
+      macro = Macro.new @title, debug: @debug
+      macro.import_xml(node)
+      macro
+      
+    end
+  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()
@@ -239,12 +504,22 @@ class MacroDroid
 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()
@@ -267,6 +542,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
@@ -279,11 +561,18 @@ class Trigger < MacroObject
     super({fakeIcon: 0}.merge(h))
     @list << 'fakeIcon'
   end
+  
+  def match?(detail={})    
 
-end
+    detail.all? {|key,value| @h[key] == value}
+    
+  end
 
+end
 
 
+# Category: Applications
+#
 class WebHookTrigger < Trigger
 
   def initialize(h={})
@@ -298,6 +587,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={})
@@ -313,6 +618,8 @@ class WifiConnectionTrigger < Trigger
 
 end
 
+# Category: Applications
+#
 class ApplicationInstalledRemovedTrigger < Trigger
 
   def initialize(h={})
@@ -331,6 +638,8 @@ class ApplicationInstalledRemovedTrigger < Trigger
 
 end
 
+# Category: Applications
+#
 class ApplicationLaunchedTrigger < Trigger
 
   def initialize(h={})
@@ -347,6 +656,8 @@ class ApplicationLaunchedTrigger < Trigger
 
 end
 
+# Category: Battery/Power
+#
 class BatteryLevelTrigger < Trigger
 
   def initialize(h={})
@@ -363,6 +674,8 @@ class BatteryLevelTrigger < Trigger
 
 end
 
+# Category: Battery/Power
+#
 class BatteryTemperatureTrigger < Trigger
 
   def initialize(h={})
@@ -379,6 +692,8 @@ class BatteryTemperatureTrigger < Trigger
 
 end
 
+# Category: Battery/Power
+#
 class PowerButtonToggleTrigger < Trigger
 
   def initialize(h={})
@@ -393,6 +708,9 @@ class PowerButtonToggleTrigger < Trigger
 
 end
 
+
+# Category: Battery/Power
+#
 class ExternalPowerTrigger < Trigger
 
   def initialize(h={})
@@ -410,6 +728,8 @@ class ExternalPowerTrigger < Trigger
 
 end
 
+# Category: Call/SMS
+#
 class CallActiveTrigger < Trigger
 
   def initialize(h={})
@@ -426,6 +746,8 @@ class CallActiveTrigger < Trigger
 
 end
 
+# Category: Call/SMS
+#
 class IncomingCallTrigger < Trigger
 
   def initialize(h={})
@@ -444,6 +766,8 @@ class IncomingCallTrigger < Trigger
 
 end
 
+# Category: Call/SMS
+#
 class OutgoingCallTrigger < Trigger
 
   def initialize(h={})
@@ -462,6 +786,8 @@ class OutgoingCallTrigger < Trigger
 
 end
 
+# Category: Call/SMS
+#
 class CallEndedTrigger < Trigger
 
   def initialize(h={})
@@ -480,6 +806,8 @@ class CallEndedTrigger < Trigger
 
 end
 
+# Category: Call/SMS
+#
 class CallMissedTrigger < Trigger
 
   def initialize(h={})
@@ -494,6 +822,8 @@ class CallMissedTrigger < Trigger
 
 end
 
+# Category: Call/SMS
+#
 class IncomingSMSTrigger < Trigger
 
   def initialize(h={})
@@ -516,6 +846,8 @@ class IncomingSMSTrigger < Trigger
 
 end
 
+# Category: Connectivity
+#
 class WebHookTrigger < Trigger
 
   def initialize(h={})
@@ -530,6 +862,8 @@ class WebHookTrigger < Trigger
 
 end
 
+# Category: Connectivity
+#
 class WifiConnectionTrigger < Trigger
 
   def initialize(h={})
@@ -545,6 +879,8 @@ class WifiConnectionTrigger < Trigger
 
 end
 
+# Category: Connectivity
+#
 class BluetoothTrigger < Trigger
 
   def initialize(h={})
@@ -561,6 +897,8 @@ class BluetoothTrigger < Trigger
 
 end
 
+# Category: Connectivity
+#
 class HeadphonesTrigger < Trigger
 
   def initialize(h={})
@@ -576,6 +914,8 @@ class HeadphonesTrigger < Trigger
 
 end
 
+# Category: Connectivity
+#
 class SignalOnOffTrigger < Trigger
 
   def initialize(h={})
@@ -590,6 +930,8 @@ class SignalOnOffTrigger < Trigger
 
 end
 
+# Category: Connectivity
+#
 class UsbDeviceConnectionTrigger < Trigger
 
   def initialize(h={})
@@ -604,22 +946,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={})
@@ -644,24 +1009,76 @@ 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|
+
+        r = Date::DAYNAMES.grep /#{x}/i
+        i = Date::DAYNAMES.index(r.first)
+        days[i-1] = true
+
+      end      
+      
+      h[:days_of_week] = days
+      
+    end
+    
+    if h[:time] then
+      
+      t = Time.parse(h[:time])
+      h[:hour], h[:minute] = t.hour, t.min
+      
+    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]})
+
+    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
 
 end
 
+# Category: Date/Time
+#
 class StopwatchTrigger < Trigger
 
   def initialize(h={})
@@ -677,6 +1094,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={})
@@ -698,6 +1122,10 @@ class DayTrigger < Trigger
 
 end
 
+# Category: Date/Time
+#
+# Regular Interval
+#
 class RegularIntervalTrigger < Trigger
 
   def initialize(h={})
@@ -717,6 +1145,17 @@ class RegularIntervalTrigger < Trigger
 
 end
 
+# Category: Device Events
+#
+# Airplane Mode Changed
+#
+# options: 
+#   Airplane Mode Enabled
+#   Airplane Mode Disabled
+#
+# shorthand example:
+#   airplanemode: enabled
+#
 class AirplaneModeTrigger < Trigger
 
   def initialize(h={})
@@ -731,6 +1170,8 @@ class AirplaneModeTrigger < Trigger
 
 end
 
+# Category: Device Events
+#
 class AutoSyncChangeTrigger < Trigger
 
   def initialize(h={})
@@ -745,6 +1186,8 @@ class AutoSyncChangeTrigger < Trigger
 
 end
 
+# Category: Device Events
+#
 class DayDreamTrigger < Trigger
 
   def initialize(h={})
@@ -759,6 +1202,8 @@ class DayDreamTrigger < Trigger
 
 end
 
+# Category: Device Events
+#
 class DockTrigger < Trigger
 
   def initialize(h={})
@@ -773,6 +1218,8 @@ class DockTrigger < Trigger
 
 end
 
+# Category: Device Events
+#
 class GPSEnabledTrigger < Trigger
 
   def initialize(h={})
@@ -787,6 +1234,8 @@ class GPSEnabledTrigger < Trigger
 
 end
 
+# Category: Device Events
+#
 class MusicPlayingTrigger < Trigger
 
   def initialize(h={})
@@ -801,19 +1250,9 @@ class MusicPlayingTrigger < Trigger
 
 end
 
-class DeviceUnlockedTrigger < Trigger
-
-  def initialize(h={})
-
-    options = {
-    }
-
-    super(options.merge h)
-
-  end
-
-end
 
+# Category: Device Events
+#
 class DeviceUnlockedTrigger < Trigger
 
   def initialize(h={})
@@ -827,6 +1266,8 @@ class DeviceUnlockedTrigger < Trigger
 
 end
 
+# Category: Device Events
+#
 class AutoRotateChangeTrigger < Trigger
 
   def initialize(h={})
@@ -841,6 +1282,8 @@ class AutoRotateChangeTrigger < Trigger
 
 end
 
+# Category: Device Events
+#
 class ClipboardChangeTrigger < Trigger
 
   def initialize(h={})
@@ -856,6 +1299,8 @@ class ClipboardChangeTrigger < Trigger
 
 end
 
+# Category: Device Events
+#
 class BootTrigger < Trigger
 
   def initialize(h={})
@@ -869,19 +1314,8 @@ class BootTrigger < Trigger
 
 end
 
-class BootTrigger < Trigger
-
-  def initialize(h={})
-
-    options = {
-    }
-
-    super(options.merge h)
-
-  end
-
-end
-
+# Category: Device Events
+#
 class IntentReceivedTrigger < Trigger
 
   def initialize(h={})
@@ -900,6 +1334,8 @@ class IntentReceivedTrigger < Trigger
 
 end
 
+# Category: Device Events
+#
 class NotificationTrigger < Trigger
 
   def initialize(h={})
@@ -924,6 +1360,8 @@ class NotificationTrigger < Trigger
 
 end
 
+# Category: Device Events
+#
 class ScreenOnOffTrigger < Trigger
 
   def initialize(h={})
@@ -938,6 +1376,8 @@ class ScreenOnOffTrigger < Trigger
 
 end
 
+# Category: Device Events
+#
 class SilentModeTrigger < Trigger
 
   def initialize(h={})
@@ -952,6 +1392,8 @@ class SilentModeTrigger < Trigger
 
 end
 
+# Category: Location
+#
 class WeatherTrigger < Trigger
 
   def initialize(h={})
@@ -975,6 +1417,8 @@ class WeatherTrigger < Trigger
 
 end
 
+# Category: Location
+#
 class GeofenceTrigger < Trigger
 
   def initialize(h={})
@@ -993,6 +1437,8 @@ class GeofenceTrigger < Trigger
 
 end
 
+# Category: Location
+#
 class SunriseSunsetTrigger < Trigger
 
   def initialize(h={})
@@ -1008,7 +1454,8 @@ class SunriseSunsetTrigger < Trigger
 
 end
 
-
+# Category: Sensors
+#
 class ActivityRecognitionTrigger < Trigger
 
   def initialize(h={})
@@ -1024,7 +1471,8 @@ class ActivityRecognitionTrigger < Trigger
 
 end
 
-
+# Category: Sensors
+#
 class ProximityTrigger < Trigger
 
   def initialize(h={})
@@ -1040,6 +1488,8 @@ class ProximityTrigger < Trigger
 
 end
 
+# Category: Sensors
+#
 class ShakeDeviceTrigger < Trigger
 
   def initialize(h={})
@@ -1053,6 +1503,8 @@ class ShakeDeviceTrigger < Trigger
 
 end
 
+# Category: Sensors
+#
 class FlipDeviceTrigger < Trigger
 
   def initialize(h={})
@@ -1069,6 +1521,8 @@ class FlipDeviceTrigger < Trigger
 
 end
 
+# Category: Sensors
+#
 class OrientationTrigger < Trigger
 
   def initialize(h={})
@@ -1084,6 +1538,8 @@ class OrientationTrigger < Trigger
 
 end
 
+# Category: User Input
+#
 class FloatingButtonTrigger < Trigger
 
   def initialize(h={})
@@ -1107,6 +1563,8 @@ class FloatingButtonTrigger < Trigger
 
 end
 
+# Category: User Input
+#
 class ShortcutTrigger < Trigger
 
   def initialize(h={})
@@ -1120,6 +1578,8 @@ class ShortcutTrigger < Trigger
 
 end
 
+# Category: User Input
+#
 class VolumeButtonTrigger < Trigger
 
   def initialize(h={})
@@ -1137,6 +1597,8 @@ class VolumeButtonTrigger < Trigger
 
 end
 
+# Category: User Input
+#
 class MediaButtonPressedTrigger < Trigger
 
   def initialize(h={})
@@ -1152,6 +1614,8 @@ class MediaButtonPressedTrigger < Trigger
 
 end
 
+# Category: User Input
+#
 class SwipeTrigger < Trigger
 
   def initialize(h={})
@@ -1174,14 +1638,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: '',
@@ -1199,39 +1679,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={})
 
@@ -1248,7 +1708,9 @@ class LaunchActivityAction < Action
 
 end
 
-class KillBackgroundAppAction < Action
+# Category: Applications
+#
+class KillBackgroundAppAction < ApplicationAction
 
   def initialize(h={})
 
@@ -1263,7 +1725,9 @@ class KillBackgroundAppAction < Action
 
 end
 
-class OpenWebPageAction < Action
+# Category: Applications
+#
+class OpenWebPageAction < ApplicationAction
 
   def initialize(h={})
 
@@ -1281,7 +1745,19 @@ class OpenWebPageAction < Action
 
 end
 
-class UploadPhotoAction < Action
+
+class CameraAction < Action
+  
+  def initialize(h={})
+    super(h)
+    @group = 'camera'
+  end
+  
+end
+
+# Category: Camera/Photo
+#
+class UploadPhotoAction < CameraAction
 
   def initialize(h={})
 
@@ -1296,7 +1772,9 @@ class UploadPhotoAction < Action
 
 end
 
-class TakePictureAction < Action
+# Category: Camera/Photo
+#
+class TakePictureAction < CameraAction
 
   def initialize(h={})
 
@@ -1314,7 +1792,19 @@ class TakePictureAction < Action
 
 end
 
-class SetWifiAction < Action
+
+class ConnectivityAction < Action
+  
+  def initialize(h={})
+    super(h)
+    @group = 'connectivity'
+  end
+  
+end
+
+# Category: Connectivity
+#
+class SetWifiAction < ConnectivityAction
 
   def initialize(h={})
 
@@ -1330,7 +1820,9 @@ class SetWifiAction < Action
 
 end
 
-class SetBluetoothAction < Action
+# Category: Connectivity
+#
+class SetBluetoothAction < ConnectivityAction
 
   def initialize(h={})
 
@@ -1345,7 +1837,9 @@ class SetBluetoothAction < Action
 
 end
 
-class SetBluetoothAction < Action
+# Category: Connectivity
+#
+class SetBluetoothAction < ConnectivityAction
 
   def initialize(h={})
 
@@ -1360,7 +1854,9 @@ class SetBluetoothAction < Action
 
 end
 
-class SendIntentAction < Action
+# Category: Connectivity
+#
+class SendIntentAction < ConnectivityAction
 
   def initialize(h={})
 
@@ -1386,7 +1882,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={})
 
@@ -1409,7 +1917,9 @@ class SetAlarmClockAction < Action
 
 end
 
-class StopWatchAction < Action
+# Category: Date/Time
+#
+class StopWatchAction < DateTimeAction
 
   def initialize(h={})
 
@@ -1424,7 +1934,9 @@ class StopWatchAction < Action
 
 end
 
-class SayTimeAction < Action
+# Category: Date/Time
+#
+class SayTimeAction < DateTimeAction
 
   def initialize(h={})
 
@@ -1438,7 +1950,19 @@ class SayTimeAction < Action
 
 end
 
-class AndroidShortcutsAction < Action
+
+class DeviceAction < Action
+  
+  def initialize(h={})
+    super(h)
+    @group = 'device'
+  end
+  
+end
+
+# Category: Device Actions
+#
+class AndroidShortcutsAction < DeviceAction
 
   def initialize(h={})
 
@@ -1452,7 +1976,9 @@ class AndroidShortcutsAction < Action
 
 end
 
-class ClipboardAction < Action
+# Category: Device Actions
+#
+class ClipboardAction < DeviceAction
 
   def initialize(h={})
 
@@ -1466,7 +1992,9 @@ class ClipboardAction < Action
 
 end
 
-class PressBackAction < Action
+# Category: Device Actions
+#
+class PressBackAction < DeviceAction
 
   def initialize(h={})
 
@@ -1479,7 +2007,9 @@ class PressBackAction < Action
 
 end
 
-class SpeakTextAction < Action
+# Category: Device Actions
+#
+class SpeakTextAction < DeviceAction
 
   def initialize(h={})
 
@@ -1500,7 +2030,9 @@ class SpeakTextAction < Action
 
 end
 
-class UIInteractionAction < Action
+# Category: Device Actions
+#
+class UIInteractionAction < DeviceAction
 
   def initialize(h={})
 
@@ -1515,7 +2047,9 @@ class UIInteractionAction < Action
 
 end
 
-class VoiceSearchAction < Action
+# Category: Device Actions
+#
+class VoiceSearchAction < DeviceAction
 
   def initialize(h={})
 
@@ -1528,7 +2062,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={})
 
@@ -1542,7 +2088,9 @@ class ExpandCollapseStatusBarAction < Action
 
 end
 
-class LaunchHomeScreenAction < Action
+# Category: Device Settings
+#
+class LaunchHomeScreenAction < DeviceSettingsAction
 
   def initialize(h={})
 
@@ -1555,7 +2103,9 @@ class LaunchHomeScreenAction < Action
 
 end
 
-class CameraFlashLightAction < Action
+# Category: Device Settings
+#
+class CameraFlashLightAction < DeviceSettingsAction
 
   def initialize(h={})
 
@@ -1570,7 +2120,9 @@ class CameraFlashLightAction < Action
 
 end
 
-class VibrateAction < Action
+# Category: Device Settings
+#
+class VibrateAction < DeviceSettingsAction
 
   def initialize(h={})
 
@@ -1584,7 +2136,9 @@ class VibrateAction < Action
 
 end
 
-class SetAutoRotateAction < Action
+# Category: Device Settings
+#
+class SetAutoRotateAction < DeviceSettingsAction
 
   def initialize(h={})
 
@@ -1598,7 +2152,9 @@ class SetAutoRotateAction < Action
 
 end
 
-class DayDreamAction < Action
+# Category: Device Settings
+#
+class DayDreamAction < DeviceSettingsAction
 
   def initialize(h={})
 
@@ -1611,7 +2167,9 @@ class DayDreamAction < Action
 
 end
 
-class SetKeyboardAction < Action
+# Category: Device Settings
+#
+class SetKeyboardAction < DeviceSettingsAction
 
   def initialize(h={})
 
@@ -1624,7 +2182,9 @@ class SetKeyboardAction < Action
 
 end
 
-class SetKeyguardAction < Action
+# Category: Device Settings
+#
+class SetKeyguardAction < DeviceSettingsAction
 
   def initialize(h={})
 
@@ -1638,7 +2198,9 @@ class SetKeyguardAction < Action
 
 end
 
-class CarModeAction < Action
+# Category: Device Settings
+#
+class CarModeAction < DeviceSettingsAction
 
   def initialize(h={})
 
@@ -1652,7 +2214,9 @@ class CarModeAction < Action
 
 end
 
-class ChangeKeyboardAction < Action
+# Category: Device Settings
+#
+class ChangeKeyboardAction < DeviceSettingsAction
 
   def initialize(h={})
 
@@ -1667,7 +2231,9 @@ class ChangeKeyboardAction < Action
 
 end
 
-class SetWallpaperAction < Action
+# Category: Device Settings
+#
+class SetWallpaperAction < DeviceSettingsAction
 
   def initialize(h={})
 
@@ -1686,7 +2252,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={})
 
@@ -1703,7 +2280,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={})
 
@@ -1716,7 +2305,9 @@ class ForceLocationUpdateAction < Action
 
 end
 
-class ShareLocationAction < Action
+# Category: Location
+#
+class ShareLocationAction < LocationAction
 
   def initialize(h={})
 
@@ -1734,7 +2325,9 @@ class ShareLocationAction < Action
 
 end
 
-class SetLocationUpdateRateAction < Action
+# Category: Location
+#
+class SetLocationUpdateRateAction < LocationAction
 
   def initialize(h={})
 
@@ -1749,7 +2342,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={})
 
@@ -1776,7 +2380,9 @@ class AddCalendarEntryAction < Action
 
 end
 
-class LogAction < Action
+# Category: Logging
+#
+class LogAction < LoggingAction
 
   def initialize(h={})
 
@@ -1791,7 +2397,9 @@ class LogAction < Action
 
 end
 
-class ClearLogAction < Action
+# Category: Logging
+#
+class ClearLogAction < LoggingAction
 
   def initialize(h={})
 
@@ -1805,24 +2413,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={})
 
@@ -1839,7 +2441,9 @@ class RecordMicrophoneAction < Action
 
 end
 
-class PlaySoundAction < Action
+# Category: Media
+#
+class PlaySoundAction < MediaAction
 
   def initialize(h={})
 
@@ -1855,7 +2459,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={})
 
@@ -1875,7 +2490,9 @@ class SendEmailAction < Action
 
 end
 
-class SendSMSAction < Action
+# Category: Messaging
+#
+class SendSMSAction < MessagingAction
 
   def initialize(h={})
 
@@ -1894,7 +2511,9 @@ class SendSMSAction < Action
 
 end
 
-class UDPCommandAction < Action
+# Category: Messaging
+#
+class UDPCommandAction < MessagingAction
 
   def initialize(h={})
 
@@ -1910,7 +2529,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={})
 
@@ -1932,7 +2563,9 @@ class ClearNotificationsAction < Action
 
 end
 
-class MessageDialogAction < Action
+# Category: Notifications
+#
+class MessageDialogAction < NotificationsAction
 
   def initialize(h={})
 
@@ -1957,7 +2590,9 @@ class MessageDialogAction < Action
 
 end
 
-class AllowLEDNotificationLightAction < Action
+# Category: Notifications
+#
+class AllowLEDNotificationLightAction < NotificationsAction
 
   def initialize(h={})
 
@@ -1971,7 +2606,9 @@ class AllowLEDNotificationLightAction < Action
 
 end
 
-class SetNotificationSoundAction < Action
+# Category: Notifications
+#
+class SetNotificationSoundAction < NotificationsAction
 
   def initialize(h={})
 
@@ -1985,7 +2622,9 @@ class SetNotificationSoundAction < Action
 
 end
 
-class SetNotificationSoundAction < Action
+# Category: Notifications
+#
+class SetNotificationSoundAction < NotificationsAction
 
   def initialize(h={})
 
@@ -1999,7 +2638,9 @@ class SetNotificationSoundAction < Action
 
 end
 
-class SetNotificationSoundAction < Action
+# Category: Notifications
+#
+class SetNotificationSoundAction < NotificationsAction
 
   def initialize(h={})
 
@@ -2013,7 +2654,9 @@ class SetNotificationSoundAction < Action
 
 end
 
-class NotificationAction < Action
+# Category: Notifications
+#
+class NotificationAction < NotificationsAction
 
   def initialize(h={})
 
@@ -2037,10 +2680,17 @@ class NotificationAction < Action
 
 end
 
-class ToastAction < Action
+# Category: Notifications
+#
+class ToastAction < NotificationsAction
 
   def initialize(h={})
 
+    if h[:msg] then
+      h[:message_text] = h[:msg]
+      h.delete :msg
+    end
+    
     options = {
       message_text: '',
       image_resource_name: 'launcher_no_border',
@@ -2055,10 +2705,26 @@ class ToastAction < Action
     super(options.merge h)
 
   end
+  
+  def invoke()
+    super(@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={})
 
@@ -2072,7 +2738,9 @@ class AnswerCallAction < Action
 
 end
 
-class ClearCallLogAction < Action
+# Category: Phone
+#
+class ClearCallLogAction < PhoneAction
 
   def initialize(h={})
 
@@ -2088,7 +2756,9 @@ class ClearCallLogAction < Action
 
 end
 
-class OpenCallLogAction < Action
+# Category: Phone
+#
+class OpenCallLogAction < PhoneAction
 
   def initialize(h={})
 
@@ -2101,7 +2771,9 @@ class OpenCallLogAction < Action
 
 end
 
-class RejectCallAction < Action
+# Category: Phone
+#
+class RejectCallAction < PhoneAction
 
   def initialize(h={})
 
@@ -2114,7 +2786,9 @@ class RejectCallAction < Action
 
 end
 
-class MakeCallAction < Action
+# Category: Phone
+#
+class MakeCallAction < PhoneAction
 
   def initialize(h={})
 
@@ -2129,7 +2803,10 @@ class MakeCallAction < Action
 
 end
 
-class SetRingtoneAction < Action
+
+# Category: Phone
+#
+class SetRingtoneAction < PhoneAction
 
   def initialize(h={})
 
@@ -2143,7 +2820,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={})
 
@@ -2159,7 +2847,9 @@ class SetBrightnessAction < Action
 
 end
 
-class ForceScreenRotationAction < Action
+# Category: Screen
+#
+class ForceScreenRotationAction < ScreenAction
 
   def initialize(h={})
 
@@ -2173,7 +2863,9 @@ class ForceScreenRotationAction < Action
 
 end
 
-class ScreenOnAction < Action
+# Category: Screen
+#
+class ScreenOnAction < ScreenAction
 
   def initialize(h={})
 
@@ -2190,7 +2882,9 @@ class ScreenOnAction < Action
 
 end
 
-class DimScreenAction < Action
+# Category: Screen
+#
+class DimScreenAction < ScreenAction
 
   def initialize(h={})
 
@@ -2205,7 +2899,9 @@ class DimScreenAction < Action
 
 end
 
-class KeepAwakeAction < Action
+# Category: Screen
+#
+class KeepAwakeAction < ScreenAction
 
   def initialize(h={})
 
@@ -2222,7 +2918,9 @@ class KeepAwakeAction < Action
 
 end
 
-class SetScreenTimeoutAction < Action
+# Category: Screen
+#
+class SetScreenTimeoutAction < ScreenAction
 
   def initialize(h={})
 
@@ -2239,8 +2937,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={})
 
@@ -2254,7 +2962,9 @@ class SilentModeVibrateOffAction < Action
 
 end
 
-class SetVibrateAction < Action
+# Category: Volume
+#
+class SetVibrateAction < VolumeAction
 
   def initialize(h={})
 
@@ -2269,7 +2979,9 @@ class SetVibrateAction < Action
 
 end
 
-class VolumeIncrementDecrementAction < Action
+# Category: Volume
+#
+class VolumeIncrementDecrementAction < VolumeAction
 
   def initialize(h={})
 
@@ -2283,7 +2995,9 @@ class VolumeIncrementDecrementAction < Action
 
 end
 
-class SpeakerPhoneAction < Action
+# Category: Volume
+#
+class SpeakerPhoneAction < VolumeAction
 
   def initialize(h={})
 
@@ -2298,9 +3012,9 @@ class SpeakerPhoneAction < Action
 
 end
 
-
-
-class SetVolumeAction < Action
+# Category: Volume
+#
+class SetVolumeAction < VolumeAction
 
   def initialize(h={})
 
@@ -2325,3 +3039,856 @@ class Constraint < MacroObject
   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
+
+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