yt 0.32.5 → 0.33.3

data/lib/yt/models/playlist_item.rb

@@ -101,6 +101,13 @@ module Yt
         {kind: 'youtube#video', videoId: video_id}
       end
 
+      def delete_params
+        super.tap do |params|
+          params[:params] ||= {}
+          params[:params].merge! @auth.playlist_items_params
+        end
+      end
+
       # @see https://developers.google.com/youtube/v3/docs/playlistItems/update
       def update_parts
         keys = [:position, :playlist_id, :resource_id]
@@ -109,4 +116,4 @@ module Yt
       end
     end
   end
-end
+end

data/lib/yt/models/resource.rb

@@ -12,7 +12,13 @@ module Yt
 
       # @!attribute [r] id
       #   @return [String] the ID that YouTube uses to identify each resource.
-      attr_reader :id
+      def id
+        if @id.nil? && @match && @match[:kind] == :channel
+          @id ||= fetch_channel_id
+        else
+          @id
+        end
+      end
 
     ### STATUS ###
 
@@ -42,7 +48,13 @@ module Yt
 
       # @private
       def initialize(options = {})
-        @id = options[:id]
+        if options[:url]
+          @url = options[:url]
+          @match = find_pattern_match
+          @id = @match['id']
+        else
+          @id = options[:id]
+        end
         @auth = options[:auth]
         @snippet = Snippet.new(data: options[:snippet]) if options[:snippet]
         @status = Status.new(data: options[:status]) if options[:status]
@@ -50,7 +62,11 @@ module Yt
 
       # @private
       def kind
-        self.class.to_s.demodulize.underscore
+        if @url
+          @match[:kind].to_s
+        else
+          self.class.to_s.demodulize.underscore
+        end
       end
 
       # @private
@@ -66,8 +82,63 @@ module Yt
         end
       end
 
+      # @return [Array<Regexp>] patterns matching URLs of YouTube playlists.
+      PLAYLIST_PATTERNS = [
+         %r{^(?:https?://)?(?:www\.)?youtube\.com/playlist/?\?list=(?<id>[a-zA-Z0-9_-]+)},
+      ]
+
+      # @return [Array<Regexp>] patterns matching URLs of YouTube videos.
+      VIDEO_PATTERNS = [
+        %r{^(?:https?://)?(?:www\.)?youtube\.com/watch\?v=(?<id>[a-zA-Z0-9_-]{11})},
+        %r{^(?:https?://)?(?:www\.)?youtu\.be/(?<id>[a-zA-Z0-9_-]{11})},
+        %r{^(?:https?://)?(?:www\.)?youtube\.com/embed/(?<id>[a-zA-Z0-9_-]{11})},
+        %r{^(?:https?://)?(?:www\.)?youtube\.com/v/(?<id>[a-zA-Z0-9_-]{11})},
+      ]
+
+      # @return [Array<Regexp>] patterns matching URLs of YouTube channels.
+      CHANNEL_PATTERNS = [
+        %r{^(?:https?://)?(?:www\.)?youtube\.com/channel/(?<id>UC[a-zA-Z0-9_-]{22})},
+        %r{^(?:https?://)?(?:www\.)?youtube\.com/(?<format>c/|user/)?(?<name>[a-zA-Z0-9_-]+)}
+      ]
+
     private
 
+      def find_pattern_match
+        patterns.find do |kind, regex|
+          if data = @url.match(regex)
+            # Note: With Ruby 2.4, the following is data.named_captures
+            break data.names.zip(data.captures).to_h.merge kind: kind
+          end
+        end || {kind: :unknown}
+      end
+
+      def patterns
+        # @note: :channel *must* be the last since one of its regex eats the
+        # remaining patterns. In short, don't change the following order.
+        Enumerator.new do |patterns|
+          VIDEO_PATTERNS.each {|regex| patterns << [:video, regex]}
+          PLAYLIST_PATTERNS.each {|regex| patterns << [:playlist, regex]}
+          CHANNEL_PATTERNS.each {|regex| patterns << [:channel, regex]}
+        end
+      end
+
+      def fetch_channel_id
+        response = Net::HTTP.start 'www.youtube.com', 443, use_ssl: true do |http|
+          http.request Net::HTTP::Get.new("/#{@match['format']}#{@match['name']}")
+        end
+        if response.is_a?(Net::HTTPRedirection)
+          response = Net::HTTP.start 'www.youtube.com', 443, use_ssl: true do |http|
+            http.request Net::HTTP::Get.new(response['location'])
+          end
+        end
+        regex = %r{<meta itemprop="channelId" content="(?<id>UC[a-zA-Z0-9_-]{22})">}
+        if data = response.body.match(regex)
+          data[:id]
+        else
+          raise Yt::Errors::NoItems
+        end
+      end
+
       # Since YouTube API only returns tags on Videos#list, the memoized
       # `@snippet` is erased if the video was instantiated through Video#search
       # (e.g., by calling account.videos or channel.videos), so that the full

data/lib/yt/models/statistics_set.rb

@@ -6,6 +6,7 @@ module Yt
     # Encapsulates statistics about the resource, such as the number of times
     # the resource has been viewed or liked.
     # @see https://developers.google.com/youtube/v3/docs/videos#resource
+    # @see https://developers.google.com/youtube/v3/docs/channels#resource-representation
     class StatisticsSet < Base
       attr_reader :data
 
@@ -23,4 +24,4 @@ module Yt
       has_attribute :hidden_subscriber_count
     end
   end
-end
+end

data/lib/yt/models/url.rb

@@ -14,18 +14,17 @@ module Yt
       # @param [String] text the name or URL of a YouTube resource (in any form).
       def initialize(text)
         @text = text.to_s.strip
-        @match = find_pattern_match
       end
 
       # @return [Symbol] the kind of YouTube resource matching the URL.
       # Possible values are: +:playlist+, +:video+, +:channel+, and +:unknown:.
       def kind
-        @match[:kind]
+        Resource.new(url: @text).kind.to_sym
       end
 
       # @return [<String, nil>] the ID of the YouTube resource matching the URL.
       def id
-        @match['id'] ||= fetch_id
+        Resource.new(url: @text).id
       end
 
       # @return [<Yt::Channel>] the resource associated with the URL
@@ -37,63 +36,6 @@ module Yt
           else raise Yt::Errors::NoItems
         end.new options.merge(id: id)
       end
-
-      # @return [Array<Regexp>] patterns matching URLs of YouTube playlists.
-      PLAYLIST_PATTERNS = [
-         %r{^(?:https?://)?(?:www\.)?youtube\.com/playlist/?\?list=(?<id>[a-zA-Z0-9_-]+)},
-      ]
-
-      # @return [Array<Regexp>] patterns matching URLs of YouTube videos.
-      VIDEO_PATTERNS = [
-        %r{^(?:https?://)?(?:www\.)?youtube\.com/watch\?v=(?<id>[a-zA-Z0-9_-]{11})},
-        %r{^(?:https?://)?(?:www\.)?youtu\.be/(?<id>[a-zA-Z0-9_-]{11})},
-        %r{^(?:https?://)?(?:www\.)?youtube\.com/embed/(?<id>[a-zA-Z0-9_-]{11})},
-        %r{^(?:https?://)?(?:www\.)?youtube\.com/v/(?<id>[a-zA-Z0-9_-]{11})},
-      ]
-
-      # @return [Array<Regexp>] patterns matching URLs of YouTube channels.
-      CHANNEL_PATTERNS = [
-        %r{^(?:https?://)?(?:www\.)?youtube\.com/channel/(?<id>UC[a-zA-Z0-9_-]{22})},
-        %r{^(?:https?://)?(?:www\.)?youtube\.com/(?<format>c/|user/)?(?<name>[a-zA-Z0-9_-]+)}
-      ]
-
-    private
-
-      def find_pattern_match
-        patterns.find(-> {{kind: :unknown}}) do |kind, regex|
-          if data = @text.match(regex)
-            # Note: With Ruby 2.4, the following is data.named_captures
-            break data.names.zip(data.captures).to_h.merge kind: kind
-          end
-        end
-      end
-
-      def patterns
-        # @note: :channel *must* be the last since one of its regex eats the
-        # remaining patterns. In short, don't change the following order.
-        Enumerator.new do |patterns|
-          VIDEO_PATTERNS.each {|regex| patterns << [:video, regex]}
-          PLAYLIST_PATTERNS.each {|regex| patterns << [:playlist, regex]}
-          CHANNEL_PATTERNS.each {|regex| patterns << [:channel, regex]}
-        end
-      end
-
-      def fetch_id
-        response = Net::HTTP.start 'www.youtube.com', 443, use_ssl: true do |http|
-          http.request Net::HTTP::Get.new("/#{@match['format']}#{@match['name']}")
-        end
-        if response.is_a?(Net::HTTPRedirection)
-          response = Net::HTTP.start 'www.youtube.com', 443, use_ssl: true do |http|
-            http.request Net::HTTP::Get.new(response['location'])
-          end
-        end
-        regex = %r{<meta itemprop="channelId" content="(?<id>UC[a-zA-Z0-9_-]{22})">}
-        if data = response.body.match(regex)
-          data[:id]
-        else
-          raise Yt::Errors::NoItems
-        end
-      end
     end
   end
 end

data/lib/yt/models/video.rb

@@ -621,7 +621,8 @@ module Yt
       # @private
       # Tells `has_reports` to retrieve the reports from YouTube Analytics API
       # either as a Channel or as a Content Owner.
-      # @see https://developers.google.com/youtube/analytics/v1/reports
+      # @see https://developers.google.com/youtube/analytics/channel_reports
+      # @see https://developers.google.com/youtube/analytics/content_owner_reports
       def reports_params
         {}.tap do |params|
           if auth.owner_name
@@ -642,8 +643,11 @@ module Yt
       # @private
       # Tells `has_many :resumable_sessions` what params are set for the object
       # associated to the uploaded file.
+      # https://developers.google.com/youtube/v3/docs/thumbnails/set
       def upload_params
-        {video_id: id}
+        params = {video_id: id}
+        params.merge! auth.upload_thumbnail_params
+        params
       end
 
       # @private
@@ -667,6 +671,15 @@ module Yt
         {snippet: snippet, status: {keys: status_keys}}
       end
 
+      # For updating video with content owner auth.
+      # @see https://developers.google.com/youtube/v3/docs/videos/update
+      def update_params
+        params = super
+        params[:params] ||= {}
+        params[:params].merge! auth.update_video_params
+        params
+      end
+
       # NOTE: Another irrational behavior of YouTube API. If you are setting a
       # video to public/unlisted then you should *not* pass publishAt at any
       # cost, otherwise the API will fail (since setting publishAt means you

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?(1) ||
       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.5'
+  VERSION = '0.33.3'
 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.5
+  version: 0.33.3
 platform: ruby
 authors:
 - Claudio Baccigalupo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-07 00:00:00.000000000 Z
+date: 2020-11-17 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,95 +274,12 @@ 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:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -349,93 +294,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.1.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: []