atrea_control 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 919ab4f4ed1dde112816e58cecfb4ffc393cb539cecf81796a2490219683c75d
-  data.tar.gz: 7b450714f08130ad30ad565c5ce04b22b29435c43cd8230dbf10103a04c9e624
+  metadata.gz: 5690a9a78277344372417c1df8158c7b1b2becfdd461abd9c3bd46efdf93e46a
+  data.tar.gz: 22a0cbeefafd222b0670b674099d821dbbdbe1ad597218adb6694194e321724f
 SHA512:
-  metadata.gz: 360fc2c895cc21dabffd4450a5013899263077b7a9f5c968c7046584728e457f795e8a159dc714021ac2dfaed2b5fe3792debd67c88c52810144d83bea792cff
-  data.tar.gz: bfdd992e729adccf960aee9d26e9088ef9fe7beb20f1067396099248659c187e079f303504e04fefb7bdac9dee0dd0249f01c053b39966cef67f55c2da2ada69
+  metadata.gz: fb10dd338ab4969d9184b79f098901b3b0c9bf42e89d1fe1a106e2b97a83b9ec35bef7f8169d566991f95fc07f54d1fcfe257b3a339668cd09d633662f4f36e0
+  data.tar.gz: d1dc59a9dc1b00461e48d58c0f6388c6680619f4181eb56cf17612cb856e1d957084064f125024410d7bc5f86a06e7f338808f10b19d8f652e2b3ebced1e9d13

data/.github/workflows/main.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: [3.2, 3.3, 3]
+        ruby-version: [3.2, 3.3, 3.4, 3]
     steps:
     - uses: actions/checkout@v4
     - name: Set up Ruby

data/.gitignore

@@ -8,6 +8,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/
 
 # rspec failure tracking
 .rspec_status

data/.rubocop.yml

@@ -1,6 +1,6 @@
 inherit_from: .rubocop_todo.yml
 
-require:
+plugins:
   - rubocop-rspec
 AllCops:
   NewCops: enable

data/.ruby-version

@@ -1 +1 @@
-3.3.6
+3.4.7

data/CHANGELOG.md

@@ -1,4 +1,15 @@
 ## [Unreleased]
+## [3.1.0] - 2025-11-14
+### Changed
+- upgrade dependencies
+- replace RestClient by Faraday
+
+## [3.0.1] - 2025-03-17
+### Security
+- upgrade gems
+### Change
+- update rubocop (plugins)
+
 ## [3.0.0] - 2025-01-25
 ### Removed
 - selenium-based login procedure

data/Gemfile.lock

@@ -1,103 +1,110 @@
 PATH
   remote: .
   specs:
-    atrea_control (3.0.0)
+    atrea_control (3.1.0)
+      faraday (~> 2.7)
+      faraday-cookie_jar (~> 0.0)
       i18n (~> 1.14)
       nokogiri (~> 1.15)
-      rest-client (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    ast (2.4.2)
-    bigdecimal (3.1.9)
+    ast (2.4.3)
+    bigdecimal (3.3.1)
     coderay (1.1.3)
     concurrent-ruby (1.3.5)
-    crack (1.0.0)
+    crack (1.0.1)
       bigdecimal
       rexml
-    diff-lcs (1.5.1)
+    diff-lcs (1.6.2)
     docile (1.4.1)
     domain_name (0.6.20240107)
-    hashdiff (1.1.2)
-    http-accept (1.7.0)
-    http-cookie (1.0.8)
+    faraday (2.14.0)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-cookie_jar (0.0.8)
+      faraday (>= 0.8.0)
+      http-cookie (>= 1.0.0)
+    faraday-net_http (3.4.2)
+      net-http (~> 0.5)
+    hashdiff (1.2.1)
+    http-cookie (1.1.0)
       domain_name (~> 0.5)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.9.1)
-    language_server-protocol (3.17.0.3)
-    logger (1.6.5)
+    json (2.16.0)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    logger (1.7.0)
     method_source (1.1.0)
-    mime-types (3.6.0)
-      logger
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2025.0107)
-    netrc (0.11.0)
-    nokogiri (1.18.2-arm64-darwin)
+    net-http (0.8.0)
+      uri (>= 0.11.1)
+    nokogiri (1.18.10-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.2-x86_64-darwin)
+    nokogiri (1.18.10-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.2-x86_64-linux-gnu)
+    nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
-    parallel (1.26.3)
-    parser (3.3.7.0)
+    parallel (1.27.0)
+    parser (3.3.10.0)
       ast (~> 2.4.1)
       racc
+    prism (1.6.0)
     pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (6.0.1)
+    public_suffix (6.0.2)
     racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.2.1)
-    regexp_parser (2.10.0)
-    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.4.0)
-    rspec (3.13.0)
+    rake (13.3.1)
+    regexp_parser (2.11.3)
+    rexml (3.4.4)
+    rspec (3.13.2)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.2)
+    rspec-core (3.13.6)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.2)
+    rspec-mocks (3.13.7)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.2)
-    rubocop (1.70.0)
+    rspec-support (3.13.6)
+    rubocop (1.81.7)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.36.2, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.37.0)
-      parser (>= 3.3.1.0)
-    rubocop-rspec (3.4.0)
-      rubocop (~> 1.61)
+    rubocop-ast (1.48.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-rspec (3.8.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.81)
     ruby-progressbar (1.13.0)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.1)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
-    webmock (3.24.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
+    uri (1.1.1)
+    webmock (3.26.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -106,6 +113,7 @@ PLATFORMS
   arm64-darwin-22
   arm64-darwin-23
   arm64-darwin-24
+  arm64-darwin-25
   x86_64-darwin-20
   x86_64-linux
 
@@ -120,4 +128,4 @@ DEPENDENCIES
   webmock (~> 3.14)
 
 BUNDLED WITH
-   2.6.3
+   2.7.2

data/atrea_control.gemspec

@@ -18,9 +18,8 @@ Gem::Specification.new do |spec|
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/luk4s/atrea_control"
   spec.metadata["changelog_uri"] = "https://github.com/luk4s/atrea_control/CHANGELOG.md"
-  spec.metadata = {
-    "rubygems_mfa_required" => "true",
-  }
+  spec.metadata["rubygems_mfa_required"] = "true"
+
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
@@ -36,7 +35,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 "faraday", "~> 2.7"
+  spec.add_dependency "faraday-cookie_jar", "~> 0.0"
   spec.add_dependency "i18n", "~> 1.14"
   spec.add_dependency "nokogiri", "~> 1.15"
-  spec.add_dependency "rest-client", "~> 2.1"
 end

data/lib/atrea_control/duplex/login.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 require "nokogiri"
-require "rest-client"
+require "faraday"
+require "faraday-cookie_jar"
 require "securerandom"
 
 module AtreaControl
@@ -21,6 +22,7 @@ module AtreaControl
       def initialize(login:, password:)
         @login = login
         @password = password
+        @jar = HTTP::CookieJar.new
       end
 
       # Perform login procedure for retrieve `sid` (auth_token)
@@ -29,8 +31,14 @@ module AtreaControl
       def call
         @sid = sid
         if @sid == "0"
-          re_login = RestClient.post "#{AtreaControl::Duplex::CONTROL_URI}/apps/rd5Control/handle.php?action=unitLogin&user=#{user_id}&unit=#{unit_id}&table=userUnits&idPwd=#{unit[:iid]}&#{SecureRandom.hex(2)}&_ts=#{SecureRandom.hex(4)}",
-                                     { comm: "config/login.cgi?magic=" }, headers
+          login_url = "#{AtreaControl::Duplex::CONTROL_URI}/apps/rd5Control/handle.php?" \
+                      "action=unitLogin&user=#{user_id}&unit=#{unit_id}&table=userUnits&" \
+                      "idPwd=#{unit[:iid]}&#{SecureRandom.hex(2)}&_ts=#{SecureRandom.hex(4)}"
+          re_login = connection.post(login_url) do |req|
+            req.body = { comm: "config/login.cgi?magic=" }
+            req.headers["Cookie"] = "PHPSESSID=#{php_session_id}"
+            req.headers["App-name"] = "rd5Control"
+          end
           time = Nokogiri::XML(re_login.body).at_xpath("//sended")["time"].to_i
           logger.debug "Login in #{time} seconds..."
           time.times do
@@ -55,9 +63,11 @@ module AtreaControl
       # Retrieve user details from RD5 core.php?action=init
       # @return [Hash] - user_id, name
       def user
-        core_init = RestClient.get "#{AtreaControl::Duplex::CONTROL_URI}/core/core.php?action=init&_ts=#{SecureRandom.hex(4)}",
-                                   headers
-        client = Nokogiri::XML(core_init.body).at_xpath("//client")
+        response = connection.get("#{AtreaControl::Duplex::CONTROL_URI}/core/core.php?action=init&_ts=#{SecureRandom.hex(4)}") do |req|
+          req.headers["Cookie"] = "PHPSESSID=#{php_session_id}"
+          req.headers["App-name"] = "rd5Control"
+        end
+        client = Nokogiri::XML(response.body).at_xpath("//client")
         user_id = client["id"]
         name = client["name"]
         logger.debug "User ID: #{user_id}, User Name: #{name}"
@@ -71,10 +81,16 @@ module AtreaControl
 
       # For some reason, this requests must be done before `unit_id` requested
       def run_rd5_app
-        RestClient.post "#{AtreaControl::Duplex::CONTROL_URI}/core/core.php?Sync=1&action=run&object=app&lng=28&rVer=1&_ts=#{SecureRandom.hex(4)}",
-                        { name: "rd5Control", path: "apps/rd5Control/" }, headers
-        RestClient.post "#{AtreaControl::Duplex::CONTROL_URI}/core/core.php?Sync=1&action=load&object=setting&_ts=#{SecureRandom.hex(4)}",
-                        { path: "apps/rd5Control" }, headers
+        connection.post("#{AtreaControl::Duplex::CONTROL_URI}/core/core.php?Sync=1&action=run&object=app&lng=28&rVer=1&_ts=#{SecureRandom.hex(4)}") do |req|
+          req.body = { name: "rd5Control", path: "apps/rd5Control/" }
+          req.headers["Cookie"] = "PHPSESSID=#{php_session_id}"
+          req.headers["App-name"] = "rd5Control"
+        end
+        connection.post("#{AtreaControl::Duplex::CONTROL_URI}/core/core.php?Sync=1&action=load&object=setting&_ts=#{SecureRandom.hex(4)}") do |req|
+          req.body = { path: "apps/rd5Control" }
+          req.headers["Cookie"] = "PHPSESSID=#{php_session_id}"
+          req.headers["App-name"] = "rd5Control"
+        end
       end
 
       # Retrieve overview of RD5 unit
@@ -83,9 +99,11 @@ module AtreaControl
         return @unit if @unit
 
         # run_rd5_app
-        units_table = RestClient.get "#{AtreaControl::Duplex::CONTROL_URI}/_data/data.php?Sync=1&action=getdata&rH&rE&table=userUnits&ds=rd5&_ts=#{SecureRandom.hex(4)}",
-                                     headers
-        item = Nokogiri::XML(units_table.body).at_xpath("//i")
+        response = connection.get("#{AtreaControl::Duplex::CONTROL_URI}/_data/data.php?Sync=1&action=getdata&rH&rE&table=userUnits&ds=rd5&_ts=#{SecureRandom.hex(4)}") do |req|
+          req.headers["Cookie"] = "PHPSESSID=#{php_session_id}"
+          req.headers["App-name"] = "rd5Control"
+        end
+        item = Nokogiri::XML(response.body).at_xpath("//i")
         unit_number = item["unit"]
         iid = item["id"]
         @unit ||= { unit_number:, iid: }
@@ -96,16 +114,20 @@ module AtreaControl
       def unit_id
         return @unit_id if @unit_id
 
-        records = RestClient.get "#{AtreaControl::Duplex::CONTROL_URI}/_data/data.php?Sync=1&action=getrecord&id=#{unit[:unit_number]}&table=units&ds=rd5&_ts=#{SecureRandom.hex(4)}",
-                                 headers
-        @unit_id ||= Nokogiri::XML(records.body).at_xpath("//table/i")["ident"]
+        response = connection.get("#{AtreaControl::Duplex::CONTROL_URI}/_data/data.php?Sync=1&action=getrecord&id=#{unit[:unit_number]}&table=units&ds=rd5&_ts=#{SecureRandom.hex(4)}") do |req|
+          req.headers["Cookie"] = "PHPSESSID=#{php_session_id}"
+          req.headers["App-name"] = "rd5Control"
+        end
+        @unit_id ||= Nokogiri::XML(response.body).at_xpath("//table/i")["ident"]
       end
 
       def sid
-        data = RestClient.get "#{AtreaControl::Duplex::CONTROL_URI}/apps/rd5Control/handle.php?Sync=1&action=unitQuery&query=loged&user=#{user_id}&unit=#{unit_id}&#{SecureRandom.hex(2)}&_ts=#{SecureRandom.hex(4)}",
-                              headers
-        logger.debug data.body
-        Nokogiri::XML(data.body).at_xpath("//login")["sid"]
+        response = connection.get("#{AtreaControl::Duplex::CONTROL_URI}/apps/rd5Control/handle.php?Sync=1&action=unitQuery&query=loged&user=#{user_id}&unit=#{unit_id}&#{SecureRandom.hex(2)}&_ts=#{SecureRandom.hex(4)}") do |req|
+          req.headers["Cookie"] = "PHPSESSID=#{php_session_id}"
+          req.headers["App-name"] = "rd5Control"
+        end
+        logger.debug response.body
+        Nokogiri::XML(response.body).at_xpath("//login")["sid"]
       end
 
       # @!group Private methods
@@ -115,14 +137,21 @@ module AtreaControl
         return @php_session_id if @php_session_id
 
         payload = { username: @login, password: @password }
-        RestClient.post "#{AtreaControl::Duplex::CONTROL_URI}?action=login", payload do |response|
-          @php_session_id = response.cookies["PHPSESSID"]
-        end
+        connection.post("#{AtreaControl::Duplex::CONTROL_URI}?action=login", payload)
+
+        # Extract PHPSESSID from cookie jar
+        cookies = @jar.cookies(URI.parse(AtreaControl::Duplex::CONTROL_URI))
+        @php_session_id = cookies.find { |c| c.name == "PHPSESSID" }&.value
         @php_session_id
       end
 
-      def headers
-        { cookies: { PHPSESSID: php_session_id }, "App-name": "rd5Control" }
+      # Create Faraday connection with cookie jar
+      def connection
+        @connection ||= Faraday.new do |f|
+          f.request :url_encoded
+          f.use :cookie_jar, jar: @jar
+          f.adapter Faraday.default_adapter
+        end
       end
     end
   end

data/lib/atrea_control/duplex/request.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rest-client"
+require "faraday"
 
 module AtreaControl
   module Duplex
@@ -24,7 +24,12 @@ module AtreaControl
       # @param [Hash] params
       # @option params [String] :_t ("config/xml.xml") file name
       def call(params)
-        RestClient.get "#{AtreaControl::Duplex::CONTROL_URI}/comm/sw/unit.php", params: @params.merge(params)
+        @connection ||= Faraday.new do |f|
+          f.request :url_encoded
+          f.adapter Faraday.default_adapter
+        end
+
+        @connection.get("#{AtreaControl::Duplex::CONTROL_URI}/comm/sw/unit.php", @params.merge(params))
       end
     end
   end

data/lib/atrea_control/version.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 # :nocov:
 
 module AtreaControl
-  VERSION = "3.0.0"
+  VERSION = "3.1.0"
 end

metadata

@@ -1,57 +1,70 @@
 --- !ruby/object:Gem::Specification
 name: atrea_control
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Lukáš Pokorný
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: faraday-cookie_jar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
 description: Read data from web controller of RD5 duplex by Atrea.
 email:
 - pokorny@luk4s.cz
@@ -89,8 +102,11 @@ files:
 homepage: https://github.com/luk4s/atrea_control
 licenses: []
 metadata:
+  allowed_push_host: https://rubygems.org
+  homepage_uri: https://github.com/luk4s/atrea_control
+  source_code_uri: https://github.com/luk4s/atrea_control
+  changelog_uri: https://github.com/luk4s/atrea_control/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -105,8 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Get data control.atrea.eu
 test_files: []