ruby_home 0.2.1 → 0.2.6

data/lib/ruby_home/http/controllers/pairings_controller.rb

@@ -1,10 +1,10 @@
-require_relative 'application_controller'
+require_relative "application_controller"
 
 module RubyHome
   module HTTP
     class PairingsController < ApplicationController
-      post '/' do
-        content_type 'application/pairing+tlv8'
+      post "/" do
+        content_type "application/pairing+tlv8"
 
         case unpack_request[:method]
         when 3
@@ -20,9 +20,9 @@ module RubyHome
         pairing_params = {
           admin: !!unpack_request[:permissions],
           identifier: unpack_request[:identifier],
-          public_key: unpack_request[:public_key].unpack1('H*')
+          public_key: unpack_request[:public_key].unpack1("H*")
         }
-        accessory_info.add_paired_client pairing_params
+        accessory_info.add_paired_client(**pairing_params)
 
         tlv state: 2
       end
@@ -30,7 +30,7 @@ module RubyHome
       def remove_pairing
         accessory_info.remove_paired_client(unpack_request[:identifier])
 
-        response['connection'] = 'close'
+        response["connection"] = "close"
         tlv state: 2
       end
     end

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

@@ -1,5 +1,5 @@
-require_relative 'object_serializer'
-require_relative 'service_serializer'
+require_relative "object_serializer"
+require_relative "service_serializer"
 
 module RubyHome
   module HTTP
@@ -7,13 +7,13 @@ module RubyHome
       include ObjectSerializer
 
       def root
-        'accessories'
+        "accessories"
       end
 
       def record_hash(accessory)
         {
-          'aid' => accessory.id,
-          'services' => ServiceSerializer.new(accessory.services).serializable_hash,
+          "aid" => accessory.id,
+          "services" => ServiceSerializer.new(accessory.services).serializable_hash
         }
       end
     end

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

@@ -1,5 +1,5 @@
-require_relative 'object_serializer'
-require_relative 'uuid_helper'
+require_relative "object_serializer"
+require_relative "uuid_helper"
 
 module RubyHome
   module HTTP
@@ -9,31 +9,39 @@ module RubyHome
 
       def record_hash(characteristic)
         {
-          'iid' => characteristic.instance_id,
-          'type' => uuid_short_form(characteristic.uuid),
-          'perms' => perms(characteristic),
-          'format' => characteristic.format,
-          'description' => characteristic.description,
-        }.merge(value_hash(characteristic))
+          "iid" => characteristic.instance_id,
+          "type" => uuid_short_form(characteristic.uuid),
+          "perms" => perms(characteristic),
+          "format" => characteristic.format,
+          "description" => characteristic.description
+        }
+          .merge(value_hash(characteristic))
+          .merge(valid_values_hash(characteristic))
       end
 
       private
 
-        HIDDEN_VALUE_OBJECTS = [ IdentifyValue ].freeze
+      def perms(characteristic)
+        characteristic.properties.map do |property|
+          RubyHome::Characteristic::PROPERTIES[property]
+        end.compact
+      end
 
-        def perms(characteristic)
-          characteristic.properties.map do |property|
-            RubyHome::Characteristic::PROPERTIES[property]
-          end.compact
+      def value_hash(characteristic)
+        if characteristic.properties.include?("read")
+          {"value" => characteristic.value}
+        else
+          {}
         end
+      end
 
-        def value_hash(characteristic)
-          if HIDDEN_VALUE_OBJECTS.include?(characteristic.value_object.class)
-            {}
-          else
-            { 'value' => characteristic.value }.compact
-          end
+      def valid_values_hash(characteristic)
+        if characteristic.valid_values.empty?
+          {}
+        else
+          {"valid-values" => characteristic.valid_values}
         end
+      end
     end
   end
 end

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

@@ -1,4 +1,4 @@
-require_relative 'object_serializer'
+require_relative "object_serializer"
 
 module RubyHome
   module HTTP
@@ -6,14 +6,14 @@ module RubyHome
       include ObjectSerializer
 
       def root
-        'characteristics'
+        "characteristics"
       end
 
       def record_hash(characteristic)
         {
-          'aid' => characteristic.accessory_id,
-          'iid' => characteristic.instance_id,
-          'value' => characteristic.value,
+          "aid" => characteristic.accessory_id,
+          "iid" => characteristic.instance_id,
+          "value" => characteristic.value
         }
       end
     end

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

@@ -1,4 +1,4 @@
-require 'facets/hash/symbolize_keys'
+require "facets/hash/symbolize_keys"
 
 module RubyHome
   module HTTP

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

@@ -1,6 +1,6 @@
-require_relative 'characteristic_serializer'
-require_relative 'object_serializer'
-require_relative 'uuid_helper'
+require_relative "characteristic_serializer"
+require_relative "object_serializer"
+require_relative "uuid_helper"
 
 module RubyHome
   module HTTP
@@ -10,12 +10,22 @@ module RubyHome
 
       def record_hash(service)
         {
-          'iid' => service.instance_id,
-          'type' => uuid_short_form(service.uuid),
-          'characteristics' => CharacteristicSerializer.new(service.characteristics).serializable_hash,
-          'primary' => service.primary,
-          'hidden' => service.hidden,
-        }
+          "iid" => service.instance_id,
+          "type" => uuid_short_form(service.uuid),
+          "characteristics" => CharacteristicSerializer.new(service.characteristics).serializable_hash,
+          "primary" => service.primary,
+          "hidden" => service.hidden
+        }.merge(linked_services(service))
+      end
+
+      private
+
+      def linked_services(service)
+        if service.linked.empty?
+          {}
+        else
+          {"linked" => service.linked.map(&:instance_id)}
+        end
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module RubyHome
   module HTTP
     module UUIDHelper
-      APPLE_BASE_UUID = -'0000-1000-8000-0026BB765291'
+      APPLE_BASE_UUID = -"0000-1000-8000-0026BB765291"
 
       def uuid_short_form(uuid)
         return uuid unless apple_defined_uuid?(uuid)
@@ -14,7 +14,7 @@ module RubyHome
       end
 
       def trim_leading_zeros(input)
-        input.gsub(/^0*/, '')
+        input.gsub(/^0*/, "")
       end
     end
   end

data/lib/ruby_home/http/services/session_notifier.rb

@@ -16,21 +16,21 @@ module RubyHome
 
       def ==(other)
         self.class == other.class &&
-          self.session == other.session &&
-          self.characteristic == other.characteristic
+          session == other.session &&
+          characteristic == other.characteristic
       end
 
       attr_reader :session, :characteristic
 
       private
 
-        def send_ev_response
-          HAP::EVResponse.new(session, serialized_characteristic).send_response
-        end
+      def send_ev_response
+        HAP::EVResponse.new(session, serialized_characteristic).send_response
+      end
 
-        def serialized_characteristic
-          HTTP::CharacteristicValueSerializer.new([characteristic]).serialized_json
-        end
+      def serialized_characteristic
+        HTTP::CharacteristicValueSerializer.new([characteristic]).serialized_json
+      end
     end
   end
 end

data/lib/ruby_home/http/services/start_srp_service.rb

@@ -1,16 +1,16 @@
 module RubyHome
   class StartSRPService
-    def initialize(username: , password:)
+    def initialize(username:, password:)
       @username = username
       @password = password
     end
 
     def salt_bytes
-      [salt].pack('H*')
+      [salt].pack("H*")
     end
 
     def public_key_bytes
-      [public_key].pack('H*')
+      [public_key].pack("H*")
     end
 
     def proof

data/lib/ruby_home/http/services/verify_finish_service.rb

@@ -1,6 +1,6 @@
 module RubyHome
   class VerifyFinishService
-    def initialize(accessory_info: , encrypted_data: , session_key:, shared_secret:)
+    def initialize(accessory_info:, encrypted_data:, session_key:, shared_secret:)
       @accessory_info = accessory_info
       @encrypted_data = encrypted_data
       @session_key = session_key
@@ -23,34 +23,34 @@ module RubyHome
 
     private
 
-      NONCE = -'PV-Msg03'
+    NONCE = -"PV-Msg03"
 
-      attr_reader :accessory_info, :encrypted_data, :session_key, :shared_secret
+    attr_reader :accessory_info, :encrypted_data, :session_key, :shared_secret
 
-      def paired_client_exists?
-        accessory_info.paired_clients.any? do |paired_client|
-          paired_client[:identifier] == identifier
-        end
+    def paired_client_exists?
+      accessory_info.paired_clients.any? do |paired_client|
+        paired_client[:identifier] == identifier
       end
+    end
 
-      def chacha20poly1305
-        HAP::Crypto::ChaCha20Poly1305.new(session_key)
-      end
+    def chacha20poly1305
+      HAP::Crypto::ChaCha20Poly1305.new(session_key)
+    end
 
-      def nonce
-        HexHelper.pad(NONCE)
-      end
+    def nonce
+      HexHelper.pad(NONCE)
+    end
 
-      def decrypted_data
-        chacha20poly1305.decrypt(nonce, encrypted_data)
-      end
+    def decrypted_data
+      chacha20poly1305.decrypt(nonce, encrypted_data)
+    end
 
-      def unpacked_decrypted_data
-        TLV.decode(decrypted_data)
-      end
+    def unpacked_decrypted_data
+      TLV.decode(decrypted_data)
+    end
 
-      def identifier
-        unpacked_decrypted_data[:identifier]
-      end
+    def identifier
+      unpacked_decrypted_data[:identifier]
+    end
   end
 end

data/lib/ruby_home/http/services/verify_srp_service.rb

@@ -1,8 +1,8 @@
 module RubyHome
   class VerifySRPService
-    def initialize(device_proof: , public_key: , srp_session: )
-      @device_proof_bytes = device_proof.to_s.unpack1('H*')
-      @public_key_bytes = public_key.to_s.unpack1('H*')
+    def initialize(device_proof:, public_key:, srp_session:)
+      @device_proof_bytes = device_proof.to_s.unpack1("H*")
+      @public_key_bytes = public_key.to_s.unpack1("H*")
       @srp_session = srp_session
     end
 
@@ -20,29 +20,29 @@ module RubyHome
 
     private
 
-      def valid_session?
-        !!verify_session
-      end
+    def valid_session?
+      !!verify_session
+    end
 
-      def session_key
-        srp_verifier.K
-      end
+    def session_key
+      srp_verifier.K
+    end
 
-      def verify_session_bytes
-        [verify_session].pack('H*')
-      end
+    def verify_session_bytes
+      [verify_session].pack("H*")
+    end
 
-      def verify_session
-        srp_verifier.verify_session(
-          srp_session.merge({A: public_key_bytes}),
-          device_proof_bytes
-        )
-      end
+    def verify_session
+      srp_verifier.verify_session(
+        srp_session.merge({A: public_key_bytes}),
+        device_proof_bytes
+      )
+    end
 
-      def srp_verifier
-        @_verifier ||= RubyHome::SRP::Verifier.new
-      end
+    def srp_verifier
+      @_verifier ||= RubyHome::SRP::Verifier.new
+    end
 
-      attr_reader :public_key_bytes, :device_proof_bytes, :srp_session
+    attr_reader :public_key_bytes, :device_proof_bytes, :srp_session
   end
 end

data/lib/ruby_home/identifier_cache.rb

@@ -1,10 +1,10 @@
-require_relative 'persistable'
+require_relative "persistable"
 
 module RubyHome
   class IdentifierCache
     include Persistable
 
-    self.source = 'identifier_cache.yml'
+    self.source = "identifier_cache.yml"
 
     def self.all
       raw_items = read || []
@@ -33,7 +33,7 @@ module RubyHome
       end
     end
 
-    def initialize(accessory_id:, instance_id:, service_uuid: nil, subtype: , uuid: )
+    def initialize(accessory_id:, instance_id:, subtype:, uuid:, service_uuid: nil)
       @accessory_id = accessory_id
       @instance_id = instance_id
       @subtype = subtype
@@ -52,10 +52,9 @@ module RubyHome
           instance_id: identifier.instance_id,
           subtype: identifier.subtype,
           service_uuid: identifier.service_uuid,
-          uuid: identifier.uuid,
+          uuid: identifier.uuid
         }
       end
     end
   end
 end
-

data/lib/ruby_home/password.rb

@@ -1,21 +1,21 @@
 module RubyHome
   module Password
     class << self
-      DELIMITER = '-'
+      DELIMITER = "-"
       LENGTH = 8
       INVALIDS = [
-        '00000000',
-        '11111111',
-        '22222222',
-        '33333333',
-        '44444444',
-        '55555555',
-        '66666666',
-        '77777777',
-        '88888888',
-        '99999999',
-        '12345678',
-        '87654321',
+        "00000000",
+        "11111111",
+        "22222222",
+        "33333333",
+        "44444444",
+        "55555555",
+        "66666666",
+        "77777777",
+        "88888888",
+        "99999999",
+        "12345678",
+        "87654321"
       ]
 
       # The Setup Code must conform to the format XXX-XX-XXX where each X is a
@@ -34,7 +34,7 @@ module RubyHome
         [
           digits[0...3],
           digits[3...5],
-          digits[5...8],
+          digits[5...8]
         ].join(DELIMITER)
       end