senec 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3914b7ea67325757972bb42f497370f9195ba55222d5e5fc87c03af9ff7c825
-  data.tar.gz: dca80a11290b1ea0f2b791090b83ba4a169ade0ec528f36ec92463ccb945f5dc
+  metadata.gz: 3fd3ccc37bfaa1b9583583d9d845200844da9f51e4231c3c527729ac7494c790
+  data.tar.gz: 2cd5722e55aca66579c755d6fc9490b1f546616048f3a208b4e4fce15d68723c
 SHA512:
-  metadata.gz: d19c80369fad7f4f066e0916e26c4280eb8d2a708e149cf9fb11071f29cee49be6fdebd7b225bb1368796771d3cc73682132e22056410db03ec98bea4dbd07e8
-  data.tar.gz: 9ca1fa435012bbe331924b1fd2173358fd700fbe3cb5fa2cbd75a9e2a59f9017c6ff575aee089df918bdfe9318dcd34c2b543ae3bd43207617af5bc96a2d79f0
+  metadata.gz: e14c8db17de64087e464f587764c29ea3f3d89b92edd95b1bd1a8090d81610dac5bcd5e177620260ef29784a24dc2572fc993dfda33205b7534b7d154c863dd2
+  data.tar.gz: c650cbe64f69875e943330752510b525d2215399b6087fcaa46625e6aa3a07f89cf3ca6699d260ac132329b5913a267526afcbc1cbf29f12331c8490f49d8350

data/lib/senec/constants.rb

@@ -16,6 +16,9 @@ module Senec
       GUI_INVERTER_POWER: '',           # PV production (W)
       STAT_HOURS_OF_OPERATION: ''       # Appliance hours of operation
     },
+    PV1: {
+      MPP_POWER: ''                     # List: MPP power (W)
+    },
     TEMPMEASURE: {
       CASE_TEMP: ''
     },

data/lib/senec/request.rb

@@ -1,5 +1,4 @@
-require 'http'
-require 'json'
+require 'httparty'
 require 'senec/value'
 require 'senec/constants'
 
@@ -18,6 +17,10 @@ module Senec
       get('ENERGY', 'GUI_INVERTER_POWER')
     end
 
+    def mpp_power
+      get('PV1', 'MPP_POWER')
+    end
+
     def bat_power
       get('ENERGY', 'GUI_BAT_DATA_POWER')
     end
@@ -76,15 +79,15 @@ module Senec
 
     def response
       @response ||= begin
-        res = HTTP.post uri, json: Senec::BASIC_REQUEST
-        raise Senec::Error, res.status.to_s unless res.status.success?
+        res = HTTParty.post(url, body: JSON.generate(Senec::BASIC_REQUEST))
+        raise Senec::Error, res.message.to_s unless res.success?
 
-        JSON.parse(res.body)
+        res.parsed_response
       end
     end
 
-    def uri
-      URI.parse("http://#{@host}/lala.cgi")
+    def url
+      "http://#{@host}/lala.cgi"
     end
   end
 end

data/lib/senec/state.rb

@@ -1,4 +1,4 @@
-require 'http'
+require 'httparty'
 
 module Senec
   class State
@@ -31,16 +31,16 @@ module Senec
 
     def response
       @response ||= begin
-        res = HTTP.get uri
-        raise Senec::Error, res.status.to_s unless res.status.success?
+        res = HTTParty.get url
+        raise Senec::Error, res.message unless res.success?
 
-        res.body.to_s
+        res.body
       end
     end
 
     # Use the JavaScript file with German names from the SENEC web interface
-    def uri
-      URI.parse("http://#{host}/js/DE-de.js")
+    def url
+      "http://#{host}/js/DE-de.js"
     end
   end
 end

data/lib/senec/version.rb

@@ -1,3 +1,3 @@
 module Senec
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.7.1'.freeze
 end

data/senec.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/solectrus/senec'
   spec.license       = 'MIT'
   spec.required_ruby_version = Gem::Requirement.new('>= 3.0.0')
-  spec.add_runtime_dependency 'http', '~> 5'
+  spec.add_runtime_dependency 'httparty'
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/solectrus/senec'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: senec
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Georg Ledermann
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-04 00:00:00.000000000 Z
+date: 2023-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: http
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
 description: Access your local SENEC Solar Battery Storage System
 email:
 - georg@ledermann.dev
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.7
 signing_key:
 specification_version: 4
 summary: Unofficial Ruby Client for SENEC Home