rzwaveway 0.0.2 → 0.0.3

data/lib/rzwaveway/command_classes.rb

@@ -1,26 +1,47 @@
 module RZWaveWay
   module CommandClasses
+    BASIC = 32
     SENSOR_BINARY = 48
     MULTI_LEVEL_SENSOR = 49
     CONFIGURATION = 112
     BATTERY = 128
     WAKEUP = 132
     ALARM_SENSOR = 156
+
+    DATA = {
+      SENSOR_BINARY => {
+        'level' => 'data.1.level.value',
+        'lastLevelChangeTime' => 'data.1.level.updateTime'
+      },
+      WAKEUP => {
+        'wakeUpInterval' => 'data.interval.value',
+        'lastSleepTime' => 'data.lastSleep.value',
+        'lastWakeUpTime' => 'data.lastWakeup.value'
+      },
+      BATTERY => {
+        'batteryLevel' => 'data.last.value'
+      }
+    }
   end
 
   class CommandClass
     include CommandClasses
     attr_reader :id
-    @data
+    attr_reader :properties
 
     def initialize(id, data)
       @id = id
-      @data = data
+      @properties = {}
+      if DATA.has_key? id 
+        DATA[id].each do |key, name|
+          @properties[key] = get_data(name, data)
+        end
+      end
     end
 
-    def get_data name
+    def get_data name, data
       parts = name.split '.'
-      result = @data
+      result = data
       parts.each do | part |
         raise "Could not find part '#{part}' in '#{name}'" unless result.has_key? part
         result = result[part]
@@ -30,19 +51,32 @@ module RZWaveWay
 
     def process updates, device_id
       event = nil
-      names = updates.collect { |x| x[0]}
+      names = updates.keys
       case id
       when WAKEUP
         if names.include?("data.lastWakeup") &&
           names.include?("data.lastSleep")
-          event = AliveEvent.new(device_id, updates[1][1]["value"])
+          @properties['lastSleepTime'] = updates["data.lastSleep"]["value"]
+          event = AliveEvent.new(device_id, @properties['lastSleepTime'])
         end
       when SENSOR_BINARY
         if names.include?("data.1")
-          event = LevelEvent.new(device_id,updates[0][1]["level"]["updateTime"], updates[0][1]["level"]["value"])
+          @properties['lastLevelChangeTime'] = updates['data.1']["level"]["updateTime"]
+          @properties['level'] = updates['data.1']["level"]["value"]
+          event = LevelEvent.new(device_id, @properties['lastLevelChangeTime'], @properties['level'])
         end
       end
       event
     end
+
+    def process_alive_check device_id
+      wakeup_interval = @properties['wakeUpInterval']
+      last_sleep_time = @properties['lastSleepTime']
+      current_time = Time.now.to_i
+      estimated_wakeup_time = (last_sleep_time + wakeup_interval * 1.1).to_i
+      if(current_time > estimated_wakeup_time)
+        return NotAliveEvent.new(device_id, current_time - estimated_wakeup_time)
+      end
+    end
   end
 end

data/lib/rzwaveway/events.rb

@@ -9,6 +9,16 @@ module RZWaveWay
     end
   end
 
+  class NotAliveEvent
+    attr_reader :device_id
+    attr_reader :time_delay
+
+    def initialize device_id, time_delay
+      @device_id = device_id
+      @time_delay = time_delay
+    end
+  end
+
   class LevelEvent
     attr_reader :device_id
     attr_reader :time

data/lib/rzwaveway/zwave_device.rb

@@ -22,23 +22,8 @@ module RZWaveWay
 
     def build_json
       properties = {'deviceId' => @id}
-      if(support_commandclass? SENSOR_BINARY)
-        properties.merge!( {
-          'level' => @command_classes[SENSOR_BINARY].get_data('data.1.level.value'),
-          'lastLevelChangeTime' => @command_classes[SENSOR_BINARY].get_data('data.1.level.updateTime')          
-        })
-      end
-      if(support_commandclass? WAKEUP)
-        properties.merge!( {
-          'wakeUpInterval' => @command_classes[WAKEUP].get_data('data.interval.value'),
-          'lastSleepTime' => @command_classes[WAKEUP].get_data('data.lastSleep.value'),
-          'lastWakeUpTime' => @command_classes[WAKEUP].get_data('data.lastWakeup.value')
-        })
-      end
-      if(support_commandclass? BATTERY)
-        properties.merge!( {
-          'batteryLevel' => @command_classes[BATTERY].get_data('data.last.value')
-        })
+      @command_classes.each do |cc_id, cc|
+        properties.merge!(cc.properties)
       end
       properties.to_json
     end
@@ -52,7 +37,8 @@ module RZWaveWay
       updates_per_commandclass =  group_per_commandclass updates
       updates_per_commandclass.each do |cc, values|
         if @command_classes.has_key? cc
-          events << (@command_classes[cc].process(values, @id))
+          event = @command_classes[cc].process(values, @id)
+          events << event if event
         else
           $log.warn "Could not find command class: '#{cc}'"
         end
@@ -60,14 +46,22 @@ module RZWaveWay
       events
     end
 
+    def process_alive_check
+      if(support_commandclass? WAKEUP)
+        return @command_classes[WAKEUP].process_alive_check(@id)
+      end
+    end
+
+    private
+
     def group_per_commandclass updates
-      updates_per_commandclass = Hash.new { [] }
+      updates_per_commandclass = Hash.new({})
       updates.each do | key, value |
         match_data = key.match(/\Ainstances.0.commandClasses.(\d+)./)
         if match_data
           command_class = match_data[1].to_i
           cc_updates = updates_per_commandclass[command_class]
-          cc_updates << [match_data.post_match, value]
+          cc_updates[match_data.post_match] = value
           updates_per_commandclass[command_class] = cc_updates
         else
           $log.warn "? #{key}" unless key.match(/\Adata./)

data/lib/rzwaveway/zway.rb

@@ -1,54 +1,49 @@
-require 'uri'
+require 'httpclient'
 require 'log4r'
-require 'net/http'
 require 'json'
 
 module RZWaveWay
-  class ZWay
+  module ZWay
+    extend self
     include Log4r
 
-    def self.init
+    BASE_PATH='/ZWaveAPI/Data/'
+
+    def self.init hostname
       $log = Logger.new 'RZWaveWay'
       outputter = Outputter.stdout
       outputter.formatter = PatternFormatter.new(:pattern => "[%l] %d - %m")
       $log.outputters = Outputter.stdout
-    end
-
-    def initialize hostname
       @devices = {}
       @update_time = "0"
-      @uri = URI::HTTP.build({:host => hostname, :port => 8083})
       @event_handlers = {}
+      @http_client = HTTPClient.new
+      @base_uri="http://#{hostname}:8083"
     end
 
     def get_devices
-      @uri.path = "/ZWaveAPI/Data/#{@update_time}"
-      response = http_post_request
-      if response.code == "200"
-        results = JSON.parse response.body
-        @update_time = results["updateTime"]
-        results["devices"].each do |device |
-          device_id = device[0].to_i
-          @devices[device_id] = ZWaveDevice.new(device_id, device[1]) if device_id > 1
-        end
-        @devices
-      else
-        pp response.code
-        return {}
+      results = http_post_request
+      results["devices"].each do |device_id,device_data_tree|
+        device_id = device_id.to_i
+        @devices[device_id] = ZWaveDevice.new(device_id, device_data_tree) if device_id > 1
       end
+      @devices
     end
 
     def process_events
       events = []
-      updates = get_updates
+      updates = http_post_request
       updates_per_device = group_per_device updates
       updates_per_device.each do | id, updates |
         if @devices[id]
-          events.concat (@devices[id].process updates)
+          device_events = @devices[id].process updates
+          events += device_events unless device_events.empty?
         else
           $log.warn "Could not find device with id '#{id}'"
         end
       end
+      alive_events = check_not_alive_devices
+      events += alive_events unless alive_events.empty?
       events.each do |event|
         handler = @event_handlers[event.class]
         if handler
@@ -60,27 +55,14 @@ module RZWaveWay
       events
     end
 
-    def get_updates
-      @uri.path = "/ZWaveAPI/Data/#{@update_time}"
-      response = http_post_request
-      if response.is_a?(Net::HTTPSuccess)
-        results = JSON.parse response.body
-        @update_time = results.delete("updateTime")
-        return results
-      else
-        pp response.code
-        return {}
-      end
-    end
-
     def group_per_device updates
-      updates_per_device = Hash.new { [] }
+      updates_per_device = Hash.new({})
       updates.each do | key, value |
         match_data = key.match(/\Adevices\.(\d+)\./)
         if match_data
           device_id = match_data[1].to_i
           device_updates = updates_per_device[device_id]
-          device_updates << [match_data.post_match, value]
+          device_updates[match_data.post_match] = value
           updates_per_device[device_id] = device_updates
         else
           $log.warn "? #{key}"
@@ -89,12 +71,26 @@ module RZWaveWay
       updates_per_device
     end
 
-    def http_post_request
-      http = Net::HTTP.new(@uri.host, @uri.port)
-      http.use_ssl = false
+    def check_not_alive_devices
+      events = []
+      @devices.values.each do |device|
+        event = device.process_alive_check
+        events << event if event 
+      end
+      events
+    end
 
-      request = Net::HTTP::Post.new(@uri.path)
-      http.request(request)
+    def http_post_request
+      results = {}
+      url = @base_uri + BASE_PATH + "#{@update_time}"
+      response = @http_client.post(url)
+      if response.ok?
+        results = JSON.parse response.body
+        @update_time = results.delete("updateTime")
+      else
+        $log.error(response.reason)
+      end
+      results
     end
 
     def on_event (event, &listener)

data/rzwaveway.gemspec

@@ -1,17 +1,18 @@
 Gem::Specification.new do |s|
   s.name = "rzwaveway"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
   s.authors = ["Vincent Touchard"]
   s.date = %q{2014-02-08}
   s.summary = 'ZWave API for ZWay'
   s.description = 'A Ruby API to use the Razberry ZWave ZWay interface'
-  s.email = 'vincentoo@yahoo.com'
-  s.homepage = 'https://github.com/rzwaveway'
+  s.email = 'vincentoo.ignore@yahoo.com'
+  s.homepage = 'https://github.com/touchardv/rzwaveway'
   s.files = `git ls-files`.split("\n")
   s.has_rdoc = false
 
   dependencies = [
-    [:runtime,     "log4r",  "~> 1.1.10"]
+    [:runtime, "log4r", "~> 1.1.10"],
+    [:runtime, "httpclient", "~> 2.3.4.1"]
   ]
 
   dependencies.each do |type, name, version|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rzwaveway
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -27,8 +27,24 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.10
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.4.1
 description: A Ruby API to use the Razberry ZWave ZWay interface
-email: vincentoo@yahoo.com
+email: vincentoo.ignore@yahoo.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -42,7 +58,7 @@ files:
 - lib/rzwaveway/zwave_device.rb
 - lib/rzwaveway/zway.rb
 - rzwaveway.gemspec
-homepage: https://github.com/rzwaveway
+homepage: https://github.com/touchardv/rzwaveway
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -67,3 +83,4 @@ signing_key:
 specification_version: 3
 summary: ZWave API for ZWay
 test_files: []
+has_rdoc: false