ruby_home 0.2.1 → 0.2.6

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

@@ -1,4 +1,4 @@
-require_relative 'base_value'
+require_relative "base_value"
 
 module RubyHome
   class IdentifyValue < BaseValue

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

@@ -1,4 +1,4 @@
-require_relative 'base_value'
+require_relative "base_value"
 
 module RubyHome
   class Int32Value < BaseValue
@@ -8,8 +8,8 @@ module RubyHome
 
     private
 
-      def minimum_value
-        template.constraints.fetch('MinimumValue')
-      end
+    def minimum_value
+      template.constraints.fetch("MinimumValue")
+    end
   end
 end

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

@@ -1,4 +1,4 @@
-require_relative 'base_value'
+require_relative "base_value"
 
 module RubyHome
   class NullValue < BaseValue

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

@@ -1,15 +1,15 @@
-require_relative 'base_value'
+require_relative "base_value"
 
 module RubyHome
   class StringValue < BaseValue
     DEFAULT_VALUES = {
-      firmware_revision: '1.0',
-      hardware_revision: '1.0',
-      manufacturer: 'Default-Manufacturer',
-      model: 'Default-Model',
-      name: 'RubyHome',
-      serial_number: 'Default-SerialNumber',
-      version: '1.0',
+      firmware_revision: "1.0",
+      hardware_revision: "1.0",
+      manufacturer: "Default-Manufacturer",
+      model: "Default-Model",
+      name: "RubyHome",
+      serial_number: "Default-SerialNumber",
+      version: "1.0"
     }.freeze
 
     def default
@@ -18,8 +18,8 @@ module RubyHome
 
     private
 
-      def name
-        template.name
-      end
+    def name
+      template.name
+    end
   end
 end

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

@@ -1,10 +1,10 @@
-require_relative 'base_value'
+require_relative "base_value"
 
 module RubyHome
   class Uint32Value < BaseValue
     DEFAULT_VALUES = {
       color_temperature: 50,
-      lock_management_auto_security_timeout: 0,
+      lock_management_auto_security_timeout: 0
     }.freeze
 
     def default
@@ -13,8 +13,8 @@ module RubyHome
 
     private
 
-      def name
-        template.name
-      end
+    def name
+      template.name
+    end
   end
 end

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

@@ -1,4 +1,4 @@
-require_relative 'base_value'
+require_relative "base_value"
 
 module RubyHome
   class Uint8Value < BaseValue
@@ -8,22 +8,22 @@ module RubyHome
 
     private
 
-      def first_default_value
-        valid_values.keys.first
-      end
+    def first_default_value
+      valid_values.keys.first
+    end
 
-      def valid_values
-        defined_values || range_values || raise(UnknownValueError, "Constraint contains an unrecognized list of values: #{template.constraints.inspect }")
-      end
+    def valid_values
+      defined_values || range_values || raise(UnknownValueError, "Constraint contains an unrecognized list of values: #{template.constraints.inspect}")
+    end
 
-      def defined_values
-        template.constraints.dig('ValidValues')
-      end
+    def defined_values
+      template.constraints.dig("ValidValues")
+    end
 
-      def range_values
-        if min = template.constraints.dig('MinimumValue')
-          { min.to_s => min }
-        end
+    def range_values
+      if (min = template.constraints.dig("MinimumValue"))
+        {min.to_s => min}
       end
+    end
   end
 end

data/lib/ruby_home/hex_helper.rb

@@ -1,15 +1,15 @@
 module RubyHome
   module HexHelper
     def self.pad(input, pad_length: 24)
-      pack_hex_string(unpack_hex_string(input).rjust(pad_length, '0'))
+      pack_hex_string(unpack_hex_string(input).rjust(pad_length, "0"))
     end
 
     def self.unpack_hex_string(input)
-      input.to_s.unpack1('H*')
+      input.to_s.unpack1("H*")
     end
 
     def self.pack_hex_string(input)
-      [input].pack('H*')
+      [input].pack("H*")
     end
   end
 end

data/lib/ruby_home/http/application.rb

@@ -1,16 +1,16 @@
-Dir[File.dirname(__FILE__) + '/controllers/*.rb'].each { |file| require file }
+Dir[File.dirname(__FILE__) + "/controllers/*.rb"].each { |file| require file }
 
 module RubyHome
   module HTTP
     class Application
       def self.rack_builder
         ::Rack::Builder.new do
-          map('/accessories') { run AccessoriesController }
-          map('/characteristics') { run CharacteristicsController }
-          map('/identify') { run IdentifyController }
-          map('/pair-setup') { run PairSetupsController }
-          map('/pair-verify') { run PairVerifiesController }
-          map('/pairings') { run PairingsController }
+          map("/accessories") { run AccessoriesController }
+          map("/characteristics") { run CharacteristicsController }
+          map("/identify") { run IdentifyController }
+          map("/pair-setup") { run PairSetupsController }
+          map("/pair-verify") { run PairVerifiesController }
+          map("/pairings") { run PairingsController }
         end
       end
     end

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

@@ -1,10 +1,10 @@
-require_relative 'application_controller'
+require_relative "application_controller"
 
 module RubyHome
   module HTTP
     class AccessoriesController < ApplicationController
-      get '/' do
-        content_type 'application/hap+json'
+      get "/" do
+        content_type "application/hap+json"
 
         if session.sufficient_privileges?
           AccessorySerializer.new(identifier_cache.accessories).serialized_json

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

@@ -1,21 +1,21 @@
-require 'logger'
+require "logger"
 
 module RubyHome
   module HTTP
     class ApplicationController < Sinatra::Base
       disable :protection
 
-      logger = Logger.new(STDOUT)
-      logger.level = case ENV['DEBUG']
-      when 'debug'
+      logger = Logger.new($stdout)
+      logger.level = case ENV["DEBUG"]
+      when "debug"
         Logger::DEBUG
-      when 'info'
+      when "info"
         Logger::INFO
       else
         Logger::WARN
       end
       set :logger, logger
-      enable :logging if ENV['DEBUG']
+      enable :logging if ENV["DEBUG"]
 
       before do
         logger.debug "Session"

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

@@ -1,19 +1,19 @@
-require_relative 'application_controller'
+require_relative "application_controller"
 
 module RubyHome
   module HTTP
     class CharacteristicsController < ApplicationController
       before do
-        content_type 'application/hap+json'
+        content_type "application/hap+json"
         require_session
       end
 
-      get '/' do
+      get "/" do
         CharacteristicValueSerializer.new(find_characteristics).serialized_json
       end
 
-      put '/' do
-        json_body.fetch('characteristics', []).each do |characteristic_params|
+      put "/" do
+        json_body.fetch("characteristics", []).each do |characteristic_params|
           if characteristic_params.key?("value")
             update_characteristics(characteristic_params)
           elsif characteristic_params.key?("ev")
@@ -26,40 +26,40 @@ module RubyHome
 
       private
 
-        def find_characteristics
-          params.fetch(:id, "").split(',').flat_map do |characteristic_params|
-            aid, iid = characteristic_params.split('.')
-            find_characteristic(aid: aid, iid: iid)
-          end
+      def find_characteristics
+        params.fetch(:id, "").split(",").flat_map do |characteristic_params|
+          aid, iid = characteristic_params.split(".")
+          find_characteristic(aid: aid, iid: iid)
         end
+      end
 
-        def update_characteristics(characteristic_params)
-          find_characteristic(**characteristic_params.symbolize_keys.slice(:aid, :iid)) do |characteristic|
-            characteristic.value = characteristic_params['value']
-          end
+      def update_characteristics(characteristic_params)
+        find_characteristic(**characteristic_params.symbolize_keys.slice(:aid, :iid)) do |characteristic|
+          characteristic.value = characteristic_params["value"]
         end
+      end
 
-        def subscribe_characteristics(characteristic_params)
-          find_characteristic(**characteristic_params.symbolize_keys.slice(:aid, :iid)) do |characteristic|
-            notifier = SessionNotifier.new(session, characteristic)
+      def subscribe_characteristics(characteristic_params)
+        find_characteristic(**characteristic_params.symbolize_keys.slice(:aid, :iid)) do |characteristic|
+          notifier = SessionNotifier.new(session, characteristic)
 
-            unless characteristic.listeners.include?(notifier)
-              characteristic.subscribe(notifier)
-            end
+          unless characteristic.listeners.include?(notifier)
+            characteristic.subscribe(notifier)
           end
         end
+      end
 
-        def find_characteristic(aid:, iid:)
-          characteristic = identifier_cache.find_characteristic(accessory_id: aid.to_i, instance_id: iid.to_i)
-          yield characteristic if block_given?
-          characteristic
-        end
+      def find_characteristic(aid:, iid:)
+        characteristic = identifier_cache.find_characteristic(accessory_id: aid.to_i, instance_id: iid.to_i)
+        yield characteristic if block_given?
+        characteristic
+      end
 
-        def require_session
-          unless session.sufficient_privileges?
-            halt 401, JSON.generate({"status" => -70401})
-          end
+      def require_session
+        unless session.sufficient_privileges?
+          halt 401, JSON.generate({"status" => -70401})
         end
+      end
     end
   end
 end

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

@@ -1,9 +1,9 @@
-require_relative 'application_controller'
+require_relative "application_controller"
 
 module RubyHome
   module HTTP
     class IdentifyController < ApplicationController
-      post '/' do
+      post "/" do
         if accessory_info.paired?
           paired_accessory
         else
@@ -13,15 +13,15 @@ module RubyHome
 
       private
 
-        def paired_accessory
-          status 400
-          content_type 'application/hap+json'
-          JSON.generate({"status" => -70401})
-        end
+      def paired_accessory
+        status 400
+        content_type "application/hap+json"
+        JSON.generate({"status" => -70401})
+      end
 
-        def unpaired_accessory
-          halt 204
-        end
+      def unpaired_accessory
+        halt 204
+      end
     end
   end
 end

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

@@ -1,10 +1,10 @@
-require_relative 'application_controller'
+require_relative "application_controller"
 
 module RubyHome
   module HTTP
     class PairSetupsController < ApplicationController
-      post '/' do
-        content_type 'application/pairing+tlv8'
+      post "/" do
+        content_type "application/pairing+tlv8"
 
         case unpack_request[:state]
         when 1
@@ -37,7 +37,7 @@ module RubyHome
         verify_srp = VerifySRPService.new(
           device_proof: unpack_request[:proof],
           srp_session: session.srp_session,
-          public_key: unpack_request[:public_key],
+          public_key: unpack_request[:public_key]
         ).run
 
         if verify_srp.success?
@@ -53,12 +53,12 @@ module RubyHome
       def exchange
         encrypted_data = unpack_request[:encrypted_data]
 
-        hkdf = HAP::Crypto::HKDF.new(info: 'Pair-Setup-Encrypt-Info', salt: 'Pair-Setup-Encrypt-Salt')
+        hkdf = HAP::Crypto::HKDF.new(info: "Pair-Setup-Encrypt-Info", salt: "Pair-Setup-Encrypt-Salt")
         key = hkdf.encrypt(session.session_key)
 
         chacha20poly1305ietf = HAP::Crypto::ChaCha20Poly1305.new(key)
 
-        nonce = HexHelper.pad('PS-Msg05')
+        nonce = HexHelper.pad("PS-Msg05")
         decrypted_data = chacha20poly1305ietf.decrypt(nonce, encrypted_data)
         unpacked_decrypted_data = TLV.decode(decrypted_data)
 
@@ -66,37 +66,37 @@ module RubyHome
         iosdevicesignature = unpacked_decrypted_data[:signature]
         iosdeviceltpk = unpacked_decrypted_data[:public_key]
 
-        hkdf = HAP::Crypto::HKDF.new(info: 'Pair-Setup-Controller-Sign-Info', salt: 'Pair-Setup-Controller-Sign-Salt')
+        hkdf = HAP::Crypto::HKDF.new(info: "Pair-Setup-Controller-Sign-Info", salt: "Pair-Setup-Controller-Sign-Salt")
         iosdevicex = hkdf.encrypt(session.session_key)
 
         iosdeviceinfo = [
-          iosdevicex.unpack1('H*'),
-          iosdevicepairingid.unpack1('H*'),
-          iosdeviceltpk.unpack1('H*')
+          iosdevicex.unpack1("H*"),
+          iosdevicepairingid.unpack1("H*"),
+          iosdeviceltpk.unpack1("H*")
         ].join
         verify_key = RbNaCl::Signatures::Ed25519::VerifyKey.new(iosdeviceltpk)
 
-        if verify_key.verify(iosdevicesignature, [iosdeviceinfo].pack('H*'))
-          hkdf = HAP::Crypto::HKDF.new(info: 'Pair-Setup-Accessory-Sign-Info', salt: 'Pair-Setup-Accessory-Sign-Salt')
+        if verify_key.verify(iosdevicesignature, [iosdeviceinfo].pack("H*"))
+          hkdf = HAP::Crypto::HKDF.new(info: "Pair-Setup-Accessory-Sign-Info", salt: "Pair-Setup-Accessory-Sign-Salt")
           accessory_x = hkdf.encrypt(session.session_key)
 
           signing_key = accessory_info.signing_key
           accessoryltpk = signing_key.verify_key.to_bytes
           accessoryinfo = [
-            accessory_x.unpack1('H*'),
-            accessory_info.device_id.unpack1('H*'),
-            accessoryltpk.unpack1('H*')
+            accessory_x.unpack1("H*"),
+            accessory_info.device_id.unpack1("H*"),
+            accessoryltpk.unpack1("H*")
           ].join
 
-          accessorysignature = signing_key.sign([accessoryinfo].pack('H*'))
+          accessorysignature = signing_key.sign([accessoryinfo].pack("H*"))
 
           subtlv = tlv(identifier: accessory_info.device_id, public_key: accessoryltpk, signature: accessorysignature)
 
-          nonce = HexHelper.pad('PS-Msg06')
+          nonce = HexHelper.pad("PS-Msg06")
           encrypted_data = chacha20poly1305ietf.encrypt(nonce, subtlv)
 
-          pairing_params = { admin: true, identifier: iosdevicepairingid, public_key: iosdeviceltpk.unpack1('H*') }
-          accessory_info.add_paired_client pairing_params
+          pairing_params = {admin: true, identifier: iosdevicepairingid, public_key: iosdeviceltpk.unpack1("H*")}
+          accessory_info.add_paired_client(**pairing_params)
 
           tlv state: 6, encrypted_data: encrypted_data
         end

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

@@ -1,10 +1,10 @@
-require_relative 'application_controller'
+require_relative "application_controller"
 
 module RubyHome
   module HTTP
     class PairVerifiesController < ApplicationController
-      post '/' do
-        content_type 'application/pairing+tlv8'
+      post "/" do
+        content_type "application/pairing+tlv8"
 
         verify_accessory_paired
 
@@ -26,22 +26,22 @@ module RubyHome
         session.shared_secret = shared_secret
 
         accessoryinfo = [
-          public_key.unpack1('H*'),
-          accessory_info.device_id.unpack1('H*'),
-          client_public_key.to_bytes.unpack1('H*')
+          public_key.unpack1("H*"),
+          accessory_info.device_id.unpack1("H*"),
+          client_public_key.to_bytes.unpack1("H*")
         ].join
 
         signing_key = accessory_info.signing_key
-        accessorysignature = signing_key.sign([accessoryinfo].pack('H*'))
+        accessorysignature = signing_key.sign([accessoryinfo].pack("H*"))
 
         subtlv = tlv(identifier: accessory_info.device_id, signature: accessorysignature)
 
-        hkdf = HAP::Crypto::HKDF.new(info: 'Pair-Verify-Encrypt-Info', salt: 'Pair-Verify-Encrypt-Salt')
+        hkdf = HAP::Crypto::HKDF.new(info: "Pair-Verify-Encrypt-Info", salt: "Pair-Verify-Encrypt-Salt")
         session_key = hkdf.encrypt(shared_secret)
         session.session_key = session_key
 
         chacha20poly1305ietf = HAP::Crypto::ChaCha20Poly1305.new(session_key)
-        nonce = HexHelper.pad('PV-Msg02')
+        nonce = HexHelper.pad("PV-Msg02")
         encrypted_data = chacha20poly1305ietf.encrypt(nonce, subtlv)
 
         tlv state: 2, public_key: public_key, encrypted_data: encrypted_data