yt 0.11.6 → 0.12.0

data/lib/yt/models/statistics_set.rb

@@ -11,44 +11,30 @@ module Yt
       end
 
       # @return [Integer] the number of times the resource has been viewed.
-      def view_count
-        @view_count ||= @data['viewCount'].to_i
-      end
+      has_attribute :view_count, type: Integer
 
       # @return [Integer] the number of comments for the resource.
-      def comment_count
-        @comment_count ||= @data['commentCount'].to_i
-      end
+      has_attribute :comment_count, type: Integer
 
       # @return [Integer] the number of users who liked the resource.
-      def like_count
-        @like_count ||= @data['likeCount'].to_i
-      end
+      has_attribute :like_count, type: Integer
 
       # @return [Integer] the number of users who disliked the resource.
-      def dislike_count
-        @dislike_count ||= @data['dislikeCount'].to_i
-      end
+      has_attribute :dislike_count, type: Integer
 
       # @return [Integer] the number of users who currently have the resource
       #   marked as a favorite resource.
-      def favorite_count
-        @favorite_count ||= @data['favoriteCount'].to_i
-      end
+      has_attribute :favorite_count, type: Integer
 
       # @return [Integer] the number of videos updated to the resource.
-      def video_count
-        @video_count ||= @data['videoCount'].to_i
-      end
+      has_attribute :video_count, type: Integer
 
       # @return [Integer] the number of subscriber the resource has.
-      def subscriber_count
-        @subscriber_count ||= @data['subscriberCount'].to_i
-      end
+      has_attribute :subscriber_count, type: Integer
 
       # @return [Boolean] whether the number of subscribers is publicly visible.
-      def subscriber_count_visible?
-        @subscriber_count_visible ||= @data['hiddenSubscriberCount'] == false
+      has_attribute :subscriber_count_visible?, from: :hidden_subscriber_count do |hidden|
+        hidden == false
       end
     end
   end

data/lib/yt/models/status.rb

@@ -11,7 +11,7 @@ module Yt
     # @see https://developers.google.com/youtube/v3/docs/videos#resource
     # @see https://developers.google.com/youtube/v3/docs/playlists#resource
     # @see https://developers.google.com/youtube/v3/docs/playlistItems#resource
-    class Status
+    class Status < Base
       def initialize(options = {})
         @data = options[:data]
       end
@@ -22,9 +22,7 @@ module Yt
 
       # @return [String] the privacy status of the resource. Valid values are:
       #   private, public, unlisted.
-      def privacy_status
-        @privacy_status ||= @data['privacyStatus']
-      end
+      has_attribute :privacy_status
 
       # @return [Boolean] whether the resource is public.
       def public?
@@ -48,9 +46,7 @@ module Yt
       #   uploaded video. Valid values are: deleted, failed, processed,
       #   rejected, uploaded.
       # @return [nil] if the resource is not a video.
-      def upload_status
-        @upload_status ||= @data['uploadStatus']
-      end
+      has_attribute :upload_status
 
       # Returns whether an uploaded video was deleted.
       # @return [Boolean] if the resource is a video, whether the uploaded
@@ -101,9 +97,7 @@ module Yt
       #   the reason why the video failed to upload. Valid values are: codec,
       #   conversion, emptyFile, invalidFile, tooSmall, uploadAborted.
       # @return [nil] if the resource is not a video or upload has not failed.
-      def failure_reason
-        @failure_reason ||= @data['failureReason']
-      end
+      has_attribute :failure_reason
 
       # Returns whether a video upload failed because of the codec.
       # @return [Boolean] if the resource is a video, whether the video uses
@@ -163,9 +157,7 @@ module Yt
       #   claim, copyright, duplicate, inappropriate, length, termsOfUse,
       #   trademark, uploaderAccountClosed, uploaderAccountSuspended.
       # @return [nil] if the resource is not a rejected video.
-      def rejection_reason
-        @rejection_reason ||= @data['rejectionReason']
-      end
+      has_attribute :rejection_reason
 
       # Returns whether a video was rejected because it was claimed.
       # @return [Boolean] if the resource is a rejected video, whether the
@@ -249,16 +241,15 @@ module Yt
       # @return [nil] if the resource is not a private video scheduled to be
       #   published.
       def scheduled_at
-        @scheduled_at ||= Yt::Timestamp.parse @data['publishAt'] if scheduled?
+        publish_at if scheduled?
       end
-      alias publish_at scheduled_at
 
       # Returns whether the video is scheduled to be published.
       # @return [Boolean] if the resource is a video, whether it is currently
       #   private and is scheduled to become public in the future.
       # @return [nil] if the resource is not a video.
       def scheduled?
-        private? && @data['publishAt'] if video?
+        private? && publish_at if video?
       end
 
 # License (Video only)
@@ -267,9 +258,7 @@ module Yt
       # @return [String] if resource is a video, its license. Valid values are:
       #   creativeCommon, youtube.
       # @return [nil] if the resource is not a video.
-      def license
-        @license ||= @data['license']
-      end
+      has_attribute :license
 
       # Returns whether the video uses a Creative Commons license.
       # @return [Boolean] if the resource is a video, whether it uses a
@@ -295,10 +284,12 @@ module Yt
       # @return [Boolean] if the resource is a video, whether it can be
       #   embedded on another website.
       # @return [nil] if the resource is not a video.
-      def embeddable?
-        @embeddable ||= @data['embeddable']
+      has_attribute :embeddable?, from: :embeddable
+
+      # @deprecated Use {#embeddable?} instead.
+      def embeddable
+        embeddable?
       end
-      alias embeddable embeddable?
 
 # Public stats (Video only)
 
@@ -309,13 +300,17 @@ module Yt
       #   video’s viewcount and ratings will still be publicly visible even
       #   if this property’s value is set to false.
       # @return [nil] if the resource is not a video.
-      def has_public_stats_viewable?
-        @public_stats_viewable ||= @data['publicStatsViewable']
+      has_attribute :has_public_stats_viewable?, from: :public_stats_viewable
+
+      # @deprecated Use {#has_public_stats_viewable?} instead.
+      def public_stats_viewable
+        has_public_stats_viewable?
       end
-      alias public_stats_viewable has_public_stats_viewable?
 
     private
 
+      has_attribute :publish_at, type: Time
+
       def video?
         upload_status.present?
       end

data/lib/yt/models/subscription.rb

@@ -13,14 +13,8 @@ module Yt
         @auth = options[:auth]
       end
 
-      def delete(options = {})
-        begin
-          do_delete {@id = nil}
-        rescue Yt::Error => error
-          ignorable_errors = error.reasons & ['subscriptionNotFound']
-          raise error unless options[:ignore_errors] && ignorable_errors.any?
-          @id = nil
-        end
+      def delete(options = {}, &block)
+        do_delete {@id = nil}
         !exists?
       end
 

data/lib/yt/models/user_info.rb

@@ -10,61 +10,39 @@ module Yt
       end
 
       # @return [String] the user’s ID.
-      def id
-        @id ||= @data.fetch 'id', ''
-      end
+      has_attribute :id, default: ''
 
       # @return [String] the user’s email address.
-      def email
-        @email ||= @data.fetch 'email', ''
-      end
+      has_attribute :email, default: ''
 
       # @return [Boolean] whether the email address is verified.
-      def has_verified_email?
-        @verified_email ||= @data.fetch 'verified_email', false
-      end
+      has_attribute :has_verified_email?, from: :verified_email, default: false, camelize: false
 
       # @return [String] the user's full name.
-      def name
-        @name ||= @data.fetch 'name', ''
-      end
+      has_attribute :name, default: ''
 
       # @return [String] the user’s given (first) name.
-      def given_name
-        @given_name ||= @data.fetch 'given_name', ''
-      end
+      has_attribute :given_name, default: '', camelize: false
 
       # @return [String] the user’s family (last) name.
-      def family_name
-        @family_name ||= @data.fetch 'family_name', ''
-      end
+      has_attribute :family_name, default: '', camelize: false
 
       # @return [String] the URL of the user’s profile page.
-      def profile_url
-        @profile_url ||= @data.fetch 'link', ''
-      end
+      has_attribute :profile_url, from: :link, default: ''
 
       # @return [String] the URL of the user’s profile picture.
-      def avatar_url
-        @avatar_url ||= @data.fetch 'picture', ''
-      end
+      has_attribute :avatar_url, from: :picture, default: ''
 
       # @return [String] the person’s gender. Possible values include, but
       #   are not limited to, "male", "female", "other".
-      def gender
-        @gender ||= @data.fetch 'gender', ''
-      end
+      has_attribute :gender, default: ''
 
       # @return [String] the user’s preferred locale.
-      def locale
-        @locale ||= @data.fetch 'locale', ''
-      end
+      has_attribute :locale, default: ''
 
       # @return [String] the hosted domain name for the user’s Google Apps
       #   account. For instance, example.com.
-      def hd
-        @hd ||= @data.fetch 'hd', ''
-      end
+      has_attribute :hd, default: ''
     end
   end
 end

data/lib/yt/version.rb

@@ -1,3 +1,3 @@
 module Yt
-  VERSION = '0.11.6'
+  VERSION = '0.12.0'
 end

data/spec/collections/subscriptions_spec.rb

@@ -4,7 +4,6 @@ require 'yt/collections/subscriptions'
 describe Yt::Collections::Subscriptions do
   subject(:collection) { Yt::Collections::Subscriptions.new }
   let(:msg) { {response_body: {error: {errors: [{reason: reason}]}}}.to_json }
-  before { expect(collection).to receive :throttle }
   before { expect(collection).to behave }
 
   describe '#insert' do
@@ -23,10 +22,4 @@ describe Yt::Collections::Subscriptions do
       it { expect{collection.insert 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/errors/forbidden_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+require 'yt/errors/forbidden'
+
+describe Yt::Errors::Forbidden do
+  let(:msg) { %r{^A request to YouTube API was considered forbidden by the server} }
+
+  describe '#exception' do
+    it { expect{raise Yt::Errors::Forbidden}.to raise_error msg }
+  end
+end

data/spec/errors/server_error_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+require 'yt/errors/server_error'
+
+describe Yt::Errors::ServerError do
+  let(:msg) { %r{^A request to YouTube API caused an unexpected server error} }
+
+  describe '#exception' do
+    it { expect{raise Yt::Errors::ServerError}.to raise_error msg }
+  end
+end

data/spec/models/subscription_spec.rb

@@ -3,7 +3,6 @@ require 'yt/models/subscription'
 
 describe Yt::Subscription do
   subject(:subscription) { Yt::Subscription.new id: id }
-  let(:msg) { {response_body: {error: {errors: [{reason: reason}]}}}.to_json }
 
   describe '#exists?' do
     context 'given a subscription with an id' do
@@ -27,13 +26,5 @@ describe Yt::Subscription do
       it { expect(subscription.delete).to be true }
       it { expect{subscription.delete}.to change{subscription.exists?} }
     end
-
-    context 'given an unknown subscription' do
-      let(:reason) { 'subscriptionNotFound' }
-      let(:behave) { receive(:do_delete).and_raise Yt::Error, msg }
-
-      it { expect{subscription.delete}.to fail.with 'subscriptionNotFound' }
-      it { expect{subscription.delete ignore_errors: true}.not_to fail }
-    end
   end
 end

data/spec/requests/as_account/account_spec.rb

@@ -61,4 +61,12 @@ describe Yt::Account, :device_app do
       it { expect(video).to be_a Yt::Video }
     end
   end
+
+  describe '.subscribers' do
+    let(:subscriber) { $account.subscribers.first }
+
+    specify 'returns the channels who are subscribed to me' do
+      expect(subscriber).to be_a Yt::Channel
+    end
+  end
 end

data/spec/requests/as_account/channel_spec.rb

@@ -25,21 +25,51 @@ describe Yt::Channel, :device_app do
     it { expect(channel.playlists.first).to be_a Yt::Playlist }
     it { expect{channel.create_playlist}.to raise_error Yt::Errors::RequestError }
     it { expect{channel.delete_playlists}.to raise_error Yt::Errors::RequestError }
-    it { expect(channel.subscriptions).to be_a Yt::Collections::Subscriptions }
+
+    specify 'with a public list of subscriptions' do
+      expect(channel.subscribed_channels.first).to be_a Yt::Channel
+    end
+
+    context 'with a hidden list of subscriptions' do
+      let(:id) { 'UCG0hw7n_v0sr8MXgb6oel6w' }
+      it { expect{channel.subscribed_channels.size}.to raise_error Yt::Errors::Forbidden }
+    end
 
     # NOTE: These tests are slow because we *must* wait some seconds between
     # subscribing and unsubscribing to a channel, otherwise YouTube will show
     # wrong (cached) data, such as a user is subscribed when he is not.
     context 'that I am not subscribed to', :slow do
-      before { channel.unsubscribe }
+      let(:id) { 'UCCj956IF62FbT7Gouszaj9w' }
+      before { channel.throttle_subscriptions }
+
       it { expect(channel.subscribed?).to be false }
-      it { expect(channel.subscribe!).to be_truthy }
+      it { expect(channel.unsubscribe).to be_falsey }
+      it { expect{channel.unsubscribe!}.to raise_error Yt::Errors::RequestError }
+
+      context 'when I subscribe' do
+        before { channel.subscribe }
+        after { channel.unsubscribe }
+
+        it { expect(channel.subscribed?).to be true }
+        it { expect(channel.unsubscribe!).to be_truthy }
+      end
     end
 
     context 'that I am subscribed to', :slow do
-      before { channel.subscribe }
+      let(:id) { 'UCxO1tY8h1AhOz0T4ENwmpow' }
+      before { channel.throttle_subscriptions }
+
       it { expect(channel.subscribed?).to be true }
-      it { expect(channel.unsubscribe!).to be_truthy }
+      it { expect(channel.subscribe).to be_falsey }
+      it { expect{channel.subscribe!}.to raise_error Yt::Errors::RequestError }
+
+      context 'when I unsubscribe' do
+        before { channel.unsubscribe }
+        after { channel.subscribe }
+
+        it { expect(channel.subscribed?).to be false }
+        it { expect(channel.subscribe!).to be_truthy }
+      end
     end
 
     describe 'filtering by ID is ignored when listing videos' do
@@ -71,6 +101,10 @@ describe Yt::Channel, :device_app do
     let(:privacy_status) { 'unlisted' }
     let(:params) { {title: title, description: description, tags: tags, privacy_status: privacy_status} }
 
+    specify 'subscriptions can be listed (hidden or public)' do
+      expect(channel.subscriptions.size).to be
+    end
+
     describe 'playlists can be added' do
       after { channel.delete_playlists params }
       it { expect(channel.create_playlist params).to be_a Yt::Playlist }
@@ -141,4 +175,4 @@ describe Yt::Channel, :device_app do
       it { expect(channel.videos.size).to be_zero }
     end
   end
-end
+end

data/spec/requests/as_account/playlist_item_spec.rb

@@ -27,4 +27,30 @@ describe Yt::PlaylistItem, :device_app do
 
     it { expect{item.snippet}.to raise_error Yt::Errors::RequestError }
   end
+
+
+  context 'given one of my own playlist items that I want to update' do
+    before(:all) do
+      @my_playlist = $account.create_playlist title: "Yt Test Update Playlist Item #{rand}"
+      @my_playlist.add_video 'MESycYJytkU'
+      @my_playlist_item = @my_playlist.add_video 'MESycYJytkU'
+    end
+    after(:all) { @my_playlist.delete }
+
+    let(:id) { @my_playlist_item.id }
+    let!(:old_title) { @my_playlist_item.title }
+    let!(:old_privacy_status) { @my_playlist_item.privacy_status }
+    let(:update) { @my_playlist_item.update attrs }
+
+    context 'given I update the position' do
+      let(:attrs) { {position: 0} }
+
+      specify 'only updates the position' do
+        expect(update).to be true
+        expect(@my_playlist_item.position).to be 0
+        expect(@my_playlist_item.title).to eq old_title
+        expect(@my_playlist_item.privacy_status).to eq old_privacy_status
+      end
+    end
+  end
 end