projectsimulator 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 004c088ecb944c24b758301d5cd41fe5a9135b6401b5c489bbac794a951ad17e
-  data.tar.gz: d5ce967f78e745769888e57b0f3342f1c2669280923bbd699f55a066f84fc5de
+  metadata.gz: 5d6d7ab7020d9059697cd4a5d7e681cf876f560cc1837e74bd3eb0e896004a9c
+  data.tar.gz: d1c40af5df514a3a41b82d03610c3fd89c8938f27b87ade37518c3295e4f65b8
 SHA512:
-  metadata.gz: 35fbc194fa72f2fa1b8081259504e62abe03b47336b8bbf952957b172f2d19276296278406a0db710a8dca39e9d798bb4514de397d429cabcf981085a7272c53
-  data.tar.gz: 5de28c8c32f433c3efe1cad7b90cd0111ac69025fa40ed4d28e75cd14ae35c52a755feb3ce899ccd27836bc6c61218292cf0789def2baa6812c644c0d219a0c3
+  metadata.gz: 6ff10c8255f576a0bdd80920108ad6ef2e07ded1be62b84dae5a1beac65d8836ad80c21fb73fcc51c7e328dfb1f38621c60f28d05210a19953a588ee1261e73f
+  data.tar.gz: 20f8991ea5a55153acf1c1ef584c3063de630d64704fc174c2e99587fc8c24d0e8b589491d86577dab0d9c00650c2561917fef44e9a59a2276f714fe69ac9442

data/lib/projectsimulator.rb

@@ -2,10 +2,9 @@
 
 # file: projectsimulator.rb
 
-require 'rowx'
+
 require 'easydom'
 require 'app-routes'
-require 'chronic_between'
 
 
 module ProjectSimulator
@@ -127,430 +126,44 @@ module ProjectSimulator
     alias find_request run_route    
 
   end
-  
-  
-  class Event
 
+  class Controller
+    
+    attr_reader :macros
     attr_accessor :title
-    attr_reader :triggers, :actions, :constraints, :messages
-
-    def initialize(e, time: nil, title: '', debug: false)
-
-      @time, @debug = time, debug
-      @title = e.text('event')
-      @actions = []
-      @triggers = []
-      @constraints = []
-
-      e.xpath('trigger').each do |x| 
-        @triggers << Trigger.new(x.text().strip, time: time, debug: debug)\
-            .to_type
-      end
 
-      e.xpath('action').each do |x|
-        @actions << Action.new(x.text().strip, debug: debug).to_type
-      end
-
-      e.xpath('constraint').each do |x|
-        puts 'before Constraints.new'
-        @constraints << Constraint.new(x.text().strip, \
-                                       time: time, debug: debug).to_type
-      end
-
-    end
-    
-    def match(trigger: nil, location: '')
-      
-      @messages = []
-      
-      h = {motion: MotionTrigger}
-      
-      if @triggers.any? {|x| x.is_a? h[trigger.to_sym] and x.match } then
-        
-        if @constraints.all?(&:match) then
-        
-          @messages = @actions.map(&:call)
-          
-        else
-          
-          puts 'else reset?' if @debug
-          a = @constraints.select {|x| x.is_a? FrequencyConstraint }
-          puts 'a:' + a.inspect if @debug
-          a.each {|x| x.reset if x.counter > 0 }
-          return false
-        end
-        
-      end
-      
-    end
-    
-    def time=(val)
-      @time = val
-      @constraints.each {|x| x.time = val if x.is_a? TimeConstraint }
-    end
-    
-    def to_node()
+    def initialize(mcs, debug: false)
       
-      e = Rexle::Element.new(:event, attributes: {title: @title})
-      
-      e.add node_collection(:triggers, @triggers)
-      e.add node_collection(:actions, @actions)
-      e.add node_collection(:constraints, @constraints)
-      
-      return e
-    end
-    
-    def to_rowx()
-      
-      s = "event: %s\n\n" % @title
-      s + [@triggers, @actions, @constraints]\
-          .map {|x| x.collect(&:to_rowx).join("\n")}.join("\n")
-    end
-    
-    private
-    
-    def node_collection(name, a)
-      
-      e = Rexle::Element.new(name)
-      a.each {|x| e.add x.to_node}
-      return e
-      
-    end
-    
-  end
-
-  class Action
-    include AppRoutes
-
-    attr_reader :to_type
-
-    def initialize(s, event: '', debug: false)
-
-      super()
       @debug = debug
-      params = {s: s, event: event}
-      actions(params)
-      @to_type = find_action(s) || {}
-
-    end
-
-    protected
-
-    def actions(params) 
-
-      puts 'inside actions'
-      # e.g. Say 'Good morning'
-      #
-      get /say ['"]([^'"]+)/i do |s|
-        puts 's: ' + s.inspect if @debug
-        SayAction.new(s)
-      end
-      
-      # e.g. webhook entered_kitchen
-      #
-      get /webhook (.*)/i do |name|
-        WebhookAction.new(name)
-      end      
-      
-      get /.*/ do
-        puts 'action unknown' if @debug
-        {}
-      end
-
-    end
-
-    private
-
-    alias find_action run_route
-
-  end
-
-  class Trigger
-    include AppRoutes
-
-    attr_reader :to_type
-
-    def initialize(s, time: nil, debug: false)
-
-      super()
-      @time, @debug = time, debug
-      params = {s: s}
-      puts 'inside Trigger'
-      puts 'params: ' + params.inspect
-      triggers(params)
-      @to_type = find_trigger(s)
-
-    end
-
-    protected
-
-    def triggers(params) 
-      
-      puts 'inside triggers'
-
-      # e.g. Motion detected in the kitchen
-      #
-      get /motion detected in the (.*)/i do |location|
-        puts 'motion detection trigger'
-        MotionTrigger.new(location)
-      end
-
-    end
-
-    private
-
-    alias find_trigger run_route
-
-  end
-  
-  class Constraint
-    include AppRoutes
-    
-    attr_reader :to_type
-    
-    def initialize(s, time: nil, debug: false)
-      
-      super()
-      @time, @debug = time, debug
-      
-      params = {s: s }
-      constraints(params)
-      @to_type = find_constraint(s)
-      
-    end
-    
-    protected
-
-    def constraints(params) 
-
-      puts 'inside constraints' if @debug
-      # e.g. Between 8am and 10am
-      #
-      get /^between (.*)/i do |s|
-        TimeConstraint.new(s, time: @time)
-      end
-      
-      get /^on a (.*)/i do |s|
-        TimeConstraint.new(s, time: @time)
-      end
-      
-      get /^(after .*)/i do |s|
-        TimeConstraint.new(s, time: @time)
-      end      
-      
-      get /^once only|only once|once|one time|1 time$/i do |s|
-        FrequencyConstraint.new(1, debug: @debug)
-      end
-      
-      get /^twice only|only twice|twice|two times|2 times$/i do |s|
-        FrequencyConstraint.new(2, debug: @debug)
-      end
-      
-      get /^(Maximum|Max|Up to) ?three times|3 times$/i do |s|
-        FrequencyConstraint.new(3, debug: @debug)
-      end                    
-      
-      get /^(Maximum|Max|Up to) ?four times|4 times$/i do |s|
-        FrequencyConstraint.new(4, debug: @debug)
-      end                          
-
-    end
-
-    private
-
-    alias find_constraint run_route    
-  end
-
-  class MotionTrigger
+      @syslog = []
+            
+      @macros = mcs.macros
 
-    attr_reader :location
-    
-    def initialize(locationx, location: locationx)
-      @location = location
-    end
-
-    def match()
-      @location.downcase == location.downcase
-    end
-    
-    def to_node()
-      Rexle::Element.new(:trigger, \
-                         attributes: {type: :motion, location: @location})
-    end
-    
-    def to_rowx()
-      "trigger: Motion detected in the %s" %  @location
     end        
-
-  end
-
-  class SayAction
-
-    def initialize(s, text: s)
-      @s = s
-    end
-    
-    def call()
-      "say: %s" % @s
-    end
     
-    def to_node()
-      Rexle::Element.new(:action, attributes: {type: :say, text: @s})
-    end        
-    
-    def to_rowx()
-      "action: say %s" %  @s
-    end    
-
-  end
-  
-  class WebhookAction
-    
-    attr_accessor :url
-
-    def initialize(namex, name: namex, url: '127.0.0.1')
-      @name = name
-      @url = url
-    end
-    
-    def call()
-      "webhook: %s" % @url
-    end
-    
-    def to_node()
-      Rexle::Element.new(:action, \
-                         attributes: {type: :webhook, name: @name, url: @url})
-    end    
-    
-    def to_rowx()
-      s = "action: webhook %s" %  @name
-      s += "\n  url: %s" % @url
-    end
-
-  end
-
-  class TimeConstraint    
-    
-    attr_accessor :time
-    
-    def initialize(timesx, times: timesx, time: nil)
-      @times, @time = times, time
-    end
-    
-    def match()
-      ChronicBetween.new(@times).within?(@time)
-    end
     
-    def to_node()
-      Rexle::Element.new(:constraint, \
-                         attributes: {type: :time, times: @times})      
-    end    
-    
-    def to_rowx()            
-      "constraint: %s" %  @times
-    end    
-        
-  end
-
-  class FrequencyConstraint      
-      
-    def initialize(freqx, freq: freqx, debug: false)
-      @freq, @debug = freq, debug
-      @counter = 0
-    end
-    
-    def counter()
-      @counter
-    end
-    
-    def increment()
-      @counter += 1
-    end
-    
-    def match()
-      @counter < @freq
-    end
-    
-    def reset()
-      puts 'resetting' if @debug
-      @counter = 0
-    end
-    
-    def to_node()
-      Rexle::Element.new(:constraint, \
-                         attributes: {type: :frequency, freq: @freq})      
-    end
-    
-    def to_rowx()
-      
-      freq = case @freq
-      when 1
-        'Once'
-      when 2
-        'Twice'
-      else
-        "Maximum %s times" % @freq
-      end
-      
-      "constraint: %s" %  freq
-
-    end
-    
-  end
-
-  class Controller
-    
-    attr_reader :events
-    attr_accessor :time
-
-    def initialize(s, time: Time.now, debug: false)
-      
-      @time, @debug = time, debug
-
-      doc = Rexle.new(RowX.new(s).to_xml)
-
-      @events = doc.root.xpath('item')\
-          .map {|e| Event.new(e, time: @time, debug: debug) }
-
-    end
-    
-    def time=(val)
-      @time = val
-      @events.each {|event| event.time = val }
-    end
-    
-    def to_doc()
+    def trigger(name, detail={})
       
-      doc = Rexle.new('<events/>')      
-      @events.each {|event| doc.root.add event.to_node }
-      return doc
-      
-    end
-    
-    def to_rowx()
-      @events.collect(&:to_rowx).join("\n\n#{'-'*50}\n\n")
-    end
-    
-    def trigger(name, location: '')
-      
-      events = @events.select do |event|
+      macros = @macros.select do |macro|
         
-        puts 'event: '  + event.inspect if @debug
+        puts 'macro: '  + macro.inspect if @debug
 
-        event.match(trigger: 'motion', location: location)
+        valid_trigger = macro.match?(name, detail)
+        
+        puts 'valid_trigger: ' + valid_trigger.inspect if @debug
+        
+        if valid_trigger then
+          @syslog << [Time.now, :trigger, name] 
+          @syslog << [Time.now, :macro, macro.title]
+        end
+                     
+        valid_trigger
         
       end
       
-      puts 'events: ' + events.inspect if @debug
-      
-      events.each do |event|
-        c = event.constraints.select {|x| x.is_a? FrequencyConstraint }
-        puts 'c:' + c.inspect
-        c.each(&:increment)
-      end
-      
-      events.flat_map(&:messages)
+      puts 'macros: ' + macros.inspect if @debug
       
+      macros.flat_map(&:run)
     end
 
   end  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: projectsimulator
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,28 +35,8 @@ cert_chain:
   2GrtfOXGVOS+2jvmCQC6vU+ew9WBxiDUbebI95TeTwMs2o0cs3IASXX5rIn4TPcz
   SCccB3fVg2yfsy5DivaWaZwg
   -----END CERTIFICATE-----
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rowx
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  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::Dependency
   name: easydom
   requirement: !ruby/object:Gem::Requirement
@@ -97,26 +77,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.19
-- !ruby/object:Gem::Dependency
-  name: chronic_between
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
 description: 
 email: james@jamesrobertson.eu
 executables: []