ruby_home 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90d257a9cc88bba2f6323a89829fc89000e6e84842dbf7abadefb35168eb2848
-  data.tar.gz: 94acb47192d8cb7b9a54f01f7621da8b5371c2218ebf9494d2324af2193a705d
+  metadata.gz: 78d53eedc8551fe938a91a59629393108dbab03836f237ee9c535769c97bc09e
+  data.tar.gz: '0388c9fee54bc40b072eefb0d330701c5460d9e99156c7b0df305caf2294a671'
 SHA512:
-  metadata.gz: e229661aca3237368c77159703e01b10ad8a39d4c3ce35176ce73251668bba6077646285c2360fa783d79d5c77b658ae84299af6143ecd613b8abf97edd2213b
-  data.tar.gz: 3e4aadce797eb3b8a8be1ae6f70af601866726c7d53f76e3a0c7246fda25affadc0c67220e98d1596b4befa1a6dc6299ff89f7863c232b45e1748529497d84c8
+  metadata.gz: f60165e3c45540053e7074e94dfb190d4290363189c6e730079d669b1d85e9b1ab4f2c0297ec5359acd6c680d30200c646b0d5c4e8be680d765d9f3097dda06a
+  data.tar.gz: 3da982336642c9a69d64b32a3c769bdc60f55c30cfaf6be51c3b3a6eb56fd629e65186ccd705b8bfaac54a87fe34dc28baa3a7b0fc3e3ac28a73a8924bd40748

data/lib/ruby_home/factories/characteristic_factory.rb

@@ -1,9 +1,5 @@
 module RubyHome
   class CharacteristicFactory
-    DEFAULT_VALUES = {
-      identify: nil,
-    }.freeze
-
     def self.create(characteristic_name, service: , subtype: 'default' , value: nil)
       new(
         characteristic_name: characteristic_name,
@@ -22,7 +18,7 @@ module RubyHome
         service: service,
         unit: template.unit,
         uuid: template.uuid,
-        value: value
+        value_object: value_object
       )
 
       if persisted_characteristic
@@ -54,11 +50,11 @@ module RubyHome
         @template ||= CharacteristicTemplate.find_by(name: characteristic_name)
       end
 
-      def value
-        value_object.new(template, @requested_value)
+      def value_object
+        value_object_class.new(template, @requested_value)
       end
 
-      def value_object
+      def value_object_class
         BaseValue.value_for_template(template)
       end
 

data/lib/ruby_home/hap/characteristic.rb

@@ -23,7 +23,7 @@ module RubyHome
       'write' => 'pw',
     }.freeze
 
-    def initialize(uuid:, name:, description:, format:, unit:, properties:, service: , value: nil)
+    def initialize(uuid:, name:, description:, format:, unit:, properties:, service: , value_object: )
       @uuid = uuid
       @name = name
       @description = description
@@ -31,7 +31,7 @@ module RubyHome
       @unit = unit
       @properties = properties
       @service = service
-      @value = value
+      @value_object = value_object
     end
 
     attr_reader(
@@ -42,7 +42,8 @@ module RubyHome
       :format,
       :unit,
       :properties,
-      :instance_id
+      :instance_id,
+      :value_object,
     )
 
     def instance_id=(new_id)
@@ -59,11 +60,11 @@ module RubyHome
     end
 
     def value
-      @value.value
+      value_object.value
     end
 
     def value=(new_value)
-      @value.value = new_value
+      value_object.value = new_value
       broadcast(:after_update, self)
     end
   end

data/lib/ruby_home/hap/server.rb

@@ -65,8 +65,8 @@ module RubyHome
 
         return close(socket) unless request.keep_alive?
         return close(socket) unless response.keep_alive?
-      rescue Errno::ECONNRESET, Errno::ECONNABORTED,
-             Errno::EPROTO, Errno::EINVAL, Errno::EHOSTUNREACH
+      rescue Errno::ECONNABORTED, Errno::ECONNRESET, Errno::EHOSTUNREACH,
+             Errno::EINVAL, Errno::EPROTO, Errno::ETIMEDOUT
         close(socket)
       rescue EOFError
         close(socket)
@@ -79,4 +79,3 @@ module RubyHome
     end
   end
 end
-

data/lib/ruby_home/hap/values/base_value.rb

@@ -1,7 +1,7 @@
 module RubyHome
   class BaseValue
     def self.value_for_template(template)
-      return NullValue if template.name == :identify
+      return IdentifyValue if template.name == :identify
 
       "::RubyHome::#{template.format.classify}Value".safe_constantize || NullValue
     end

data/lib/ruby_home/hap/values/identify_value.rb

@@ -0,0 +1,9 @@
+require_relative 'base_value'
+
+module RubyHome
+  class IdentifyValue < BaseValue
+    def value
+      true
+    end
+  end
+end

data/lib/ruby_home/http/serializers/characteristic_serializer.rb

@@ -14,22 +14,26 @@ module RubyHome
           'perms' => perms(characteristic),
           'format' => characteristic.format,
           'description' => characteristic.description,
-        }.merge(optional_hash(characteristic))
+        }.merge(value_hash(characteristic))
       end
 
-      def perms(characteristic)
-        characteristic.properties.map do |property|
-          RubyHome::Characteristic::PROPERTIES[property]
-        end.compact
-      end
+      private
+
+        HIDDEN_VALUE_OBJECTS = [ IdentifyValue ].freeze
 
-      def optional_hash(characteristic)
-        Hash.new.tap do |optional_hash|
-          if characteristic.value != nil
-            optional_hash['value'] = characteristic.value
+        def perms(characteristic)
+          characteristic.properties.map do |property|
+            RubyHome::Characteristic::PROPERTIES[property]
+          end.compact
+        end
+
+        def value_hash(characteristic)
+          if HIDDEN_VALUE_OBJECTS.include?(characteristic.value_object.class)
+            {}
+          else
+            { 'value' => characteristic.value }.compact
           end
         end
-      end
     end
   end
 end

data/lib/ruby_home/version.rb

@@ -1,3 +1,3 @@
 module RubyHome
-  VERSION = '0.1.15'
+  VERSION = '0.1.16'
 end

data/rubyhome.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'dnssd', '~> 3.0'
   spec.add_dependency 'hkdf', '~> 0.3.0'
   spec.add_dependency 'nio4r', '~> 2.3', '>= 2.3.1'
-  spec.add_dependency 'oj', '3.7.1'
+  spec.add_dependency 'oj', '3.7.4'
   spec.add_dependency 'rbnacl', '~> 6.0'
   spec.add_dependency 'ruby_home-srp', '~> 1.2'
   spec.add_dependency 'sinatra', '2.0.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_home
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Karl Entwistle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2018-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -98,14 +98,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: 3.7.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: 3.7.4
 - !ruby/object:Gem::Dependency
   name: rbnacl
   requirement: !ruby/object:Gem::Requirement
@@ -300,6 +300,7 @@ files:
 - lib/ruby_home/hap/values/base_value.rb
 - lib/ruby_home/hap/values/bool_value.rb
 - lib/ruby_home/hap/values/float_value.rb
+- lib/ruby_home/hap/values/identify_value.rb
 - lib/ruby_home/hap/values/int32_value.rb
 - lib/ruby_home/hap/values/null_value.rb
 - lib/ruby_home/hap/values/string_value.rb