projectsimulator 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d48b4e25949ccbd4ae87be72f39091fd3b6ffe94b0222dd027f045288468b24c
-  data.tar.gz: cc8d40687884dc750ec041e65ea5982aec888bd80c288f863cc03330d396eacb
+  metadata.gz: 5d6d7ab7020d9059697cd4a5d7e681cf876f560cc1837e74bd3eb0e896004a9c
+  data.tar.gz: d1c40af5df514a3a41b82d03610c3fd89c8938f27b87ade37518c3295e4f65b8
 SHA512:
-  metadata.gz: 5fbc68d2b15cd3db89945c3257d415e966f5dbf1b22035fa60d52061c55a893fb9a49bf64c67cb6253d8cef116a30122a1a53000ef6ab972b04796dc11efbe05
-  data.tar.gz: 2d03532745effa29d59f1005b13f69ddc6f6c21349d93349517ace4eb0ce7587c35b87a878b4688f29fc65f3f5159c5a18d4975b748431c5ed7ecf0ece15bec9
+  metadata.gz: 6ff10c8255f576a0bdd80920108ad6ef2e07ded1be62b84dae5a1beac65d8836ad80c21fb73fcc51c7e328dfb1f38621c60f28d05210a19953a588ee1261e73f
+  data.tar.gz: 20f8991ea5a55153acf1c1ef584c3063de630d64704fc174c2e99587fc8c24d0e8b589491d86577dab0d9c00650c2561917fef44e9a59a2276f714fe69ac9442

data/lib/projectsimulator.rb

@@ -2,6 +2,7 @@
 
 # file: projectsimulator.rb
 
+
 require 'easydom'
 require 'app-routes'
 
@@ -11,18 +12,30 @@ module ProjectSimulator
   class Model
     include AppRoutes
 
-    def initialize()
+    def initialize(obj=nil, root: 'building1')
 
-      super() 
+      super()
+      @root = root
+      @location = nil
+      build(obj, root: root) if obj
 
     end
 
-    def build(raw_requests, root: 'building1')
+    def build(raw_requests, root: @root)
 
       @ed = EasyDom.new(debug: false, root: root)
       raw_requests.lines.each {|line| request(line) }
 
     end
+    
+    def get_device(h)
+      
+      a = h[:location].split(/ /)
+      a << h[:device]
+      status = a.inject(@ed) {|r,x| r.send(x)}.send(h[:action])
+      "The %s %s is %s." % [h[:location], h[:device], status]
+      
+    end    
 
     def op()
       @ed
@@ -31,6 +44,24 @@ module ProjectSimulator
     def query(s)
       @ed.e.element(s)
     end
+    
+    def request(s)
+
+      params = {request: s}
+      requests(params)
+      h = find_request(s)
+
+      method(h.first[-1]).call(h)
+      
+    end      
+    
+    def set_device(h)
+      
+      a = h[:location].split(/ /)
+      a << h[:device]
+      a.inject(@ed) {|r,x| r.send(x)}.send(h[:action], h[:value])
+      
+    end
 
     def to_sliml()
       @ed.to_sliml
@@ -44,28 +75,96 @@ module ProjectSimulator
 
     def requests(params) 
 
+      # e.g. switch the livingroom gas_fire off
+      #
       get /(?:switch|turn) the ([^ ]+) +([^ ]+) +(on|off)$/ do |location, device, onoff|
-        {action: 'switch=', location: location, device: device, value: onoff}
+        {type: :set_device, action: 'switch=', location: location, device: device, value: onoff}
+      end
+      
+      # e.g. switch the gas _fire off
+      #
+      get /(?:switch|turn) the ([^ ]+) +(on|off)$/ do |device, onoff|
+        location = dev_location(device)
+        {type: :set_device, action: 'switch=', location: location, device: device, value: onoff}
+      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. is the gas_fire on?
+      #
+      get /is the ([^ ]+) +(?:on|off)\??$/ do |device|
+        location = dev_location(device)        
+        {type: :get_device, action: 'switch', location: location, device: device}
+      end            
+      
+      # e.g. fetch the livingroom temperature reading
+      #
+      get /fetch the ([^ ]+) +([^ ]+) +(?:reading)$/ do |location, device|
+        {type: :get_device, action: 'reading', location: location, device: device}
+      end
+
+      # e.g. fetch the temperature reading
+      #
+      get /fetch the ([^ ]+) +(?:reading)$/ do |device|
+        location = dev_location(device)        
+        {type: :get_device, action: 'reading', location: location, device: device}
+      end          
+
     end
     
     private
     
-    def request(s)
+    def dev_location(device)
+      a = query('//'+ device).backtrack.to_xpath.split('/')
+      a[1..-2].join(' ')            
+    end
+        
+    alias find_request run_route    
 
-      params = {request: s}
-      requests(@params)
-      h = find_request(s)
+  end
 
-      a = h[:location].split(/ /)
-      a << h[:device]
-      a.inject(@ed) {|r,x| r.send(x)}.send(h[:action], h[:value])
+  class Controller
+    
+    attr_reader :macros
+    attr_accessor :title
 
-    end      
+    def initialize(mcs, debug: false)
+      
+      @debug = debug
+      @syslog = []
+            
+      @macros = mcs.macros
 
-    alias find_request run_route
+    end        
     
+    
+    def trigger(name, detail={})
+      
+      macros = @macros.select do |macro|
+        
+        puts 'macro: '  + macro.inspect if @debug
+
+        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 'macros: ' + macros.inspect if @debug
+      
+      macros.flat_map(&:run)
+    end
 
-  end
+  end  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: projectsimulator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   2GrtfOXGVOS+2jvmCQC6vU+ew9WBxiDUbebI95TeTwMs2o0cs3IASXX5rIn4TPcz
   SCccB3fVg2yfsy5DivaWaZwg
   -----END CERTIFICATE-----
-date: 2020-05-02 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: easydom