ruby-macrodroid 0.8.9 → 0.9.1

data/lib/ruby-macrodroid/triggers.rb

@@ -416,20 +416,41 @@ end
 #
 class WebHookTrigger < Trigger
 
-  def initialize(h={})
+  def initialize(obj={})
+    
+    h = if obj.is_a? Hash then
+      obj
+    elsif obj.is_a? Array
+      e, macro = obj
+      txt = e.text('item/description')
+      {url: (txt || e.text), macro: macro}
+    end        
+    
+    if h[:url] then
+      h[:identifier] = h[:url][/https:\/\/trigger.macrodroid.com\/(?:\w+\-){4}\w+\/([^$]+)/,1]
+    end
+
 
     options = {
       identifier: ''
     }
+    
+    @deviceid = h[:macro].deviceid
 
-    super(options.merge h)
+    
+    if h[:identifier].nil? or h[:identifier].empty? then
+      h[:identifier] = h[:macro].title.downcase.gsub(/ +/,'-')
+    end
+    
+    super(options.merge filter(options,h))
+    @list << 'identifier'
 
   end
 
   def to_s(colour: false)
     
     url = "https://trigger.macrodroid.com/%s/%s" % \
-        [@h[:macro].deviceid, @h[:identifier]]
+        [@deviceid, @h[:identifier]]
     @s = 'WebHook (Url)' + "\n  " + url
     super()
 
@@ -1372,8 +1393,21 @@ end
 #
 class ProximityTrigger < SensorsTrigger
 
-  def initialize(h={})
+  def initialize(obj=nil)
 
+    h = if obj.is_a? Hash then
+      obj
+    elsif obj.is_a? Array
+      e, macro = obj
+      txt = e.text('item/description')
+      {option: (txt || e.text), macro: macro}
+    end 
+    
+    options = {
+      near: true,
+      selected_option: 0
+    }
+    
     if h[:distance] then
       
       case h[:distance].to_sym
@@ -1382,15 +1416,14 @@ class ProximityTrigger < SensorsTrigger
       end
     end
     
-    options = {
-      near: true,
-      selected_option: 0
-    }
-
     super(options.merge h)
 
   end
   
+  def match?(detail={}, model=nil)
+    @h[:selected_option] == detail[:option].to_i
+  end
+  
   def to_s(colour: false)
     
     distance = if @h[:near] then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macrodroid
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.9.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   NZ2kdBIUDnAM24e0/wXdVxg4HnsZbdymxyzMQ4P5pKYcpI6oisBxI37p/Xy+wAg3
   SBHno3GEuuD8ZWj24IMJpfbp
   -----END CERTIFICATE-----
-date: 2020-09-25 00:00:00.000000000 Z
+date: 2020-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glw
@@ -81,22 +81,22 @@ dependencies:
   name: rowx
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: subunit
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -156,7 +156,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: chronic_cron
   requirement: !ruby/object:Gem::Requirement
@@ -186,6 +186,8 @@ files:
 - lib/ruby-macrodroid.rb
 - lib/ruby-macrodroid/actions.rb
 - lib/ruby-macrodroid/base.rb
+- lib/ruby-macrodroid/constraints.rb
+- lib/ruby-macrodroid/macro.rb
 - lib/ruby-macrodroid/triggers.rb
 homepage: https://github.com/jrobertson/ruby-macrodroid
 licenses: