ruby-macrodroid 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d741e63df502364d934438221160e20d967303ec5c79923924e7c978175f44d
-  data.tar.gz: 9b0e372bb0cfc60ddcd553355bc30dbb90cdd303904c93556a8f16ef87fb2432
+  metadata.gz: 5f4e1e8fee18ccf4731c38c61f67b673888872ffa5b33349a6f2da8e9e51535f
+  data.tar.gz: a3fe55c967182a61cf50514a38e7c3b8521e3efda4ce93d2b99c41e89540408b
 SHA512:
-  metadata.gz: 40c3507258eade1847ea92c63912f930db4c3843e36beec011e9b9fbaf5fbbc47ea9d8778aaaf7b43be9486ce63875116433065a007dd6956112128c1d96aa0f
-  data.tar.gz: dff690f4ce9ebb274cc22f99c95f18981ab05136597a2b0c0eabdf9fa6848c004d2003b653b280da147302aec651731952b8d3c5077222bfc625d4e3819b0008
+  metadata.gz: 22ec4d0d3b94072c272817def3167dd5b6c8d2874572028bb0f3629dfb0b86e00cbd5779e0f3f99344182819abe556f5ab2440c18621cc50302b35aff40a16bf
+  data.tar.gz: b61d5d2efe7d8e47d1c99438a837f85d25af466c49c34eb3979d7204c600c4ca017262ba3f311311904abb78973713a8f53db9a17b6dce3c802ca8a651cacd21

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-a��ũt�w��Т��|�<���3u����P���ɞ�0���.�D��4a�H��@�qh�l<��x?J]���O_��
�/UӇ���0+i�`�d�y�|Q{$e�b@���n�3s�Yx_��<��E���MWֿ	l?��AmҬzz�U"��A⷏��g|֕��	���/�9x*������2},yzzh�L�Y*�;to-n�lnn<���1�~ww DEm�ҥxu�|�O�-��:[�y�#	�k�x{�yr���RD�z���B�2�Ou.o��m���.Ih=���v<u�=0�g��T�V��G[���h(��1fI�y�r�R1?LKO�Ppf3�0�xi��M�$�E�\	��ܷ/����ZY���&Z�=u!S�D
+&CQ@��VU俱���̳UP}QG�ɋ�D��-���
�V�򿱉��*#E
���H�A�6�r"�(��ø�/�y���k��Cd����F��w����O�`0���E8��zހ@��ހ4�A�Đ�4k�"u���[_Q깜L�]
+|����,zxD"\ݳ�psS��Gv+s�
+d�oL�ox��`]�&�]d|7�Pe��a��9/�O�n4�

data/lib/ruby-macrodroid.rb

@@ -7,8 +7,58 @@ require 'json'
 require 'uuid'
 require 'date'
 require 'rxfhelper'
+require 'app-routes'
 
 
+
+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
+
 module Params
 
   refine Hash do
@@ -155,28 +205,62 @@ class Macro
     
     @name = node.attributes[:name]
 
-    # get all the triggers
-    @triggers = node.xpath('triggers/*').map do |e|
+    if node.element('triggers') then
       
-      puts 'e.name: ' + e.name.inspect if @debug
-      {timer: TimerTrigger}[e.name.to_sym].new(e.attributes.to_h)
+      # level 2
       
-    end
+      # 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|
+      # 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    
+      
+    else
       
-      if e.name == 'notification' then
+      # Level 1
+      
+      tp = TriggersNlp.new      
+      
+      @triggers = node.xpath('trigger').map do |e|
         
-        case e.attributes[:type].to_sym
-        when :popup          
-          e.attributes.delete :type
-          ToastAction.new e.attributes.to_h
+        r = tp.find_trigger e.text
+        
+        if r then
+          r[0].new(r[1])
         end
         
       end
-
-    end    
+      
+      ap = ActionsNlp.new      
+      
+      @actions = node.xpath('action').map do |e|
+        
+        r = ap.find_action e.text
+        
+        if r then
+          r[0].new(r[1])
+        end
+        
+      end      
+      
+    end
     
     self
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macrodroid
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   NZ2kdBIUDnAM24e0/wXdVxg4HnsZbdymxyzMQ4P5pKYcpI6oisBxI37p/Xy+wAg3
   SBHno3GEuuD8ZWj24IMJpfbp
   -----END CERTIFICATE-----
-date: 2020-08-12 00:00:00.000000000 Z
+date: 2020-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid
@@ -77,6 +77,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.4
+- !ruby/object:Gem::Dependency
+  name: app-routes
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.19
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.19
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -106,5 +126,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: 'Reads the exported JSON file from MacroDroid. #unofficialgem #experimental'
+summary: 'A macro builder for MacroDroid. #unofficialgem #experimental'
 test_files: []