yt 0.5.4 → 0.5.5

data/lib/yt/models/url.rb

@@ -1,88 +1,88 @@
 module Yt
-  class URL
-    attr_reader :kind
-
-    def initialize(url)
-      @url = url
-      @kind ||= parse url
-      @match_data ||= {}
-    end
+  module Models
+    class URL
+      attr_reader :kind
+
+      def initialize(url)
+        @url = url
+        @kind ||= parse url
+        @match_data ||= {}
+      end
 
-    def id
-      @match_data[:id]
-    rescue IndexError
-    end
+      def id
+        @match_data[:id]
+      rescue IndexError
+      end
 
-    def username
-      @match_data[:username]
-    rescue IndexError
-    end
+      def username
+        @match_data[:username]
+      rescue IndexError
+      end
 
-  private
+    private
 
-    def parse(url)
-      matching_pattern = patterns.find do |pattern|
-        @match_data = url.match pattern[:regex]
+      def parse(url)
+        matching_pattern = patterns.find do |pattern|
+          @match_data = url.match pattern[:regex]
+        end
+        matching_pattern[:kind] if matching_pattern
       end
-      matching_pattern[:kind] if matching_pattern
-    end
 
-    def patterns
-      # @note: :video *must* be the last since one of its regex eats the
-      # remaining patterns. In short, don't change the following order
+      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
 
-      @patterns ||= patterns_for :playlist, :subscription, :channel, :video
-    end
+        @patterns ||= patterns_for :playlist, :subscription, :video, :channel
+      end
 
-    def patterns_for(*kinds)
-      prefix = '^(?:https?://)?(?:www\.)?'
-      suffix = '(?:|/)$'
-      kinds.map do |kind|
-        patterns = send "#{kind}_patterns" # meta programming :/
-        patterns.map do |pattern|
-          {kind: kind, regex: %r{#{prefix}#{pattern}#{suffix}}}
-        end
-      end.flatten
-    end
+      def patterns_for(*kinds)
+        prefix = '^(?:https?://)?(?:www\.)?'
+        suffix = '(?:|/)'
+        kinds.map do |kind|
+          patterns = send "#{kind}_patterns" # meta programming :/
+          patterns.map do |pattern|
+            {kind: kind, regex: %r{#{prefix}#{pattern}#{suffix}}}
+          end
+        end.flatten
+      end
 
-    def subscription_patterns
-      name = '(?:[a-zA-Z0-9&_=-]*)'
+      def subscription_patterns
+        name = '(?:[a-zA-Z0-9&_=-]*)'
 
-      %W{
-        subscription_center\\?add_user=#{name}
-        subscribe_widget\\?p=#{name}
-        channel/#{name}\\?sub_confirmation=1
-      }.map{|path| "youtube\\.com/#{path}"}
-    end
+        %W{
+          subscription_center\\?add_user=#{name}
+          subscribe_widget\\?p=#{name}
+          channel/#{name}\\?sub_confirmation=1
+        }.map{|path| "youtube\\.com/#{path}"}
+      end
 
-    def playlist_patterns
-      playlist_id = '(?<id>[a-zA-Z0-9_-]+)'
-      video_id = '(?:[a-zA-Z0-9&_=-]*)'
+      def playlist_patterns
+        playlist_id = '(?<id>[a-zA-Z0-9_-]+)'
 
-      %W{
-        playlist\\?list=#{playlist_id}
-        watch\\?v=#{video_id}&list=#{playlist_id}
-      }.map{|path| "youtube\\.com/#{path}"}
-    end
+        %W{
+          playlist\\?list=#{playlist_id}
+        }.map{|path| "youtube\\.com/#{path}"}
+      end
 
-    def video_patterns
-      video_id = '(?<id>[a-zA-Z0-9_-]+)'
+      def video_patterns
+        video_id = '(?<id>[a-zA-Z0-9_-]+)'
 
-      %W{
-        youtube\\.com/watch\\?v=#{video_id}
-        youtu\\.be/#{video_id}
-      }
-    end
+        %W{
+          youtube\\.com/watch\\?v=#{video_id}
+          youtu\\.be/#{video_id}
+        }
+      end
 
-    def channel_patterns
-      channel_id = '(?<id>[a-zA-Z0-9_-]+)'
-      username = '(?<username>[a-zA-Z0-9_-]+)'
+      def channel_patterns
+        channel_id = '(?<id>[a-zA-Z0-9_-]+)'
+        username = '(?<username>[a-zA-Z0-9_-]+)'
 
-      %W{
-        channel/#{channel_id}
-        user/#{username}
-        #{username}
-      }.map{|path| "youtube\\.com/#{path}"}
+        %W{
+          channel/#{channel_id}
+          user/#{username}
+          #{username}
+        }.map{|path| "youtube\\.com/#{path}"}
+      end
     end
   end
 end

data/lib/yt/models/user_info.rb

@@ -1,66 +1,68 @@
 require 'yt/models/base'
 
 module Yt
-  class UserInfo < Base
-    def initialize(options = {})
-      @data = options[:data]
-    end
+  module Models
+    class UserInfo < Base
+      def initialize(options = {})
+        @data = options[:data]
+      end
 
-    # @return [String] User ID
-    def id
-      @id ||= @data.fetch 'id', ''
-    end
+      # @return [String] User ID
+      def id
+        @id ||= @data.fetch 'id', ''
+      end
 
-    # Return the email of the YouTube account.
-    #
-    # @return [String] Email of the YouTube account
-    def email
-      @email ||= @data.fetch 'email', ''
-    end
+      # Return the email of the YouTube account.
+      #
+      # @return [String] Email of the YouTube account
+      def email
+        @email ||= @data.fetch 'email', ''
+      end
 
-    # @return [Boolean] Email is verified?
-    def has_verified_email?
-      @verified_email ||= @data.fetch 'verified_email', false
-    end
+      # @return [Boolean] Email is verified?
+      def has_verified_email?
+        @verified_email ||= @data.fetch 'verified_email', false
+      end
 
-    # @return [String] name
-    def name
-      @name ||= @data.fetch 'name', ''
-    end
+      # @return [String] name
+      def name
+        @name ||= @data.fetch 'name', ''
+      end
 
-    # @return [String] given_name
-    def given_name
-      @given_name ||= @data.fetch 'given_name', ''
-    end
+      # @return [String] given_name
+      def given_name
+        @given_name ||= @data.fetch 'given_name', ''
+      end
 
-    # @return [String] family_name
-    def family_name
-      @family_name ||= @data.fetch 'family_name', ''
-    end
+      # @return [String] family_name
+      def family_name
+        @family_name ||= @data.fetch 'family_name', ''
+      end
 
-    # @return [String] family_name
-    def profile_url
-      @profile_url ||= @data.fetch 'link', ''
-    end
+      # @return [String] family_name
+      def profile_url
+        @profile_url ||= @data.fetch 'link', ''
+      end
 
-    # @return [String] avatar_url
-    def avatar_url
-      @avatar_url ||= @data.fetch 'picture', ''
-    end
+      # @return [String] avatar_url
+      def avatar_url
+        @avatar_url ||= @data.fetch 'picture', ''
+      end
 
-    # @return [String] gender
-    def gender
-      @gender ||= @data.fetch 'gender', ''
-    end
+      # @return [String] gender
+      def gender
+        @gender ||= @data.fetch 'gender', ''
+      end
 
-    # @return [String] locale
-    def locale
-      @locale ||= @data.fetch 'locale', ''
-    end
+      # @return [String] locale
+      def locale
+        @locale ||= @data.fetch 'locale', ''
+      end
 
-    # @return [String] hd
-    def hd
-      @hd ||= @data.fetch 'hd', ''
+      # @return [String] hd
+      def hd
+        @hd ||= @data.fetch 'hd', ''
+      end
     end
   end
 end

data/lib/yt/models/video.rb

@@ -1,9 +1,11 @@
 require 'yt/models/resource'
 
 module Yt
-  class Video < Resource
-    has_one :details_set, delegate: [:duration]
-    has_one :rating
-    has_many :annotations
+  module Models
+    class Video < Resource
+      has_one :details_set, delegate: [:duration]
+      has_one :rating
+      has_many :annotations
+    end
   end
 end

data/lib/yt/version.rb

@@ -1,3 +1,3 @@
 module Yt
-  VERSION = '0.5.4'
+  VERSION = '0.5.5'
 end

data/spec/associations/device_auth/authentications_spec.rb

@@ -0,0 +1,78 @@
+require 'spec_helper'
+require 'yt/associations/authentications'
+
+describe Yt::Associations::Authentications, :device_app do
+  subject(:account) { Yt::Account.new attrs }
+
+  describe '#authentication' do
+    context 'given a refresh token' do
+      let(:attrs) { {refresh_token: refresh_token} }
+
+      context 'that is valid' do
+        let(:refresh_token) { ENV['YT_TEST_DEVICE_REFRESH_TOKEN'] }
+        it { expect(account.authentication).to be_a Yt::Authentication }
+      end
+
+      context 'that is invalid' do
+        let(:refresh_token) { '--not-a-valid-refresh-token--' }
+        it { expect{account.authentication}.to raise_error Yt::Errors::MissingAuth }
+      end
+    end
+
+    context 'given a redirect URI and an authorization code' do
+      let(:attrs) { {authorization_code: authorization_code, redirect_uri: 'http://localhost/'} }
+
+      context 'that is valid' do
+        # cannot be tested "live"
+      end
+
+      context 'that is invalid' do
+        let(:authorization_code) { '--not-a-valid-authorization-code--' }
+        it { expect{account.authentication}.to raise_error Yt::Errors::MissingAuth }
+      end
+    end
+
+    context 'given an access token' do
+      let(:attrs) { {access_token: access_token, expires_at: expires_at} }
+
+      context 'that is valid' do
+        let(:access_token) { $account.access_token }
+
+        context 'that does not have an expiration date' do
+          let(:expires_at) { nil }
+          it { expect(account.authentication).to be_a Yt::Authentication }
+        end
+
+        context 'that has not expired' do
+          let(:expires_at) { 1.day.from_now.to_s }
+          it { expect(account.authentication).to be_a Yt::Authentication }
+        end
+
+        context 'that has expired' do
+          let(:expires_at) { 1.day.ago.to_s }
+          it { expect{account.authentication}.to raise_error Yt::Errors::MissingAuth }
+        end
+      end
+
+      context 'that is invalid' do
+        let(:access_token) { '--not-a-valid-access-token--' }
+        let(:expires_at) { 1.day.from_now }
+        it { expect(account.authentication).to be_a Yt::Authentication }
+        it { expect{account.channel}.to raise_error Yt::Errors::MissingAuth }
+      end
+
+    end
+
+    context 'given no token or code' do
+      let(:attrs) { {} }
+      it { expect{account.authentication}.to raise_error Yt::Errors::MissingAuth }
+    end
+  end
+
+  describe '#authentication_url' do
+    context 'given a redirect URI and scopes' do
+      let(:attrs) { {redirect_uri: 'http://localhost/', scopes: ['userinfo.email', 'userinfo.profile']} }
+      it { expect(account.authentication_url).to match 'access_type=offline' }
+    end
+  end
+end

data/spec/associations/device_auth/channels_spec.rb

@@ -1,10 +1,8 @@
 require 'spec_helper'
 require 'yt/associations/channels'
 
-describe Yt::Associations::Channels, scenario: :device_app do
-  let(:account) { Yt.configuration.account }
-
+describe Yt::Associations::Channels, :device_app do
   describe '#channel' do
-    it { expect(account.channel).to be_a Yt::Channel }
+    it { expect($account.channel).to be_a Yt::Channel }
   end
 end

data/spec/associations/device_auth/details_sets_spec.rb

@@ -1,18 +1,17 @@
 require 'spec_helper'
 require 'yt/associations/details_sets'
 
-describe Yt::Associations::DetailsSets, scenario: :device_app do
-  let(:account) { Yt.configuration.account }
-  let(:video) { Yt::Video.new id: 'fsdfsfsdMESycYJytkU', auth: account.auth }
+describe Yt::Associations::DetailsSets, :device_app do
+  let(:video) { Yt::Video.new id: 'fsdfsfsdMESycYJytkU', auth: $account }
 
   describe '#details_set' do
     context 'given an existing video' do
-      let(:video) { Yt::Video.new id: 'MESycYJytkU', auth: account }
+      let(:video) { Yt::Video.new id: 'MESycYJytkU', auth: $account }
       it { expect(video.details_set).to be_a Yt::DetailsSet }
     end
 
     context 'given an unknown video' do
-      let(:video) { Yt::Video.new id: 'not-a-video-id', auth: account }
+      let(:video) { Yt::Video.new id: 'not-a-video-id', auth: $account }
       it { expect{video.details_set}.to raise_error Yt::Errors::NoItems }
     end
   end

data/spec/associations/device_auth/ids_spec.rb

@@ -1,9 +1,8 @@
 require 'spec_helper'
 require 'yt/associations/ids'
 
-describe Yt::Associations::Ids, scenario: :device_app do
-  let(:account) { Yt.configuration.account }
-  subject(:resource) { Yt::Resource.new url: url, auth: account.auth }
+describe Yt::Associations::Ids, :device_app do
+  subject(:resource) { Yt::Resource.new url: url, auth: $account }
 
   describe '#id' do
     context 'given a URL containing an existing username' do

data/spec/associations/device_auth/playlist_items_spec.rb

@@ -3,10 +3,9 @@ require 'yt/associations/playlist_items'
 
 # TODO: Delete playlist item after tests that create them
 
-describe Yt::Associations::PlaylistItems, scenario: :device_app do
-  before :all do
-    account = Yt.configuration.account
-    @playlist = account.create_playlist title: "Yt Test Playlist Items"
+describe Yt::Associations::PlaylistItems, :device_app do
+  before:all do
+    @playlist = $account.create_playlist title: "Yt Test Playlist Items"
    end
   after(:all) { @playlist.delete }
 

data/spec/associations/device_auth/playlists_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 require 'yt/associations/playlists'
 
-describe Yt::Associations::Playlists, scenario: :device_app do
-  let(:account) { Yt.configuration.account }
+describe Yt::Associations::Playlists, :device_app do
   let(:title) { 'Yt Test title' }
   let(:description) { 'Yt Test description' }
   let(:tags) { ['Yt Test Tag 1', 'Yt Test Tag 2'] }
@@ -10,38 +9,38 @@ describe Yt::Associations::Playlists, scenario: :device_app do
   let(:params) { {title: title, description: description, tags: tags, privacy_status: privacy_status} }
 
   describe 'playlists' do
-    before { account.create_playlist params }
-    after { account.delete_playlists params }
+    before { $account.create_playlist params }
+    after { $account.delete_playlists params }
 
-    it { expect(account.playlists.count).to be > 0 }
-    it { expect(account.playlists.first).to be_a Yt::Playlist }
+    it { expect($account.playlists.count).to be > 0 }
+    it { expect($account.playlists.first).to be_a Yt::Playlist }
   end
 
   describe 'create a playlist' do
-    after { account.delete_playlists params }
+    after { $account.delete_playlists params }
 
-    it { expect(account.create_playlist params).to be_a Yt::Playlist }
-    it { expect{account.create_playlist params}.to change{account.playlists.count}.by(1) }
+    it { expect($account.create_playlist params).to be_a Yt::Playlist }
+    it { expect{$account.create_playlist params}.to change{$account.playlists.count}.by(1) }
   end
 
   describe 'delete a playlist' do
     let(:title) { "Yt Test Delete Playlist #{rand}" }
-    before { @playlist = account.create_playlist params }
+    before { @playlist = $account.create_playlist params }
 
     it { expect(@playlist.delete).to be true }
   end
 
   describe 'delete a set of playlists' do
     let(:title) { "Yt Test Delete All Playlists #{rand}" }
-    before { account.create_playlist params }
+    before { $account.create_playlist params }
 
-    it { expect(account.delete_playlists title: %r{#{params[:title]}}).to eq [true] }
-    it { expect(account.delete_playlists params).to eq [true] }
-    it { expect{account.delete_playlists params}.to change{account.playlists.count}.by(-1) }
+    it { expect($account.delete_playlists title: %r{#{params[:title]}}).to eq [true] }
+    it { expect($account.delete_playlists params).to eq [true] }
+    it { expect{$account.delete_playlists params}.to change{$account.playlists.count}.by(-1) }
   end
 
   describe 'update a playlist' do
-    before { @playlist = account.create_playlist params }
+    before { @playlist = $account.create_playlist params }
     after { @playlist.delete }
 
     context 'changes the attributes that are specified to be updated' do

data/spec/associations/device_auth/ratings_spec.rb

@@ -1,12 +1,10 @@
 require 'spec_helper'
 require 'yt/models/video'
 
-describe Yt::Associations::Ratings, scenario: :device_app do
-  let(:account) { Yt.configuration.account }
-
+describe Yt::Associations::Ratings, :device_app do
   describe '#rating' do
     context 'given an existing video' do
-      let(:video) { Yt::Video.new id: 'MESycYJytkU', auth: account }
+      let(:video) { Yt::Video.new id: 'MESycYJytkU', auth: $account }
 
       context 'that I like' do
         before { video.like }

data/spec/associations/device_auth/snippets_spec.rb

@@ -3,27 +3,25 @@ require 'yt/associations/snippets'
 require 'yt/models/channel'
 require 'yt/models/video'
 
-describe Yt::Associations::Snippets, scenario: :device_app do
-  let(:account) { Yt.configuration.account }
-
+describe Yt::Associations::Snippets, :device_app do
   describe '#snippet' do
     context 'given an existing video resource' do
-      let(:video) { Yt::Video.new id: 'MESycYJytkU', auth: account }
+      let(:video) { Yt::Video.new id: 'MESycYJytkU', auth: $account }
       it { expect(video.snippet).to be_a Yt::Snippet }
     end
 
     context 'given an unknown video resource' do
-      let(:video) { Yt::Video.new id: 'not-a-video-id', auth: account }
+      let(:video) { Yt::Video.new id: 'not-a-video-id', auth: $account }
       it { expect{video.snippet}.to raise_error Yt::Errors::NoItems }
     end
 
     context 'given an existing channel resource' do
-      let(:channel) { Yt::Channel.new id: 'UCxO1tY8h1AhOz0T4ENwmpow', auth: account }
+      let(:channel) { Yt::Channel.new id: 'UCxO1tY8h1AhOz0T4ENwmpow', auth: $account }
       it { expect(channel.snippet).to be_a Yt::Snippet }
     end
 
     context 'given an unknown channel resource' do
-      let(:channel) { Yt::Channel.new id: 'not-a-channel-id', auth: account }
+      let(:channel) { Yt::Channel.new id: 'not-a-channel-id', auth: $account }
       it { expect{channel.snippet}.to raise_error Yt::Errors::NoItems }
     end
   end

data/spec/associations/device_auth/subscriptions_spec.rb

@@ -4,12 +4,10 @@ require 'yt/models/channel'
 # NOTE: This test is slow because we *must* wait for 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.
-describe Yt::Associations::Subscriptions, scenario: :device_app do
-  let(:account) { Yt.configuration.account }
-
+describe Yt::Associations::Subscriptions, :device_app do
   describe '#subscription' do
     context 'given an existing channel' do
-      let(:channel) { Yt::Channel.new id: 'UCxO1tY8h1AhOz0T4ENwmpow', auth: account }
+      let(:channel) { Yt::Channel.new id: 'UCxO1tY8h1AhOz0T4ENwmpow', auth: $account }
 
       context 'that I am not subscribed to' do
         before { channel.unsubscribe }

data/spec/associations/device_auth/user_infos_spec.rb

@@ -1,13 +1,10 @@
 require 'spec_helper'
 require 'yt/associations/user_infos'
 
-describe Yt::Associations::UserInfos, scenario: :device_app do
-  subject(:account) { Yt::Account.new attrs }
-
+describe Yt::Associations::UserInfos, :device_app do
   describe '#user_info' do
     context 'given an existing account' do
-      let(:account) { Yt.configuration.account }
-      it { expect(account.user_info).to be_a Yt::UserInfo }
+      it { expect($account.user_info).to be_a Yt::UserInfo }
     end
 
     # Note: testing with an unknown account would fail before getting user info

data/spec/associations/device_auth/videos_spec.rb

@@ -1,12 +1,10 @@
 require 'spec_helper'
 require 'yt/associations/videos'
 
-describe Yt::Associations::Videos, scenario: :device_app do
-  let(:account) { Yt.configuration.account }
-
+describe Yt::Associations::Videos, :device_app do
   describe '#videos' do
     context 'given a channel with videos' do
-      let(:channel) { Yt::Channel.new id: 'UCxO1tY8h1AhOz0T4ENwmpow', auth: account }
+      let(:channel) { Yt::Channel.new id: 'UCxO1tY8h1AhOz0T4ENwmpow', auth: $account }
       it { expect(channel.videos.count).to be > 0 }
       it { expect(channel.videos.first).to be_a Yt::Video }
     end
@@ -15,7 +13,7 @@ describe Yt::Associations::Videos, scenario: :device_app do
     # wrong channel ID starts with "UC" then it returns 0 results, otherwise
     # it ignores the channel filter and returns 100,000 results.
     context 'given an unknown channel starting with UC' do
-      let(:channel) { Yt::Channel.new id: 'UC-not-a-channel', auth: account }
+      let(:channel) { Yt::Channel.new id: 'UC-not-a-channel', auth: $account }
       it { expect(channel.videos.count).to be 0 }
     end
   end

data/spec/associations/server_auth/details_sets_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'yt/associations/details_sets'
 
-describe Yt::Associations::DetailsSets, scenario: :server_app do
+describe Yt::Associations::DetailsSets, :server_app do
   subject(:video) { Yt::Video.new id: video_id }
 
   describe '#details_set' do

data/spec/associations/server_auth/ids_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'yt/associations/ids'
 
-describe Yt::Associations::Ids, scenario: :server_app do
+describe Yt::Associations::Ids, :server_app do
   subject(:resource) { Yt::Resource.new url: url }
 
   describe '#id' do

data/spec/associations/server_auth/playlist_items_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'yt/models/playlist'
 require 'yt/models/playlist_item'
 
-describe Yt::Associations::PlaylistItems, scenario: :server_app do
+describe Yt::Associations::PlaylistItems, :server_app do
   describe '#playlist_items' do
     subject(:playlist_items) { playlist.playlist_items }
 

data/spec/associations/server_auth/playlists_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'yt/models/channel'
 require 'yt/models/playlist'
 
-describe Yt::Associations::Playlists, scenario: :server_app do
+describe Yt::Associations::Playlists, :server_app do
   describe '#playlists' do
     subject(:playlists) { channel.playlists }