saj_collector 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cd6cde289ad4c8172d81fe8328aaed9d80739b034e373e76b2a84e3d7378fad
-  data.tar.gz: c6c71fc42fe81350dcbf3edaf7f9e26c02f90b07f412340702d3ecaa830d2806
+  metadata.gz: aadd3eb567df88df560c127500d33875d0b39f8dbed4728dc58812034c6471d3
+  data.tar.gz: 10d9fbb5e8151cb7e44963ca4fb1d156e6b44bed4ba224677e2eba4611a39499
 SHA512:
-  metadata.gz: ba424ce76bf030ff3afb5ba7a4e300e8934ae8086f237e1f933ffbd92a449c953e594c31a374ddd45dd3e232b6001069ef42199f2b03adb3604ccf176203bd26
-  data.tar.gz: f3a2a0145efc2ea370e73353907b59e59a32f3d4caec503b005d322ffa92141e5b855d6459679cbe5eeaeccd8a615ccacab351da8613ae596e119358f50f65b7
+  metadata.gz: 62c56c6a9bf49fd761bf16c74fc985fcb1717659d08b17b99db47264c90bcfd105d18a1376f09ce15379b216fbc64af7edc3233352907023daa9cb61b396cb5b
+  data.tar.gz: c340d3fc7171eac32cfb9c7fd6dfb0854401896f57fde87032e53dbc5f0b05bd51c638da478eb4a02fbae20a6b6f2ea22ba6b80a1f9cd1e2027b016e13624044

data/exe/saj_collector

@@ -21,7 +21,7 @@ options = {
   'power_today'      => 0,
   'power_all_time'   => 0,
   'runtime_today'    => 0,
-  'runtime_all_time' => 0,
+  'runtime_all_time' => 0
 }
 
 # Get the current realtime data from the SAJ device
@@ -31,40 +31,40 @@ c = Net::HTTP.get(sajcollector_config[:saj], '/real_time_data.xml')
 doc = REXML::Document.new c
 
 # Get the temperature
-doc.elements.each('real_time_data/temp'){
-  |e| options[:temperature] = e.text
+doc.elements.each('real_time_data/temp') { |e|
+  options[:temperature] = e.text
 }
 
 # e-today is in kWh where pvoutput is Wh
-doc.elements.each('real_time_data/e-today'){
-  |e| options[:energy_generated] = e.text.to_f * 1000
+doc.elements.each('real_time_data/e-today') { |e|
+  options[:energy_generated] = e.text.to_f * 1000
 }
 
 # Get the power generated
-doc.elements.each('real_time_data/p-ac'){
-  |e| options[:power_generated] = e.text
+doc.elements.each('real_time_data/p-ac') { |e|
+  options[:power_generated] = e.text
 }
 
 # Get the current amperage
-doc.elements.each('real_time_data/i-grid'){
-  |e| options[:amperage] = e.text
+doc.elements.each('real_time_data/i-grid') { |e|
+  options[:amperage] = e.text
 }
 
 # Get the voltage
-doc.elements.each('real_time_data/v-grid'){
-  |e| options[:voltage] = e.text
+doc.elements.each('real_time_data/v-grid') { |e|
+  options[:voltage] = e.text
 }
-doc.elements.each('real_time_data/e-today'){
-  |e| options[:power_today] = e.text
+doc.elements.each('real_time_data/e-today') { |e|
+  options[:power_today] = e.text
 }
-doc.elements.each('real_time_data/e-total'){
-  |e| options[:power_all_time] = e.text
+doc.elements.each('real_time_data/e-total') { |e|
+  options[:power_all_time] = e.text
 }
-doc.elements.each('real_time_data/t-today'){
-  |e| options[:runtime_today] = e.text
+doc.elements.each('real_time_data/t-today') { |e|
+  options[:runtime_today] = e.text
 }
-doc.elements.each('real_time_data/t-total'){
-  |e| options[:runtime_all_time] = e.text
+doc.elements.each('real_time_data/t-total') { |e|
+  options[:runtime_all_time] = e.text
 }
 
 puts '-------------------------'

data/exe/saj_output_collector

@@ -34,16 +34,17 @@ day_trend_multiplication = 100
 
 # Some SAJ Inverters provide they energy_generated in granularity of 0.1kWh and
 # others in 0.01kWh.
-if !sajcollector_config[:day_trend_multiplication_factor].nil?
-    day_trend_multiplication = sajcollector_config[:day_trend_multiplication_factor].to_i
+unless sajcollector_config[:day_trend_multiplication_factor].nil?
+  day_trend_multiplication = sajcollector_config[:day_trend_multiplication_factor].to_i
 end
 
 while counter < days
   value = {
-    :energy_generated => 0 }
+    :energy_generated => 0
+  }
   # Get the power output of the day,
-  doc.elements.each("day_trend/d#{counter}"){
-    |e| value[:energy_generated] = (e.text.to_i * day_trend_multiplication).to_s
+  doc.elements.each("day_trend/d#{counter}") { |e|
+    value[:energy_generated] = (e.text.to_i * day_trend_multiplication).to_s
   }
   options[:"#{m}#{current_day.next!}"] = value
 

data/lib/saj_collector/version.rb

@@ -1,3 +1,3 @@
 module SAJCollector
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.5.1'.freeze
 end

data/saj_collector.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'saj_collector/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saj_collector
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Johnny Willemsen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-27 00:00:00.000000000 Z
+date: 2018-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pvoutput