projectsimulator 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb11152fdb739b57353cb3a2c426465b20ecde48075f0e25bd4a3212c2d47d1b
-  data.tar.gz: 854bf9dd30fcc841211ab8c6a8424e9fc2a0e214755cc8b80951d5c35afd9905
+  metadata.gz: 74f715665b457881348502fb3cc58e1103faa8408b2e2e75d0d9f84eaade8020
+  data.tar.gz: 0b8e799a7f519c100763d78599b4971b4974bbad6e6df14e1d3d7b0f01b60248
 SHA512:
-  metadata.gz: 262fbd34450b87dff84eb25f0d65857e524f8aa16d2ad1e1f1079ce13c35c3793b056f40b974008d67f38cfa38e3ae91c95b2b5df496ae16500d41d4466acd72
-  data.tar.gz: 6c2db15265e494622f67b285ecd509ab656248ac01199a47d8796f41d9226c0e3fe7fa6b4fbae781972f169faa848b0577e1a51e75165422bf7c90c519b491d3
+  metadata.gz: 99827c8f22a234833341f5a466f006d83d5f369cbaca01fe6420e2911dc78dd564b480e428b2c70e8ad265b37516bc155b8ced72257a0d742d94921a023e4a3e
+  data.tar.gz: fc4e4e4ab3f71273763094f04bf777c98fbf02c57cad03a9ce3af090783e171a2346f3c46d6038b5cd084fef66bb157fc5409861ffc90406f4aa43f68d9d0779

data/lib/projectsimulator.rb

@@ -12,12 +12,22 @@ 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
+        if s[0] == '<' or s.lines[1][0..1] == '  ' then
+          @ed = EasyDom.new(s)          
+        else
+          build(obj, root: root) 
+        end
+
+      end
 
     end
 
@@ -35,8 +45,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
@@ -45,13 +74,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      
     
@@ -62,14 +94,27 @@ 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()
       @ed.to_sliml
     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      
 
@@ -84,20 +129,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            
       
@@ -110,7 +179,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          
 
@@ -118,8 +187,11 @@ 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
         

metadata

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