atrea_control 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff5e62d3cbb95e39a1b342fa6662636255b8d78b6d76ab54f1e4c3cc12841afc
-  data.tar.gz: b1aa30c99ff332e261cb3c9e9752bba0eedd16e730bec244c67e91b51b2ab661
+  metadata.gz: 3801a6bbd9c137e26eecbf9adcb43d8d1ba7fd7dbcc19be4a95ff1ae5a189a47
+  data.tar.gz: efd8adb1f53738b28aac974260c0fca23d46ab3329ec745d2fce6d5bb73c43cf
 SHA512:
-  metadata.gz: 881da41972aea45c4e3ea36b2a14ec44d87c9a8d42e6249048780bcfb9066c8c42b35d27770be7f23663a13cc3f0b663b621030adb58f52714851d7d3a833354
-  data.tar.gz: ee2aaa4913ab06f77ff3fab98661b53085519dffdb1b49786d39e32db80d365618d274e3aef17d12e6041bba9d8d7f030afe5616e5c106c16ccd84062bb88b83
+  metadata.gz: a22728dedc9c10022d86dc433d81cacd91193a1851f4302d066763fa8f600c9a632dc02d235f97560d7300f72618ce25c57f83e4581085d049d41c36f7e0b340
+  data.tar.gz: e4348ee806d25350c3b2d1f861cec60f8b77504005aabd57115a82966ebb084735f7a8d04a4f79538dbbaa9dff777a34429551d90f302ebdf20dfddc632a09a2

data/.rubocop_todo.yml

@@ -1,11 +1,28 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude`
-# on 2021-10-26 20:31:23 UTC using RuboCop version 1.22.2.
+# on 2021-10-30 20:32:55 UTC using RuboCop version 1.22.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
+# SupportedStylesForExponentOperator: space, no_space
+Layout/SpaceAroundOperators:
+  Exclude:
+    - '_x.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
+# SupportedStyles: space, no_space, compact
+# SupportedStylesForEmptyBraces: space, no_space
+Layout/SpaceInsideHashLiteralBraces:
+  Exclude:
+    - '_x.rb'
+
 # Offense count: 2
 # Configuration parameters: CountComments, Max, CountAsOne, ExcludedMethods, IgnoredMethods.
 # IgnoredMethods: refine
@@ -20,13 +37,13 @@ Metrics/ClassLength:
   Exclude:
     - 'lib/atrea_control/duplex.rb'
 
-# Offense count: 5
+# Offense count: 4
 # Configuration parameters: .
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
   EnforcedStyle: receive
 
-# Offense count: 2
+# Offense count: 1
 # Configuration parameters: Max.
 RSpec/MultipleExpectations:
   Exclude:
@@ -37,7 +54,7 @@ RSpec/StubbedMock:
   Exclude:
     - 'spec/atrea_control/duplex_spec.rb'
 
-# Offense count: 5
+# Offense count: 6
 RSpec/SubjectStub:
   Exclude:
     - 'spec/atrea_control/duplex_spec.rb'
@@ -50,14 +67,23 @@ Style/Documentation:
     - 'test/**/*'
     - 'lib/atrea_control.rb'
 
-# Offense count: 1
+# Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Exclude:
+    - '_x.rb'
     - 'spec/atrea_control/duplex_spec.rb'
 
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+Style/HashSyntax:
+  Exclude:
+    - '_x.rb'
+
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.

data/CHANGELOG.md

@@ -1,4 +1,9 @@
 ## [Unreleased]
+## [1.2.1] - 2021-10-30
+### Changed
+- login procedure
+- ensure logged user by window.user object
+
 ## [1.2.0] - 2021-10-26
 ### Changed
 - use internal unit.php for read values

data/Gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in atrea_control.gemspec
 gemspec
 
+gem "pry"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.10"
 gem "rubocop", "~> 1.7", require: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    atrea_control (1.2.0)
+    atrea_control (1.2.1)
       nokogiri (~> 1.12)
       rest-client (~> 2.1)
       selenium-webdriver (~> 3.142)
@@ -13,6 +13,7 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     childprocess (3.0.0)
+    coderay (1.1.3)
     crack (0.4.5)
       rexml
     diff-lcs (1.4.4)
@@ -23,17 +24,19 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.4)
       domain_name (~> 0.5)
+    method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0901)
     netrc (0.11.0)
     nokogiri (1.12.5-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.12.5-x86_64-linux)
-      racc (~> 1.4)
     parallel (1.21.0)
     parser (3.0.2.0)
       ast (~> 2.4.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     public_suffix (4.0.6)
     racc (1.6.0)
     rainbow (3.0.0)
@@ -97,6 +100,7 @@ PLATFORMS
 
 DEPENDENCIES
   atrea_control!
+  pry
   rake (~> 13.0)
   rspec (~> 3.10)
   rubocop (~> 1.7)

data/lib/atrea_control/duplex.rb

@@ -21,7 +21,6 @@ module AtreaControl
     # @option sensors_map [String] :current_power
     # @option sensors_map [String] :current_mode
     def initialize(login:, password:, sensors_map: Config.default_sensors_map)
-      @logged = false
       @login = login
       @password = password
       @sensors = sensors_map
@@ -37,12 +36,26 @@ module AtreaControl
     end
 
     def logged?
-      @logged
+      user&.[] "loged"
+    end
+
+    def login_in_progress?
+      @login_in_progress
     end
 
     # Login into control
     def login
+      @login_in_progress = true
+      logger.debug "start new login"
       driver.get CONTROL_URI
+      submit_login_form if user.nil? || !logged?
+      finish_login
+      @login_in_progress = false
+      inspect
+    end
+
+    # Submit given credentials and proceed login
+    def submit_login_form
       form = driver.find_element(id: "loginFrm")
       username = form.find_element(name: "username")
       username.send_keys @login
@@ -51,7 +64,6 @@ module AtreaControl
 
       submit = form.find_element(css: "input[type=submit]")
       submit.click
-      finish_login && inspect
     end
 
     # Retrieve dashboard URI from object tag and open it again
@@ -59,7 +71,6 @@ module AtreaControl
       uri = driver.find_element(tag_name: "object").attribute "data"
       driver.get uri
       logger.debug "#{name} login success"
-      @logged = true
     end
 
     # @return [String]
@@ -80,9 +91,10 @@ module AtreaControl
       @unit_id ||= driver.execute_script("return window._unit")
     end
 
-    # @return [String]
-    def user_auth
-      @user_auth ||= driver.execute_script("return window.user")&.[] "auth"
+    # Window.user object from atrea
+    # @return [Hash, nil]
+    def user
+      driver.execute_script("return window.user")
     end
 
     # @return [String]
@@ -95,7 +107,6 @@ module AtreaControl
 
     # quit selenium browser
     def close
-      @logged = false
       @user_auth = nil
       driver.quit
       remove_instance_variable :@driver
@@ -124,12 +135,14 @@ module AtreaControl
     end
 
     def call_unit!
-      return false unless user_auth
+      return false if @login_in_progress
 
+      logger.debug "call_unit!"
       parse_response(response_comm_unit)
       @valid_for = Time.now
       as_json
     rescue RestClient::Forbidden
+      logger.debug "session expired..."
       close if @logged
       login && call_unit!
     end
@@ -183,7 +196,7 @@ module AtreaControl
       params = {
         _user: user_id,
         _unit: unit_id,
-        auth: user_auth,
+        auth: user&.[]("auth"),
         _t: "config/xml.xml",
       }
       autologin_token = CGI.escape([@login, @password].join("\b"))

data/lib/atrea_control/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atrea_control
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Lukáš Pokorný
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2021-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri