fritzbox-smarthome 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37cd022a30a2468d0e2fd1c21ef92435eb43327791d5b946fcf5cde3d3dfeab3
-  data.tar.gz: 21e8a2ff7d347b99e8c865caaa594f56de3356fcd5d0c73dbea65eebb8d8d05b
+  metadata.gz: 430136a0736fded1a9e2cf308cdeb00129e94514259915306146fc65be4fb04a
+  data.tar.gz: 8755e3f921c2c815b1e6d38d3372bcfff068e6a8aa7a47785d07213585e67101
 SHA512:
-  metadata.gz: 9ae9f2ae8acc810dd26d9f6a0ee4c3372a3ce3bd38db87c13145bd7f5aeedfb384f8df6e5a6109ef7ca57f0cc9bc2521dcac01460b67fa90b268f90ff14246bb
-  data.tar.gz: e2dcc816dd0110f36ce60cfe26ea4a1183b2f8358d8ccf459be84ac3ae2501d8fd7c7f321f750926ba3dd8afec063b95c0f06324a9340d81182959ff14314812
+  metadata.gz: 94ac858e01f25649f9171df8cf685658b4a4e17f5c230a1394569c37d3052444ed1b155d8eb9a58d61fc056eb471347ee5c0c163b0a777651a8abceac4a3c76a
+  data.tar.gz: 198756b6e8a1d7d2cfcf886e26f5e2efd3d75eb655d2533e94074c936b42da531d58147ceba13e3a54b5e621f66fe99f56fe5652cbdd6c2b64294a095fa5e22e

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.4.0
+
+* Add support for Fritz!DECT lightbulbs
+
 ## v0.3.0
 
 * Use generic Actor class for unrecognised device

data/lib/fritzbox/smarthome/actor.rb

@@ -29,7 +29,7 @@ module Fritzbox
             ain:           data.dig('@identifier').to_s,
             present:       data.dig('present') == '1',
             name:          (data.dig('name') || data.dig('@productname')).to_s,
-            manufacturer:  data.dig('manufacturer').to_s,
+            manufacturer:  (data.dig('manufacturer') || data.dig('@manufacturer')).to_s,
             group_members: data.dig('groupinfo', 'members').to_s.split(',').presence
           )
         end

data/lib/fritzbox/smarthome/lightbulb.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Fritzbox
+  module Smarthome
+    class Lightbulb < Actor
+
+      attr_accessor \
+        :simpleonoff_state
+
+      class << self
+        def match?(data)
+          data.fetch('@productname', '') =~ /FRITZ!DECT 5\d{2}/i
+        end
+
+        def new_from_api(data)
+          instance = super
+          instance.assign_attributes(
+            simpleonoff_state:   data.dig('simpleonoff', 'state').to_i,
+          )
+          instance
+        end
+      end
+
+      def active?
+        simpleonoff_state == 1
+      end
+
+      def toggle!
+        value = active? ? 0 : 1
+        response = self.class.get(command: 'setsimpleonoff', ain: ain, onoff: value)
+
+        response.ok? && @simpleonoff_state = value
+      end
+    end
+  end
+end

data/lib/fritzbox/smarthome/null_logger.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Fritzbox
+  module Smarthome
+    class NullLogger < Logger
+      def initialize(*_args)
+        super(File::NULL)
+      end
+    end
+  end
+end

data/lib/fritzbox/smarthome/resource.rb

@@ -2,11 +2,18 @@ module Fritzbox
   module Smarthome
     class Resource
       class << self
-        def get(command:, ain: nil, param: nil)
+        # @param params [Hash] key/value pairs that will be appended to the switchcmd query string
+        def get(command:, ain: nil, param: nil, **params)
           url = "#{config.endpoint}/webservices/homeautoswitch.lua?switchcmd=#{command}&sid=#{authenticate}"
           url = "#{url}&ain=#{ain}"     if ain.present?
           url = "#{url}&param=#{param}" if param.present?
 
+          params.each_with_object(url) do |(key, value)|
+            url = "#{url}&#{key}=#{value}"
+          end
+
+          config.logger.debug(url)
+
           HTTParty.get(url, **httparty_options)
         end
 

data/lib/fritzbox/smarthome/version.rb

@@ -1,5 +1,5 @@
 module Fritzbox
   module Smarthome
-    VERSION = '0.3.0'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

data/lib/fritzbox/smarthome.rb

@@ -4,11 +4,13 @@ require 'httparty'
 require 'nori'
 
 require 'fritzbox/smarthome/version'
+require 'fritzbox/smarthome/null_logger'
 require 'fritzbox/smarthome/resource'
 require 'fritzbox/smarthome/actor'
 require 'fritzbox/smarthome/heater'
 require 'fritzbox/smarthome/switch'
 require 'fritzbox/smarthome/smoke_detector'
+require 'fritzbox/smarthome/lightbulb'
 
 module Fritzbox
   module Smarthome
@@ -28,7 +30,7 @@ module Fritzbox
       defaults.username   = 'smarthome'
       defaults.password   = 'verysmart'
       defaults.verify_ssl = true
-      defaults.logger     = nil
+      defaults.logger     = NullLogger.new
     end
 
     class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fritzbox-smarthome
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Klaus Meyer
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-25 00:00:00.000000000 Z
+date: 2022-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -171,6 +171,8 @@ files:
 - lib/fritzbox/smarthome.rb
 - lib/fritzbox/smarthome/actor.rb
 - lib/fritzbox/smarthome/heater.rb
+- lib/fritzbox/smarthome/lightbulb.rb
+- lib/fritzbox/smarthome/null_logger.rb
 - lib/fritzbox/smarthome/resource.rb
 - lib/fritzbox/smarthome/smoke_detector.rb
 - lib/fritzbox/smarthome/switch.rb