projectsimulator 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 850c1d323a1816a344d896177412330258c4b9bcbe8c946182701533efdddf05
-  data.tar.gz: 9e7a2e6ab061f4820207085240a52d8bd36847e57b6ef5d8cf0a625739802dad
+  metadata.gz: 7e70e7f4a42e34c20b395b0fab1113c1ed59bbb00c2e0b0b117b201708d8578c
+  data.tar.gz: 3c9431a5a680b62c1070023a2b32f4b540530145d0eb896af6bc629105643d2f
 SHA512:
-  metadata.gz: e52e950765845719638554324e058fdda5484feb34128aad13b76f8ff0623b5db4af437aaf60778e6b2356edb43533347831e7a78c3269500f61be6183946ca0
-  data.tar.gz: 55d386d448cd8edb318f938771505d2d61155d7106ebf48932469ffab840db66de019a0556bfe481206af055668326e111cfc04f50346aef7f48a16ac5b80740
+  metadata.gz: '0683c9527e84ffa413551d16b9d9fff3805fe9042a7068b3bdbf8b7c6ede26894aa6d2ce26a7cef07144abfa7501c577f0db9aa13418fe40f5283c283563be46'
+  data.tar.gz: a64eb0b3ba73be9163927edcdb8f202f955fc29474a9c65539a456a3f4e70f3612cbe97c9892a996b62d529436485319183cce26c80f37883f6b162fd204b443

data/lib/projectsimulator.rb

@@ -4,279 +4,33 @@
 
 
 require 'easydom'
+require 'unichron'
 require 'app-routes'
 
 
 module ProjectSimulator
 
-  class Model
-    include AppRoutes
-
-    def initialize(obj=nil, root: 'building1', debug: false)
-
-      super()
-      @root, @debug = root, debug
-      @location = nil
-      
-      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
-
-    def build(raw_requests, root: @root)
-
-      @ed = EasyDom.new(debug: false, root: root)
-      raw_requests.lines.each {|line| request(line) }
-
-    end
+  class Server
     
-    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 get_service(h)
+    def initialize(macros_package, drb_host: '127.0.0.1', devices: nil, 
+                   debug: false)
       
-      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])
+      rdc = ProjectSimulator::Controller.new(macros_package, devices: devices, 
+                                        debug: debug)
+      @drb = OneDrb::Server.new host: drb_host, port: '5777', obj: rdc
       
-      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
-
-    def query(s)
-      @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).gsub(/_/,' ')
-      
-    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])
-      
+    def start
+      @drb.start
     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
-
-      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 to_xml(options=nil)
-      @ed.xml(pretty: true).gsub(' style=\'\'','')
-    end
-    
-    alias xml to_xml
-    
-    # to_xml() is the preferred method
-
-    protected      
-
-    def requests(params) 
-
-      # e.g. switch the livingroom gas_fire off
-      #
-      get /(?:switch|turn) the ([^ ]+) +([^ ]+) +(on|off)$/ do |location, device, 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 = find_path(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. 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 = find_path(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 = find_path(device)        
-        {type: :get_device, action: 'reading', location: location, device: device}
-      end          
-
-    end
-    
-    private
-    
-    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
+  
+  
+end
 
-  class Controller
-    
-    attr_reader :macros
-    attr_accessor :title
-
-    def initialize(mcs, debug: false)
-      
-      @debug = debug
-      @syslog = []
-            
-      @macros = mcs.macros
-
-    end        
-    
-    
-    def trigger(name, detail={time: $env[:time]})
-      
-      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
+require 'projectsimulator/model'
+require 'projectsimulator/controller'
+require 'projectsimulator/client'

data/lib/projectsimulator/controller.rb

@@ -0,0 +1,116 @@
+#!/usr/bin/env ruby
+
+# file: projectsimulator/controller.rb
+
+
+module ProjectSimulator
+    
+  class Controller
+    
+    attr_reader :macros, :model
+    attr_accessor :title, :speed
+
+    def initialize(mcs, model=nil, time: Time.now, speed: 1, debug: false)
+      
+      @debug = debug
+      @syslog = []
+            
+      @macros = mcs.macros
+      
+      if model then
+        @model = Model.new(model)
+      end
+      
+      @state = :stop
+      @speed = speed
+      
+      @qt = UnichronUtils::Quicktime.new time: time, speed: @speed
+      @qt.start
+      @qt.pause
+
+    end
+
+    # Object Property (op)
+    # Helpful for accessing properites in dot notation 
+    # e.g. op.livingroom.light.switch = 'off'
+    #    
+    def op()
+      @model.op if @model
+    end
+    
+    def pause()
+      @state = :pause
+      @qt.pause
+    end
+    
+    def play()
+      @state = :play
+      @qt.play
+    end
+    
+    def request(s)
+      @model.request s
+    end
+    
+    def start()
+      
+
+      Thread.new do
+        
+        old_time = @qt.time - 1
+        
+        loop do
+          
+          interval = (1 / (2.0 * @speed))
+          (sleep interval; next) if @state != :play or old_time == @qt.time
+          #puts Time.now.inspect if @debug
+          r = self.trigger :timer, {time: @qt.time}
+          
+          yield(r) if r.any?
+          
+          puts 'r: ' + r.inspect if @debug and r.any?
+          sleep interval
+          old_time  = @qt.time
+        end
+        
+      end
+    end
+    
+    def stop()
+      @state = :stop
+      @qt.pause
+    end
+    
+    def time()
+      @qt.time
+    end
+    
+    def trigger(name, detail={})
+      
+      macros = @macros.select do |macro|
+        
+        #puts 'macro: '  + macro.inspect if @debug
+
+        # fetch the associated properties from the model if possible and 
+        # merge them into the detail.
+        #
+        valid_trigger = macro.match?(name, detail, op())
+        
+        #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

data/lib/projectsimulator/model.rb

@@ -0,0 +1,232 @@
+#!/usr/bin/env ruby
+
+# file: projectsimulator/controller.rb
+
+
+module ProjectSimulator
+    
+  class Model
+    include AppRoutes
+
+    def initialize(obj=nil, root: 'building1', debug: false)
+
+      super()
+      @root, @debug = root, debug
+      @location = nil
+      
+      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
+
+    def build(raw_requests, root: @root)
+
+      @ed = EasyDom.new(debug: false, root: root)
+      raw_requests.lines.each {|line| request(line) }
+
+    end
+    
+    
+    def get_thing(h)
+      
+      h[:thing].gsub!(/ /,'_')
+      
+      if not h.has_key? :location then
+        location = false
+        h[:location] = find_path(h[:thing]) 
+      else
+        location = true
+      end
+      
+      puts 'h: ' + h.inspect if @debug
+      
+      a = []
+      a += h[:location].split(/ /)
+      a << h[:thing]
+      status = a.inject(@ed) {|r,x| r.send(x)}.send(h[:action])
+      
+      if location then
+        "The %s %s is %s." % [h[:location], h[:thing], status]
+      else
+        "%s is %s." % [h[:thing].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
+
+    def query(s)
+      @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).gsub(/_/,' ')
+      
+    end      
+    
+    def set_thing(h)
+
+      h[:thing].gsub!(/ /,'_')
+      h[:location] = find_path(h[:thing]) unless h.has_key? :location
+      
+      a = []
+      a += h[:location].split(/ /)
+      a << h[:thing]
+      
+      a.inject(@ed) {|r,x| r.send(x)}.send(h[:action], h[:value])
+      
+    end       
+
+    def to_sliml(level: 0)
+      
+      s = @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 to_xml(options=nil)
+      @ed.xml(pretty: true).gsub(' style=\'\'','')
+    end
+    
+    alias xml to_xml
+    
+    # to_xml() is the preferred method
+
+    protected      
+
+    def requests(params) 
+
+      # e.g. switch the livingroom gas_fire off
+      #
+      get /(?:switch|turn) the ([^ ]+) +([^ ]+) +(on|off)$/ do |location, device, onoff|
+        {type: :set_thing, action: 'switch=', location: location, thing: device, value: onoff}
+      end
+      
+      # e.g. switch the gas _fire off
+      #
+      get /(?:switch|turn) the ([^ ]+) +(on|off)$/ do |device, onoff|
+        {type: :set_thing, action: 'switch=', thing: device, value: onoff}
+      end            
+      
+      # e.g. is the livingroom gas_fire on?
+      #
+      get /is the ([^ ]+) +([^ ]+) +(?:on|off)\??$/ do |location, device|
+        {type: :get_thing, action: 'switch', location: location, thing: device}
+      end
+      
+      # e.g. enable airplane mode
+      #
+      get /((?:dis|en)able) ([^$]+)$/ do |state, service|
+        {type: :set_thing, action: 'switch=', thing: service, value: state + 'd'}
+      end
+      
+      # e.g. switch airplane mode off
+      #
+      get /switch (.*) (on|off)/ do |service, rawstate|        
+        
+        state = rawstate == 'on' ? 'enabled' : 'disabled'
+        {type: :set_thing, action: 'switch=', thing: service, value: state}
+        
+      end               
+      
+      # e.g. is airplane mode enabed?
+      #
+      get /is (.*) +(?:(?:dis|en)abled)\??$/ do |service|
+        {type: :get_thing, action: 'switch', thing: service.gsub(/ /,'_')}
+      end      
+
+      # e.g. is the gas_fire on?
+      #
+      get /is the ([^ ]+) +(?:on|off)\??$/ do |device|
+        location = find_path(device)        
+        {type: :get_thing, action: 'switch', location: location, thing: device}
+      end            
+      
+      # e.g. fetch the livingroom temperature reading
+      #
+      get /fetch the ([^ ]+) +([^ ]+) +(?:reading)$/ do |location, device|
+        {type: :get_thing, action: 'reading', location: location, thing: device}
+      end
+
+      # e.g. fetch the temperature reading
+      #
+      get /fetch the ([^ ]+) +(?:reading)$/ do |device|
+        location = find_path(device)        
+        {type: :get_thing, action: 'reading', location: location, thing: device}
+      end          
+
+    end
+    
+    private
+    
+    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
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: projectsimulator
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,8 +35,28 @@ cert_chain:
   2GrtfOXGVOS+2jvmCQC6vU+ew9WBxiDUbebI95TeTwMs2o0cs3IASXX5rIn4TPcz
   SCccB3fVg2yfsy5DivaWaZwg
   -----END CERTIFICATE-----
-date: 2020-08-20 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: unichron
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: easydom
   requirement: !ruby/object:Gem::Requirement
@@ -84,6 +104,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/projectsimulator.rb
+- lib/projectsimulator/controller.rb
+- lib/projectsimulator/model.rb
 homepage: https://github.com/jrobertson/projectsimulator
 licenses:
 - MIT