projectsimulator 0.2.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 024bbe43574b19e2cef1d32997464cb570ae9828559842a47980069503d4ccd4
-  data.tar.gz: ac1aac4437f90007c016ef61e7b6bf89673d6d1310929e9557e1f334e730198d
+  metadata.gz: 850c1d323a1816a344d896177412330258c4b9bcbe8c946182701533efdddf05
+  data.tar.gz: 9e7a2e6ab061f4820207085240a52d8bd36847e57b6ef5d8cf0a625739802dad
 SHA512:
-  metadata.gz: c18c8f2422750ffa91db344a0d9845633be16d23447599e9c73404bf2203335a110f0fa56f45cf5e552aa2ef66740c18d4d1de3ee9cdbca72d4602aaa203528b
-  data.tar.gz: 349887e64fcd35c9bfadbb113e52cea58a7f781b58896e1888dd9763e064d9b38a4917e6622f9bee7334a1ebb186d1abda4048bfa4c154b448a6953507000892
+  metadata.gz: e52e950765845719638554324e058fdda5484feb34128aad13b76f8ff0623b5db4af437aaf60778e6b2356edb43533347831e7a78c3269500f61be6183946ca0
+  data.tar.gz: 55d386d448cd8edb318f938771505d2d61155d7106ebf48932469ffab840db66de019a0556bfe481206af055668326e111cfc04f50346aef7f48a16ac5b80740

data/lib/projectsimulator.rb

@@ -2,10 +2,9 @@
 
 # file: projectsimulator.rb
 
-require 'rowx'
+
 require 'easydom'
 require 'app-routes'
-require 'chronic_between'
 
 
 module ProjectSimulator
@@ -13,12 +12,40 @@ module ProjectSimulator
   class Model
     include AppRoutes
 
-    def initialize(obj=nil, root: 'building1')
+    def initialize(obj=nil, root: 'building1', debug: false)
 
       super()
-      @root = root
+      @root, @debug = root, debug
       @location = nil
-      build(obj, root: root) if obj
+      
+      if obj then
+        
+        s = obj.strip
+        
+        puts 's: ' + s.inspect if @debug
+        
+        if s[0] == '<' or s.lines[1][0..1] == '  ' then
+          
+          puts 'before easydom' if @debug
+          
+          s2 = if s.lines[1][0..1] == '  ' then
+          
+            lines = s.lines.map do |line|
+              line.sub(/(\w+) +is +(\w+)$/) {|x| "#{$1} {switch: #{$2}}" }
+            end
+            
+            lines.join
+            
+          else
+            s
+          end
+          
+          @ed = EasyDom.new(s2)
+        else
+          build(s, root: root) 
+        end
+
+      end
 
     end
 
@@ -36,8 +63,27 @@ module ProjectSimulator
       status = a.inject(@ed) {|r,x| r.send(x)}.send(h[:action])
       "The %s %s is %s." % [h[:location], h[:device], status]
       
-    end    
+    end
 
+    def get_service(h)
+      
+      a = []
+      a << h[:location].split(/ /) if h.has_key? :location
+      a << h[:service]
+      status = a.inject(@ed) {|r,x| r.send(x)}.send(h[:action])
+      
+      if h.has_key? :location then
+        "The %s %s is %s." % [h[:location], h[:service], status]
+      else
+        "%s is %s." % [h[:service].capitalize, status]
+      end
+      
+    end      
+
+    # Object Property (op)
+    # Helpful for accessing properites in dot notation 
+    # e.g. op.livingroom.light.switch = 'off'
+    #
     def op()
       @ed
     end
@@ -46,13 +92,16 @@ module ProjectSimulator
       @ed.e.element(s)
     end
     
+    # request accepts a string in plain english 
+    # e.g. request 'switch the livingroom light on'
+    #
     def request(s)
 
       params = {request: s}
       requests(params)
       h = find_request(s)
 
-      method(h.first[-1]).call(h)
+      method(h.first[-1]).call(h).gsub(/_/,' ')
       
     end      
     
@@ -63,14 +112,49 @@ module ProjectSimulator
       a.inject(@ed) {|r,x| r.send(x)}.send(h[:action], h[:value])
       
     end
+    
+    def set_service(h)
+      
+      a = []
+      a += h[:location].split(/ /) if h[:location]
+      a << h[:service]
+      a.inject(@ed) {|r,x| r.send(x)}.send(h[:action], h[:value])
+      
+    end    
+
+    def to_sliml(level: 0)
+      
+      s = @ed.to_sliml
 
-    def to_sliml()
-      @ed.to_sliml
+      return s if level.to_i > 0
+      
+      lines = s.lines.map do |line|
+        
+        line.sub(/\{[^\}]+\}/) do |x|
+          
+          a = x.scan(/\w+: +[^ ]+/)
+          if a.length == 1 and x[/switch:/] then
+
+            val = x[/(?<=switch: ) *["']([^"']+)/,1]
+            'is ' + val
+          else
+            x
+          end
+
+        end
+      end
+      
+      lines.join
+      
     end
 
-    def xml(options=nil)
+    def to_xml(options=nil)
       @ed.xml(pretty: true).gsub(' style=\'\'','')
     end
+    
+    alias xml to_xml
+    
+    # to_xml() is the preferred method
 
     protected      
 
@@ -85,20 +169,44 @@ module ProjectSimulator
       # e.g. switch the gas _fire off
       #
       get /(?:switch|turn) the ([^ ]+) +(on|off)$/ do |device, onoff|
-        location = dev_location(device)
+        location = find_path(device)
         {type: :set_device, action: 'switch=', location: location, device: device, value: onoff}
-      end      
+      end            
       
       # e.g. is the livingroom gas_fire on?
       #
       get /is the ([^ ]+) +([^ ]+) +(?:on|off)\??$/ do |location, device|
         {type: :get_device, action: 'switch', location: location, device: device}
       end
+      
+      # e.g. enable airplane mode
+      #
+      get /((?:dis|en)able) ([^$]+)$/ do |state, rawservice|
+        service = rawservice.gsub(/ /,'_')
+        location = find_path(service)
+        {type: :set_service, action: 'switch=', location: location, service: service, value: state + 'd'}
+      end
+      
+      # e.g. switch airplane mode off
+      #
+      get /switch (.*) (on|off)/ do |rawservice, rawstate|        
+        
+        state = rawstate == 'on' ? 'enabled' : 'disabled'
+        service = rawservice.gsub(/ /,'_')
+        location = find_path(service)
+        {type: :set_service, action: 'switch=', location: location, service: service, value: state}
+      end               
+      
+      # e.g. is airplane mode enabed?
+      #
+      get /is (.*) +(?:(?:dis|en)abled)\??$/ do |service|
+        {type: :get_service, action: 'switch', service: service.gsub(/ /,'_')}
+      end      
 
       # e.g. is the gas_fire on?
       #
       get /is the ([^ ]+) +(?:on|off)\??$/ do |device|
-        location = dev_location(device)        
+        location = find_path(device)        
         {type: :get_device, action: 'switch', location: location, device: device}
       end            
       
@@ -111,7 +219,7 @@ module ProjectSimulator
       # e.g. fetch the temperature reading
       #
       get /fetch the ([^ ]+) +(?:reading)$/ do |device|
-        location = dev_location(device)        
+        location = find_path(device)        
         {type: :get_device, action: 'reading', location: location, device: device}
       end          
 
@@ -119,329 +227,55 @@ module ProjectSimulator
     
     private
     
-    def dev_location(device)
-      a = query('//'+ device).backtrack.to_xpath.split('/')
+    def find_path(s)
+      puts 'find_path s: ' + s.inspect if @debug
+      found = query('//'+ s)
+      return unless found
+      a = found.backtrack.to_xpath.split('/')
       a[1..-2].join(' ')            
     end
         
     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, debug: false)    
-
-      @time, @debug = time, debug
-      @title = e.text('event')
-      @actions = []
-      @triggers = []
-      @constraints = []
 
-      e.xpath('trigger/text()').each do |x| 
-        @triggers << Trigger.new(x, time: time, debug: debug).to_type
-      end
-
-      e.xpath('action/text()').each do |x|
-        @actions << Action.new(x, debug: debug).to_type
-      end
-
-      e.xpath('constraint/text()').each do |x|
-        puts 'before Constraints.new'
-        @constraints << Constraint.new(x, time: time, debug: debug).to_type
-      end
-
-    end
-    
-    def match(trigger: nil, location: '')
-      
-      @messages = []
+    def initialize(mcs, debug: false)
       
-      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
-    
-  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
+      @syslog = []
+            
+      @macros = mcs.macros
 
-  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
+    end        
     
-    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
+    def trigger(name, detail={time: $env[:time]})
       
-      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/i do |s|
-        FrequencyConstraint.new(1, debug: @debug)
-      end        
-
-    end
-
-    private
-
-    alias find_constraint run_route    
-  end
-
-  class MotionTrigger
-
-    attr_reader :location
-    
-    def initialize(location)
-      @location = location
-    end
-
-    def match()
-      @location.downcase == location.downcase
-    end
-
-  end
-
-  class SayAction
-
-    def initialize(s)
-      @s = s
-    end
-    
-    def call()
-      "say: %s" % @s
-    end
-
-  end
-  
-  class WebhookAction
-    
-    attr_accessor :url
-
-    def initialize(name)
-      @name = name
-      @url = '127.0.0.1'
-    end
-    
-    def call()
-      "webhook: %s" % @url
-    end
-
-  end
-
-  class TimeConstraint    
-    
-    attr_accessor :time
-    
-    def initialize(times, time: nil)
-      @times, @time = times, time
-    end
-    
-    def match()
-      ChronicBetween.new(@times).within?(@time)
-    end
+      macros = @macros.select do |macro|
         
-  end
+        puts 'macro: '  + macro.inspect if @debug
 
-  class FrequencyConstraint      
-      
-    def initialize(freq, 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
-@foo = 0      
-@counter = 0
-    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 trigger(name, location: '')
-      
-      events = @events.select do |event|
+        valid_trigger = macro.match?(name, detail)
         
-        puts 'event: '  + event.inspect if @debug
-
-        event.match(trigger: 'motion', location: location)
+        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.1
+  version: 0.3.3
 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-20 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: []