rzwaveway 0.0.4 → 0.0.6

data/spec/command_classes/wake_up_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+module RZWaveWay
+  module CommandClasses
+    describe WakeUp do
+      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)
+      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
+        end
+      end
+
+      describe '#process' do
+        it 'does nothing when it processes no updates' do
+          expect(command_class.process({})).to be_nil
+        end
+
+        it 'returns an alive event' 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
+        end
+      end
+    end
+  end
+end

data/spec/data/battery_get.txt

@@ -0,0 +1,73 @@
+{
+  "devices.11.instances.0.commandClasses.128.data": {
+    "name": "devices.11.instances.0.commandClasses.128.data",
+    "value": null,
+    "type": "NoneType",
+    "supported": {
+      "name": "supported",
+      "value": true,
+      "type": "bool",
+      "invalidateTime": 1409683007,
+      "updateTime": 1403337655
+    },
+    "version": {
+      "name": "version",
+      "value": 1,
+      "type": "int",
+      "invalidateTime": 1409683007,
+      "updateTime": 1403337810
+    },
+    "security": {
+      "name": "security",
+      "value": false,
+      "type": "bool",
+      "invalidateTime": 1403337654,
+      "updateTime": 1403337655
+    },
+    "interviewDone": {
+      "name": "interviewDone",
+      "value": true,
+      "type": "bool",
+      "invalidateTime": 1403337654,
+      "updateTime": 1403337815
+    },
+    "interviewCounter": {
+      "name": "interviewCounter",
+      "value": 9,
+      "type": "int",
+      "invalidateTime": 1403337654,
+      "updateTime": 1403337814
+    },
+    "lastChange": {
+      "name": "lastChange",
+      "value": 1403338820,
+      "type": "int",
+      "invalidateTime": 1409683007,
+      "updateTime": 1403338820
+    },
+    "history": {
+      "name": "history",
+      "value": null,
+      "type": "NoneType",
+      "96": {
+        "name": "96",
+        "value": 1403338820,
+        "type": "int",
+        "invalidateTime": 1409683007,
+        "updateTime": 1403338820
+      },
+      "invalidateTime": 1409683007,
+      "updateTime": 1403338820
+    },
+    "last": {
+      "name": "last",
+      "value": 96,
+      "type": "int",
+      "invalidateTime": 1409683007,
+      "updateTime": 1403338820
+    },
+    "invalidateTime": 1409683007,
+    "updateTime": 1403337655
+  },
+  "updateTime": 1409683018
+}

data/spec/data/sensor_level.txt

@@ -0,0 +1,24 @@
+{
+  "devices.10.instances.0.commandClasses.48.data.1": {
+    "name": "1",
+    "value": null,
+    "type": "NoneType",
+    "sensorTypeString": {
+      "name": "sensorTypeString",
+      "value": "General purpose",
+      "type": "str",
+      "invalidateTime": 1400840129,
+      "updateTime": 1400840130
+    },
+    "level": {
+      "name": "level",
+      "value": false,
+      "type": "bool",
+      "invalidateTime": 1400840129,
+      "updateTime": 1409508623
+    },
+    "invalidateTime": 1400840129,
+    "updateTime": 1409508623
+  },
+  "updateTime": 1409508626
+}

data/spec/data/switch_multi_level_get.txt

@@ -0,0 +1,24 @@
+{
+  "devices.6.data.lastSend": {
+      "name": "lastSend",
+      "value": 38650858,
+      "type": "int",
+      "invalidateTime": 1416820647,
+      "updateTime": 1417258409
+    },
+    "devices.6.data.lastReceived": {
+      "name": "lastReceived",
+      "value": 0,
+      "type": "int",
+      "invalidateTime": 1392567359,
+      "updateTime": 1417258409
+    },
+    "devices.6.instances.0.commandClasses.38.data.level": {
+      "name": "level",
+      "value": 0,
+      "type": "int",
+      "invalidateTime": 1417258408,
+      "updateTime": 1417258409
+    }
+  }
+}

data/spec/data/wake_up.txt

@@ -0,0 +1,45 @@
+{
+  "devices.4.data.isAwake": {
+    "name": "isAwake",
+    "value": false,
+    "type": "bool",
+    "invalidateTime": 1371901717,
+    "updateTime": 1409500515
+  },
+  "devices.4.data.lastSend": {
+    "name": "lastSend",
+    "value": 177270192,
+    "type": "int",
+    "invalidateTime": 1407492414,
+    "updateTime": 1409500515
+  },
+  "devices.4.data.lastNonceGet": {
+    "name": "lastNonceGet",
+    "value": 177269183,
+    "type": "int",
+    "invalidateTime": 1407492414,
+    "updateTime": 1409500514
+  },
+  "devices.4.data.lastReceived": {
+    "name": "lastReceived",
+    "value": 0,
+    "type": "int",
+    "invalidateTime": 1371901717,
+    "updateTime": 1409500514
+  },
+  "devices.4.instances.0.commandClasses.132.data.lastWakeup": {
+    "name": "lastWakeup",
+    "value": 1409500514,
+    "type": "int",
+    "invalidateTime": 1402383689,
+    "updateTime": 1409500514
+  },
+  "devices.4.instances.0.commandClasses.132.data.lastSleep": {
+    "name": "lastSleep",
+    "value": 1409500514,
+    "type": "int",
+    "invalidateTime": 1402383689,
+    "updateTime": 1409500514
+  },
+  "updateTime": 1409500520
+}

data/spec/spec_helper.rb

@@ -0,0 +1,37 @@
+require 'rzwaveway'
+require 'log4r'
+require 'securerandom'
+
+module SpecHelpers
+  def create_id
+    SecureRandom.random_number(1000000)
+  end
+
+  def create_device_data(command_classes_data = {}, last_contact_time = 0)
+    {
+      'data' => {
+        'givenName' => {
+          'value' => 'device name'
+          },
+        'lastReceived' => {
+          'updateTime' => last_contact_time
+        },
+        'lastSend' => {
+          'updateTime' => last_contact_time
+        }
+      },
+      'instances' => {'0' => {'commandClasses' => command_classes_data}}
+    }
+  end
+end
+
+RSpec.configure do |c|
+  c.include SpecHelpers
+end
+
+$log = Log4r::Logger.new 'RZWaveWay'
+# formatter = Log4r::PatternFormatter.new(:pattern => "[%l] %d - %m")
+# outputter = Log4r::Outputter.stdout
+# outputter.formatter = formatter
+# outputter.level = Log4r::DEBUG
+# $log.outputters = [Log4r::Outputter.stdout]

data/spec/zwave_device_spec.rb

@@ -0,0 +1,217 @@
+require 'spec_helper'
+
+module RZWaveWay
+  describe ZWaveDevice do
+    let(:now) { Time.now }
+    let(:device) do
+      ZWaveDevice.new(create_id,
+                      create_device_data({CommandClass::WAKEUP =>
+                                          {
+                                            'data' => {
+                                              'interval' => { 'value' => 300, 'updateTime' => 0 },
+                                              'lastSleep' => { 'value' => 1390251561, 'updateTime' => 0 },
+                                              'lastWakeup' => { 'value' => 1390251561, 'updateTime' => 0 }
+                                            }
+                                          }
+                                          }))
+    end
+
+    describe '#new' do
+      it 'sets last contact time from data (wake up command class)' do
+        expect(device.last_contact_time).to eq 1390251561
+      end
+
+      it 'sets the last contact time from data (device data > wake up command class)' do
+        battery_device = ZWaveDevice.new(create_id, create_device_data({CommandClass::WAKEUP =>
+                                                                        {
+                                                                          'data' => {
+                                                                            'interval' => { 'value' => 300, 'updateTime' => 0 },
+                                                                            'lastSleep' => { 'value' => 1390251000, 'updateTime' => 0 },
+                                                                            'lastWakeup' => { 'value' => 1390251000, 'updateTime' => 0 }
+                                                                          }
+                                                                        }
+                                                                        }, 1390252000))
+        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
+      end
+
+      it 'sets the name from data' do
+        expect(device.name).to eq 'device name'
+      end
+    end
+
+    describe '#contacts_controller_periodically?' do
+      it 'returns true if device supports wake up cc' do
+        expect(device.contacts_controller_periodically?).to be true
+      end
+
+      it 'returns false if device does not support wake up cc' do
+        ac_powered_device = ZWaveDevice.new(create_id, create_device_data)
+        expect(ac_powered_device.contacts_controller_periodically?).to be false
+      end
+    end
+
+    describe '#notify_contacted' do
+      it 'updates the last contact time' do
+        now = Time.now.to_i
+        device.notify_contacted(now)
+        expect(device.last_contact_time).to eq now
+      end
+
+      it 'does not update the last contact time' do
+        now = Time.now.to_i
+        device.notify_contacted(now)
+        expect(device.last_contact_time).to eq now
+        device.notify_contacted(now - 600)
+        expect(device.last_contact_time).to eq now
+      end
+    end
+
+    describe '#process' do
+      it 'updates the last contact time (from lastReceived)' do
+        updates = {
+          'data.lastReceived' => {
+            'name' => 'lastReceived',
+            'value' => 176428709,
+            'type' => 'int',
+            'invalidateTime' => 1390251561,
+            'updateTime' => 1409490977
+
+          }
+        }
+        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
+      end
+    end
+  end
+end

data/spec/zway_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+module RZWaveWay
+  describe ZWay do
+    let(:http_stubs) { Faraday::Adapter::Test::Stubs.new }
+    let(:zway) do
+      zway = ZWay.instance
+      zway.setup('dummy', :test, http_stubs)
+      zway
+    end
+
+    describe '#start' do
+      it 'starts the library' do
+        http_stubs.get('/ZWaveAPI/Data/0') {|env| [200, {}, { devices: {}}.to_json]}
+        zway.start
+        expect(zway.devices.size).to eq 0
+      end
+
+      it 'starts the library, even when ZWay HTTP is ready later' do
+        Thread.new do
+          sleep(1)
+          http_stubs.get('/ZWaveAPI/Data/0') {|env| [200, {}, '{}']}
+          sleep(2)
+          http_stubs.get('/ZWaveAPI/Data/') {|env| [200, {}, { devices: {}}.to_json]}
+        end
+        zway.start
+        expect(zway.devices.size).to eq 0
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rzwaveway
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -27,37 +27,108 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.10
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.4.1
+        version: '0'
   type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.4.1
+        version: 3.0.0
 description: A Ruby API to use the Razberry ZWave ZWay interface
-email: vincentoo.ignore@yahoo.com
+email: touchardv@yahoo.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- Gemfile
 - LICENSE
 - README.md
 - lib/rzwaveway.rb
+- lib/rzwaveway/command_class.rb
 - lib/rzwaveway/command_classes.rb
+- lib/rzwaveway/command_classes/battery.rb
+- lib/rzwaveway/command_classes/sensor_binary.rb
+- lib/rzwaveway/command_classes/switch_binary.rb
+- lib/rzwaveway/command_classes/switch_multi_level.rb
+- lib/rzwaveway/command_classes/wake_up.rb
 - lib/rzwaveway/events.rb
+- lib/rzwaveway/extensions.rb
+- lib/rzwaveway/extensions/fibaro_smoke_sensor.rb
+- lib/rzwaveway/extensions/ssa_siren_strobe_alarm.rb
+- lib/rzwaveway/version.rb
 - lib/rzwaveway/zwave_device.rb
 - lib/rzwaveway/zway.rb
 - rzwaveway.gemspec
+- 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/battery_get.txt
+- spec/data/sensor_level.txt
+- spec/data/switch_multi_level_get.txt
+- spec/data/wake_up.txt
+- spec/spec_helper.rb
+- spec/zwave_device_spec.rb
+- spec/zway_spec.rb
 homepage: https://github.com/touchardv/rzwaveway
 licenses: []
 post_install_message: 
@@ -78,9 +149,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: ZWave API for ZWay
 test_files: []
-has_rdoc: false