projectsimulator 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d48b4e25949ccbd4ae87be72f39091fd3b6ffe94b0222dd027f045288468b24c
-  data.tar.gz: cc8d40687884dc750ec041e65ea5982aec888bd80c288f863cc03330d396eacb
+  metadata.gz: 95e2aac79d4eedf850b1a69fd68c5ca4dea570e3f29b7c58ba08929b39ff6da6
+  data.tar.gz: 7fcbd8da672a655223aa6fe5fedd6fe3ec5eaa167390163fd4f93c805859d028
 SHA512:
-  metadata.gz: 5fbc68d2b15cd3db89945c3257d415e966f5dbf1b22035fa60d52061c55a893fb9a49bf64c67cb6253d8cef116a30122a1a53000ef6ab972b04796dc11efbe05
-  data.tar.gz: 2d03532745effa29d59f1005b13f69ddc6f6c21349d93349517ace4eb0ce7587c35b87a878b4688f29fc65f3f5159c5a18d4975b748431c5ed7ecf0ece15bec9
+  metadata.gz: c14beebb3a964700e458e9f910d647efb1e5df8135444d5fb5a7701e9af3a67148c5bcd7ef60b00bd158a91b2fe86031189dc5087046f46a146bccd2f6f88f8a
+  data.tar.gz: 516649266578dc2aefbc924e750dab05ab42dcb1e225ac079d80d28d227a247cf4db024239fa4b90cc4b725c352ddcc774ef1e7e63bcad2cf018590f28086cb0

data/lib/projectsimulator.rb

@@ -11,18 +11,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 +43,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 +74,42 @@ 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            
 
     end
     
     private
     
-    def request(s)
-
-      params = {request: s}
-      requests(@params)
-      h = find_request(s)
-
-      a = h[:location].split(/ /)
-      a << h[:device]
-      a.inject(@ed) {|r,x| r.send(x)}.send(h[:action], h[:value])
-
-    end      
-
-    alias find_request run_route
-    
+    def dev_location(device)
+      a = query('//'+ device).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.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - James Robertson