ruby_home 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20c4e7bd6f5933ac540dd31a8812ef3bd62e2d716342caa67c76d9e3f3b6ad03
-  data.tar.gz: 80bd7706f39dac8db197d13dbb1260958e6f7fc0578bea9094926aaa658cb487
+  metadata.gz: 7827557dbb63a17e05cd09dd3af1b97f7de15d7f966917ac59d9c5474cebb929
+  data.tar.gz: 143a09fe23eef55188ec241f0ee026656bf4a14095e430c8998fcbb07f7671b1
 SHA512:
-  metadata.gz: 2c7d93aa8fdd09648b5ab2701b21068ee9f3b7d1b29dd441ccd969c92953a641d9068d4febe74319e63680bc5759dba7ce180c1976f42be5547ed9b64fa4e6f7
-  data.tar.gz: 3aad8d2ae35afab38bd3a58a306c647bfb768e5d5cefb9a9bebe66f875e409ee4a5176e8ab32c3149c3f1818d469655ef93ccac8a22c1294966c5133554cde40
+  metadata.gz: 6de3e8a1a0bea2d14aa7ebcd98ce438daf6703fb46ef20e54e7c3440d10145d7c2891e16f9edb592cd9f6219969e3ae8638e834f4755b2fd69721458eb4db494
+  data.tar.gz: 3c40fde21107cc236c2a141383649e752ffd627d0f0f7fde8695eab53ab5205f970db99d755e50f50fb5d6569f99115e0e3ff5cf37109da0877a29905e25daa4

data/.travis.yml

@@ -1,14 +1,19 @@
 cache: bundler
 language: ruby
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y software-properties-common; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo LC_ALL=C.UTF-8 add-apt-repository -y ppa:ondrej/php; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y libsodium-dev; fi
 install:
   - 'gem update --system'
   - 'gem --version'
-  - 'gem install bundler -v 1.16.1'
+  - 'gem install bundler -v 1.17.1'
   - 'bundle --version'
   - bundle
 rvm:
-  - 2.5.1
-  - 2.5.0
+  - 2.4
+  - 2.5
   - ruby-head
 os:
   - linux
@@ -17,5 +22,8 @@ addons:
   apt:
     packages:
       - libavahi-compat-libdnssd-dev
+  homebrew:
+    packages:
+      - libsodium
 notifications:
   email: false

data/README.md

@@ -7,6 +7,24 @@ ruby_home is an implementation of the HomeKit Accessory Protocol (HAP) to create
 
 ## Installation
 
+### libsodium
+
+To use ruby_home, you will need to install libsodium:
+
+https://github.com/jedisct1/libsodium
+
+At least version `1.0.9` is required.
+
+For OS X users, libsodium is available via homebrew and can be installed with:
+
+    brew install libsodium
+
+For Debian users, libsodium is available both via apt:
+
+    sudo apt-get install libsodium-dev
+
+### ruby_home
+
 Add this line to your application's Gemfile:
 
 ```ruby

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

@@ -1,14 +1,16 @@
 require_relative 'object_serializer'
+require_relative 'uuid_helper'
 
 module RubyHome
   module HTTP
     class CharacteristicSerializer
       include ObjectSerializer
+      include UUIDHelper
 
       def record_hash(characteristic)
         {
           'iid' => characteristic.instance_id,
-          'type' => characteristic.uuid,
+          'type' => uuid_short_form(characteristic.uuid),
           'perms' => perms(characteristic),
           'format' => characteristic.format,
           'description' => characteristic.description,

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

@@ -1,15 +1,17 @@
 require_relative 'characteristic_serializer'
 require_relative 'object_serializer'
+require_relative 'uuid_helper'
 
 module RubyHome
   module HTTP
     class ServiceSerializer
       include ObjectSerializer
+      include UUIDHelper
 
       def record_hash(service)
         {
           'iid' => service.instance_id,
-          'type' => service.uuid,
+          'type' => uuid_short_form(service.uuid),
           'characteristics' => CharacteristicSerializer.new(service.characteristics).serializable_hash,
           'primary' => service.primary,
           'hidden' => service.hidden,

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

@@ -0,0 +1,21 @@
+module RubyHome
+  module HTTP
+    module UUIDHelper
+      APPLE_BASE_UUID = -'0000-1000-8000-0026BB765291'
+
+      def uuid_short_form(uuid)
+        return uuid unless apple_defined_uuid?(uuid)
+
+        trim_leading_zeros(uuid[0...8])
+      end
+
+      def apple_defined_uuid?(uuid)
+        uuid.end_with?(APPLE_BASE_UUID)
+      end
+
+      def trim_leading_zeros(input)
+        input.remove(/^0*/)
+      end
+    end
+  end
+end

data/lib/ruby_home/version.rb

@@ -1,3 +1,3 @@
 module RubyHome
-  VERSION = '0.1.9'
+  VERSION = '0.1.10'
 end

data/lib/ruby_home.rb

@@ -6,7 +6,7 @@ require 'hkdf'
 require 'nio'
 require 'oj'
 require 'rack'
-require 'rbnacl/libsodium'
+require 'rbnacl'
 require 'ruby_home-srp'
 require 'securerandom'
 require 'sinatra/base'

data/rubyhome.gemspec

@@ -30,9 +30,8 @@ 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.0'
-  spec.add_dependency 'rbnacl', '~> 5.0'
-  spec.add_dependency 'rbnacl-libsodium', '~> 1.0', '>= 1.0.16'
+  spec.add_dependency 'oj', '3.7.1'
+  spec.add_dependency 'rbnacl', '~> 6.0'
   spec.add_dependency 'ruby_home-srp', '~> 1.2'
   spec.add_dependency 'sinatra', '2.0.4'
   spec.add_dependency 'wisper', '~> 2.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_home
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Karl Entwistle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2018-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -98,48 +98,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.7.1
 - !ruby/object:Gem::Dependency
   name: rbnacl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: rbnacl-libsodium
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.16
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.16
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: ruby_home-srp
   requirement: !ruby/object:Gem::Requirement
@@ -338,6 +318,7 @@ files:
 - lib/ruby_home/http/serializers/characteristic_value_serializer.rb
 - lib/ruby_home/http/serializers/object_serializer.rb
 - lib/ruby_home/http/serializers/service_serializer.rb
+- lib/ruby_home/http/serializers/uuid_helper.rb
 - lib/ruby_home/http/services/socket_notifier.rb
 - lib/ruby_home/http/services/start_srp_service.rb
 - lib/ruby_home/http/services/verify_srp_service.rb
@@ -368,7 +349,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby HomeKit support