atrea_control 2.1.3 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80a3235f52e3b6e0015107859af95310e9015bf80b2f5c02b32e94165544633a
-  data.tar.gz: cf9bcedac30febc4c5c09c2e3e632d98438b0688cb4ae014e22f44b3d891a9f3
+  metadata.gz: fd2ed6c46c2b1c7caef1d39ee4ed6e67971265273b1f985ba522876c6aaaa991
+  data.tar.gz: d076c8e9079314311694dc98429bad429a4b49e55456bf44699fb2ec33d7101e
 SHA512:
-  metadata.gz: '096ace3ac304fc801a7a8d14de5df29a9110c38aef315e05a5ef265aebdc024b23a78889b547a26e3e0444a3143c0b8a320cfbd2cfed42127c84a9fb905bc5d2'
-  data.tar.gz: 16d86c3250a24b7d14d8a29c9724e59718eba200623c185fc131371b0efc85b9ba7f015a93c1fae12b9705e58cd6d376f16984cb75d2758cc0982d86f52e366c
+  metadata.gz: b7fc76c48e32e116d94135d23073df680f33ad30bc6637ee596a4762b61ed57f00a8af418a8e7e6a29ffb92d2daa11aecc67e4de2353b31681670de802e06bd2
+  data.tar.gz: e2ff402d8e723d43c5baec15a694ee941ba3f8d5f96c31c3e30b080c03d0090209456b7e55b71085d89dd9b355840e4bf1413921e502ddef984edc4d6ad99000

data/.github/workflows/main.yml

@@ -6,11 +6,11 @@ jobs:
   spec:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.2.2
         bundler-cache: true
     - uses: browser-actions/setup-firefox@latest
     - name: Run tests

data/.rubocop.yml

@@ -5,7 +5,7 @@ require:
 AllCops:
   NewCops: enable
   SuggestExtensions: false
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.2
 
 Style/StringLiterals:
   Enabled: true
@@ -17,3 +17,6 @@ Style/StringLiteralsInInterpolation:
 
 Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: consistent_comma
+
+Style/HashSyntax:
+  EnforcedShorthandSyntax: either

data/.ruby-version

@@ -0,0 +1 @@
+3.3.4

data/CHANGELOG.md

@@ -1,4 +1,13 @@
 ## [Unreleased]
+### Added
+- timestamp from atrea server
+### Changed
+- upgrade dependencies
+- upgrade ruby version
+
+## [2.2.0] - 2023-10-09
+### Changed
+- update dependencies
 
 ## [2.1.3] - 2023-02-04
 ### Fixed

data/Gemfile

@@ -9,7 +9,7 @@ gem "pry"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.10"
 gem "rubocop", "~> 1.7", require: false
-gem "rubocop-rspec", "~> 2.4", require: false
+gem "rubocop-rspec", "~> 3.1", require: false
 group :test do
   gem "simplecov", require: false
   gem "webmock", "~> 3.14"

data/Gemfile.lock

@@ -1,94 +1,99 @@
 PATH
   remote: .
   specs:
-    atrea_control (2.1.3)
-      i18n (~> 1.8)
-      nokogiri (~> 1.12)
+    atrea_control (2.3.0)
+      i18n (~> 1.14)
+      nokogiri (~> 1.15)
       rest-client (~> 2.1)
-      selenium-webdriver (~> 4.8)
+      selenium-webdriver (~> 4.25.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
-    crack (0.4.5)
+    concurrent-ruby (1.3.4)
+    crack (1.0.0)
+      bigdecimal
       rexml
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    hashdiff (1.0.1)
+    diff-lcs (1.5.1)
+    docile (1.4.1)
+    domain_name (0.6.20240107)
+    hashdiff (1.1.1)
     http-accept (1.7.0)
-    http-cookie (1.0.5)
+    http-cookie (1.0.7)
       domain_name (~> 0.5)
-    i18n (1.12.0)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
-    method_source (1.0.0)
-    mime-types (3.4.1)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    logger (1.6.1)
+    method_source (1.1.0)
+    mime-types (3.6.0)
+      logger
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0218.1)
+    mime-types-data (3.2024.1001)
     netrc (0.11.0)
-    nokogiri (1.14.2-arm64-darwin)
+    nokogiri (1.16.7-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.2-x86_64-darwin)
+    nokogiri (1.16.7-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.2-x86_64-linux)
+    nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.22.1)
-    parser (3.2.1.0)
+    parallel (1.26.3)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
+      racc
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (5.0.1)
-    racc (1.6.2)
+    public_suffix (6.0.1)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.7.0)
+    rake (13.2.1)
+    regexp_parser (2.9.2)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rexml (3.3.8)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.2)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.47.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.67.0)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.26.0, < 2.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.27.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.17.1)
-      rubocop (~> 1.41)
-    rubocop-rspec (2.18.1)
-      rubocop (~> 1.33)
-      rubocop-capybara (~> 2.17)
-    ruby-progressbar (1.12.0)
+    rubocop-ast (1.32.3)
+      parser (>= 3.3.1.0)
+    rubocop-rspec (3.1.0)
+      rubocop (~> 1.61)
+    ruby-progressbar (1.13.0)
     rubyzip (2.3.2)
-    selenium-webdriver (4.8.1)
+    selenium-webdriver (4.25.0)
+      base64 (~> 0.2)
+      logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
@@ -96,21 +101,18 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (2.4.2)
-    webmock (3.18.1)
+    unicode-display_width (2.6.0)
+    webmock (3.24.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    websocket (1.2.9)
+    websocket (1.2.11)
 
 PLATFORMS
   arm64-darwin-22
-  x86_64-darwin-19
+  arm64-darwin-23
   x86_64-darwin-20
   x86_64-linux
 
@@ -120,9 +122,9 @@ DEPENDENCIES
   rake (~> 13.0)
   rspec (~> 3.10)
   rubocop (~> 1.7)
-  rubocop-rspec (~> 2.4)
+  rubocop-rspec (~> 3.1)
   simplecov
   webmock (~> 3.14)
 
 BUNDLED WITH
-   2.4.6
+   2.5.17

data/atrea_control.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary = "Get data control.atrea.eu"
   spec.description = "Read data from web controller of RD5 duplex by Atrea."
   spec.homepage = "https://github.com/luk4s/atrea_control"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.2")
+  spec.required_ruby_version = Gem::Requirement.new("~> 3.2")
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
@@ -36,8 +36,8 @@ Gem::Specification.new do |spec|
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html
 
-  spec.add_dependency "i18n", "~> 1.8"
-  spec.add_dependency "nokogiri", "~> 1.12"
+  spec.add_dependency "i18n", "~> 1.14"
+  spec.add_dependency "nokogiri", "~> 1.15"
   spec.add_dependency "rest-client", "~> 2.1"
-  spec.add_dependency "selenium-webdriver", "~> 4.8"
+  spec.add_dependency "selenium-webdriver", "~> 4.25.0"
 end

data/lib/atrea_control/duplex/unit.rb

@@ -13,6 +13,8 @@ module AtreaControl
       attr_reader :valid_for
       # @return [UserCtrl]
       attr_reader :user_ctrl
+      # @return [Time, DateTime]
+      attr_writer :timestamp
 
       # @param [String, Integer] user_id
       # @param [String, Integer] unit_id
@@ -37,6 +39,10 @@ module AtreaControl
         current_power || values[:current_power]
       end
 
+      def timestamp
+        @timestamp ||= values[:timestamp]
+      end
+
       def preheating?
         preheating || values[:preheating]
       end
@@ -56,7 +62,7 @@ module AtreaControl
       end
 
       def parsed
-        parser.values(read.body)
+        @parsed ||= parser.values(read.body)
       end
 
       def values
@@ -75,11 +81,12 @@ module AtreaControl
           input_temperature: input_temperature,
           preheating: preheating,
           valid_for: valid_for,
+          timestamp: timestamp,
         }
       end
 
-      def to_json(*args)
-        values.to_json(*args)
+      def to_json(*)
+        values.to_json(*)
       end
 
       # Additional "parameters" for each sensors

data/lib/atrea_control/sensor_parser.rb

@@ -43,6 +43,7 @@ module AtreaControl
       preheating = %w[C10200 C10202 C10215 C10217].any? do |i|
         xml.xpath("//O[@I=\"#{i}\"]/@V").last&.value == "1"
       end
+      parsed["timestamp"] = xml.xpath("//RD5WEB").attribute("t").to_s
       parsed["preheating"] = preheating
       parsed
     end
@@ -57,6 +58,7 @@ module AtreaControl
         "preheat_temperature" => values["preheat_temperature"].to_f / 10.0,
         "input_temperature" => values["input_temperature"].to_f / 10.0,
         "preheating" => values["preheating"],
+        "timestamp" => DateTime.parse(values["timestamp"]),
         "valid_for" => Time.now,
       }
     end

data/lib/atrea_control/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AtreaControl
-  VERSION = "2.1.3"
+  VERSION = "2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atrea_control
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.3.0
 platform: ruby
 authors:
 - Lukáš Pokorný
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-04 00:00:00.000000000 Z
+date: 2024-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: 4.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: 4.25.0
 description: Read data from web controller of RD5 duplex by Atrea.
 email:
 - pokorny@luk4s.cz
@@ -78,6 +78,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".ruby-version"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -109,16 +110,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.7.2
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Get data control.atrea.eu