yt 0.5.11 → 0.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72f7e8f2bdbc10f6d4ee9e400032c623f9dcaf9c
-  data.tar.gz: 3f2eaf3a29cf656f4bf127ad92d4661603effa93
+  metadata.gz: a7a1e9d6fa998dd66d1929e0a2c39fbc0d18af93
+  data.tar.gz: 1be8fb1e1e1b38d3d2b5f8bfc074511f2dd44b4f
 SHA512:
-  metadata.gz: 66571f1ace7215bc148992f19758a974f1ff46cb832c7c2312e76ed4d2bafa41241fd355e09803b0e520fc8c38e7b4d91d3baab53ba81b421d5130751d0b8aba
-  data.tar.gz: 0d5d8ba68f7350f7d9d744d3202e616cb3bc64e322185c729b24de96bce99a6a44c9cc00b7fb843c00da41b400ccb7d505b8aa0511342bebbc63dcca73e44549
+  metadata.gz: cd51e6439cd718fd612ac6433d003da818155f79b4d824c146161a7398f5c52ffa7c2c47807e66b29d08251c758fc10663ed742086b4793c5471f852e70bf109
+  data.tar.gz: c0ebf331e22a6b59fa2f56293a01e0a85e1c729636916e0eeccf1856c9cf4715ba91f0c8a98d2325a5f103bed7331adbbc671c970f88d2cccb904b175f73b0eb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yt (0.5.11)
+    yt (0.5.12)
       activesupport
 
 GEM

data/HISTORY.md

@@ -18,6 +18,7 @@ v0.5 - 2014/05/16
 * Update RSpec to 3.0 (only required in development/testing)
 * New ContentOwner subclass of Account with access to partnered channels
 * Automatically refresh the access token when it expires or becomes invalid
+* Retry once YouTube earning queries that return error 503
 
 v0.4 - 2014/05/09
 --------------------

data/README.md

@@ -365,7 +365,7 @@ To install on your system, run
 
 To use inside a bundled Ruby project, add this line to the Gemfile:
 
-    gem 'yt', '~> 0.5.11'
+    gem 'yt', '~> 0.5.12'
 
 Since the gem follows [Semantic Versioning](http://semver.org),
 indicating the full version in your Gemfile (~> *major*.*minor*.*patch*)

data/lib/yt/collections/earnings.rb

@@ -12,6 +12,7 @@ module Yt
       # case running the same query after one second fixes the issue. This is
       # not documented by YouTube and hardly testable, but trying again the
       # same query is a workaround that works and can hardly cause any damage.
+      # Similarly, once in while YouTube responds with a random 503 error.
       rescue Yt::Error => e
         try_again && rescue?(e) ? sleep(3) && within(days_range, false) : raise
       end
@@ -42,8 +43,16 @@ module Yt
       end
 
       def rescue?(error)
+        bad_request?(error) || backend_error?(error)
+      end
+
+      def bad_request?(error)
         'badRequest'.in?(error.reasons) && error.message =~ /did not conform/
       end
+
+      def backend_error?(error)
+        'backendError'.in?(error.reasons)
+      end
     end
   end
 end

data/lib/yt/version.rb

@@ -1,3 +1,3 @@
 module Yt
-  VERSION = '0.5.11'
+  VERSION = '0.5.12'
 end

data/spec/collections/earnings_spec.rb

@@ -5,10 +5,9 @@ describe Yt::Collections::Earnings do
   subject(:collection) { Yt::Collections::Earnings.new parent: channel }
   let(:channel) { Yt::Channel.new id: 'UCxO1tY8h1AhOz0T4ENwmpow' }
   let(:msg) { {response_body: {error: {errors: [error]}}}.to_json }
-  let(:error) { {reason: 'badRequest', message: message} }
-  let(:message) { 'Invalid query. Query did not conform to the expectations.' }
   let(:date) { 1.day.ago.to_date }
   let(:dollars) { 10 }
+  let(:message) { 'Invalid query. Query did not conform to the expectations.' }
   before { expect(collection).to behave }
 
   describe '#within' do
@@ -19,21 +18,41 @@ describe Yt::Collections::Earnings do
     end
 
     # NOTE: This test is just a reflection of YouTube irrational behavior
-    # of raising a 400 error once in a while when retrieving earnings.
+    # of raising 400 or 504 error once in a while when retrieving earnings.
     # Hopefully this will get fixed and this code (and test) removed.
-    context 'given YouTube responds with "Invalid query" the first time' do
+    context 'given YouTube responds to the first request with' do
       let(:behave) { receive(:flat_map) do
         expect(collection).to receive(:flat_map).and_return [date, dollars]
         raise Yt::Error, msg
       end}
 
-      it { expect(collection.within(date..date)[date]).to eq dollars }
+      context 'an Invalid Query error' do
+        let(:error) { {reason: 'badRequest', message: message} }
+
+        it { expect(collection.within(date..date)[date]).to eq dollars }
+      end
+
+      context 'a Backend error' do
+        let(:error) { {reason: 'backendError', message: 'Backend Error'} }
+
+        it { expect(collection.within(date..date)[date]).to eq dollars }
+      end
     end
 
-    context 'given YouTube responds with "Invalid query" the second time' do
+    context 'given YouTube responds to the second request with' do
       let(:behave) { receive(:flat_map).twice.and_raise Yt::Error, msg }
 
-      it { expect{collection.within date..date}.to raise_error Yt::Error }
+      context 'an Invalid Query error' do
+        let(:error) { {reason: 'badRequest', message: message} }
+
+        it { expect{collection.within date..date}.to raise_error Yt::Error }
+      end
+
+      context 'a Backend error' do
+        let(:error) { {reason: 'backendError', message: 'Backend Error'} }
+
+        it { expect{collection.within date..date}.to raise_error Yt::Error }
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yt
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.5.12
 platform: ruby
 authors:
 - Claudio Baccigalupo