fritzbox-smarthome 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4ed289626e1d8c8cacccb9f89eed39178c5b11c781c99a649b3872521a3d0d4
-  data.tar.gz: 02b35061da61c6f1084b87192eefe55cc83113526addf7caff584240256997f7
+  metadata.gz: 5ea6ed68d8e2192e09bcb904d927fe415b4a83174496f73f2afb57ce3836780f
+  data.tar.gz: 63944795b9c64f8a0389aa95bd234b2c42a37972580360c6722caf3b80166ece
 SHA512:
-  metadata.gz: d2840a781e1717f8e9b11fa1a18929b316c930e57ee3b5e57a24574ad2f065c1b44fa3837e85dc0e88367ff1f402826d5210d8bbf2b9a9079b48dbe655a9d1e8
-  data.tar.gz: 02f972de29e194f5c42f7671c3caddfdfe046951e0fd91095f4614412c5afb76a1861ed71211f89d0e44b52ff909dd79df4f7e93d558d50e9903d217ab0e8be4
+  metadata.gz: 36b9d64dbf43c0cb0003944d205da74d5ea3164837f81afb111bdd99660c8e9716ce5f1151fc22a8640f35770f4be51c28116e60801c90b6d718d5584776c782
+  data.tar.gz: 5b5a06172b88d899d0c226dcf040d327ecc18075fc1d893f38d83d04deae1a74564bbe2b3d5517896f1b59bc722deee20b46bd1166122de82ed0993cbdc060a2

data/.ruby-version

@@ -1 +1 @@
-3.2.0
+3.3.3

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v0.8.0
+
+* Use `ActiveModel::Attributes`
+* Allow usage in Rails `7.1` and `7.2`
+* Drop usage in Rails `< 7.0`
+
 ## v0.7.0
 
 * Measure HTTP request duration

data/fritzbox-smarthome.gemspec

@@ -20,8 +20,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activesupport', '>= 5.1', '<= 7.1'
-  spec.add_dependency 'activemodel', '>= 5.1', '<= 7.1'
+  spec.add_dependency 'activesupport', '>= 7.0', '<= 8'
+  spec.add_dependency 'activemodel', '>= 7.0', '<= 8'
+  spec.add_dependency 'csv', '~> 3.2' # For httparty to silence deprecation warning in ruby >= 3.3.0
   spec.add_dependency 'httparty', '~> 0.20'
   spec.add_dependency 'nori', '~> 2.6'
   spec.add_dependency 'nokogiri', '~> 1.13'

data/lib/fritzbox/smarthome/actor.rb

@@ -2,15 +2,15 @@ module Fritzbox
   module Smarthome
     class Actor < Resource
       include ActiveModel::Model
+      include ActiveModel::Attributes
 
-      attr_accessor \
-      :id,
-      :type,
-      :ain,
-      :present,
-      :name,
-      :manufacturer,
-      :group_members
+      attribute :id, :string
+      attribute :type #, :symbol
+      attribute :ain, :string
+      attribute :present, :string
+      attribute :name, :string
+      attribute :manufacturer, :string
+      attribute :group_members #, :string, array: true
 
       ResourceNotFound = Class.new(RuntimeError)
 

data/lib/fritzbox/smarthome/heater.rb

@@ -1,14 +1,12 @@
 module Fritzbox
   module Smarthome
     class Heater < Actor
-
-      attr_accessor \
-        :battery,
-        :batterylow,
-        :hkr_temp_is,
-        :hkr_temp_set,
-        :hkr_next_change_period,
-        :hkr_next_change_temp
+      attribute :battery, :integer
+      attribute :batterylow, :integer
+      attribute :hkr_temp_is, :float
+      attribute :hkr_temp_set, :float
+      attribute :hkr_next_change_period, :time
+      attribute :hkr_next_change_temp, :float
 
       class << self
         def match?(data)

data/lib/fritzbox/smarthome/lightbulb.rb

@@ -1,9 +1,6 @@
-# frozen_string_literal: true
-
 module Fritzbox
   module Smarthome
     class Lightbulb < Actor
-
       include Properties::SimpleOnOff
 
       class << self

data/lib/fritzbox/smarthome/null_logger.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Fritzbox
   module Smarthome
     class NullLogger < Logger

data/lib/fritzbox/smarthome/properties/simple_on_off.rb

@@ -9,20 +9,20 @@ module Fritzbox
         extend ActiveSupport::Concern
 
         included do
-          attr_accessor :simpleonoff_state
+          attribute :simpleonoff_state, :integer
         end
 
         module ClassMethods
           def new_from_api(data)
             instance = defined?(super) ? super : new
-            instance.simpleonoff_state = data.dig('simpleonoff', 'state').to_i
+            instance.simpleonoff_state = data.dig('simpleonoff', 'state')
             instance
           end
         end
 
         # @return [Boolean]
         def active?
-          simpleonoff_state.to_s == "1"
+          simpleonoff_state == 1
         end
 
         # Makes a request to the Fritzbox and set the current instance's active state.
@@ -43,10 +43,9 @@ module Fritzbox
         def toggle!
           raise ArgumentError, "Attribute `ain` is missing on #{inspect}" unless respond_to?(:ain)
           value = active? ? 0 : 1
-          response =
-            Fritzbox::Smarthome::Resource.get(command: 'setsimpleonoff', ain: ain, onoff: value)
+          response = Fritzbox::Smarthome::Resource.get(command: 'setsimpleonoff', ain: ain, onoff: value)
 
-          response.ok? && @simpleonoff_state = value
+          response.ok? && self.simpleonoff_state = value
         end
       end
     end

data/lib/fritzbox/smarthome/properties.rb

@@ -1,10 +1,7 @@
-# frozen_string_literal: true
-
 require 'fritzbox/smarthome/properties/simple_on_off'
 
 module Fritzbox
   module Smarthome
-    module Properties
-    end
+    module Properties; end
   end
 end

data/lib/fritzbox/smarthome/smoke_detector.rb

@@ -1,10 +1,8 @@
 module Fritzbox
   module Smarthome
     class SmokeDetector < Actor
-
-      attr_accessor \
-        :alert_state,
-        :last_alert
+      attribute :alert_state, :integer
+      attribute :last_alert, :time
 
       class << self
         def match?(data)

data/lib/fritzbox/smarthome/switch.rb

@@ -1,19 +1,17 @@
 module Fritzbox
   module Smarthome
     class Switch < Actor
-
       include Properties::SimpleOnOff
 
-      attr_accessor \
-        :switch_state,
-        :switch_mode,
-        :switch_lock,
-        :switch_devicelock,
-        :powermeter_voltage,
-        :powermeter_power,
-        :powermeter_energy,
-        :temperature_celsius,
-        :temperature_offset
+      attribute :switch_state, :integer
+      attribute :switch_mode, :string
+      attribute :switch_lock, :integer
+      attribute :switch_devicelock, :integer
+      attribute :powermeter_voltage, :integer
+      attribute :powermeter_power, :integer
+      attribute :powermeter_energy, :integer
+      attribute :temperature_celsius, :integer
+      attribute :temperature_offset, :integer
 
       class << self
         def match?(data)
@@ -25,15 +23,15 @@ module Fritzbox
         super(data)
 
         assign_attributes(
-          switch_state:        data.dig('switch', 'state').to_i,
-          switch_mode:         data.dig('switch', 'mode').to_s,
-          switch_lock:         data.dig('switch', 'lock').to_i,
-          switch_devicelock:   data.dig('switch', 'devicelock').to_i,
-          powermeter_voltage:  data.dig('powermeter', 'voltage').to_i,
-          powermeter_power:    data.dig('powermeter', 'power').to_i,
-          powermeter_energy:   data.dig('powermeter', 'energy').to_i,
-          temperature_celsius: data.dig('temperature', 'celsius').to_i,
-          temperature_offset:  data.dig('temperature', 'offset').to_i
+          switch_state:        data.dig('switch', 'state'),
+          switch_mode:         data.dig('switch', 'mode'),
+          switch_lock:         data.dig('switch', 'lock'),
+          switch_devicelock:   data.dig('switch', 'devicelock'),
+          powermeter_voltage:  data.dig('powermeter', 'voltage'),
+          powermeter_power:    data.dig('powermeter', 'power'),
+          powermeter_energy:   data.dig('powermeter', 'energy'),
+          temperature_celsius: data.dig('temperature', 'celsius'),
+          temperature_offset:  data.dig('temperature', 'offset')
         )
       end
     end

data/lib/fritzbox/smarthome/version.rb

@@ -1,5 +1,5 @@
 module Fritzbox
   module Smarthome
-    VERSION = '0.7.0'.freeze
+    VERSION = '0.8.0'.freeze
   end
 end

data/lib/fritzbox/smarthome.rb

@@ -18,13 +18,13 @@ module Fritzbox
   module Smarthome
     class Configuration
       include ActiveModel::Model
+      include ActiveModel::Attributes
 
-      attr_accessor \
-        :endpoint, \
-        :username, \
-        :password,
-        :verify_ssl,
-        :logger
+      attribute :endpoint,   :string
+      attribute :username,   :string
+      attribute :password,   :string
+      attribute :verify_ssl, :boolean
+      attribute :logger
     end
 
     @config = Configuration.new.tap do |defaults|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fritzbox-smarthome
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Klaus Meyer
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-28 00:00:00.000000000 Z
+date: 2024-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,40 +16,54 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -199,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Client library to interface with Smarthome features of your FritzBox