rzwaveway 0.0.11 → 0.0.13

data/rzwaveway.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |s|
     [:runtime, 'faraday'],
     [:runtime, 'httpclient'],
     [:development, 'bundler', '~> 1.0'],
-    [:development, 'rspec', '~> 3.0.0']
+    [:development, 'rspec', '~> 3.0.0'],
+    [:development, 'pry-byebug']
   ]
 
   dependencies.each do |type, name, version|

data/spec/command_classes/alarm_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+module RZWaveWay
+  module CommandClasses
+    describe Alarm do
+      let(:device) { ZWaveDevice.new(create_id, create_device_data) }
+      let(:command_class) { Alarm.new(device) }
+
+      describe '#process' do
+        it 'yields an alarm event (v1 event)' do
+          updates = File.read('spec/data/alarm_v1.json')
+          updates = JSON.parse updates
+          zway = ZWay.instance
+          updates_per_device = zway.send(:group_per_device, updates)
+          updates_per_cc = device.send(:group_per_commandclass, updates_per_device[12])
+          
+          event = nil
+          command_class.process(updates_per_cc[113]) {|e| event = e}
+          expect(event.alarm_type).to eq :power_management
+          expect(event.level).to eq 2
+        end
+
+        it 'yields an alarm event' do
+          updates = File.read('spec/data/alarm.json')
+          updates = JSON.parse updates
+          zway = ZWay.instance
+          updates_per_device = zway.send(:group_per_device, updates)
+          updates_per_cc = device.send(:group_per_commandclass, updates_per_device[24])
+          
+          event = nil
+          command_class.process(updates_per_cc[113]) {|e| event = e}
+          expect(event.alarm_type).to eq :burglar
+        end
+      end
+    end
+  end
+end

data/spec/command_classes/battery_spec.rb

@@ -3,20 +3,21 @@ require 'spec_helper'
 module RZWaveWay
   module CommandClasses
     describe Battery do
+      let(:command_class) { Battery.new(device) }
       let(:device) { ZWaveDevice.new(create_id, create_device_data) }
-      let(:command_class) do
-        Battery.new(
-          {'data' => { 'last' => {
-                         'value' => 60,
-                         'type' => 'int',
-                         'updateTime' => 1409681662
-        }}}, device)
-      end
+      let(:data) {
+        {'data' => { 'last' => {
+                       'value' => 60,
+                       'type' => 'int',
+                       'updateTime' => 1409681662
+        }}}
+      }
+
+      before { command_class.build_from(data) }
 
-      describe '#new' do
-        it 'stores interesting properties' do
-          command_class
-          expect(device.get_property(:battery_level)).to eq [60, 1409681662]
+      describe '#build_from' do
+        it 'adds the battery level property' do
+          expect(command_class.battery_level).to eq 60
         end
       end
 
@@ -25,14 +26,15 @@ module RZWaveWay
           expect(command_class.process({})).to be_nil
         end
 
-        it 'returns a battery event' do
+        it 'yields a battery event' do
           updates = {
             'data.last' => {
               'value' => 50,
               'type' => 'int',
               'updateTime' => 1409681762
           }}
-          event = command_class.process(updates)
+          event = nil
+          command_class.process(updates) {|e| event = e}
           expect(event.class).to be RZWaveWay::BatteryValueEvent
           expect(event.value).to eq 50
           expect(event.device_id).to eq device.id

data/spec/command_classes/sensor_binary_spec.rb

@@ -3,19 +3,20 @@ require 'spec_helper'
 module RZWaveWay
   module CommandClasses
     describe SensorBinary do
+      let(:command_class) { SensorBinary.new(device) }
       let(:device) { ZWaveDevice.new(create_id, create_device_data) }
-      let(:command_class) do
-        SensorBinary.new(
-          {'data' => { '1' => { 'level' => {
-                                  'value' => false,
-                                  'updateTime' => 1405102560
-        }}}}, device)
-      end
+      let(:data) {
+        {'data' => { '1' => { 'level' => {
+                                'value' => false,
+                                'updateTime' => 1405102560
+        }}}}
+      }
+
+      before { command_class.build_from(data) }
 
-      describe '#new' do
-        it 'stores interesting properties' do
-          command_class
-          expect(device.get_property(:level)).to eq [false, 1405102560]
+      describe '#build_from' do
+        it 'adds a property for level' do
+          expect(command_class.level).to eq false
         end
       end
 
@@ -24,13 +25,14 @@ module RZWaveWay
           expect(command_class.process({})).to be_nil
         end
 
-        it 'returns a level event' do
+        it 'yields a level event' do
           updates = {
             'data.1' => { 'level' => {
                             'value' => true,
                             'updateTime' => 1405102860
           }}}
-          event = command_class.process(updates)
+          event = nil
+          command_class.process(updates) {|e| event = e}
           expect(event.class).to be RZWaveWay::LevelEvent
           expect(event.level).to eq true
           expect(event.device_id).to eq device.id

data/spec/command_classes/switch_binary_spec.rb

@@ -3,19 +3,20 @@ require 'spec_helper'
 module RZWaveWay
   module CommandClasses
     describe SwitchBinary do
+      let(:command_class) { SwitchBinary.new(device) }
       let(:device) { ZWaveDevice.new(create_id, create_device_data) }
-      let(:command_class) do
-        SwitchBinary.new(
-          {'data' => { 'level' => {
-                         'value' => false,
-                         'updateTime' => 1405102560
-        }}}, device)
-      end
+      let(:data) {
+        {'data' => { 'level' => {
+                       'value' => false,
+                       'updateTime' => 1405102560
+        }}}
+      }
+
+      before { command_class.build_from(data) }
 
-      describe '#it caches the level' do
-        it 'stores interesting properties' do
-          command_class
-          expect(device.get_property(:level)).to eq [false, 1405102560]
+      describe '#build_from' do
+        it 'adds a property for level' do
+          expect(command_class.level).to eq false
         end
       end
 
@@ -24,13 +25,14 @@ module RZWaveWay
           expect(command_class.process({})).to be_nil
         end
 
-        it 'returns a multi level event' do
+        it 'yields a multi level event' do
           updates = {
             'data.level' => {
               'value' => true,
               'updateTime' => 1405102860
           }}
-          event = command_class.process(updates)
+          event = nil
+          command_class.process(updates) {|e| event = e}
           expect(event.class).to be RZWaveWay::LevelEvent
           expect(event.level).to eq true
           expect(event.device_id).to eq device.id

data/spec/command_classes/switch_multi_level_spec.rb

@@ -3,19 +3,20 @@ require 'spec_helper'
 module RZWaveWay
   module CommandClasses
     describe SwitchMultiLevel do
+      let(:command_class) { SwitchMultiLevel.new(device) }
       let(:device) { ZWaveDevice.new(create_id, create_device_data) }
-      let(:command_class) do
-        SwitchMultiLevel.new(
-          {'data' => { 'level' => {
-                         'value' => 33,
-                         'updateTime' => 1405102560
-        }}}, device)
-      end
+      let(:data) {
+        {'data' => { 'level' => {
+                       'value' => 33,
+                       'updateTime' => 1405102560
+        }}}
+      }
+
+      before { command_class.build_from(data) }
 
-      describe '#new' do
-        it 'stores interesting properties' do
-          command_class
-          expect(device.get_property(:level)).to eq [33, 1405102560]
+      describe '#build_from' do
+        it 'adds a property for level' do
+          expect(command_class.level).to eq 33
         end
       end
 
@@ -24,13 +25,14 @@ module RZWaveWay
           expect(command_class.process({})).to be_nil
         end
 
-        it 'returns a multi level event' do
+        it 'yields a multi level event' do
           updates = {
             'data.level' => {
               'value' => 66,
               'updateTime' => 1405102860
           }}
-          event = command_class.process(updates)
+          event = nil
+          command_class.process(updates) {|e| event = e}
           expect(event.class).to be RZWaveWay::MultiLevelEvent
           expect(event.level).to eq 66
           expect(event.device_id).to eq device.id

data/spec/command_classes/wake_up_spec.rb

@@ -3,24 +3,65 @@ require 'spec_helper'
 module RZWaveWay
   module CommandClasses
     describe WakeUp do
+      let(:command_class) { WakeUp.new(device) }
       let(:device) { ZWaveDevice.new(create_id, create_device_data) }
-      let(:command_class) do
-        WakeUp.new(
-          {'data' => {
-             'interval' => {'value' => 300, 'updateTime' => 1394983000},
-             'lastSleep' => {'value' => 1394983222, 'updateTime' => 1394983222},
-             'lastWakeup' => {'value' => 1394983222, 'updateTime' => 1394983222}
-        }}, device)
+      let(:data) {
+        {'data' => {
+           'interval' => {'value' => contact_frequency, 'updateTime' => 1394983000},
+           'lastSleep' => {'value' => time, 'updateTime' => time},
+           'lastWakeup' => {'value' => time, 'updateTime' => time}
+        }}
+      }
+      let(:contact_frequency) { 300 }
+      let(:time) { 1394983222 }
+
+      before { command_class.build_from(data) }
+
+      describe '#build_from' do
+        it 'adds a property for wakeup interval' do
+          expect(command_class.contact_frequency).to eq 300
+        end
+
+        it 'adds a property for last sleep/wakeup time' do
+          expect(command_class.last_sleep_time).to eq time
+        end
+
+        it 'updates the last contact time' do
+          expect(command_class.device.last_contact_time).to eq time
+        end
       end
 
-      describe '#new' do
-        it 'stores interesting properties' do
-          command_class
-          expect(device.get_property(:wakeup_interval)).to eq [300, 1394983000]
-          expect(device.contact_frequency).to eq 300
-          expect(device.get_property(:wakeup_last_sleep_time)).to eq [1394983222, 1394983222]
-          expect(device.get_property(:wakeup_last_wakeup_time)).to eq [1394983222, 1394983222]
-          expect(device.last_contact_time).to eq 1394983222
+      describe '#missed_contact_count' do
+        it 'returns 0' do
+          expect(command_class.missed_contact_count(time + (contact_frequency - 1))).to eq 0
+        end
+
+        it 'returns 1' do
+          expect(command_class.missed_contact_count(time + contact_frequency)).to eq 1
+        end
+      end
+
+      describe '#on_time?' do
+        context 'no contact with device during wake up interval' do
+          it 'returns true (wake up time not yet reached)' do
+            expect(command_class.on_time?(time + (contact_frequency - 1))).to eq true
+          end
+
+          it 'returns true (wake up time reached but with small latency' do
+            expect(command_class.on_time?(time + (contact_frequency + 2))).to eq true
+          end
+
+          it 'returns false' do
+            expect(command_class.on_time?(time + (contact_frequency * 1.5))).to eq false
+          end
+        end
+
+        context 'contact with device during wake up interval' do
+          before { device.notify_contacted(time + 120) }
+
+          it 'return true' do
+            expect(command_class.on_time?(time + 120 + (contact_frequency - 1))).to eq true
+          end
         end
       end
 
@@ -29,15 +70,13 @@ module RZWaveWay
           expect(command_class.process({})).to be_nil
         end
 
-        it 'returns an alive event' do
+        it 'updates the last contact time' do
           updates = {
             'data.lastWakeup' => {'value' => 1395247772, 'updateTime' => 1395247772},
             'data.lastSleep' => {'value' => 1395247772, 'updateTime' => 1395247772}
           }
-          event = command_class.process(updates)
-          expect(event.class).to be RZWaveWay::AliveEvent
-          expect(event.device_id).to eq device.id
-          expect(event.time).to eq 1395247772
+          command_class.process(updates)
+          expect(device.last_contact_time).to eq 1395247772
         end
       end
     end

data/spec/data/alarm.json

@@ -0,0 +1,69 @@
+{
+  "devices.24.data.isAwake": {
+    "value": true,
+    "type": "bool",
+    "invalidateTime": 1496580849,
+    "updateTime": 1497033124
+  },
+  "devices.24.data.lastSend": {
+    "value": 34492540,
+    "type": "int",
+    "invalidateTime": 1496676167,
+    "updateTime": 1497033124
+  },
+  "devices.24.data.lastReceived": {
+    "value": 0,
+    "type": "int",
+    "invalidateTime": 1496580849,
+    "updateTime": 1497033124
+  },
+  "devices.24.instances.0.commandClasses.113.data.7": {
+    "value": null,
+    "type": "empty",
+    "typeString": {
+      "value": "Burglar",
+      "type": "string",
+      "invalidateTime": 1496581247,
+      "updateTime": 1496581248
+    },
+    "status": {
+      "value": 255,
+      "type": "int",
+      "invalidateTime": 1496581247,
+      "updateTime": 1497033124
+    },
+    "eventMask": {
+      "value": 265,
+      "type": "int",
+      "invalidateTime": 1496581247,
+      "updateTime": 1496581249
+    },
+    "event": {
+      "value": 8,
+      "type": "int",
+      "invalidateTime": 1496581247,
+      "updateTime": 1497033124
+    },
+    "eventString": {
+      "value": "Motion detected, location unknown",
+      "type": "string",
+      "invalidateTime": 1496581247,
+      "updateTime": 1497033124
+    },
+    "eventParameters": {
+      "value": [],
+      "type": "binary",
+      "invalidateTime": 1496581247,
+      "updateTime": 1497033124
+    },
+    "eventSequence": {
+      "value": null,
+      "type": "empty",
+      "invalidateTime": 1496676245,
+      "updateTime": 1496676246
+    },
+    "invalidateTime": 1496581247,
+    "updateTime": 1497033124
+  },
+  "updateTime": 1497033128
+}

data/spec/data/alarm_v1.json

@@ -0,0 +1,69 @@
+{
+    "devices.12.instances.0.commandClasses.113.data.V1event": {
+      "value": null,
+      "type": "empty",
+      "alarmType": {
+        "value": 8,
+        "type": "int",
+        "invalidateTime": 1476129162,
+        "updateTime": 1476903673
+      },
+      "level": {
+        "value": 2,
+        "type": "int",
+        "invalidateTime": 1476129162,
+        "updateTime": 1476903673
+      },
+      "invalidateTime": 1476129162,
+      "updateTime": 1476903673
+    },
+    "devices.12.instances.0.commandClasses.113.data.8": {
+      "value": null,
+      "type": "empty",
+      "typeString": {
+        "value": "Power Management",
+        "type": "string",
+        "invalidateTime": 1476129182,
+        "updateTime": 1476129183
+      },
+      "status": {
+        "value": 255,
+        "type": "int",
+        "invalidateTime": 1476129182,
+        "updateTime": 1476903673
+      },
+      "eventMask": {
+        "value": 12,
+        "type": "int",
+        "invalidateTime": 1476129182,
+        "updateTime": 1476129183
+      },
+      "event": {
+        "value": 2,
+        "type": "int",
+        "invalidateTime": 1476129182,
+        "updateTime": 1476903673
+      },
+      "eventString": {
+        "value": "AC mains disconnected",
+        "type": "string",
+        "invalidateTime": 1476129182,
+        "updateTime": 1476903673
+      },
+      "eventParameters": {
+        "value": [ ],
+        "type": "binary",
+        "invalidateTime": 1476129182,
+        "updateTime": 1476903673
+      },
+      "eventSequence": {
+        "value": null,
+        "type": "empty",
+        "invalidateTime": 1476129182,
+        "updateTime": 1476129183
+      },
+      "invalidateTime": 1476129182,
+      "updateTime": 1476903673
+    },
+ "updateTime": 1476903675
+}