rzwaveway 0.0.11 → 0.0.13

data/spec/events_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+module RZWaveWay
+  describe Event do
+    describe '#new' do
+      it 'enforces a non-nil argument' do
+        expect { Event.new(nil) }
+        .to raise_error ArgumentError
+      end
+
+      it 'requires a device id' do
+        expect { Event.new(foo: 'bar') }
+        .to raise_error ArgumentError
+      end
+
+      it 'adds a time if none is provided' do
+        event = AliveDevice.new(device_id: 123)
+        expect(event[:time]).not_to be_nil
+      end
+
+      it 'keeps the existing time if provided' do
+        event = Event.new(device_id: 123, time: 1472373723)
+        expect(event[:time]).to eq 1472373723
+      end
+    end
+  end
+end

data/spec/property_spec.rb

@@ -0,0 +1,83 @@
+require 'spec_helper'
+
+module RZWaveWay
+  describe Property do
+    let(:property) { Property.new(value: 123, update_time: 0) }
+
+    describe '#changed?' do
+      it 'returns false when no change is performed on property' do
+        expect(property.changed?).to eq false
+
+        property.update(123, 10)
+        expect(property.changed?).to eq false
+      end
+
+      it 'returns true when the value is changed' do
+        property.update(456, 0)
+        expect(property.changed?).to eq true
+      end
+    end
+
+    describe '#read_only?' do
+      it 'is false when not specified' do
+        expect(property.read_only?).to eq false
+      end
+
+      it 'is true when specified to true' do
+        special_property = Property.new(value: 456, update_time: 0, read_only: true)
+        expect(special_property.read_only?).to eq true
+      end
+    end
+
+    describe '#save' do
+      it '"applies/persists" the value update' do
+        property.update(456, 10)
+        property.save
+        expect(property.changed?).to eq false
+      end
+    end
+
+    describe '#to_hash' do
+      it 'returns a hash with value, update time and read-only' do
+        hash = property.to_hash
+        expect(hash.class).to eq Hash
+        expect(hash.keys).to include(:value, :read_only, :update_time)
+      end
+    end
+
+    describe '#update' do
+      it 'updates the value and update time' do
+        property.update(456, 10)
+        expect(property.value).to eq 456
+        expect(property.update_time).to eq 10
+      end
+
+      it 'updates the update time' do
+        property.update(123, 10)
+        expect(property.update_time).to eq 10
+      end
+
+      it 'does not update with a past value' do
+        property.update(0, -10)
+        expect(property.value).to eq 123
+        expect(property.update_time).to eq 0
+      end
+
+      it 'does not update the value and time' do
+        property.update(123, 0)
+        expect(property.value).to eq 123
+        expect(property.update_time).to eq 0
+      end
+
+      it 'returns true when the value is changed' do
+        result = property.update(456, 10)
+        expect(result).to eq true
+      end
+
+      it 'returns false when the value is unchanged' do
+        result = property.update(123, 10)
+        expect(result).to eq false
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require 'pry-byebug'
 require 'rzwaveway'
 require 'securerandom'
 
@@ -10,9 +11,19 @@ module SpecHelpers
     {
       'data' => {
         'givenName' => {
-          'value' => 'device name'
-          },
+          'value' => 'device name',
+          'updateTime' => 0
+        },
+        'failureCount' => {
+          'value' => 0,
+          'updateTime' => 0
+        },
+        'isFailed' => {
+          'value' => false,
+          'updateTime' => 0
+        },
         'lastReceived' => {
+          'value' => 0,
           'updateTime' => last_contact_time
         },
         'lastSend' => {

data/spec/zwave_device_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 module RZWaveWay
   describe ZWaveDevice do
-    let(:now) { Time.now }
     let(:device) do
       ZWaveDevice.new(create_id,
                       create_device_data({CommandClass::WAKEUP =>
@@ -15,6 +14,7 @@ module RZWaveWay
                                           }
                                           }))
     end
+    let(:ac_powered_device) { ZWaveDevice.new(create_id, create_device_data({}, 1390252000)) }
 
     describe '#new' do
       it 'sets last contact time from data (wake up command class)' do
@@ -34,37 +34,20 @@ module RZWaveWay
         expect(battery_device.last_contact_time).to eq 1390252000
       end
 
-      it 'sets the last contact time from data (device data)' do
-        ac_powered_device = ZWaveDevice.new(create_id, create_device_data({}, 1390252000))
-        expect(ac_powered_device.last_contact_time).to eq 1390252000
+      it 'sets the failure count' do
+        expect(ac_powered_device.failure_count).to eq 0
       end
 
-      it 'sets the name from data' do
-        expect(device.name).to eq 'device name'
+      it 'sets the is failed flag' do
+        expect(ac_powered_device.is_failed).to eq false
       end
-    end
-
-    describe '#add_property' do
-      it 'stores a property' do
-        property = { name: 'prop1', value: 123, update_time: Time.now.to_i, read_only: true }
-        device.add_property(property)
 
-        expect(device.get_property('prop1')).not_to be_nil
-      end
-    end
-
-    describe '#properties' do
-      it 'returns the name and value of all properties' do
-        device.add_property({ name: 'prop1', value: 123, update_time: 1390252000 })
-        device.add_property({ name: 'prop2', value: 456, update_time: 1390252000 })
-
-        expect(device.properties).to eq( 'prop1' => { value: 123, update_time: 1390252000, read_only: true },
-                                         'prop2' => { value: 456, update_time: 1390252000, read_only: true })
+      it 'sets the last contact time from data (device data)' do
+        expect(ac_powered_device.last_contact_time).to eq 1390252000
       end
 
-      it 'does not include internal properties' do
-        device.add_property({ name: 'prop1', value: 123, update_time: 1390252000, internal: true })
-        expect(device.properties).to be_empty
+      it 'sets the name from data' do
+        expect(device.name).to eq 'device name'
       end
     end
 
@@ -110,131 +93,11 @@ module RZWaveWay
         device.process(updates)
         expect(device.last_contact_time).to eq 1409490977
       end
-
-      it 'updates the last contact time (from lastSend)' do
-        updates = {
-          'data.lastSend' => {
-            'name' => 'lastSend',
-            'value' => 176428709,
-            'type' => 'int',
-            'invalidateTime' => 1390251561,
-            'updateTime' => 1409490970
-          }
-        }
-        device.process(updates)
-        expect(device.last_contact_time).to eq 1409490970
-      end
-
-      it 'updates the last contact time' do
-        updates = {
-          'data.lastReceived' => {
-            'name' => 'lastReceived',
-            'value' => 176428709,
-            'type' => 'int',
-            'invalidateTime' => 1390251561,
-            'updateTime' => 1409490977
-          },
-          'data.lastSend' => {
-            'name' => 'lastSend',
-            'value' => 176428709,
-            'type' => 'int',
-            'invalidateTime' => 1390251561,
-            'updateTime' => 1409490970
-          }
-        }
-        device.process(updates)
-        expect(device.last_contact_time).to eq 1409490977
-      end
-
-      it 'generates an AliveEvent when last contact time got updated' do
-        device.notify_contacted(now)
-        updates = {
-          'data.lastReceived' => {
-            'name' => 'lastReceived',
-            'value' => 176428709,
-            'type' => 'int',
-            'invalidateTime' => 1390251561,
-            'updateTime' => now+100
-          },
-          'data.lastSend' => {
-            'name' => 'lastSend',
-            'value' => 176428709,
-            'type' => 'int',
-            'invalidateTime' => 1390251561,
-            'updateTime' => now+100
-          }
-        }
-        events = device.process(updates)
-        expect(events.size).to eq 1
-        event = events.first
-        expect(event.class).to be AliveEvent
-        expect(event.device_id).to eq device.id
-        expect(event.time).to eq (now+100)
-      end
-
-      it 'does not generate an AliveEvent when last contact time is not updated' do
-        device.notify_contacted(now)
-        updates = {
-          'data.lastReceived' => {
-            'name' => 'lastReceived',
-            'value' => 176428709,
-            'type' => 'int',
-            'invalidateTime' => 1390251561,
-            'updateTime' => 1409490970
-          },
-          'data.lastSend' => {
-            'name' => 'lastSend',
-            'value' => 176428709,
-            'type' => 'int',
-            'invalidateTime' => 1390251561,
-            'updateTime' => 1409490970
-          }
-        }
-        events = device.process(updates)
-        expect(events.size).to eq 0
-      end
-    end
-
-    describe '#process_alive_check' do
-      it 'generates no event' do
-        device.notify_contacted(now)
-        event = device.process_alive_check
-        expect(event).to be_nil
-      end
-
-      it 'generates a NotAliveEvent' do
-        device.notify_contacted(now - 600)
-        event = device.process_alive_check
-        expect(event.class).to be NotAliveEvent
-        expect(event.device_id).to eq device.id
-      end
-
-      it 'does not generate a NotAliveEvent at each check' do
-        device.notify_contacted(now - 600)
-        event = device.process_alive_check
-        event = device.process_alive_check
-        expect(event).to be_nil
-      end
-
-      it 'generates a DeadEvent' do
-        device.notify_contacted(now - 6000)
-        event = device.process_alive_check
-        expect(event.class).to be DeadEvent
-        expect(event.device_id).to eq device.id
-      end
-
-      it 'does not generate a DeadEvent multiple times' do
-        device.notify_contacted(now - 6000)
-        event = device.process_alive_check
-        event = device.process_alive_check
-        expect(event).to be_nil
-      end
     end
 
-    describe '#to_json' do
-      it 'returns json' do
-        json = device.to_json
-        expect(json.size).not_to eq 0
+    describe '#to_hash' do
+      it 'returns a Hash' do
+        expect(device.to_hash.class).to eq Hash
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rzwaveway
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Vincent Touchard
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby API to use the Razberry ZWave ZWay interface
 email: touchardv@yahoo.com
 executables: []
@@ -93,6 +107,8 @@ files:
 - lib/rzwaveway.rb
 - lib/rzwaveway/command_class.rb
 - lib/rzwaveway/command_classes.rb
+- lib/rzwaveway/command_classes/alarm.rb
+- lib/rzwaveway/command_classes/alarm_sensor.rb
 - lib/rzwaveway/command_classes/battery.rb
 - lib/rzwaveway/command_classes/sensor_binary.rb
 - lib/rzwaveway/command_classes/switch_binary.rb
@@ -103,19 +119,26 @@ files:
 - lib/rzwaveway/extensions/fibaro_smoke_sensor.rb
 - lib/rzwaveway/extensions/ssa_siren_strobe_alarm.rb
 - lib/rzwaveway/logger.rb
+- lib/rzwaveway/properties_cache.rb
+- lib/rzwaveway/property.rb
 - lib/rzwaveway/version.rb
 - lib/rzwaveway/zwave_device.rb
 - lib/rzwaveway/zway.rb
 - rzwaveway.gemspec
+- spec/command_classes/alarm_spec.rb
 - spec/command_classes/battery_spec.rb
 - spec/command_classes/sensor_binary_spec.rb
 - spec/command_classes/switch_binary_spec.rb
 - spec/command_classes/switch_multi_level_spec.rb
 - spec/command_classes/wake_up_spec.rb
+- spec/data/alarm.json
+- spec/data/alarm_v1.json
 - spec/data/battery_get.txt
 - spec/data/sensor_level.txt
 - spec/data/switch_multi_level_get.txt
 - spec/data/wake_up.txt
+- spec/events_spec.rb
+- spec/property_spec.rb
 - spec/spec_helper.rb
 - spec/zwave_device_spec.rb
 - spec/zway_spec.rb
@@ -138,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: ZWave API for ZWay