ruby_home 0.2.1 → 0.2.6

data/lib/ruby_home/factories/templates/service_template.rb

@@ -1,10 +1,11 @@
 module RubyHome
   class ServiceTemplate
-    FILEPATH = (File.dirname(__FILE__) + '/../../config/services.yml').freeze
-    DATA = YAML.load_file(FILEPATH).freeze
+    FILENAMES = %w[services.yml manual_services.yml].freeze
+    FILEPATHS = FILENAMES.map { |filename| File.join(__dir__, "..", "..", "config", filename) }.freeze
+    DATA = FILEPATHS.flat_map { |filepath| YAML.load_file(filepath) }.freeze
 
     def self.all
-      @all ||= DATA.map { |data| new(data) }
+      @all ||= DATA.map { |data| new(**data) }
     end
 
     def self.find_by(options)
@@ -15,25 +16,25 @@ module RubyHome
       end
     end
 
-    def initialize(name:, description:, uuid:, optional_characteristics_uuids:, required_characteristics_uuids:)
+    def initialize(name:, description:, uuid:, optional_characteristic_names:, required_characteristic_names:)
       @name = name
       @description = description
       @uuid = uuid
-      @optional_characteristics_uuids = optional_characteristics_uuids
-      @required_characteristics_uuids = required_characteristics_uuids
+      @optional_characteristic_names = optional_characteristic_names
+      @required_characteristic_names = required_characteristic_names
     end
 
-    attr_reader :name, :description, :uuid, :optional_characteristics_uuids, :required_characteristics_uuids
+    attr_reader :name, :description, :uuid, :optional_characteristic_names, :required_characteristic_names
 
     def optional_characteristics
-      @optional_characteristics ||= optional_characteristics_uuids.map do |uuid|
-        CharacteristicTemplate.find_by(uuid: uuid)
+      @optional_characteristics ||= optional_characteristic_names.map do |name|
+        CharacteristicTemplate.find_by(name: name)
       end
     end
 
     def required_characteristics
-      @required_characteristics ||= required_characteristics_uuids.map do |uuid|
-        CharacteristicTemplate.find_by(uuid: uuid)
+      @required_characteristics ||= required_characteristic_names.map do |name|
+        CharacteristicTemplate.find_by(name: name)
       end
     end
   end

data/lib/ruby_home/hap/crypto/chacha20poly1305.rb

@@ -6,11 +6,11 @@ module RubyHome
           @key = key
         end
 
-        def encrypt(nonce, message, additional_data=nil)
+        def encrypt(nonce, message, additional_data = nil)
           chacha20poly1305ietf.encrypt(nonce, message, additional_data)
         end
 
-        def decrypt(nonce, ciphertext, additional_data=nil)
+        def decrypt(nonce, ciphertext, additional_data = nil)
           chacha20poly1305ietf.decrypt(nonce, ciphertext, additional_data)
         end
 

data/lib/ruby_home/hap/crypto/hkdf.rb

@@ -4,19 +4,19 @@ module RubyHome
   module HAP
     module Crypto
       class HKDF
-        def initialize(salt:, info: )
+        def initialize(salt:, info:)
           @salt = salt
           @info = info
         end
 
         def encrypt(source)
           byte_string = convert_string_to_byte_string(source)
-          GEM_HKDF.new(byte_string, hkdf_opts).next_bytes(BYTE_LENGTH)
+          GEM_HKDF.new(byte_string, hkdf_opts).read(BYTE_LENGTH)
         end
 
         private
 
-        ALGORITHM = 'SHA512'
+        ALGORITHM = "SHA512"
         BYTE_LENGTH = 32
 
         attr_reader :info, :salt, :source
@@ -33,7 +33,7 @@ module RubyHome
           if string.encoding == Encoding::ASCII_8BIT
             string
           else
-            [string].pack('H*')
+            [string].pack("H*")
           end
         end
       end

data/lib/ruby_home/hap/crypto/session_key.rb

@@ -16,15 +16,15 @@ module RubyHome
 
         private
 
-          SALT = -'Control-Salt'
-          READ = -'Control-Read-Encryption-Key'
-          WRITE = -'Control-Write-Encryption-Key'
+        SALT = -"Control-Salt"
+        READ = -"Control-Read-Encryption-Key"
+        WRITE = -"Control-Write-Encryption-Key"
 
-          attr_reader :shared_secret
+        attr_reader :shared_secret
 
-          def generate_shared_secret_key(info)
-            Crypto::HKDF.new(info: info, salt: SALT).encrypt(shared_secret)
-          end
+        def generate_shared_secret_key(info)
+          Crypto::HKDF.new(info: info, salt: SALT).encrypt(shared_secret)
+        end
       end
     end
   end

data/lib/ruby_home/hap/decrypter.rb

@@ -1,9 +1,9 @@
 module RubyHome
   module HAP
     class Decrypter
-      AAD_LENGTH_BYTES = 2.freeze
-      AUTHENTICATE_TAG_LENGTH_BYTES = 16.freeze
-      NONCE_32_BIT_FIX_COMMENT_PART = [0].pack('L').freeze
+      AAD_LENGTH_BYTES = 2
+      AUTHENTICATE_TAG_LENGTH_BYTES = 16
+      NONCE_32_BIT_FIX_COMMENT_PART = [0].pack("L").freeze
 
       def initialize(key, count: 0)
         @key = key
@@ -15,14 +15,14 @@ module RubyHome
         read_pointer = 0
 
         while read_pointer < data.length
-          little_endian_length_of_encrypted_data = data[read_pointer...read_pointer+AAD_LENGTH_BYTES]
-          length_of_encrypted_data = little_endian_length_of_encrypted_data.unpack1('v')
+          little_endian_length_of_encrypted_data = data[read_pointer...read_pointer + AAD_LENGTH_BYTES]
+          length_of_encrypted_data = little_endian_length_of_encrypted_data.unpack1("v")
           read_pointer += AAD_LENGTH_BYTES
 
-          message = data[read_pointer...read_pointer+length_of_encrypted_data]
+          message = data[read_pointer...read_pointer + length_of_encrypted_data]
           read_pointer += length_of_encrypted_data
 
-          auth_tag = data[read_pointer...read_pointer+AUTHENTICATE_TAG_LENGTH_BYTES]
+          auth_tag = data[read_pointer...read_pointer + AUTHENTICATE_TAG_LENGTH_BYTES]
           read_pointer += AUTHENTICATE_TAG_LENGTH_BYTES
 
           ciphertext = message + auth_tag
@@ -46,7 +46,7 @@ module RubyHome
       end
 
       def nonce
-        NONCE_32_BIT_FIX_COMMENT_PART + [count].pack('Q')
+        NONCE_32_BIT_FIX_COMMENT_PART + [count].pack("Q")
       end
 
       def chacha20poly1305ietf

data/lib/ruby_home/hap/encrypter.rb

@@ -2,8 +2,8 @@ module RubyHome
   module HAP
     class Session
       class Encrypter
-        MAX_FRAME_LENGTH = 1024.freeze
-        NONCE_32_BIT_FIX_COMMENT_PART = [0].pack('L').freeze
+        MAX_FRAME_LENGTH = 1024
+        NONCE_32_BIT_FIX_COMMENT_PART = [0].pack("L").freeze
 
         def initialize(key, count: 0)
           @key = key
@@ -17,9 +17,9 @@ module RubyHome
           while read_pointer < data.length
             encrypted_frame = ""
 
-            frame = data[read_pointer...read_pointer+MAX_FRAME_LENGTH]
+            frame = data[read_pointer...read_pointer + MAX_FRAME_LENGTH]
             length_of_encrypted_data = frame.length
-            little_endian_length_of_encrypted_data = [length_of_encrypted_data].pack('v')
+            little_endian_length_of_encrypted_data = [length_of_encrypted_data].pack("v")
 
             encrypted_frame += little_endian_length_of_encrypted_data
             encrypted_frame += chacha20poly1305ietf.encrypt(nonce, frame, little_endian_length_of_encrypted_data)
@@ -43,7 +43,7 @@ module RubyHome
         end
 
         def nonce
-          NONCE_32_BIT_FIX_COMMENT_PART + [count].pack('Q')
+          NONCE_32_BIT_FIX_COMMENT_PART + [count].pack("Q")
         end
 
         def chacha20poly1305ietf
@@ -53,4 +53,3 @@ module RubyHome
     end
   end
 end
-

data/lib/ruby_home/hap/ev_response.rb

@@ -13,28 +13,28 @@ module RubyHome
 
       private
 
-        attr_reader :body, :session
+      attr_reader :body, :session
 
-        CRLF = -"\x0d\x0a"
-        STATUS_LINE = -'EVENT/1.0 200 OK'
-        CONTENT_TYPE_LINE = -'Content-Type: application/hap+json'
+      CRLF = -"\x0d\x0a"
+      STATUS_LINE = -"EVENT/1.0 200 OK"
+      CONTENT_TYPE_LINE = -"Content-Type: application/hap+json"
 
-        def content_length_line
-          "Content-Length: #{body.length}"
-        end
+      def content_length_line
+        "Content-Length: #{body.length}"
+      end
 
-        def send_header(io)
-          data = STATUS_LINE + CRLF
-          data << CONTENT_TYPE_LINE + CRLF
-          data << content_length_line + CRLF
-          data << CRLF
+      def send_header(io)
+        data = STATUS_LINE + CRLF
+        data << CONTENT_TYPE_LINE + CRLF
+        data << content_length_line + CRLF
+        data << CRLF
 
-          io.write(data)
-        end
+        io.write(data)
+      end
 
-        def send_body(io)
-          io.write(body)
-        end
+      def send_body(io)
+        io.write(body)
+      end
     end
   end
 end

data/lib/ruby_home/hap/hap_request.rb

@@ -8,7 +8,7 @@ module RubyHome
 
       def meta_vars
         super.merge(
-          { "REQUEST_SESSION" => @session }
+          {"REQUEST_SESSION" => @session}
         )
       end
     end

data/lib/ruby_home/hap/server.rb

@@ -4,11 +4,11 @@ module RubyHome
       def run(sock)
         session = Session.new(sock)
 
-        while true
+        loop do
           req = HAPRequest.new(@config, session: session)
           res = HAPResponse.new(@config)
           begin
-            while true
+            loop do
               break if sock.to_io.wait_readable(0.5)
               break if @status != :Running
             end
@@ -30,13 +30,13 @@ module RubyHome
             res.set_error(ex)
           rescue ::WEBrick::HTTPStatus::Status => ex
             res.status = ex.code
-          rescue StandardError => ex
+          rescue => ex
             @logger.error(ex)
             res.set_error(ex, true)
           ensure
             if req.request_line
               if req.keep_alive? && res.keep_alive?
-                req.fixup()
+                req.fixup
               end
               res.send_response(session)
               access_log(@config, req, res)

data/lib/ruby_home/hap/server_handler.rb

@@ -1,7 +1,7 @@
 module RubyHome
   module HAP
     class RackHandler < ::Rack::Handler::WEBrick
-      def self.run(app, options={})
+      def self.run(app, options = {})
         @server = Server.new(options)
         @server.mount "/", RackHandler, app
         yield @server if block_given?
@@ -10,7 +10,7 @@ module RubyHome
     end
 
     class ServerHandler
-      def initialize(configuration: )
+      def initialize(configuration:)
         @configuration = configuration
       end
 
@@ -33,19 +33,19 @@ module RubyHome
         {
           Port: port,
           Host: bind_address,
-          ServerSoftware: 'RubyHome',
+          ServerSoftware: "RubyHome",
           Logger: server_logger,
           AccessLog: []
         }
       end
 
       def server_logger
-        if ENV['DEBUG'] == 'debug'
-          WEBrick::Log::new(STDOUT, WEBrick::BasicLog::DEBUG)
-        elsif ENV['DEBUG'] == 'info'
-          WEBrick::Log::new(STDOUT, WEBrick::BasicLog::INFO)
+        if ENV["DEBUG"] == "debug"
+          WEBrick::Log.new($stdout, WEBrick::BasicLog::DEBUG)
+        elsif ENV["DEBUG"] == "info"
+          WEBrick::Log.new($stdout, WEBrick::BasicLog::INFO)
         else
-          WEBrick::Log::new("/dev/null", WEBrick::BasicLog::WARN)
+          WEBrick::Log.new("/dev/null", WEBrick::BasicLog::WARN)
         end
       end
 
@@ -61,5 +61,3 @@ module RubyHome
     end
   end
 end
-
-

data/lib/ruby_home/hap/session.rb

@@ -54,35 +54,35 @@ module RubyHome
 
       private
 
-        attr_reader :socket, :encrypter_class, :decrypter_class
+      attr_reader :socket, :encrypter_class, :decrypter_class
 
-        def received_encrypted_request?
-          @received_encrypted_request ||= false
-        end
+      def received_encrypted_request?
+        @received_encrypted_request ||= false
+      end
 
-        def encrypter
-          @_encrypter ||= encrypter_class.new(accessory_to_controller_key)
-        end
+      def encrypter
+        @_encrypter ||= encrypter_class.new(accessory_to_controller_key)
+      end
 
-        def encryption_time?
-          accessory_to_controller_key? && received_encrypted_request?
-        end
+      def encryption_time?
+        accessory_to_controller_key? && received_encrypted_request?
+      end
 
-        def decrypter
-          @_decrypter ||= decrypter_class.new(controller_to_accessory_key)
-        end
+      def decrypter
+        @_decrypter ||= decrypter_class.new(controller_to_accessory_key)
+      end
 
-        def decryption_time?
-          !!controller_to_accessory_key
-        end
+      def decryption_time?
+        !!controller_to_accessory_key
+      end
 
-        def accessory_to_controller_key?
-          !!accessory_to_controller_key
-        end
+      def accessory_to_controller_key?
+        !!accessory_to_controller_key
+      end
 
-        def controller_to_accessory_key?
-          !!controller_to_accessory_key
-        end
+      def controller_to_accessory_key?
+        !!controller_to_accessory_key
+      end
     end
   end
 end

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

@@ -1,4 +1,4 @@
-require 'facets/string/modulize'
+require "facets/string/modulize"
 
 module RubyHome
   class BaseValue
@@ -8,7 +8,7 @@ module RubyHome
       Object.const_get("::RubyHome::#{template.format.modulize}Value") || NullValue
     end
 
-    def initialize(characteristic_template=nil, initial_value=nil)
+    def initialize(characteristic_template = nil, initial_value = nil)
       @template = characteristic_template
       @value = initial_value
     end
@@ -25,6 +25,6 @@ module RubyHome
 
     private
 
-      attr_reader :template
+    attr_reader :template
   end
 end

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

@@ -1,12 +1,12 @@
-require_relative 'base_value'
+require_relative "base_value"
 
 module RubyHome
   class BoolValue < BaseValue
     REMAPPED_VALUES = {
-      '0' => false,
+      "0" => false,
       0 => false,
-      '1' => true,
-      1 => true,
+      "1" => true,
+      1 => true
     }.freeze
 
     def default

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

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