saal 0.2.24 → 0.3.3

data/test/chart_data_test.rb

@@ -78,7 +78,7 @@ class TestChartData < Test::Unit::TestCase
                                         Time.utc(2012, 3, 25, 23, 59, 59),
                             ["0"]+(2..23).map{|s| s.to_s}+["0"], 
                             Time.utc(2012, 3, 25, 23, 59, 59),
-                            "_changing_timezone_test","Europe/Lisbon")
+                            "_changing_timezone_test2","Europe/Lisbon")
 
   assert_alignment_interval(24, :hours, Time.utc(2010, 12, 29, 16, 0, 0),
                                         Time.utc(2010, 12, 30, 15, 59, 59),

data/test/chart_test.rb

@@ -16,7 +16,6 @@ class TestChart < Test::Unit::TestCase
 
   def test_average
     name = 'week'
-    defs = @defs[name]
     chart = @charts.find(name)    
     assert_equal ['Fri','Sat','Sun','Mon','Tue','Wed','Thu'], chart.periodnames
     chart.sensors.each {|s| s.mock_set(:average => 1)}
@@ -31,7 +30,6 @@ class TestChart < Test::Unit::TestCase
 
   def test_min_max_avg_1arity
     name = 'week'
-    defs = @defs[name]
     chart = @charts.find(name)    
     assert_equal ['Fri','Sat','Sun','Mon','Tue','Wed','Thu'], chart.periodnames
     v = {:minimum => 1.0, :maximum => 2.0, :average => 1.5}
@@ -43,7 +41,6 @@ class TestChart < Test::Unit::TestCase
   
   def test_min_max_0arity
     name = 'week'
-    defs = @defs[name]
     chart = @charts.find(name)    
     assert_equal ['Fri','Sat','Sun','Mon','Tue','Wed','Thu'], chart.periodnames
     v = {:minimum => 1.0, :maximum => 2.0, :average => 1.5}

data/test/daemon_test.rb

@@ -18,7 +18,7 @@ class TestDaemon < Test::Unit::TestCase
     end
 
     db_test_query("SELECT * FROM sensor_reads") do |res|
-      assert res.num_rows > 0, "No sensor reads in DB"
+      assert res.count > 0, "No sensor reads in DB"
     end
   end
 
@@ -38,7 +38,7 @@ class TestDaemon < Test::Unit::TestCase
     end
 
     db_test_query("SELECT * FROM sensor_reads") do |res|
-      assert res.num_rows == 0
+      assert res.count == 0
     end
   end
 end

data/test/dbstore_test.rb

@@ -9,8 +9,11 @@ class TestFileStore < Test::Unit::TestCase
     @dbstore.write(:test_sensor, test_time, test_value)
     
     db_test_query("SELECT * FROM sensor_reads") do |res|
-      assert_equal 1, res.num_rows
-      assert_equal ["test_sensor", test_time.to_s, test_value.to_s], res.fetch_row
+      assert_equal 1, res.count
+      row = res.first
+      assert_equal "test_sensor", row["sensor"]
+      assert_equal test_time, row["date"].to_i
+      assert_equal test_value, row["value"].to_f
     end
   end
 

data/test/denkovi.json.erb

@@ -0,0 +1,39 @@
+{
+
+  "CurrentState": {
+
+    "Output": [
+
+<% (1..16).each do |num| %>
+<% state = outlets[num] %>
+<% val = state == "ON" ? "1" : "0" %>
+<% if num < 16 %>
+      {"Name": "RELAY<%= num %>", "Value": "<%= val %>"},
+<% else %>
+      {"Name": "RELAY<%= num %>", "Value": "<%= val %>"}
+<% end %>
+<% end %>
+
+    ],
+
+    "Auto-reboot": {
+
+      "RebootsNumber": "0",
+
+      "LastReboot": "-"
+
+    },
+
+    "Device": {
+
+      "Name": "SMARTDEN_IP-16R",
+
+      "MAC": "E8:EA:DA:AA:AA:AA"
+
+    }
+
+  }
+
+}
+
+

data/test/denkovi_test.rb

@@ -0,0 +1,212 @@
+require File.dirname(__FILE__)+'/test_helper.rb'
+require 'webrick'
+require 'benchmark'
+
+class TestDenkoviRelay < Test::Unit::TestCase
+  def setup
+    @@serv_num ||= 0
+    @@serv_num += 1
+
+    @og=SAAL::Denkovi::OutletGroup.new(service_opts)
+    @vals={1=>"OFF",2=>"OFF",3=>"ON",4=>"OFF",5=>"ON",6=>"ON",7=>"ON",8=>"OFF",
+           9=>"OFF",10=>"OFF",11=>"ON",12=>"OFF",13=>"ON",14=>"ON",15=>"ON",16=>"OFF"}
+    @rvals={1=>"ON",2=>"ON",3=>"OFF",4=>"ON",5=>"OFF",6=>"OFF",7=>"OFF",8=>"ON",
+            9=>"ON",10=>"ON",11=>"OFF",12=>"ON",13=>"OFF",14=>"OFF",15=>"OFF",16=>"ON"}
+
+    defs = YAML::load(File.new(TEST_SENSORS_DENKOVI_FILE))
+    @pass = defs["group1"]["denkovi"]["pass"]
+    defs['group1']['denkovi']['port'] = service_opts[:port]
+    tempfile = Tempfile.new('denkovi_test_yml')
+    File.open(tempfile.path,'w') {|f| f.write(YAML::dump defs)}
+    @test_sensors_denkovi_file = tempfile.path
+  end
+
+  def service_opts
+    base_opts = {:host => 'localhost', :pass =>"somepass"}
+    base_opts.merge(:port => 3333+@@serv_num)
+  end
+
+  class BasicServing < WEBrick::HTTPServlet::AbstractServlet
+    def self.get_instance(config, opts)
+      new(opts)
+    end
+    def initialize(opts)
+      @html = opts[:html]
+      @pass = opts[:pass]
+      @status = opts[:status] || 200
+      @feedback = opts[:feedback] || {}
+      @sleep = opts[:sleep] || 0
+    end
+    def do_GET(req, res)
+      sleep @sleep
+      @feedback[:uris] ||= []
+      @feedback[:uris] << req.request_uri.to_s
+      @feedback[:uri] = req.request_uri.to_s
+      @feedback[:nrequests] = (@feedback[:nrequests]||0)+1
+      res.body = @html
+      res.status = @status
+      res['Content-Type'] = "text/html"
+    end
+  end
+
+  def with_webrick(opts)
+    opts = service_opts.merge(opts)  
+
+    Socket.do_not_reverse_lookup = true # Speed up startup
+    log = WEBrick::Log.new($stderr, WEBrick::Log::ERROR)
+    access_log = [[log, WEBrick::AccessLog::COMBINED_LOG_FORMAT]]
+    s = WEBrick::HTTPServer.new(:Port => opts[:port], 
+                                :Logger => log,
+                                :AccessLog => access_log)
+    s.mount('/', BasicServing, opts.merge(:feedback => (f = {})))
+    
+    thread = Thread.new do
+      s.start
+    end
+    while s.status != :Running; sleep 0.1; end # Make sure the server is up
+    yield f
+    s.shutdown
+    thread.exit
+  end
+
+  def create_current_state_json(hash)
+    outlets = hash
+    erb = ERB.new(File.open(File.dirname(__FILE__)+'/denkovi.json.erb').read)
+    erb.result(binding)
+  end
+
+  def assert_path(path, uri)
+    assert_equal "http://localhost:#{service_opts[:port]}"+path, uri
+  end
+
+  def test_read_state
+    with_webrick(:html=>create_current_state_json(@vals)) do |feedback|
+      @vals.each do |num, state|
+        assert_equal state, @og.state(num)
+        assert_path "/current_state.json?pw=#{@pass}", feedback[:uri]
+      end
+    end
+  end
+
+  def test_set_state
+    with_webrick(:html=>create_current_state_json(@rvals)) do |feedback|
+      @vals.each do |num, state|
+        newstate = state == "ON" ? "OFF" : "ON"
+        val = {"ON" => "1", "OFF" => "0"}[newstate]
+        assert @og.set_state(num,newstate), "State change not working"
+        assert_path "/current_state.json?pw=#{@pass}&Relay#{num}=#{val}", feedback[:uri]
+      end
+    end
+  end
+
+  def test_enumerate_sensors
+    sensors = SAAL::Sensors.new(@test_sensors_denkovi_file, TEST_DBCONF)
+    assert_equal((1..16).map{|i| "name#{i.to_s.rjust(2, "0")}"}, sensors.map{|s| s.name}.sort)
+    assert_equal((1..16).map{|i| "description#{i.to_s.rjust(2, "0")}"}, sensors.map{|s| s.description}.sort)
+  end
+
+  def test_sensor_type
+    SAAL::Sensors.new(TEST_SENSORS_DENKOVI_FILE, TEST_DBCONF).each do |s|
+      assert_equal :onoff, s.sensor_type
+    end
+  end
+
+  def test_read_sensors
+    sensors = SAAL::Sensors.new(@test_sensors_denkovi_file, TEST_DBCONF)
+    with_webrick(:html=>create_current_state_json(@vals)) do |feedback|
+      @vals.each do |num, state|
+        value = state == "ON" ? 1.0 : 0.0
+        assert_equal value, sensors.send('name'+num.to_s.rjust(2, "0")).read
+        assert_path "/current_state.json?pw=#{@pass}", feedback[:uri]
+      end
+      assert_equal 1, feedback[:nrequests], "denkovi request caching not working"
+    end
+  end
+
+  def test_set_sensors
+    sensors = SAAL::Sensors.new(@test_sensors_denkovi_file, TEST_DBCONF)
+    with_webrick(:html=>create_current_state_json(@rvals)) do |feedback|
+      @vals.each do |num, state|
+        newval = state == "ON" ? 0.0 : 1.0
+        newstate = state == "ON" ? "OFF" : "ON"
+        assert_equal newval, sensors.send('name'+num.to_s.rjust(2, "0")).write(newval), 
+                     "State change not working"
+        val = {"ON" => "1", "OFF" => "0"}[newstate]
+        assert_path "/current_state.json?pw=#{@pass}&Relay#{num}=#{val}", feedback[:uris][-2]
+        assert_path "/current_state.json?pw=#{@pass}", feedback[:uris][-1]
+      end
+    end
+  end
+
+  # Test that write invalidates any caching
+  def test_write_read_sensors
+    sensors = SAAL::Sensors.new(@test_sensors_denkovi_file, TEST_DBCONF)
+    with_webrick(:html=>create_current_state_json(@vals)) do |feedback|
+      @vals.each do |num, state|
+        sensors.send('name'+num.to_s.rjust(2, "0")).write(0.0)
+        sensors.send('name'+num.to_s.rjust(2, "0")).read
+      end
+      assert_equal 32, feedback[:nrequests], "denkovi caching too much"
+    end
+  end
+
+  # Test that the cache times out
+  def test_cache_invalidation
+    _sensors = SAAL::Sensors.new(@test_sensors_denkovi_file, TEST_DBCONF)
+    @og.cache_timeout = 0.1
+    with_webrick(:html=>create_current_state_json(@vals)) do |feedback|
+      @og.state(1)
+      sleep 0.2
+      @og.state(1)
+      assert_equal 2, feedback[:nrequests], "denkovi caching not invalidating"
+    end
+  end
+
+  def test_failed_connection
+    @vals.each do |num, state|
+      assert_equal nil, @og.state(num)
+      assert !@og.set_state(num,"ON"), "State change working without a server?!"
+    end
+  end
+
+  def test_failed_request
+    with_webrick(:html=>create_current_state_json(@vals),:status=>404) do |feedback|
+      @vals.each do |num, state|
+        assert_equal nil, @og.state(num)
+        assert !@og.set_state(num,"ON"), "State change working without a server?!"
+      end
+    end
+  end
+
+  def test_fast_open_timeout
+    #FIXME: Find a way to make this test address more generic
+    @og=SAAL::Denkovi::OutletGroup.new(service_opts.merge(:host => "10.254.254.254", 
+                                                           :timeout=>0.1))
+    with_webrick(:html=>create_current_state_json(@vals)) do |feedback|
+      time = Benchmark.measure do
+        @vals.each do |num, state|
+          assert_equal nil, @og.state(num), "Read not timing out?"
+          assert !@og.set_state(num,"ON"), "State change not timing out?"
+        end
+      end
+      total_time = @og.timeout*2*@vals.keys.size
+      assert time.total < total_time
+             "Doing the reads took too long, are we really timing out?"
+    end
+  end
+
+  def test_fast_read_timeout
+    @og=SAAL::Denkovi::OutletGroup.new(service_opts.merge(:timeout=>0.1))
+    with_webrick(:html=>create_current_state_json(@vals),:sleep=>10) do |feedback|
+      time = Benchmark.measure do
+        @vals.each do |num, state|
+          assert_equal nil, @og.state(num), "Read not timing out?"
+          assert !@og.set_state(num,"ON"), "State change not timing out?"
+        end
+      end
+      total_time = @og.timeout*2*@vals.keys.size
+      assert time.total < total_time
+             "Doing the reads took too long, are we really timing out?"
+    end
+  end
+end

data/test/dinrelay_test.rb

@@ -151,7 +151,7 @@ class TestDINRelay < Test::Unit::TestCase
 
   # Test that the cache times out
   def test_cache_invalidation
-    sensors = SAAL::Sensors.new(@test_sensors_dinrelay_file, TEST_DBCONF)
+    _sensors = SAAL::Sensors.new(@test_sensors_dinrelay_file, TEST_DBCONF)
     @og.cache_timeout = 0.1
     with_webrick(:html=>create_index_html(@vals)) do |feedback|
       @og.state(1)

data/test/sensors_test.rb

@@ -67,11 +67,11 @@ class TestSensors < Test::Unit::TestCase
     end
 
     db_test_query("SELECT * FROM sensor_reads") do |res|
-      assert_equal 1, res.num_rows
-      row = res.fetch_row
-      assert_equal "fake_temp", row[0]
-      assert_in_delta Time.now.utc.to_i, row[1].to_i, 100
-      assert_instance_of Float, row[2].to_f
+      assert_equal 1, res.count
+      row = res.first
+      assert_equal "fake_temp", row["sensor"]
+      assert_in_delta Time.now.utc.to_i, row["date"].to_i, 100
+      assert_instance_of Float, row["value"].to_f
     end
   end  
 end

data/test/test_db.yml

@@ -1,4 +1,4 @@
 host: localhost
-user: sensor_reads
-pass: password
-db: sensor_reads_test
+username: sensor_reads
+password: password
+database: sensor_reads_test

data/test/test_denkovi_sensors.yml

@@ -0,0 +1,39 @@
+group1:
+  denkovi:
+    host: localhost
+    port: 33333
+    pass: somepass
+    outlets:
+      1: name01
+      2: name02
+      3: name03
+      4: name04
+      5: name05
+      6: name06
+      7: name07
+      8: name08
+      9: name09
+      10: name10
+      11: name11
+      12: name12
+      13: name13
+      14: name14
+      15: name15
+      16: name16
+    descriptions:
+      1: description01
+      2: description02
+      3: description03
+      4: description04
+      5: description05
+      6: description06
+      7: description07
+      8: description08
+      9: description09
+      10: description10
+      11: description11
+      12: description12
+      13: description13
+      14: description14
+      15: description15
+      16: description16

data/test/test_helper.rb

@@ -6,6 +6,7 @@ require File.dirname(__FILE__)+'/../lib/saal.rb'
 class Test::Unit::TestCase
   TEST_SENSORS_FILE = File.dirname(__FILE__)+'/test_sensors.yml'
   TEST_SENSORS_DINRELAY_FILE = File.dirname(__FILE__)+'/test_dinrelay_sensors.yml'
+  TEST_SENSORS_DENKOVI_FILE = File.dirname(__FILE__)+'/test_denkovi_sensors.yml'
   TEST_SENSOR_CLEANUPS_FILE = File.dirname(__FILE__)+'/test_sensor_cleanups.yml'
   TEST_NONEXIST_SENSOR_FILE = File.dirname(__FILE__)+'/nonexistant_sensor.yml'
   TEST_CHARTS_FILE = File.dirname(__FILE__)+'/test_charts.yml'
@@ -29,8 +30,7 @@ class Test::Unit::TestCase
   end
 
   def db_test_query(query)  
-    db = Mysql.new(TEST_DBOPTS['host'],TEST_DBOPTS['user'],
-                   TEST_DBOPTS['pass'],TEST_DBOPTS['db'])
+    db = Mysql2::Client.new(TEST_DBOPTS)
     res = db.query(query)
     yield res
     db.close

data/test/test_sensors.yml

@@ -1,7 +1,7 @@
 fake_temp:
   name: "A fake temperature sensor"
   onewire: 
-    serial: /10.4AEC29CDBAAB/temperature
+    serial: /10.67C6697351FF/temperature
 
 non_existant:
   name: "A non-existant sensor"

metadata

@@ -1,63 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: saal
 version: !ruby/object:Gem::Version
-  version: 0.2.24
-  prerelease: 
+  version: 0.3.3
 platform: ruby
 authors:
 - Pedro Côrte-Real
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-23 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ownet
-  requirement: &74238440 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *74238440
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &74238180 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
-  version_requirements: *74238180
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: mysql
-  requirement: &74237790 !ruby/object:Gem::Requirement
-    none: false
+  name: net-http-digest_auth
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *74237790
-description: ! "A daemon and libraries to create an abstraction layer that interfaces
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+description: "A daemon and libraries to create an abstraction layer that interfaces
   with \nsensors and actuators, recording their state, responding to requests \nfor
   current and historical values, and allowing changes of state.\n"
 email: pedro@pedrocr.net
 executables:
-- saal_chart~
 - dinrelaystatus
-- saal_readall
-- saal_dump_database
-- saal_daemon
-- saal_chart
-- saal_daemon~
 - dinrelayset
 - saal_import_mysql
+- saal_dump_database
+- saal_readall
+- saal_denkovi_relays
+- saal_chart
+- saal_daemon
+- saal_envoy_generate_config
+- saal_envoy_read
 extensions: []
 extra_rdoc_files:
 - README.rdoc
@@ -72,7 +95,10 @@ files:
 - bin/dinrelaystatus
 - bin/saal_chart
 - bin/saal_daemon
+- bin/saal_denkovi_relays
 - bin/saal_dump_database
+- bin/saal_envoy_generate_config
+- bin/saal_envoy_read
 - bin/saal_import_mysql
 - bin/saal_readall
 - lib/chart.rb
@@ -80,7 +106,10 @@ files:
 - lib/charts.rb
 - lib/daemon.rb
 - lib/dbstore.rb
+- lib/denkovi.rb
 - lib/dinrelay.rb
+- lib/envoy.rb
+- lib/http.rb
 - lib/outliercache.rb
 - lib/owsensor.rb
 - lib/saal.rb
@@ -92,6 +121,8 @@ files:
 - test/charts_test.rb
 - test/daemon_test.rb
 - test/dbstore_test.rb
+- test/denkovi.json.erb
+- test/denkovi_test.rb
 - test/dinrelay.html.erb
 - test/dinrelay_test.rb
 - test/nonexistant_sensor.yml
@@ -100,38 +131,36 @@ files:
 - test/sensors_test.rb
 - test/test_charts.yml
 - test/test_db.yml
+- test/test_denkovi_sensors.yml
 - test/test_dinrelay_sensors.yml
 - test/test_helper.rb
 - test/test_sensor_cleanups.yml
 - test/test_sensors.yml
-- bin/saal_chart~
-- bin/saal_daemon~
 homepage: https://github.com/pedrocr/saal
-licenses: []
-post_install_message: 
+licenses:
+- LGPL-2.1
+metadata: {}
+post_install_message:
 rdoc_options:
-- -S
-- -w 2
-- -N
-- -c utf8
+- "-S"
+- "-w 2"
+- "-N"
+- "-c utf8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.11
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 2
 summary: Thin abstraction layer for interfacing and recording sensors (currently onewire)
   and actuators (currently dinrelay)
@@ -141,6 +170,7 @@ test_files:
 - test/charts_test.rb
 - test/daemon_test.rb
 - test/dbstore_test.rb
+- test/denkovi_test.rb
 - test/dinrelay_test.rb
 - test/outliercache_test.rb
 - test/sensor_test.rb