yt 0.25.6 → 0.25.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4906f2b9b0a43d68f1c2bc2e60bb629da1c976b8
-  data.tar.gz: 35ebf6686a6821d9a71cc73d721b814c1e094261
+  metadata.gz: 9b810fefdbabe409e4af5f086ba9b6423812249c
+  data.tar.gz: 2cc04a37afd86e0bb7333b59a4c9196c2acbc049
 SHA512:
-  metadata.gz: e59bb56d0fce3c1bf71b156af6a35d4373cf03c05ddc22c94ad1705cd39098d2f1379a0eb48859bf98af2d959a81ed4e20e77b01dd5d3faa29159653a1653bf3
-  data.tar.gz: 9ef78181e2dc8ecfec9742288e119cddf3ad75e164df0dc6a90b0f2d1fc1c31ab59a8f49d36ccb7b406e744254be33e925eb6b478f5af6f482edb602f51f9cc7
+  metadata.gz: bcc361e5f7fc1763e85298d605125ce82f0e7a68dbe8a36ca5626fc69fea3fcc7be068288e71c294d0e1fc5fdd0afff9b95ae1731f21e27f109928e2ffaa4a9f
+  data.tar.gz: e294831648f38525a06b6795a6d779492a218d2ac939e6a2951ca564210983324c676b94e0c1c0d96de288592721f331dd3decbaa690a0ad2122a7e5d46824e7

data/CHANGELOG.md

@@ -6,6 +6,10 @@ For more information about changelogs, check
 [Keep a Changelog](http://keepachangelog.com) and
 [Vandamme](http://tech-angels.github.io/vandamme).
 
+## 0.25.7 - 2015-09-10
+
+* [FEATURE] Retry the same request once if YouTube responds with "quotaExceeded"
+
 ## 0.25.6 - 2015-09-03
 
 * [FEATURE] New channel/video reports: `videos_added_to_playlists`, `videos_removed_from_playlists`.

data/lib/yt/request.rb

@@ -188,13 +188,15 @@ module Yt
     end
 
     # Returns whether it is worth to run a failed request again.
-    # There are two cases in which retrying a request might be worth:
+    # There are three cases in which retrying a request might be worth:
     # - when the server specifies that the request token has expired and
-    #   the user has to refresh the token in order to tryi again
+    #   the user has to refresh the token in order to try again
     # - when the server is unreachable, and waiting for a couple of seconds
     #   might solve the connection issues.
+    # - when the user has reached the quota for requests/second, and waiting
+    #   for a couple of seconds might solve the connection issues.
     def run_again?
-      refresh_token_and_retry? || server_error? && sleep_and_retry?
+      refresh_token_and_retry? || (server_error? || exceeded_quota?) && sleep_and_retry?
     end
 
     # Returns the list of server errors worth retrying the request once.
@@ -261,6 +263,11 @@ module Yt
       response_error == Errors::ServerError
     end
 
+    # @return [Boolean] whether the request exceeds the YouTube quota
+    def exceeded_quota?
+      response_error == Errors::Forbidden && response.body =~ /quotaExceeded/
+    end
+
     # @return [Boolean] whether the request lacks proper authorization.
     def unauthorized?
       response_error == Errors::Unauthorized

data/lib/yt/version.rb

@@ -1,3 +1,3 @@
 module Yt
-  VERSION = '0.25.6'
+  VERSION = '0.25.7'
 end

data/spec/models/request_spec.rb

@@ -37,6 +37,26 @@ describe Yt::Request do
         end
       end
 
+      context 'an error code 403 with a "quota exceeded message"' do
+        let(:response_class) { Net::HTTPForbidden }
+        let(:retry_response) { retry_response_class.new nil, nil, nil }
+        let(:response_body) { "{\n \"error\": {\n  \"errors\": [\n   {\n    \"domain\": \"youtube.quota\",\n    \"reason\": \"quotaExceeded\",\n    \"message\": \"The request cannot be completed because you have exceeded your \\u003ca href=\\\"/youtube/v3/getting-started#quota\\\"\\u003equota\\u003c/a\\u003e.\"\n   }\n  ],\n  \"code\": 403,\n  \"message\": \"The request cannot be completed because you have exceeded your \\u003ca href=\\\"/youtube/v3/getting-started#quota\\\"\\u003equota\\u003c/a\\u003e.\"\n }\n}\n" }
+        before { allow(retry_response).to receive(:body) }
+        before { expect(Net::HTTP).to receive(:start).at_least(:once).and_return retry_response }
+
+        context 'every time' do
+          let(:retry_response_class) { Net::HTTPForbidden }
+
+          it { expect{request.run}.to fail }
+        end
+
+        context 'but returns a success code 2XX the second time' do
+          let(:retry_response_class) { Net::HTTPOK }
+
+          it { expect{request.run}.not_to fail }
+        end
+      end
+
       context 'an error code 401' do
         let(:response_class) { Net::HTTPUnauthorized }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yt
 version: !ruby/object:Gem::Version
-  version: 0.25.6
+  version: 0.25.7
 platform: ruby
 authors:
 - Claudio Baccigalupo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport