web/db/migrate/20080627181229_switch_blower_sensor_relationship.rb @@ -1,5 +1,3 @@ -* figure out how to communicate with and kill a spawned rails process -* find a good chart library * finish web interface :) -* resolve gem dependencies (hpricot, rails 2.1, sqlite3-ruby, will_paginate, scruffy?) +* resolve gem dependencies (hpricot, rails 2.1, sqlite3-ruby, will_paginate, mechanize) * maybe make a shoes app to make it as easy as possible to install stoker gem and then start/stop web interface \ No newline at end of file TODO @@ -5,7 +5,8 @@ module Net attr_reader :stoker FORM_PREFIXES = { - "name" => "n2" + "name" => "n2", + "sensor_serial_number" => "sw" } def initialize(stoker, options = {}) @@ -21,7 +22,10 @@ module Net end def sensor_serial_number=(str) - if @sensor_serial_number = @stoker.sensor(str).serial_number + if str.to_s == "" or str == "None" + @stoker.post(@stoker.sensor(self.sensor.serial_number).form_variable("blower") => "None") rescue nil + @sensor_serial_number = nil + elsif @sensor_serial_number = @stoker.sensor(str).serial_number @stoker.blowers.each do |b| if b.sensor_serial_number == @sensor_serial_number s.change_without_update("blower_serial_number", nil) unless b == self @@ -35,7 +39,7 @@ module Net end def sensor=(s) - self.sensor_serial_number = s.serial_number + self.sensor_serial_number = s.serial_number rescue nil end def sensor @@ -49,32 +53,65 @@ module Net # updates internal state of object variable without posting an update to the stoker def change_without_update(var, val) - eval("@#{var} = val") + eval("@#{var.to_s} = val") end def update_attributes(params) variables = {} - params.each do |k,v| - if k.to_s == "sensor" - k = v.form_variable("blower") - v = self.serial_number - else - k = self.form_variable(k.to_s) + + tp = params + params = {} + tp.each{|name,value| params[name.to_s] = value} + + params.each do |name, value| + case name + when "sensor" + name = "sensor_serial_number" + if value.to_s == "" + value = "None" + else + value = value.serial_number + end + when "sensor_serial_number" + if value.to_s == "" + value = "None" + end end - variables[k] = v unless k.to_s == "serial_number" - - if k.to_s == "sensor" - @stoker.blowers.each do |b| - if b.sensor_serial_number == v - b.change_without_update("sensor_serial_number", nil) unless b == self - end + + if name == "sensor_serial_number" + # update internal state of any other sensors that have this blower + @stoker.sensors.each do |s| + s.change_without_update("blower_serial_number", nil) if s.blower_serial_number == self.serial_number end - self.change_without_update("sensor_serial_number", v) + + # set the specific sensor blower to myself + if value != "None" + @stoker.sensor(value).blower_serial_number = self.serial_number + end + end + + variables[name] = value unless name == "serial_number" + end + + # update internal state + variables.each do |name, value| + self.change_without_update(name, value) + end + + params = {} + variables.each do |name, value| + if name == "sensor_serial_number" and value != "None" + params[self.sensor.form_variable("blower_serial_number")] = self.serial_number else - self.change_without_update(k, v) + params[self.form_variable(name)] = value end end - @stoker.post(variables) + + @stoker.post(params) + end + + def to_s + @name || @serial_number end end end \ No newline at end of file lib/blower.rb @@ -10,7 +10,8 @@ module Net "target" => "ta", "high" => "th", "low" => "tl", - "blower" => "sw" + "blower" => "sw", + "blower_serial_number" => "sw" } def initialize(stoker, options = {}) @@ -62,14 +63,17 @@ module Net end def blower_serial_number=(str) - if @blower_serial_number = @stoker.blower(str).serial_number + if str.to_s == "" or str == "None" + @blower_serial_number = nil + @stoker.post(self.form_variable("blower") => "None") + elsif @blower_serial_number = @stoker.blower(str).serial_number self.blower.change_without_update("sensor_serial_number", @serial_number) @stoker.sensors.each do |s| if s.blower_serial_number == @blower_serial_number s.change_without_update("blower_serial_number", nil) unless s == self end end - @stoker.post(self.form_variable("blower") => @blower_serial_number) + @stoker.post(self.form_variable("blower_serial_number") => @blower_serial_number) else raise "Blower not found" end @@ -91,24 +95,65 @@ module Net def update_attributes(params) variables = {} - params.each do |k,v| - if k.to_s == "blower" - v = v.serial_number - end - variables[self.form_variable(k.to_s)] = v unless k.to_s == "serial_number" - - if k.to_s == "blower" - @stoker.sensors.each do |s| - if s.blower_serial_number == v - s.change_without_update("blower_serial_number", nil) unless s == self + + tp = params + params = {} + tp.each{|name,value| params[name.to_s] = value} + + params.each do |name, value| + case name + when "blower" + name = "blower_serial_number" + if value.to_s == "" + value = "None" + else + value = value.serial_number + end + when "blower_serial_number" + if value.to_s == "" + value = "None" + end + when "alarm" + value = Net::Stoker::ALARMS.index(value.capitalize) + end + + if name == "blower_serial_number" + if value != "None" + # update internal state of any other sensors that have this blower + @stoker.sensors.each do |s| + s.change_without_update("blower_serial_number", nil) if s.blower_serial_number == value + end + + # update the blower's internal state to this sensor + @stoker.blower(value).change_without_update("sensor_serial_number", self.serial_number) + end + + # update internal state of any blowers pointing to this sensor if we're setting to None + if value == "None" + @stoker.blowers.each do |b| + b.change_without_update("sensor_serial_number", nil) if b.sensor_serial_number == self.serial_number end end - self.change_without_update("blower_serial_number", v) - else - self.change_without_update(k, v) end + + variables[name] = value unless name == "serial_number" end - @stoker.post(variables) + + # update internal state + variables.each do |name, value| + self.change_without_update(name, value) + end + + params = {} + variables.each do |name, value| + params[self.form_variable(name)] = value + end + + @stoker.post(params) end + + def to_s + @name || @serial_number + end end end \ No newline at end of file lib/sensor.rb @@ -3,6 +3,7 @@ require "rubygems" require "hpricot" require "net/http" +require "mechanize" require "cgi" require "open-uri" require "net/telnet" @@ -278,15 +279,21 @@ module Net warn "Posting #{post_url}?#{q}" + # agent = WWW::Mechanize.new + # agent.read_timeout = 120 + # page = agent.post(post_url, params) + # puts page.body + # res = HTTP.post_form(URI.parse(post_url), params) url = URI.parse(post_url) req = Net::HTTP::Post.new(url.path) - req["Keep-Alive"] = 300 - req["Connection"] = "keep-alive" - req["Referer"] = "http://#{@host}:#{@http_port}/index.html" + # req["Keep-Alive"] = false + # req["Keep-Alive"] = 300 + # req["Connection"] = "keep-alive" + # req["Referer"] = "http://#{@host}:#{@port}/index.html" req.set_form_data(params) http = Net::HTTP.new(url.host, url.port) - http.read_timeout = 600 + # http.read_timeout = 0 res = http.start {|http| http.request(req)} case res when Net::HTTPSuccess, Net::HTTPRedirection @@ -309,5 +316,8 @@ module Net @blowers.find{|b| b.name.downcase == str or b.serial_number.downcase == str} end + def to_s + @name || @host + end end end \ No newline at end of file lib/stoker.rb @@ -11,6 +11,13 @@ stoker = Net::Stoker.new("10.1.1.8", :connection => "http") puts "Getting data..." stoker.get +# 530000112A584E30: Yellow +# 440000112A621E30: Pit Temp +# 0E0000112A5D1630: Blue +# 9C00001195DEE430: Red + +# 140000002AA65105: Fan + puts "Listing blowers:" stoker.blowers.each do |blower| puts "#{blower.serial_number}, #{blower.name}, #{blower.sensor.name rescue ''}" @@ -21,7 +28,10 @@ stoker.sensors.each do |sensor| puts "#{sensor.serial_number}, #{sensor.name}, #{sensor.temp}, #{sensor.target}, #{sensor.alarm}, #{sensor.low}, #{sensor.high}, #{sensor.blower.name rescue ''}" end -# sensor = stoker.sensors[0] +sensor = stoker.sensor("530000112A584E30") +res = sensor.update_attributes(:name => "Yellow Foo", :blower_serial_number => stoker.blower("140000002AA65105").serial_number) +puts res.to_s + # name = sensor.name # serial_number = sensor.serial_number # test.rb @@ -1,7 +1,6 @@ class Blower < ActiveRecord::Base belongs_to :stoker - - has_one :sensor + belongs_to :sensor has_many :adjustments @@ -12,19 +11,17 @@ class Blower < ActiveRecord::Base def update_net_stoker if !Stoker.skip_update and (self.changed & ["name", "sensor_id"]).size > 0 - spawn do + # spawn do begin - self.stoker.net.get - params = {} ["name", "sensor_id"].each do |field| if self.changed.include?(field) if field == "sensor_id" if self.sensor_id.to_s == "" - params[:sensor] = nil + params[:sensor_serial_number] = nil else - params[:sensor] = self.stoker.net.sensor(self.sensor.serial_number) + params[:sensor_serial_number] = self.sensor.serial_number end else params[field] = self.send(field) @@ -36,7 +33,7 @@ class Blower < ActiveRecord::Base rescue Exception => e raise "#{e.message}\n#{e.backtrace.to_yaml}" end - end + # end end end web/app/models/blower.rb @@ -1,8 +1,11 @@ class Sensor < ActiveRecord::Base ALARMS = ["None", "Food", "Fire"] + attr_accessor :blower_id + belongs_to :stoker - belongs_to :blower + + has_one :blower has_many :events has_many :adjustments @@ -11,40 +14,43 @@ class Sensor < ActiveRecord::Base validates_inclusion_of :alarm, :in => ALARMS validates_uniqueness_of :serial_number validates_uniqueness_of :name, :scope => :stoker_id, :unless => Proc.new {|s| s.stoker_id.to_s == ""} + + before_update :set_blower + before_update :update_net_stoker - after_update :update_net_stoker - + def blower_id + self.blower.id rescue nil + end + def temp self.events.find(:first, :order => "created_at DESC").temp rescue nil end def update_net_stoker if !Stoker.skip_update and (self.changed & ["name", "target", "alarm", "high", "low", "blower_id"]).size > 0 - spawn do - begin - self.stoker.net.get - + # spawn do + begin params = {} ["name", "target", "alarm", "high", "low", "blower_id"].each do |field| if self.changed.include?(field) if field == "blower_id" if self.blower_id.to_s == "" - params[:blower] = nil + params[:blower_serial_number] = nil else - params[:blower] = self.stoker.net.blower(self.blower.serial_number) + params[:blower_serial_number] = self.blower.serial_number end else params[field] = self.send(field) end end end - + self.stoker.net.sensor(self.serial_number).update_attributes(params) rescue Exception => e raise "#{e.message}\n#{e.backtrace.to_yaml}" end - end + # end end end @@ -64,5 +70,24 @@ class Sensor < ActiveRecord::Base alarm_status end + + private + + def set_blower + Stoker.no_update do + + puts "Updating blower assignment in sensor model" + if b = self.blower + if @blower_id.to_s == "" + b.sensor_id = nil + else + b.sensor_id = self.id + end + b.save! + end + + end + true + end end web/app/models/sensor.rb @@ -25,12 +25,40 @@ class Stoker < ActiveRecord::Base end def net - @net ||= Net::Stoker.new(host, - :connection => self.connection_type, - :port => self.port, - :output_port => self.output_port, - :telnet_port => self.telnet_port - ) + if @net.nil? + @net = Net::Stoker.new(host, + :connection => self.connection_type, + :port => self.port, + :output_port => self.output_port, + :telnet_port => self.telnet_port + ) + + self.sensors.each do |s| + @net.sensors << Net::Sensor.new(@net, + { + :serial_number => s.serial_number, + :name => s.name, + :blower_serial_number => (s.blower.serial_number rescue nil), + :alarm => s.alarm, + :high => s.high, + :low => s.low, + :target => s.target + } + ) + end + + self.blowers.each do |b| + @net.blowers << Net::Blower.new(@net, + { + :serial_number => b.serial_number, + :name => b.name, + :sensor_serial_number => (b.sensor.serial_number rescue nil) + } + ) + end + end + + @net end def sync! @@ -43,6 +71,7 @@ class Stoker < ActiveRecord::Base net_stoker.get Stoker.no_update do + puts "Updating blowers" net_stoker.blowers.each do |nb| if blower = Blower.find_or_create_by_serial_number(nb.serial_number) blower.update_attributes!( @@ -54,6 +83,7 @@ class Stoker < ActiveRecord::Base end end + puts "Updating sensors" net_stoker.sensors.each do |ns| if sensor = Sensor.find_or_create_by_serial_number(ns.serial_number) sensor.update_attributes!( @@ -66,10 +96,13 @@ class Stoker < ActiveRecord::Base ) if ns.blower_serial_number.to_s != "" - sensor.blower = Blower.find_by_serial_number(ns.blower_serial_number) - sensor.save! + b = Blower.find_by_serial_number(ns.blower_serial_number) + puts "Sensor #{sensor.name} assigning to blower #{b.name}" + b.sensor_id = sensor.id + b.save! end + puts "Creating events" Event.create!( :stoker => self, :sensor => sensor, web/app/models/stoker.rb @@ -11,6 +11,11 @@ + Sensor + <%= f.collection_select :sensor_id, Sensor.find(:all), :id, :name, {:include_blank => true} %> + + + Stoker <%= f.collection_select :stoker_id, Stoker.find(:all), :id, :name %> web/app/views/blowers/_form.html.erb @@ -1,4 +1,5 @@ <%= error_messages_for :sensor %> +<%= error_messages_for :blower %> Serial number web/app/views/sensors/_form.html.erb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20080626215857) do +ActiveRecord::Schema.define(:version => 20080627181229) do create_table "adjustments", :force => true do |t| t.integer "cook_id" @@ -34,6 +34,7 @@ ActiveRecord::Schema.define(:version => 20080626215857) do t.integer "stoker_id" t.datetime "created_at" t.datetime "updated_at" + t.integer "sensor_id" end add_index "blowers", ["stoker_id"], :name => "index_blowers_on_stoker_id" @@ -76,14 +77,12 @@ ActiveRecord::Schema.define(:version => 20080626215857) do t.string "alarm", :default => "None" t.integer "low" t.integer "high" - t.integer "blower_id" t.integer "stoker_id" t.datetime "created_at" t.datetime "updated_at" end add_index "sensors", ["alarm"], :name => "index_sensors_on_alarm" - add_index "sensors", ["blower_id"], :name => "index_sensors_on_blower_id" add_index "sensors", ["stoker_id"], :name => "index_sensors_on_stoker_id" add_index "sensors", ["name"], :name => "index_sensors_on_name" add_index "sensors", ["serial_number"], :name => "index_sensors_on_serial_number" web/db/schema.rb f2e1ca6c69ede318d6910fd46e10559006e1cd8c Tony Buser tbuser@gmail.com http://github.com/tbuser/stoker/commit/7e376814c1fa98a421f6c9513f8a67377b0848bb 7e376814c1fa98a421f6c9513f8a67377b0848bb

2008-06-27T14:01:05-07:00

fixing bugs... setting fan to sensor still isn't working right yet... 23ba6b27821b37b83b8dd5428a09004033a5d65a Tony Buser tbuser@gmail.com