yt 0.5.4 → 0.5.5

data/spec/associations/server_auth/snippets_spec.rb

@@ -3,7 +3,7 @@ require 'yt/associations/snippets'
 require 'yt/models/channel'
 require 'yt/models/video'
 
-describe Yt::Associations::Snippets, scenario: :server_app do
+describe Yt::Associations::Snippets, :server_app do
   describe '#snippet' do
     context 'given an existing video resource' do
       let(:video) { Yt::Video.new id: 'MESycYJytkU' }

data/spec/associations/server_auth/videos_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'yt/associations/videos'
 
-describe Yt::Associations::Videos, scenario: :server_app do
+describe Yt::Associations::Videos, :server_app do
   describe '#videos' do
     context 'given a channel with videos' do
       let(:channel) { Yt::Channel.new id: 'UCxO1tY8h1AhOz0T4ENwmpow' }

data/spec/collections/playlist_items_spec.rb

@@ -6,8 +6,7 @@ describe Yt::Collections::PlaylistItems do
   subject(:collection) { Yt::Collections::PlaylistItems.new parent: playlist }
   let(:playlist) { Yt::Playlist.new id: 'LLxO1tY8h1AhOz0T4ENwmpow' }
   let(:attrs) { {id: 'MESycYJytkU', kind: :video} }
-  let(:response_body) { %Q{{"error":{"errors":[{"reason":"#{reason}"}]}}} }
-  let(:msg) { {response: {body: response_body}}.to_json }
+  let(:msg) { {response_body: {error: {errors: [{reason: reason}]}}}.to_json }
 
   describe '#insert' do
     let(:playlist_item) { Yt::PlaylistItem.new }
@@ -20,7 +19,7 @@ describe Yt::Collections::PlaylistItems do
 
     context 'given an unknown video' do
       let(:reason) { 'videoNotFound' }
-      before { collection.stub(:do_insert).and_raise Yt::Errors::Failed, msg }
+      before { collection.stub(: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 }
@@ -28,7 +27,7 @@ describe Yt::Collections::PlaylistItems do
 
     context 'given a forbidden video' do
       let(:reason) { 'forbidden' }
-      before { collection.stub(:do_insert).and_raise Yt::Errors::Failed, msg }
+      before { collection.stub(: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 }

data/spec/collections/subscriptions_spec.rb

@@ -4,8 +4,7 @@ require 'yt/collections/subscriptions'
 describe Yt::Collections::Subscriptions do
   subject(:collection) { Yt::Collections::Subscriptions.new }
   before { collection.stub :throttle }
-  let(:response_body) { %Q{{"error":{"errors":[{"reason":"#{reason}"}]}}} }
-  let(:msg) { {response: {body: response_body}}.to_json }
+  let(:msg) { {response_body: {error: {errors: [{reason: reason}]}}}.to_json }
 
   describe '#insert' do
     context 'given a new subscription' do
@@ -17,7 +16,7 @@ describe Yt::Collections::Subscriptions do
 
     context 'given a duplicate subscription' do
       let(:reason) { 'subscriptionDuplicate' }
-      before { collection.stub(:do_insert).and_raise Yt::Errors::Failed, msg }
+      before { collection.stub(:do_insert).and_raise Yt::Error, msg }
 
       it { expect{collection.insert}.to fail.with 'subscriptionDuplicate' }
       it { expect{collection.insert ignore_errors: true}.not_to fail }

data/spec/errors/missing_auth_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+require 'yt/errors/missing_auth'
+
+describe Yt::Errors::MissingAuth do
+  let(:msg) { %r{^A request to YouTube API was sent without a valid authentication} }
+
+  describe '#exception' do
+    it { expect{raise Yt::Errors::MissingAuth}.to raise_error msg }
+  end
+end

data/spec/errors/no_items_spec.rb

@@ -2,7 +2,8 @@ require 'spec_helper'
 require 'yt/errors/no_items'
 
 describe Yt::Errors::NoItems do
-  let(:msg) { %r{request.+?returned no items} }
+  let(:msg) { %r{^A request to YouTube API returned no items} }
+
   describe '#exception' do
     it { expect{raise Yt::Errors::NoItems}.to raise_error msg }
   end

data/spec/errors/request_error_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+require 'yt/errors/request_error'
+
+describe Yt::Errors::RequestError do
+  let(:msg) { %r{^A request to YouTube API failed} }
+
+  describe '#exception' do
+    it { expect{raise Yt::Errors::RequestError}.to raise_error msg }
+  end
+end
+
+describe Yt::Error do
+  let(:msg) { %r{^A request to YouTube API failed} }
+
+  describe '#exception' do
+    it { expect{raise Yt::Error}.to raise_error msg }
+  end
+end

data/spec/models/configuration_spec.rb

@@ -3,23 +3,6 @@ require 'spec_helper'
 describe Yt::Configuration do
   subject(:config) { Yt::Configuration.new }
 
-  describe '#scenario' do
-    context 'without an environment variable YT_CLIENT_SCENARIO' do
-      before { ENV['YT_CLIENT_SCENARIO'] = nil }
-      it {expect(config.scenario).to be :web_app }
-    end
-
-    context 'given an invalid environment variable YT_CLIENT_SCENARIO' do
-      before { ENV['YT_CLIENT_SCENARIO'] = 'not-a-scenario'}
-      it {expect(config.scenario).to be :web_app }
-    end
-
-    context 'given a valid environment variable YT_CLIENT_SCENARIO' do
-      before { ENV['YT_CLIENT_SCENARIO'] = 'device_app'}
-      it {expect(config.scenario).to be :device_app }
-    end
-  end
-
   describe '#client_id' do
     context 'without an environment variable YT_CLIENT_ID' do
       before { ENV['YT_CLIENT_ID'] = nil }

data/spec/models/description_spec.rb

@@ -29,6 +29,11 @@ describe Yt::Description do
       let(:text) { 'Link to video: youtu.be/MESycYJytkU' }
       it { expect(description).to have_link_to_video }
     end
+
+    context 'with a playlist-embedded video URL' do
+      let(:text) { 'Link to video in playlist: youtube.com/watch?v=MESycYJytkU&index=619&list=LLxO1tY8h1AhOz0T4ENwmpow' }
+      it { expect(description).to have_link_to_video }
+    end
   end
 
   describe '#has_link_to_channel?' do
@@ -85,10 +90,5 @@ describe Yt::Description do
       let(:text) { 'Link to playlist: youtube.com/playlist?list=LLxO1tY8h1AhOz0T4ENwmpow' }
       it { expect(description).to have_link_to_playlist }
     end
-
-    context 'with a playlist embed URL' do
-      let(:text) { 'Link to video in playlist: youtube.com/watch?v=MESycYJytkU&index=619&list=LLxO1tY8h1AhOz0T4ENwmpow' }
-      it { expect(description).to have_link_to_playlist }
-    end
   end
 end

data/spec/models/request_spec.rb

@@ -3,15 +3,9 @@ require 'yt/models/request'
 
 describe Yt::Request do
   subject(:request) { Yt::Request.new attrs }
-  let(:attrs) { {} }
+  let(:attrs) { {host: 'example.com'} }
 
   describe '#run' do
-    context 'given a request to YouTube V3 API without authentication' do
-      let(:attrs) { {host: 'www.googleapis.com'} }
-      before{ Yt.configuration.api_key = nil }
-      it { expect{request.run}.to raise_error Yt::Errors::Unauthenticated }
-    end
-
     context 'given a request that returns a non-2XX code' do
       let(:not_found) { Net::HTTPNotFound.new nil, nil, nil }
       before { Net::HTTP.stub(:start).and_return not_found }

data/spec/models/subscription_spec.rb

@@ -3,8 +3,7 @@ require 'yt/models/subscription'
 
 describe Yt::Subscription do
   subject(:subscription) { Yt::Subscription.new id: id }
-  let(:response_body) { %Q{{"error":{"errors":[{"reason":"#{reason}"}]}}} }
-  let(:msg) { {response: {body: response_body}}.to_json }
+  let(:msg) { {response_body: {error: {errors: [{reason: reason}]}}}.to_json }
 
   describe '#exists?' do
     context 'given a subscription with an id' do
@@ -30,7 +29,7 @@ describe Yt::Subscription do
 
     context 'given an unknown subscription' do
       let(:reason) { 'subscriptionNotFound' }
-      before { subscription.stub(:do_delete).and_raise Yt::Errors::Failed, msg }
+      before { subscription.stub(: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 }

data/spec/models/url_spec.rb

@@ -19,6 +19,12 @@ describe Yt::URL do
     it {expect(url.id).to eq 'MESycYJytkU' }
   end
 
+  context 'given a playlist-embedded video URL' do
+    let(:text) { 'youtube.com/watch?v=MESycYJytkU&list=LLxO1tY8h1AhOz0T4ENwmpow' }
+    it {expect(url.kind).to eq :video }
+    it {expect(url.id).to eq 'MESycYJytkU' }
+  end
+
   context 'given a long channel URL' do
     let(:text) { 'http://youtube.com/channel/UCxO1tY8h1AhOz0T4ENwmpow' }
     it {expect(url.kind).to eq :channel }
@@ -59,12 +65,6 @@ describe Yt::URL do
     it {expect(url.id).to eq 'LLxO1tY8h1AhOz0T4ENwmpow' }
   end
 
-  context 'given a video-embed playlist URL' do
-    let(:text) { 'youtube.com/watch?v=MESycYJytkU&list=LLxO1tY8h1AhOz0T4ENwmpow' }
-    it {expect(url.kind).to eq :playlist }
-    it {expect(url.id).to eq 'LLxO1tY8h1AhOz0T4ENwmpow' }
-  end
-
   context 'given a valid URL with a trailing slash' do
     let(:text) { 'https://www.youtube.com/user/Fullscreen/' }
     it {expect(url.kind).to eq :channel }

data/spec/support/fail_matcher.rb

@@ -3,7 +3,7 @@ RSpec::Matchers.define :fail do
     begin
       block.call
       false
-    rescue Yt::Errors::Base => error
+    rescue Yt::Error => error
       @reason ? error.reasons.include?(@reason) : true
     end
   end

data/spec/support/global_hooks.rb

@@ -0,0 +1,33 @@
+require 'yt/config'
+require 'yt/models/account'
+
+RSpec.configure do |config|
+  # Create one global test account to avoid having to refresh the access token
+  # at every request
+  config.before :all do
+    attrs = {refresh_token: ENV['YT_TEST_DEVICE_REFRESH_TOKEN']}
+    $account = Yt::Account.new attrs
+  end
+
+  # Don't use authentication from env variables unless specified with a tag
+  config.before :all do
+    Yt.configure do |config|
+      config.client_id = nil
+      config.client_secret = nil
+      config.api_key = nil
+    end
+  end
+
+  config.before :all, device_app: true do
+    Yt.configure do |config|
+      config.client_id = ENV['YT_TEST_DEVICE_CLIENT_ID']
+      config.client_secret = ENV['YT_TEST_DEVICE_CLIENT_SECRET']
+    end
+  end
+
+  config.before :all, server_app: true do
+    Yt.configure do |config|
+      config.api_key = ENV['YT_TEST_SERVER_API_KEY']
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yt
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Claudio Baccigalupo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -124,6 +124,7 @@ files:
 - lib/yt/actions/update.rb
 - lib/yt/associations.rb
 - lib/yt/associations/annotations.rb
+- lib/yt/associations/authentications.rb
 - lib/yt/associations/channels.rb
 - lib/yt/associations/details_sets.rb
 - lib/yt/associations/ids.rb
@@ -136,6 +137,7 @@ files:
 - lib/yt/associations/user_infos.rb
 - lib/yt/associations/videos.rb
 - lib/yt/collections/annotations.rb
+- lib/yt/collections/authentications.rb
 - lib/yt/collections/base.rb
 - lib/yt/collections/channels.rb
 - lib/yt/collections/details_sets.rb
@@ -148,13 +150,12 @@ files:
 - lib/yt/collections/user_infos.rb
 - lib/yt/collections/videos.rb
 - lib/yt/config.rb
-- lib/yt/errors/base.rb
-- lib/yt/errors/error.rb
-- lib/yt/errors/failed.rb
+- lib/yt/errors/missing_auth.rb
 - lib/yt/errors/no_items.rb
-- lib/yt/errors/unauthenticated.rb
+- lib/yt/errors/request_error.rb
 - lib/yt/models/account.rb
 - lib/yt/models/annotation.rb
+- lib/yt/models/authentication.rb
 - lib/yt/models/base.rb
 - lib/yt/models/channel.rb
 - lib/yt/models/configuration.rb
@@ -173,6 +174,7 @@ files:
 - lib/yt/models/user_info.rb
 - lib/yt/models/video.rb
 - lib/yt/version.rb
+- spec/associations/device_auth/authentications_spec.rb
 - spec/associations/device_auth/channels_spec.rb
 - spec/associations/device_auth/details_sets_spec.rb
 - spec/associations/device_auth/ids_spec.rb
@@ -204,9 +206,9 @@ files:
 - spec/collections/subscriptions_spec.rb
 - spec/collections/user_infos_spec.rb
 - spec/collections/videos_spec.rb
-- spec/errors/failed_spec.rb
+- spec/errors/missing_auth_spec.rb
 - spec/errors/no_items_spec.rb
-- spec/errors/unauthenticated_spec.rb
+- spec/errors/request_error_spec.rb
 - spec/models/account_spec.rb
 - spec/models/annotation_spec.rb
 - spec/models/channel_spec.rb
@@ -225,9 +227,8 @@ files:
 - spec/models/user_info_spec.rb
 - spec/models/video_spec.rb
 - spec/spec_helper.rb
-- spec/support/device_app.rb
 - spec/support/fail_matcher.rb
-- spec/support/server_app.rb
+- spec/support/global_hooks.rb
 - yt.gemspec
 homepage: http://github.com/Fullscreen/yt
 licenses:
@@ -255,6 +256,7 @@ 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/associations/device_auth/authentications_spec.rb
 - spec/associations/device_auth/channels_spec.rb
 - spec/associations/device_auth/details_sets_spec.rb
 - spec/associations/device_auth/ids_spec.rb
@@ -286,9 +288,9 @@ test_files:
 - spec/collections/subscriptions_spec.rb
 - spec/collections/user_infos_spec.rb
 - spec/collections/videos_spec.rb
-- spec/errors/failed_spec.rb
+- spec/errors/missing_auth_spec.rb
 - spec/errors/no_items_spec.rb
-- spec/errors/unauthenticated_spec.rb
+- spec/errors/request_error_spec.rb
 - spec/models/account_spec.rb
 - spec/models/annotation_spec.rb
 - spec/models/channel_spec.rb
@@ -307,7 +309,6 @@ test_files:
 - spec/models/user_info_spec.rb
 - spec/models/video_spec.rb
 - spec/spec_helper.rb
-- spec/support/device_app.rb
 - spec/support/fail_matcher.rb
-- spec/support/server_app.rb
+- spec/support/global_hooks.rb
 has_rdoc: 

data/lib/yt/errors/base.rb

@@ -1,43 +0,0 @@
-module Yt
-  module Errors
-    class Base < StandardError
-      def initialize(msg = nil)
-        @msg = msg
-        super msg
-      end
-
-      def reasons
-        errors = response_body.fetch('error', {}).fetch 'errors', []
-        errors.map{|e| e['reason']}
-      end
-
-    private
-
-      def response_code
-        Integer(response['code']) rescue nil
-      end
-
-      def response_body
-        body = response['body']
-        JSON(body) rescue {body: body}
-      end
-
-      def request_curl
-        # TODO.. continue
-        %Q{curl -X #{request['method'].to_s.upcase} "#{request['url']}"}
-      end
-
-      def request
-        json['request'] || {}
-      end
-
-      def response
-        json['response'] || {}
-      end
-
-      def json
-        JSON(@msg) rescue {}
-      end
-    end
-  end
-end

data/lib/yt/errors/error.rb

@@ -1,8 +0,0 @@
-require 'yt/errors/base'
-
-# Just an alias in the main namespace, so external code can `rescue Yt::Error`
-# rather than `rescue Yt::Error::Base`
-module Yt
-  class Error < Errors::Base
-  end
-end

data/lib/yt/errors/failed.rb

@@ -1,17 +0,0 @@
-require 'yt/errors/base'
-
-module Yt
-  module Errors
-    class Failed < Base
-      def message
-        <<-MSG.gsub(/^ {6}/, '')
-        A request to YouTube API V3 failed (code #{response_code}):
-        #{response_body}
-
-        You can retry the same request manually by running:
-        #{request_curl}
-        MSG
-      end
-    end
-  end
-end

data/lib/yt/errors/unauthenticated.rb

@@ -1,34 +0,0 @@
-require 'yt/errors/base'
-
-module Yt
-  module Errors
-    class Unauthenticated < Base
-      def message
-        <<-MSG.gsub(/^ {6}/, '')
-        A request to YouTube API V3 was sent without the required authentication:
-
-        #{request_curl}
-
-        In order to perform this request, you need to register your app with
-        Google Developers Console (https://console.developers.google.com).
-
-        Make sure your app has access to the Google+ and YouTube APIs.
-        Generate a client ID, client secret and server API key, then pass their
-        values to Yt. One way of doing this is through an initializer:
-
-        Yt.configure do |config|
-          config.client_id = '1234567890.apps.googleusercontent.com'
-          config.client_secret = '1234567890'
-          config.api_key = '123456789012345678901234567890'
-        end
-
-        An alternative (but equivalent) way is throught environment variables:
-
-        export YT_CLIENT_ID="1234567890.apps.googleusercontent.com"
-        export YT_CLIENT_SECRET="1234567890"
-        export YT_API_KEY="123456789012345678901234567890"
-        MSG
-      end
-    end
-  end
-end

data/spec/errors/failed_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-require 'yt/errors/failed'
-
-describe Yt::Errors::Failed do
-  let(:msg) { %r{request.+?failed} }
-  describe '#exception' do
-    it { expect{raise Yt::Errors::Failed}.to raise_error msg }
-  end
-end

data/spec/errors/unauthenticated_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-require 'yt/errors/unauthenticated'
-
-describe Yt::Errors::Unauthenticated do
-  let(:msg) { %r{request.+?without the required authentication} }
-  describe '#exception' do
-    it { expect{raise Yt::Errors::Unauthenticated}.to raise_error msg }
-  end
-end

data/spec/support/device_app.rb

@@ -1,15 +0,0 @@
-require 'yt/config'
-require 'yt/models/account'
-
-RSpec.configure do |config|
-  config.before :all, scenario: :device_app do
-    unless Yt.configuration.scenario == :device_app
-      Yt.configure do |config|
-        config.scenario = :device_app
-        config.client_id = ENV['YT_TEST_DEVICE_CLIENT_ID']
-        config.client_secret = ENV['YT_TEST_DEVICE_CLIENT_SECRET']
-        config.account = Yt::Account.new refresh_token: ENV['YT_TEST_DEVICE_REFRESH_TOKEN']
-      end
-    end
-  end
-end

data/spec/support/server_app.rb

@@ -1,10 +0,0 @@
-require 'yt/config'
-
-RSpec.configure do |config|
-  config.before :all, scenario: :server_app do
-    Yt.configure do |config|
-      config.scenario = :server_app
-      config.api_key = ENV['YT_TEST_SERVER_API_KEY']
-    end
-  end
-end