rzwaveway 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c12e4156998c8b5f3b5f46d45e1e155169d556c6
-  data.tar.gz: 12394850fe070c5c3094507453159057fee67222
+  metadata.gz: 01e99f245086e41fbeca9e16d6c0c6867324906d
+  data.tar.gz: adc57ec22b54fb1f084b2adc44bbcde9835fb3c8
 SHA512:
-  metadata.gz: 1ab8e9b3a74c1ba9a355193acecef32554527808ebfdf4ebe818a996e1e198f30d16749dc21e11b7b933c43ce87c4310368028b2406b934ff7a3f75d50090f45
-  data.tar.gz: ffc3ff8422425c5a9fbdef9fe0d11dd30b0c00cfd6b6f955a6e7484beba1887896efddc3369c103f1c90b7da2481c491906ed1c4e631e26cad83c2cd8cfc5feb
+  metadata.gz: 54c2f9b32d733c49a8e5022e452cc8d16c828f9b7eab5da5436db7dab2c15b73f7391378895f163b17bc6558a46dd13c3330e033a255d9b8fc23d0a973264687
+  data.tar.gz: 7c1b8a78ebd3e5942b86e576b9e2323089b865c73dff680c7edd031c0c096e50afed5aa469db3853523b8911e640a53567e2ad8affbee8b55f10652f934e6486

data/lib/rzwaveway/command_classes/battery.rb

@@ -21,10 +21,6 @@ module RZWaveWay
         end
       end
 
-      def battery_value
-        @device.get_property(:battery_level)[0]
-      end
-
       def get
         RZWaveWay::ZWay.instance.execute(@device.id, BATTERY, :Get)
       end

data/lib/rzwaveway/command_classes/switch_multi_level.rb

@@ -7,7 +7,8 @@ module RZWaveWay
         @device = device
         @device.add_property(name: :level,
                              value: find('data.level.value', data),
-                             update_time: find('data.level.updateTime', data))
+                             update_time: find('data.level.updateTime', data),
+                             read_only: false)
       end
 
       def process(updates)

data/lib/rzwaveway/command_classes/wake_up.rb

@@ -11,13 +11,16 @@ module RZWaveWay
 
         @device.add_property(name: :wakeup_interval,
                              value: wakeup_interval,
-                             update_time: find('data.interval.updateTime', data))
+                             update_time: find('data.interval.updateTime', data),
+                             internal: true)
         @device.add_property(name: :wakeup_last_sleep_time,
                              value: last_sleep_time,
-                             update_time: find('data.lastSleep.updateTime', data))
+                             update_time: find('data.lastSleep.updateTime', data),
+                             internal: true)
         @device.add_property(name: :wakeup_last_wakeup_time,
                              value: last_wakeup_time,
-                             update_time: find('data.lastSleep.updateTime', data))
+                             update_time: find('data.lastWakeup.updateTime', data),
+                             internal: true)
 
         @device.contact_frequency = wakeup_interval
         @device.notify_contacted(last_wakeup_time)

data/lib/rzwaveway/version.rb

@@ -1,3 +1,3 @@
 module RZWaveWay
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

data/lib/rzwaveway/zwave_device.rb

@@ -25,22 +25,6 @@ module RZWaveWay
       @last_contact_time + (@contact_frequency * (1 + @missed_contact_count) * 1.1)
     end
 
-    def to_json
-      attributes = {
-        name: @name,
-        deviceId: @id,
-        # TODO remove these obsolete attributes (kept for backward compatibility)
-        lastSleepTime: @last_contact_time,
-        lastWakeUpTime: @last_contact_time,
-        wakeUpInterval: @contact_frequency,
-        # ---
-        # 'lastContactTime' => @last_contact_time,
-        # 'contactFrequency' => @contact_frequency,
-        properties: @properties
-      }
-      attributes.to_json
-    end
-
     def support_commandclass?(command_class_id)
       @command_classes.has_key? command_class_id
     end
@@ -87,14 +71,21 @@ module RZWaveWay
       end
     end
 
-    def add_property(options)
-      name = options.delete(:name)
-      read_only = options.delete(:read_only) || true
-      @properties[name] = options
+    def add_property(property)
+      name = property.delete(:name)
+      property[:read_only] = true unless property.has_key? :read_only
+      @properties[name] = property
     end
 
     def get_property(name)
-      [ @properties[name][:value], @properties[name][:update_time] ]
+      [
+        @properties[name][:value],
+        @properties[name][:update_time]
+      ]
+    end
+
+    def properties
+      @properties.reject { |_, property| property.has_key? :internal }
     end
 
     def update_property(name, value, update_time)

data/spec/zwave_device_spec.rb

@@ -53,6 +53,21 @@ module RZWaveWay
       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 })
+      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
+      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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rzwaveway
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Vincent Touchard