saj_collector 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a31fd70ac0c6bd669a29b37ae6f1b0193b6dd45164d08d93a6d7277edd709925
-  data.tar.gz: de1f11c67a24f03786dcee7c3fe3072908201c0ec49b4eb6cc824ea63cdea9fc
+  metadata.gz: 370630fb07fea199502ce6a8a421ce7d0e4a8253fec109baac95597ed8d0e225
+  data.tar.gz: 319651b7846f4ece02d5d8d725873291cf490d3a20e3dbfbb9e6775f622f9ea7
 SHA512:
-  metadata.gz: f74bdb009a76448a045064a7775c08fe892bbd6f22afd4813f3969b3eee1b3ece82ca49af61f67ac8c0657b0c82e003439c4d55bcde8590435853e58612e050a
-  data.tar.gz: 3dd6a464507c90befac9a0ea9f2c50344f919772522f80fe5d4977a098ea4226e2397f07de788ebacb42f2640f0f60dc39832c04180a57de8c568303ace44ea2
+  metadata.gz: 9c27ed515b65a42606a847f52edd54e35df6d794f53d999e3f24219599bc766b6932e2f226a4efc6db1c0b4c8f2891e2f68b04952bd33305937ea2e00d7eb7a6
+  data.tar.gz: 814743887fe0821186275a9ac7bc6a15650db9d4dddeb5166c1c7acccbe3f06e3e4a8bb32a47b0d90b0f8d8680b6fda5e52ff7bdacb4c9badde1912ff20c7a33

data/README.md

@@ -24,7 +24,6 @@ system id and API key can be found on your
 [PVOutput account page](https://pvoutput.org/account.jsp).
 
 ``` yaml
----
 :saj: a.b.c.d
 :system_id: 123456
 :api_key: fb6a2e3

data/exe/saj_collector

@@ -4,6 +4,7 @@ require 'rexml/document'
 require 'net/http'
 require 'pvoutput/client'
 require 'yaml'
+require 'ipaddress'
 
 # Load the configuration from the yaml file
 sajcollector_config = YAML.load_file('saj_collector.yaml')
@@ -12,6 +13,13 @@ sajcollector_config = YAML.load_file('saj_collector.yaml')
 # can be obtained from the pvoutput website
 pvoutput = PVOutput::Client.new(sajcollector_config[:system_id], sajcollector_config[:api_key])
 
+unless IPAddress.valid?(sajcollector_config[:saj])
+  raise ("[#{sajcollector_config[:saj]}] is not a valid IP address")
+end
+
+# Get the current realtime data from the SAJ device
+c = Net::HTTP.get(sajcollector_config[:saj], '/real_time_data.xml')
+
 options = {
   'temperature'      => 0, # Temperature in celcius
   'energy_generated' => 0, # Energy generation in watt hours
@@ -24,9 +32,6 @@ options = {
   'runtime_all_time' => 0
 }
 
-# Get the current realtime data from the SAJ device
-c = Net::HTTP.get(sajcollector_config[:saj], '/real_time_data.xml')
-
 # Let REXML parse the XML site
 doc = REXML::Document.new c
 

data/exe/saj_output_collector

@@ -4,6 +4,7 @@ require 'rexml/document'
 require 'net/http'
 require 'pvoutput/client'
 require 'yaml'
+require 'ipaddress'
 
 # Load the configuration from the yaml file
 sajcollector_config = YAML.load_file('saj_collector.yaml')
@@ -12,6 +13,10 @@ sajcollector_config = YAML.load_file('saj_collector.yaml')
 # can be obtained from the pvoutput website
 pvoutput = PVOutput::Client.new(sajcollector_config[:system_id], sajcollector_config[:api_key])
 
+unless IPAddress.valid?(sajcollector_config[:saj])
+  raise ("[#{sajcollector_config[:saj]}] is not a valid IP address")
+end
+
 # Get the current day trend data from the SAJ device
 c = Net::HTTP.get(sajcollector_config[:saj], '/day_trend.xml')
 

data/lib/saj_collector/version.rb

@@ -1,3 +1,3 @@
 module SAJCollector
-  VERSION = '0.5.5'.freeze
+  VERSION = '0.5.6'.freeze
 end

data/saj_collector.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
   spec.add_dependency 'pvoutput', '~> 0.4.0'
+  spec.add_dependency 'ipaddress'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saj_collector
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Johnny Willemsen
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: ipaddress
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement