senec 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eabf3cf6c200b6e167e68ba309a8a0365f1ad3c388bc6e6797460606ba81d13e
-  data.tar.gz: e7d1742ca594b43bb8a1636e3faea98784a468efc1a4fc86b96052a9b613f26b
+  metadata.gz: 1742fde56f587e423ac2c22d38d8cfee11fc324faa7b026af09c1419e2a93841
+  data.tar.gz: e5d4184d3d24741d76baedecf0a565fe7aad6685f6c3c2f8f745ce22a75a38b2
 SHA512:
-  metadata.gz: 9a7ac30d46616071e3d0a6d57151ff21f3c2a219e347aceda27423f82fefa9c5b7dddbcdcbeff840573f4b35c82fff575e2d3bbbc3caa526822b147a82b705b5
-  data.tar.gz: 511506136b9baf3839e92aa9ca66fb7a9354e7a924c6290e0a24ba9ce47d2d64d1f501bcc8caba0f58def09d620b57f9021781ce06f3bff5d76094a17cdeb150
+  metadata.gz: d3d1f2a65475ae606ab0c6f4f13eed3363d9cd2c8bd0e7f57cc4fe730492410295860800b1e1027e18bbd2ad5abc7b01012ec6c7fe7286c304b58e025a8cd110
+  data.tar.gz: 3dea00f3618c57301a9509cc5de3b0e14df42f9a4cefff6a82a047a73073602cbe9fc2ce2b5f0438c8f1539e1cb5784fe526198373990a8a2f271ef0e232acb9

data/lib/senec/request.rb

@@ -4,11 +4,14 @@ require 'senec/constants'
 
 module Senec
   class Request
-    def initialize(host:, state_names: nil)
+    def initialize(host:, schema: 'http', state_names: nil)
       @host = host
+      @schema = schema
       @state_names = state_names
     end
 
+    attr_reader :host, :schema, :state_names
+
     def house_power
       get('ENERGY', 'GUI_HOUSE_POW')
     end
@@ -54,9 +57,9 @@ module Senec
     end
 
     def current_state_name
-      throw RuntimeError, 'No state names provided!' unless @state_names
+      throw RuntimeError, 'No state names provided!' unless state_names
 
-      @state_names[current_state]
+      state_names[current_state]
     end
 
     def measure_time
@@ -72,9 +75,13 @@ module Senec
         value.map do |v|
           Senec::Value.new(v).decoded
         end
-      else
+      elsif value
         Senec::Value.new(value).decoded
+      else
+        raise Senec::Error, "Value missing for #{keys.join('.')}"
       end
+    rescue DecodingError => e
+      raise Senec::Error, "Decoding failed for #{keys.join('.')}: #{e.message}"
     end
 
     def response
@@ -84,7 +91,8 @@ module Senec
           body: JSON.generate(Senec::BASIC_REQUEST),
           headers: {
             'Content-Type' => 'application/x-www-form-urlencoded; charset=UTF-8'
-          }
+          },
+          verify: false
         )
         raise Senec::Error, res.message.to_s unless res.success?
 
@@ -93,7 +101,7 @@ module Senec
     end
 
     def url
-      "http://#{@host}/lala.cgi"
+      "#{schema}://#{host}/lala.cgi"
     end
   end
 end

data/lib/senec/state.rb

@@ -2,11 +2,12 @@ require 'httparty'
 
 module Senec
   class State
-    def initialize(host:)
+    def initialize(host:, schema: 'http')
       @host = host
+      @schema = schema
     end
 
-    attr_reader :host
+    attr_reader :host, :schema
 
     # Extract state names from JavaScript file, which is formatted like this:
     #
@@ -31,7 +32,7 @@ module Senec
 
     def response
       @response ||= begin
-        res = HTTParty.get url
+        res = HTTParty.get url, verify: false
         raise Senec::Error, res.message unless res.success?
 
         res.body
@@ -40,7 +41,7 @@ module Senec
 
     # Use the JavaScript file with German names from the SENEC web interface
     def url
-      "http://#{host}/js/DE-de.js"
+      "#{schema}://#{host}/js/DE-de.js"
     end
   end
 end

data/lib/senec/value.rb

@@ -18,7 +18,7 @@ module Senec
         value
       # TODO: There are some more prefixes to handle
       else
-        raise ArgumentError, "#{@data} has unknown prefix!"
+        raise Senec::DecodingError, "Unknown value '#{@data}'"
       end
     end
 

data/lib/senec/version.rb

@@ -1,3 +1,3 @@
 module Senec
-  VERSION = '0.7.2'.freeze
+  VERSION = '0.8.0'.freeze
 end

data/lib/senec.rb

@@ -4,4 +4,5 @@ require 'senec/request'
 
 module Senec
   class Error < StandardError; end
+  class DecodingError < StandardError; end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: senec
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Georg Ledermann
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-23 00:00:00.000000000 Z
+date: 2023-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.4.18
 signing_key:
 specification_version: 4
 summary: Unofficial Ruby Client for SENEC Home