ruby_home 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 164e411f03ec5168e551384eac1a24c7c95040aaa3e9c1c50fae85d2a357c0a6
-  data.tar.gz: 485d5bb8c361d732fb916f81e164d50a88cdfb44ce6088ec6c67f73d35e19f33
+  metadata.gz: cbb486ea0b95baaee4388d69f2875024e941d7a79b2385f327f6cfb4639cc270
+  data.tar.gz: d451c724e41292c3899461951bcd337095404abd0c730744cd3bf863a58e9859
 SHA512:
-  metadata.gz: 12340d7997f5c78bb160f5f7258595b73a81700c40a3a7de79acb2790290366443c5a03f899f4687487e82b6e7ed45a9c2400342c545d39588c0de14910bd052
-  data.tar.gz: 3c86acf49f8348c1d56f4189faabd222d19141bbfed8f073d69fd701a5bce40f6e65356f4f4ce95e6867da98ce3a18d4e4b279e62413ac65d1fb879952abda7a
+  metadata.gz: 569b75436eaa94dd62ce2395cedf0af12b4a9d498168d80a12534e6ee2320a870e6f7967676fae986243b2f4bf6e98a456e17089183ee9c5e2768539fcb131b1
+  data.tar.gz: 0e43c491540462de28126a06cbe84f93b15ede9ef13133998f9c1e855b7c48ba8f4a3570d4d1fa8c485f6accc2fd1e1cb2864e92ff7dca0b04f7e728363dc818

data/README.md

@@ -48,7 +48,7 @@ accessory_information = RubyHome::ServiceFactory.create(:accessory_information)
 fan = RubyHome::ServiceFactory.create(:fan)
 
 fan.characteristic(:on).after_update do |characteristic|
-  if characteristic.value == 1
+  if characteristic.value == true
     puts "Fan switched on"
   else
     puts "Fan switched off"
@@ -106,7 +106,7 @@ fan = RubyHome::ServiceFactory.create(:fan,
 )
 
 fan.characteristic(:on).after_update do |characteristic|
-  if characteristic.value == 1
+  if characteristic.value == true
     puts "Fan switched on"
   else
     puts "Fan switched off"

data/bin/ruby_home

@@ -6,7 +6,7 @@ accessory_information = RubyHome::ServiceFactory.create(:accessory_information)
 fan = RubyHome::ServiceFactory.create(:fan)
 
 fan.characteristic(:on).after_update do |characteristic|
-  if characteristic.value == 1
+  if characteristic.value == true
     puts "Fan switched on"
   else
     puts "Fan switched off"

data/lib/ruby_home/factories/characteristic_factory.rb

@@ -43,10 +43,10 @@ module RubyHome
         @characteristic_name = characteristic_name.to_sym
         @service = service
         @subtype = subtype
-        @value = value || default_value
+        @requested_value = value
       end
 
-      attr_reader :service, :characteristic_name, :value, :subtype
+      attr_reader :service, :characteristic_name, :subtype
 
       delegate :accessory, to: :service
 
@@ -54,17 +54,12 @@ module RubyHome
         @template ||= CharacteristicTemplate.find_by(name: characteristic_name)
       end
 
-      def default_value
-        DEFAULT_VALUES.fetch(characteristic_name.to_sym) do
-          klass = "RubyHome::#{template.format.classify}DefaultValue".safe_constantize || NullDefaultValue
-          default_value = klass.new(template).default
+      def value
+        value_object.new(template, @requested_value)
+      end
 
-          if default_value.nil?
-            raise "No default value available for characteristic: #{characteristic_name} of type: #{template.format}"
-          else
-            default_value
-          end
-        end
+      def value_object
+        BaseValue.value_for_template(template)
       end
 
       def persisted_characteristic

data/lib/ruby_home/hap/characteristic.rb

@@ -36,7 +36,6 @@ module RubyHome
 
     attr_reader(
       :service,
-      :value,
       :uuid,
       :name,
       :description,
@@ -59,9 +58,12 @@ module RubyHome
       service.instance_id
     end
 
+    def value
+      @value.value
+    end
+
     def value=(new_value)
-      return if name == :identify
-      @value = new_value
+      @value.value = new_value
       broadcast(:after_update, self)
     end
   end

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

@@ -0,0 +1,28 @@
+module RubyHome
+  class BaseValue
+    def self.value_for_template(template)
+      return NullValue if template.name == :identify
+
+      "::RubyHome::#{template.format.classify}Value".safe_constantize || NullValue
+    end
+
+    def initialize(characteristic_template=nil, initial_value=nil)
+      @template = characteristic_template
+      @value = initial_value
+    end
+
+    def value
+      @value || default
+    end
+
+    def default
+      raise NotImplementedError
+    end
+
+    attr_writer :value
+
+    private
+
+      attr_reader :template
+  end
+end

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

@@ -0,0 +1,20 @@
+require_relative 'base_value'
+
+module RubyHome
+  class BoolValue < BaseValue
+    REMAPPED_VALUES = {
+      '0' => false,
+      0 => false,
+      '1' => true,
+      1 => true,
+    }.freeze
+
+    def default
+      false
+    end
+
+    def value=(new_value)
+      @value = REMAPPED_VALUES.fetch(new_value, new_value)
+    end
+  end
+end

data/lib/ruby_home/{factories/default_values → hap/values}/float_value.rb

@@ -1,7 +1,7 @@
 require_relative 'base_value'
 
 module RubyHome
-  class FloatDefaultValue < BaseValue
+  class FloatValue < BaseValue
     def default
       minimum_value.to_f
     end

data/lib/ruby_home/{factories/default_values → hap/values}/int32_value.rb

@@ -1,7 +1,7 @@
 require_relative 'base_value'
 
 module RubyHome
-  class Int32DefaultValue < BaseValue
+  class Int32Value < BaseValue
     def default
       minimum_value.to_i
     end

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

@@ -0,0 +1,17 @@
+require_relative 'base_value'
+
+module RubyHome
+  class NullValue < BaseValue
+    def value
+      nil
+    end
+
+    def value=(new_value)
+      nil
+    end
+
+    def default
+      nil
+    end
+  end
+end

data/lib/ruby_home/{factories/default_values → hap/values}/string_value.rb

@@ -1,7 +1,7 @@
 require_relative 'base_value'
 
 module RubyHome
-  class StringDefaultValue < BaseValue
+  class StringValue < BaseValue
     DEFAULT_VALUES = {
       firmware_revision: '1.0',
       hardware_revision: '1.0',

data/lib/ruby_home/{factories/default_values → hap/values}/uint32_value.rb

@@ -1,7 +1,7 @@
 require_relative 'base_value'
 
 module RubyHome
-  class Uint32DefaultValue < BaseValue
+  class Uint32Value < BaseValue
     DEFAULT_VALUES = {
       color_temperature: 50,
       lock_management_auto_security_timeout: 0,

data/lib/ruby_home/{factories/default_values → hap/values}/uint8_value.rb

@@ -1,7 +1,7 @@
 require_relative 'base_value'
 
 module RubyHome
-  class Uint8DefaultValue < BaseValue
+  class Uint8Value < BaseValue
     def default
       first_default_value.to_i
     end

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

@@ -14,9 +14,9 @@ module RubyHome
 
       put '/' do
         json_body.fetch('characteristics', []).each do |characteristic_params|
-          if characteristic_params['value']
+          if characteristic_params.key?("value")
             update_characteristics(characteristic_params)
-          elsif characteristic_params['ev']
+          elsif characteristic_params.key?("ev")
             subscribe_characteristics(characteristic_params)
           end
         end

data/lib/ruby_home/version.rb

@@ -1,3 +1,3 @@
 module RubyHome
-  VERSION = '0.1.12'
+  VERSION = '0.1.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_home
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Karl Entwistle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2018-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -278,14 +278,6 @@ files:
 - lib/ruby_home/dns/service.rb
 - lib/ruby_home/dns/text_record.rb
 - lib/ruby_home/factories/characteristic_factory.rb
-- lib/ruby_home/factories/default_values/base_value.rb
-- lib/ruby_home/factories/default_values/bool_value.rb
-- lib/ruby_home/factories/default_values/float_value.rb
-- lib/ruby_home/factories/default_values/int32_value.rb
-- lib/ruby_home/factories/default_values/null_value.rb
-- lib/ruby_home/factories/default_values/string_value.rb
-- lib/ruby_home/factories/default_values/uint32_value.rb
-- lib/ruby_home/factories/default_values/uint8_value.rb
 - lib/ruby_home/factories/service_factory.rb
 - lib/ruby_home/factories/templates/characteristic_template.rb
 - lib/ruby_home/factories/templates/service_template.rb
@@ -304,6 +296,14 @@ files:
 - lib/ruby_home/hap/server.rb
 - lib/ruby_home/hap/service.rb
 - lib/ruby_home/hap/tlv.rb
+- 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/int32_value.rb
+- lib/ruby_home/hap/values/null_value.rb
+- lib/ruby_home/hap/values/string_value.rb
+- lib/ruby_home/hap/values/uint32_value.rb
+- lib/ruby_home/hap/values/uint8_value.rb
 - lib/ruby_home/hex_helper.rb
 - lib/ruby_home/http/application.rb
 - lib/ruby_home/http/controllers/accessories_controller.rb

data/lib/ruby_home/factories/default_values/base_value.rb

@@ -1,15 +0,0 @@
-module RubyHome
-  class BaseValue
-    def initialize(template)
-      @template = template
-    end
-
-    def default
-      raise NotImplementedError
-    end
-
-    private
-
-      attr_reader :template
-  end
-end

data/lib/ruby_home/factories/default_values/bool_value.rb

@@ -1,9 +0,0 @@
-require_relative 'base_value'
-
-module RubyHome
-  class BoolDefaultValue < BaseValue
-    def default
-      false
-    end
-  end
-end

data/lib/ruby_home/factories/default_values/null_value.rb

@@ -1,9 +0,0 @@
-require_relative 'base_value'
-
-module RubyHome
-  class NullDefaultValue < BaseValue
-    def default
-      nil
-    end
-  end
-end