pvoutput 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aabffd834f87c5ca43ed5d0c04c952fe4969b99c
-  data.tar.gz: d52c7cb268ad9608ce3c6503dd2e3b5cb38ff244
+  metadata.gz: fd666b46f2d458278fa5cc61a27098d80c4598ec
+  data.tar.gz: 65282209af3a86141553ad69ea734f6a71e19b83
 SHA512:
-  metadata.gz: 25b9b1b49b10ca564cb9d23233a16505a17d7703d40a01ca0c48d25f1f0cd8f5328aeff11273aa777b358d20bf453ceaf0f5b91bee36063f7ef46fb820c1d411
-  data.tar.gz: 0a8fa6e7d7841d52a0657489d5ac5b9aedcd4b2105201f63fd5cebef3dfcc92b8664a52b19a8cc129dcf3a7213b26754c77817dfa0eca6596d6987289e814a33
+  metadata.gz: 4763db564c14712d118676a008aea7a0e5d7d2c35b4ce4b04266766924df7e6d3bfc3c22ba896e169872ae249d08fd499edbae1a3457fb123cae923fd14d8a9e
+  data.tar.gz: 4fa1bd913875d28af09952b240aa9251c91bf6189bb672e426e80aa7c1dbc09e8cdc64480c5c3a54cd959793900adefc73c9fee1f49453c936fbd32fe2c61dde

data/.rubocop.yml

@@ -18,6 +18,9 @@ Metrics/MethodLength:
 Metrics/LineLength:
   Max: 120
 
+RSpec/ExampleLength:
+  Max: 15
+
 Style/ModuleFunction:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# 0.4.0 (20160911)
+
+* Add retries to batch_output (@jwillemsen)
+
 # 0.3.0 (20160229)
 
 * Add donation mode (@jwillemsen)

data/lib/pvoutput/client.rb

@@ -17,6 +17,24 @@ module PVOutput
       self.class.headers 'X-Pvoutput-Apikey' => @api_key, 'X-Pvoutput-SystemId' => @system_id
     end
 
+    # Helper method to post batch request to pvout that retries at the moment we get
+    # a 400 error back with body containing 'Load in progress'
+    def post_request(path, options = {}, &block)
+      loop do
+        response = self.class.post(path, options, &block)
+
+        if response.code == 400 && response.body =~ /Load in progress/
+          # We can't send data too fast, when the previous request is still loaded we
+          # have to wait so sleep 10 seconds and try again
+          sleep(10)
+        elsif response.code == 200
+          return
+        else
+          raise('Bad Post')
+        end
+      end
+    end
+
     # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def add_status(options)
       time = options[:when] || Time.now
@@ -84,9 +102,7 @@ module PVOutput
           :data => data.chop,
         }
 
-        response = self.class.post('/service/r2/addbatchoutput.jsp', :body => params)
-
-        raise('Bad Post') unless response.code == 200
+        post_request('/service/r2/addbatchoutput.jsp', :body => params)
       end
     end
     # rubocop:enable Metrics/AbcSize

data/lib/pvoutput/version.rb

@@ -1,3 +1,3 @@
 module PVOutput
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pvoutput
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - John Ferlito
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -207,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Library to speak to the PVOutput API