rzwaveway 0.0.9 → 0.0.10

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzJmZWU2ZGQ1YTc5ODMwNjcxNzdiYmYyNDgyNWQ3YzYxZDYzYTNlYg==
-  data.tar.gz: !binary |-
-    MThiNTZhNTY4OWU5MDRlZmY0MjIxYTdjODc2M2VkM2E4ZDcxZDQ0NQ==
+SHA1:
+  metadata.gz: c12e4156998c8b5f3b5f46d45e1e155169d556c6
+  data.tar.gz: 12394850fe070c5c3094507453159057fee67222
 SHA512:
-  metadata.gz: !binary |-
-    NDIwYjk5OGNhZDViNGNmNDliNDFhMTNjMTZiZGFhM2YwMWE5NjhkM2NkYWQ3
-    N2JhMDhmNzMzMTdiNjFiZWVlNWEwYjI5OTNkNzJlNmZiNWFhZGU2YmVjNjI0
-    MDZmMWZiOWEyNTUxMGZkZTAyYmYyMDZmYzJiMjcyZmY2YmNjODc=
-  data.tar.gz: !binary |-
-    MTBiM2QzYmRmNzZhNjAxMTUzYzk0NmJhOWViMGQwZGQ0MmJmNWQ4MWIzZjRi
-    ZTUyNzA2Y2RiMmIwOGQxZTVhYzU0NWY1ZjAxMjNmNjE4ZjkxZDdiNjNhNDhi
-    M2IzZGE0YTA0Y2ZiZjg0NmNmYWY5ZDA0Y2U3MjM4NWUxZmExMTE=
+  metadata.gz: 1ab8e9b3a74c1ba9a355193acecef32554527808ebfdf4ebe818a996e1e198f30d16749dc21e11b7b933c43ce87c4310368028b2406b934ff7a3f75d50090f45
+  data.tar.gz: ffc3ff8422425c5a9fbdef9fe0d11dd30b0c00cfd6b6f955a6e7484beba1887896efddc3369c103f1c90b7da2481c491906ed1c4e631e26cad83c2cd8cfc5feb

data/lib/rzwaveway/command_classes/battery.rb

@@ -5,9 +5,9 @@ module RZWaveWay
 
       def initialize(data, device)
         @device = device
-        @device.add_property(:battery_level,
-                             find('data.last.value', data),
-                             find('data.last.updateTime', data))
+        @device.add_property(name: :battery_level,
+                             value: find('data.last.value', data),
+                             update_time: find('data.last.updateTime', data))
       end
 
       def process(updates)

data/lib/rzwaveway/command_classes/sensor_binary.rb

@@ -5,9 +5,9 @@ module RZWaveWay
 
       def initialize(data, device)
         @device = device
-        @device.add_property(:level,
-                             find('data.1.level.value', data),
-                             find('data.1.level.updateTime', data))
+        @device.add_property(name: :level,
+                             value: find('data.1.level.value', data),
+                             update_time: find('data.1.level.updateTime', data))
       end
 
       def process(updates)

data/lib/rzwaveway/command_classes/switch_binary.rb

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

data/lib/rzwaveway/command_classes/switch_multi_level.rb

@@ -5,9 +5,9 @@ module RZWaveWay
 
       def initialize(data, device)
         @device = device
-        @device.add_property(:level,
-                             find('data.level.value', data),
-                             find('data.level.updateTime', data))
+        @device.add_property(name: :level,
+                             value: find('data.level.value', data),
+                             update_time: find('data.level.updateTime', data))
       end
 
       def process(updates)

data/lib/rzwaveway/command_classes/wake_up.rb

@@ -9,15 +9,15 @@ module RZWaveWay
         last_wakeup_time = find('data.lastWakeup.value', data)
         last_sleep_time = find('data.lastSleep.value', data)
 
-        @device.add_property(:wakeup_interval,
-                             wakeup_interval,
-                             find('data.interval.updateTime', data))
-        @device.add_property(:wakeup_last_sleep_time,
-                             last_sleep_time,
-                             find('data.lastSleep.updateTime', data))
-        @device.add_property(:wakeup_last_wakeup_time,
-                             last_wakeup_time,
-                             find('data.lastSleep.updateTime', data))
+        @device.add_property(name: :wakeup_interval,
+                             value: wakeup_interval,
+                             update_time: find('data.interval.updateTime', data))
+        @device.add_property(name: :wakeup_last_sleep_time,
+                             value: last_sleep_time,
+                             update_time: find('data.lastSleep.updateTime', data))
+        @device.add_property(name: :wakeup_last_wakeup_time,
+                             value: last_wakeup_time,
+                             update_time: find('data.lastSleep.updateTime', data))
 
         @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.9'
+  VERSION = '0.0.10'
 end

data/lib/rzwaveway/zwave_device.rb

@@ -27,16 +27,16 @@ module RZWaveWay
 
     def to_json
       attributes = {
-        'name' => @name,
-        'deviceId' => @id,
+        name: @name,
+        deviceId: @id,
         # TODO remove these obsolete attributes (kept for backward compatibility)
-        'lastSleepTime' => @last_contact_time,
-        'lastWakeUpTime' => @last_contact_time,
-        'wakeUpInterval' => @contact_frequency
+        lastSleepTime: @last_contact_time,
+        lastWakeUpTime: @last_contact_time,
+        wakeUpInterval: @contact_frequency,
         # ---
         # 'lastContactTime' => @last_contact_time,
         # 'contactFrequency' => @contact_frequency,
-        # 'properties' => @properties.to_json
+        properties: @properties
       }
       attributes.to_json
     end
@@ -87,20 +87,22 @@ module RZWaveWay
       end
     end
 
-    def add_property(name, value, updateTime)
-      @properties[name] = [value, updateTime]
+    def add_property(options)
+      name = options.delete(:name)
+      read_only = options.delete(:read_only) || true
+      @properties[name] = options
     end
 
     def get_property(name)
-      @properties[name].dup
+      [ @properties[name][:value], @properties[name][:update_time] ]
     end
 
-    def update_property(name, value, updateTime)
+    def update_property(name, value, update_time)
       if @properties.has_key?(name)
         property = @properties[name]
-        if property[0] != value || property[1] < updateTime
-          property[0] = value
-          property[1] = updateTime
+        if property[:value] != value || property[:update_time] < update_time
+          property[:value] = value
+          property[:update_time] = update_time
           true
         end
       end

data/spec/zwave_device_spec.rb

@@ -44,6 +44,15 @@ module RZWaveWay
       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 '#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.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Vincent Touchard
@@ -14,70 +14,70 @@ dependencies:
   name: log4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.10
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
 description: A Ruby API to use the Razberry ZWave ZWay interface
@@ -86,7 +86,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -128,17 +128,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ZWave API for ZWay