yt 0.32.6 → 0.33.0

data/lib/yt/request.rb

@@ -196,7 +196,7 @@ module Yt
     # - 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? ||
+      refresh_token_and_retry? && sleep_and_retry?(3) ||
       server_error? && sleep_and_retry?(3) ||
       exceeded_quota? && sleep_and_retry?(3)
     end
@@ -234,10 +234,14 @@ module Yt
       @retries_so_far += 1
       if (@retries_so_far < max_retries)
         @response = @http_request = @uri = nil
-        sleep 3 + (10 * @retries_so_far)
+        sleep retry_time
       end
     end
 
+    def retry_time
+      3 + (10 * @retries_so_far)
+    end
+
     # In case an authorized request responds with "Unauthorized", checks
     # if the original access token can be refreshed. If that's the case,
     # clears the memoized variables and returns true, so the request can

data/lib/yt/version.rb

@@ -1,3 +1,3 @@
 module Yt
-  VERSION = '0.32.6'
+  VERSION = '0.33.0'
 end

data/yt.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'yt/version'
@@ -16,7 +15,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
@@ -30,4 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'yard' #, '~> 0.8.0'
   spec.add_development_dependency 'coveralls' #, '~> 0.7.0'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'vcr'
+  spec.add_development_dependency 'webmock'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yt
 version: !ruby/object:Gem::Version
-  version: 0.32.6
+  version: 0.33.0
 platform: ruby
 authors:
 - Claudio Baccigalupo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-07 00:00:00.000000000 Z
+date: 2020-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,6 +108,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Youtube V3 API client.
 email:
 - claudio@fullscreen.net
@@ -246,89 +274,6 @@ files:
 - lib/yt/models/video_group.rb
 - lib/yt/request.rb
 - lib/yt/version.rb
-- spec/collections/claims_spec.rb
-- spec/collections/comment_threads_spec.rb
-- spec/collections/playlist_items_spec.rb
-- spec/collections/playlists_spec.rb
-- spec/collections/policies_spec.rb
-- spec/collections/references_spec.rb
-- spec/collections/reports_spec.rb
-- spec/collections/subscriptions_spec.rb
-- spec/collections/videos_spec.rb
-- spec/constants/geography_spec.rb
-- spec/errors/forbidden_spec.rb
-- spec/errors/missing_auth_spec.rb
-- spec/errors/no_items_spec.rb
-- spec/errors/request_error_spec.rb
-- spec/errors/server_error_spec.rb
-- spec/errors/unauthorized_spec.rb
-- spec/models/account_spec.rb
-- spec/models/annotation_spec.rb
-- spec/models/asset_spec.rb
-- spec/models/channel_spec.rb
-- spec/models/claim_event_spec.rb
-- spec/models/claim_history_spec.rb
-- spec/models/claim_spec.rb
-- spec/models/comment_spec.rb
-- spec/models/comment_thread_spec.rb
-- spec/models/configuration_spec.rb
-- spec/models/content_detail_spec.rb
-- spec/models/content_owner_detail_spec.rb
-- spec/models/file_detail_spec.rb
-- spec/models/live_streaming_detail_spec.rb
-- spec/models/ownership_spec.rb
-- spec/models/player_spec.rb
-- spec/models/playlist_item_spec.rb
-- spec/models/playlist_spec.rb
-- spec/models/policy_rule_spec.rb
-- spec/models/policy_spec.rb
-- spec/models/rating_spec.rb
-- spec/models/reference_spec.rb
-- spec/models/request_spec.rb
-- spec/models/resource_spec.rb
-- spec/models/right_owner_spec.rb
-- spec/models/snippet_spec.rb
-- spec/models/statistics_set_spec.rb
-- spec/models/status_spec.rb
-- spec/models/subscription_spec.rb
-- spec/models/url_spec.rb
-- spec/models/video_category_spec.rb
-- spec/models/video_spec.rb
-- spec/requests/as_account/account_spec.rb
-- spec/requests/as_account/authentications_spec.rb
-- spec/requests/as_account/channel_spec.rb
-- spec/requests/as_account/channels_spec.rb
-- spec/requests/as_account/playlist_item_spec.rb
-- spec/requests/as_account/playlist_spec.rb
-- spec/requests/as_account/thumbnail.jpg
-- spec/requests/as_account/video.mp4
-- spec/requests/as_account/video_spec.rb
-- spec/requests/as_content_owner/account_spec.rb
-- spec/requests/as_content_owner/advertising_options_set_spec.rb
-- spec/requests/as_content_owner/asset_spec.rb
-- spec/requests/as_content_owner/bulk_report_job_spec.rb
-- spec/requests/as_content_owner/channel_spec.rb
-- spec/requests/as_content_owner/claim_history_spec.rb
-- spec/requests/as_content_owner/claim_spec.rb
-- spec/requests/as_content_owner/content_owner_spec.rb
-- spec/requests/as_content_owner/match_policy_spec.rb
-- spec/requests/as_content_owner/ownership_spec.rb
-- spec/requests/as_content_owner/playlist_spec.rb
-- spec/requests/as_content_owner/video_group_spec.rb
-- spec/requests/as_content_owner/video_spec.rb
-- spec/requests/as_server_app/channel_spec.rb
-- spec/requests/as_server_app/comment_spec.rb
-- spec/requests/as_server_app/comment_thread_spec.rb
-- spec/requests/as_server_app/comment_threads_spec.rb
-- spec/requests/as_server_app/playlist_item_spec.rb
-- spec/requests/as_server_app/playlist_spec.rb
-- spec/requests/as_server_app/url_spec.rb
-- spec/requests/as_server_app/video_spec.rb
-- spec/requests/as_server_app/videos_spec.rb
-- spec/requests/unauthenticated/video_spec.rb
-- spec/spec_helper.rb
-- spec/support/fail_matcher.rb
-- spec/support/global_hooks.rb
 - yt.gemspec
 homepage: http://github.com/Fullscreen/yt
 licenses:
@@ -354,87 +299,4 @@ signing_key:
 specification_version: 4
 summary: Yt makes it easy to interact with Youtube V3 API by providing a modular,
   intuitive and tested Ruby-style API.
-test_files:
-- spec/collections/claims_spec.rb
-- spec/collections/comment_threads_spec.rb
-- spec/collections/playlist_items_spec.rb
-- spec/collections/playlists_spec.rb
-- spec/collections/policies_spec.rb
-- spec/collections/references_spec.rb
-- spec/collections/reports_spec.rb
-- spec/collections/subscriptions_spec.rb
-- spec/collections/videos_spec.rb
-- spec/constants/geography_spec.rb
-- spec/errors/forbidden_spec.rb
-- spec/errors/missing_auth_spec.rb
-- spec/errors/no_items_spec.rb
-- spec/errors/request_error_spec.rb
-- spec/errors/server_error_spec.rb
-- spec/errors/unauthorized_spec.rb
-- spec/models/account_spec.rb
-- spec/models/annotation_spec.rb
-- spec/models/asset_spec.rb
-- spec/models/channel_spec.rb
-- spec/models/claim_event_spec.rb
-- spec/models/claim_history_spec.rb
-- spec/models/claim_spec.rb
-- spec/models/comment_spec.rb
-- spec/models/comment_thread_spec.rb
-- spec/models/configuration_spec.rb
-- spec/models/content_detail_spec.rb
-- spec/models/content_owner_detail_spec.rb
-- spec/models/file_detail_spec.rb
-- spec/models/live_streaming_detail_spec.rb
-- spec/models/ownership_spec.rb
-- spec/models/player_spec.rb
-- spec/models/playlist_item_spec.rb
-- spec/models/playlist_spec.rb
-- spec/models/policy_rule_spec.rb
-- spec/models/policy_spec.rb
-- spec/models/rating_spec.rb
-- spec/models/reference_spec.rb
-- spec/models/request_spec.rb
-- spec/models/resource_spec.rb
-- spec/models/right_owner_spec.rb
-- spec/models/snippet_spec.rb
-- spec/models/statistics_set_spec.rb
-- spec/models/status_spec.rb
-- spec/models/subscription_spec.rb
-- spec/models/url_spec.rb
-- spec/models/video_category_spec.rb
-- spec/models/video_spec.rb
-- spec/requests/as_account/account_spec.rb
-- spec/requests/as_account/authentications_spec.rb
-- spec/requests/as_account/channel_spec.rb
-- spec/requests/as_account/channels_spec.rb
-- spec/requests/as_account/playlist_item_spec.rb
-- spec/requests/as_account/playlist_spec.rb
-- spec/requests/as_account/thumbnail.jpg
-- spec/requests/as_account/video.mp4
-- spec/requests/as_account/video_spec.rb
-- spec/requests/as_content_owner/account_spec.rb
-- spec/requests/as_content_owner/advertising_options_set_spec.rb
-- spec/requests/as_content_owner/asset_spec.rb
-- spec/requests/as_content_owner/bulk_report_job_spec.rb
-- spec/requests/as_content_owner/channel_spec.rb
-- spec/requests/as_content_owner/claim_history_spec.rb
-- spec/requests/as_content_owner/claim_spec.rb
-- spec/requests/as_content_owner/content_owner_spec.rb
-- spec/requests/as_content_owner/match_policy_spec.rb
-- spec/requests/as_content_owner/ownership_spec.rb
-- spec/requests/as_content_owner/playlist_spec.rb
-- spec/requests/as_content_owner/video_group_spec.rb
-- spec/requests/as_content_owner/video_spec.rb
-- spec/requests/as_server_app/channel_spec.rb
-- spec/requests/as_server_app/comment_spec.rb
-- spec/requests/as_server_app/comment_thread_spec.rb
-- spec/requests/as_server_app/comment_threads_spec.rb
-- spec/requests/as_server_app/playlist_item_spec.rb
-- spec/requests/as_server_app/playlist_spec.rb
-- spec/requests/as_server_app/url_spec.rb
-- spec/requests/as_server_app/video_spec.rb
-- spec/requests/as_server_app/videos_spec.rb
-- spec/requests/unauthenticated/video_spec.rb
-- spec/spec_helper.rb
-- spec/support/fail_matcher.rb
-- spec/support/global_hooks.rb
+test_files: []

data/spec/collections/claims_spec.rb

@@ -1,62 +0,0 @@
-require 'spec_helper'
-require 'yt/collections/claims'
-require 'yt/models/content_owner'
-
-describe Yt::Collections::Claims do
-  let(:content_owner) { Yt::ContentOwner.new owner_name: 'any-name' }
-  let(:collection) { Yt::Collections::Claims.new parent: content_owner, auth: content_owner }
-  let(:page) { {items: [], token: 'any-token'} }
-  let(:query) { {q: 'search string'} }
-
-  describe "#insert" do
-    let(:attributes) {
-      {
-        asset_id: 'some_asset_id',
-        video_id: 'some_video_id',
-        content_type: 'audiovisual',
-        policy: { id: 'some_policy_id' },
-        match_info: { match_segments: [ { manual_segment: { start: "00:01:00.000", finish: "00:02:00.000" } } ] },
-        is_manual_claim: true
-      }
-    }
-
-    before do
-      allow(collection).to receive(:do_insert)
-      collection.insert(attributes.deep_dup)
-    end
-
-    it 'calls do_insert with appropriate body' do
-      body = {
-        asset_id: 'some_asset_id',
-        video_id: 'some_video_id',
-        content_type: 'audiovisual',
-        policy: { id: 'some_policy_id' },
-        match_info: { matchSegments: [ { manual_segment: { start: "00:01:00.000", finish: "00:02:00.000" } } ] }
-      }
-      expect(collection).to have_received(:do_insert).with(
-        params: { is_manual_claim: true, on_behalf_of_content_owner: content_owner.owner_name },
-        body: body
-      )
-    end
-  end
-
-  describe '#count' do
-    context 'called once with .where(query) and once without' do
-      after do
-        collection.where(query).count
-        collection.count
-      end
-
-      it 'only applies the query on the first call' do
-        expect(collection).to receive(:fetch_page) do |options|
-          expect(options[:params]).to include query
-          page
-        end
-        expect(collection).to receive(:fetch_page) do |options|
-          expect(options[:params]).not_to include query
-          page
-        end
-      end
-    end
-  end
-end

data/spec/collections/comment_threads_spec.rb

@@ -1,46 +0,0 @@
-require 'spec_helper'
-require 'yt/collections/comment_threads'
-require 'yt/models/video'
-require 'yt/models/channel'
-
-describe Yt::Collections::CommentThreads do
-  subject(:collection) { Yt::Collections::CommentThreads.new parent: parent}
-
-  describe '#size', :ruby2 do
-    describe 'sends only one request and return the total results' do
-      let(:total_results) { 1234 }
-      let(:parent) { Yt::Video.new id: 'any-id' }
-
-      before do
-        expect_any_instance_of(Yt::Request).to receive(:run).once do
-          double(body: {'pageInfo'=>{'totalResults'=>total_results}})
-        end
-      end
-      it { expect(collection.size).to be total_results }
-    end
-  end
-
-  describe '#count' do
-    let(:query) { {q: 'search string'} }
-    let(:parent) { Yt::Video.new id: 'any-id' }
-    let(:page) { {items: [], token: 'any-token'} }
-
-    context 'called once with .where(query) and once without' do
-      after do
-        collection.where(query).count
-        collection.count
-      end
-
-      it 'only applies the query on the first call' do
-        expect(collection).to receive(:fetch_page) do |options|
-          expect(options[:params]).to include query
-          page
-        end
-        expect(collection).to receive(:fetch_page) do |options|
-          expect(options[:params]).not_to include query
-          page
-        end
-      end
-    end
-  end
-end

data/spec/collections/playlist_items_spec.rb

@@ -1,44 +0,0 @@
-require 'spec_helper'
-require 'yt/models/playlist'
-require 'yt/models/playlist_item'
-require 'yt/collections/playlist_items'
-
-describe Yt::Collections::PlaylistItems do
-  subject(:collection) { Yt::Collections::PlaylistItems.new parent: playlist }
-  let(:playlist) { Yt::Playlist.new id: 'LLxO1tY8h1AhOz0T4ENwmpow' }
-  let(:attrs) { {id: '9bZkp7q19f0', kind: :video} }
-  let(:msg) { {response_body: {error: {errors: [{reason: reason}]}}}.to_json }
-  before { expect(collection).to behave }
-
-  describe '#insert' do
-    let(:playlist_item) { Yt::PlaylistItem.new }
-
-    context 'given an existing video' do
-      let(:behave) { receive(:do_insert).and_return playlist_item }
-
-      it { expect(collection.insert attrs).to eq playlist_item }
-    end
-
-    context 'given an unknown video' do
-      let(:reason) { 'videoNotFound' }
-      let(:behave) { receive(:do_insert).and_raise Yt::Error, msg }
-
-      it { expect{collection.insert attrs}.to fail.with 'videoNotFound' }
-      it { expect{collection.insert attrs, ignore_errors: true}.not_to fail }
-    end
-
-    context 'given a forbidden video' do
-      let(:reason) { 'forbidden' }
-      let(:behave) { receive(:do_insert).and_raise Yt::Error, msg }
-
-      it { expect{collection.insert attrs}.to fail.with 'forbidden' }
-      it { expect{collection.insert attrs, ignore_errors: true}.not_to fail }
-    end
-  end
-
-  describe '#delete_all' do
-    let(:behave) { receive(:do_delete_all).and_return [true] }
-
-    it { expect(collection.delete_all).to eq [true] }
-  end
-end

data/spec/collections/playlists_spec.rb

@@ -1,27 +0,0 @@
-require 'spec_helper'
-require 'yt/collections/playlists'
-
-describe Yt::Collections::Playlists do
-  subject(:collection) { Yt::Collections::Playlists.new }
-  before { expect(collection).to behave }
-
-  describe '#insert' do
-    let(:playlist) { Yt::Playlist.new }
-    # TODO: separate stubs to show options translate into do_insert params
-    let(:behave) { receive(:do_insert).and_return playlist }
-
-    it { expect(collection.insert).to eq playlist }
-  end
-
-  describe '#delete_all' do
-    let(:behave) { receive(:do_delete_all).and_return [true] }
-
-    it { expect(collection.delete_all).to eq [true] }
-  end
-
-  describe '#delete_all' do
-    let(:behave) { receive(:do_delete_all).and_return [true] }
-
-    it { expect(collection.delete_all).to eq [true] }
-  end
-end