yt 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 280089714e1281d849dcb959a4de6e8bed69b76f
-  data.tar.gz: 8d2482b21d1ba9827c9a8172aab4475c36348c51
+  metadata.gz: 3db26d07a5ba0fed297bba2c49bf6d3124620f48
+  data.tar.gz: 9fdda77579c877c307fbd36880744ca89a925b29
 SHA512:
-  metadata.gz: 14db211427304d5eb03b6d62f50190eb50f614e8e0c9c68d6d7ff26c19ae88378f8feb4502cfaafb2e0ee15e0be0c7aa1d7aa01ff3fc211481b59b4257261a2b
-  data.tar.gz: 811037e6baf6cfc47c73cb3efd4a64ed5cb1b7c0f1aa0dfffa06ec4ee73106dbb7f26fe92b1b040b3ff5a72026c2076f5d05a3b5d2b4b7143fb22d8e652385a8
+  metadata.gz: ee58c92e64c053f44f05634012be1804841db856118917c9a02539a47267bedc1c3e4b2f662988fac7c33fd1688db71fe45f1aabed3773da78e0a8dfe3710d0a
+  data.tar.gz: 3fa6e55ee78ec12f9e9a6810f8a7260fd2d62313758324cb984e2f3655a784af60504614796d18f0107e9ad64ffa221df202283fb64537bcf1630e8d549a6746

data/.yardopts

@@ -1 +1,3 @@
 --no-private
+lib/yt/modules/reports.rb
+lib/**/*.rb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yt (0.7.3)
+    yt (0.7.4)
       activesupport
 
 GEM
@@ -24,7 +24,7 @@ GEM
     i18n (0.6.9)
     json (1.8.1)
     mime-types (2.3)
-    minitest (5.3.4)
+    minitest (5.3.5)
     multi_json (1.10.1)
     rake (10.3.2)
     rest-client (1.6.7)

data/HISTORY.md

@@ -10,6 +10,8 @@ v0.7 - 2014/06/18
 * More status methods for PlaylistItem (privacy_status, public?, private?, unlisted?)
 * Add video.update to update title, description, tags and categoryId of a video
 * Sort channel.videos by most recent first
+* Extract Reports (earnings, views) into module with macro `has_report`
+* New channel reports: comments, likes, dislikes, shares and impressions
 
 v0.6 - 2014/06/05
 -----------------

data/README.md

@@ -86,7 +86,7 @@ Use [Yt::Channel](http://rubydoc.info/github/Fullscreen/yt/master/Yt/Models/Chan
 * access the playlists of a channel
 * subscribe to and unsubscribe from a channel
 * create and delete playlists from a channel
-* retrieve the estimated daily earnings of a channel
+* retrieve the daily earnings, views, comments, likes, dislikes, shares and impressions of a channel
 
 ```ruby
 channel = Yt::Channel.new id: 'UCxO1tY8h1AhOz0T4ENwmpow'
@@ -131,10 +131,12 @@ content_owner = Yt::ContentOwner.new owner_name: 'CMSname', access_token: 'ya29.
 channel = Yt::Channel.new id: 'UCxO1tY8h1AhOz0T4ENwmpow', auth: content_owner
 
 channel.earnings_on 5.days.ago #=> 12.23
-channel.earnings until: 2.days.ago #=> {Wed, 28 May 2014 => 1.34, Thu, 29 May 2014 => 0.47}
-
-channel.views_on 5.days.ago #=> 44
-channel.views since: 3.days.ago #=> {Wed, 28 May 2014 => 12, Thu, 29 May 2014 => 3}
+channel.views since: 7.days.ago #=> {Wed, 28 May 2014 => 12.0, Thu, 29 May 2014 => 3.0, …}
+channel.comments until: 2.days.ago #=> {Wed, 28 May 2014 => 9.0, Thu, 29 May 2014 => 4.0, …}
+channel.ch.likes from: 8.days.ago #=> {Tue, 27 May 2014 => 7.0, Wed, 28 May 2014 => 0.0, …}
+channel.ch.dislikes to: 2.days.ago #=> {Tue, 27 May 2014 => 0.0, Wed, 28 May 2014 => 1.0, …}
+channel.shares since: 7.days.ago, until: 7.days.ago  #=> {Wed, 28 May 2014 => 3.0}
+channel.impressions_on 5.days.ago #=> 157.0
 ```
 
 *The methods above require to be authenticated as the channel’s content owner (see below).*
@@ -431,7 +433,7 @@ To install on your system, run
 
 To use inside a bundled Ruby project, add this line to the Gemfile:
 
-    gem 'yt', '~> 0.7.3'
+    gem 'yt', '~> 0.7.4'
 
 Since the gem follows [Semantic Versioning](http://semver.org),
 indicating the full version in your Gemfile (~> *major*.*minor*.*patch*)
@@ -459,7 +461,7 @@ How to test
 Yt comes with two different sets of tests:
 
 1. tests in `spec/models`, `spec/collections` and `spec/errors` **do not hit** the YouTube API
-1. tests in `spec/associations` **hit** the YouTube API and require authentication
+1. tests in `spec/requests` **hit** the YouTube API and require authentication
 
 The reason why some tests actually hit the YouTube API is because they are
 meant to really integrate Yt with YouTube. YouTube API is not exactly

data/lib/yt/collections/reports.rb

@@ -3,6 +3,7 @@ require 'yt/collections/base'
 module Yt
   module Collections
     class Reports < Base
+      attr_writer :metric
 
       def within(days_range)
         @days_range = days_range
@@ -24,7 +25,7 @@ module Yt
             params['filters'] = "channel==#{@parent.id}"
             params['start-date'] = @days_range.begin
             params['end-date'] = @days_range.end
-            params['metrics'] = metrics
+            params['metrics'] = @metric
             params['dimensions'] = :day
           end
         end
@@ -40,11 +41,6 @@ module Yt
         data.last
       end
 
-      # To be overriden by superclasses
-      # def metrics
-      #   ''
-      # end
-
       def items_key
         'rows'
       end

data/lib/yt/models/account.rb

@@ -1,12 +1,13 @@
 require 'yt/models/base'
-require 'yt/associations/authentications'
+require 'yt/modules/authentication'
 
 module Yt
   module Models
     # Provides methods to interact with YouTube accounts.
     # @see https://developers.google.com/youtube/v3/guides/authentication
     class Account < Base
-      include Associations::Authentications
+      # Includes methods to authenticate with YouTube API.
+      include Modules::Authentication
 
       # @!attribute [r] channel
       #   @return [Yt::Models::Channel] the account’s channel.

data/lib/yt/models/base.rb

@@ -1,45 +1,15 @@
 require 'yt/actions/delete'
 require 'yt/actions/update'
+require 'yt/modules/associations'
 require 'yt/errors/request_error'
 
-require 'active_support' # does not load anything by default but is required
-require 'active_support/core_ext/module/delegation' # for delegate
-require 'active_support/core_ext/string/inflections' # for camelize/constantize
-
 module Yt
   module Models
     class Base
+      extend Modules::Associations
+
       include Actions::Delete
       include Actions::Update
-
-      # @private
-      def self.has_many(attributes)
-        require "yt/collections/#{attributes}"
-        collection_name = attributes.to_s.sub(/.*\./, '').camelize.pluralize
-        collection = "Yt::Collections::#{collection_name}".constantize
-        define_memoized_method(attributes) { collection.of self }
-      end
-
-      # @private
-      def self.has_one(attribute)
-        attributes = attribute.to_s.pluralize
-        has_many attributes
-        define_memoized_method(attribute) { send(attributes).first! }
-      end
-
-    private
-
-      # A wrapper around Ruby’s +define_method+ that, in addition to adding an
-      # instance method called +name+, adds an instance variable called +@name+
-      # that stores the result of +name+ the first time is invoked, and returns
-      # it every other time. Especially useful if invoking +name+ takes a long
-      # time.
-      def self.define_memoized_method(name, &method)
-        define_method name do
-          ivar = instance_variable_get "@#{name}"
-          instance_variable_set "@#{name}", ivar || instance_eval(&method)
-        end
-      end
     end
   end
 

data/lib/yt/models/channel.rb

@@ -1,14 +1,13 @@
 require 'yt/models/resource'
-require 'yt/associations/earnings'
-require 'yt/associations/views'
+require 'yt/modules/reports'
 
 module Yt
   module Models
     # A channel resource contains information about a YouTube channel.
     # @see https://developers.google.com/youtube/v3/docs/channels
     class Channel < Resource
-      include Associations::Earnings
-      include Associations::Views
+      # Includes the +:has_report+ method to access YouTube Analytics reports.
+      extend Modules::Reports
 
       # @!attribute [r] subscriptions
       #   @return [Yt::Collections::Subscriptions] the channel’s subscriptions.
@@ -22,6 +21,27 @@ module Yt
       #   @return [Yt::Collections::Playlists] the channel’s playlists.
       has_many :playlists
 
+      # @macro has_report
+      has_report :earnings
+
+      # @macro has_report
+      has_report :views
+
+      # @macro has_report
+      has_report :comments
+
+      # @macro has_report
+      has_report :likes
+
+      # @macro has_report
+      has_report :dislikes
+
+      # @macro has_report
+      has_report :shares
+
+      # @macro has_report
+      has_report :impressions
+
       # @!attribute [r] statistics_set
       #   @return [Yt::Models::StatisticsSet] the statistics for the video.
       has_one :statistics_set

data/lib/yt/modules/associations.rb

@@ -0,0 +1,47 @@
+require 'active_support' # does not load anything by default but is required
+require 'active_support/core_ext/module/delegation' # for delegate
+require 'active_support/core_ext/string/inflections' # for camelize/constantize
+
+module Yt
+  module Modules
+    # Associations are a set of macro-like class methods to express
+    # relationship between YouTube resources like "Channel has many Videos" or
+    # "Account has one Id". They are inspired by ActiveRecord::Associations.
+    module Associations
+      # @example Adds the +videos+ method to the Channel resource.
+      #   class Channel < Resource
+      #     has_many :videos
+      #   end
+      def has_many(attributes)
+        require "yt/collections/#{attributes}"
+        collection_name = attributes.to_s.sub(/.*\./, '').camelize.pluralize
+        collection = "Yt::Collections::#{collection_name}".constantize
+        define_memoized_method(attributes) { collection.of self }
+      end
+
+      # @example Adds the +status+ method to the Video resource.
+      #   class Video < Resource
+      #     has_one :status
+      #   end
+      def has_one(attribute)
+        attributes = attribute.to_s.pluralize
+        has_many attributes
+        define_memoized_method(attribute) { send(attributes).first! }
+      end
+
+    private
+
+      # A wrapper around Ruby’s +define_method+ that, in addition to adding an
+      # instance method called +name+, adds an instance variable called +@name+
+      # that stores the result of +name+ the first time is invoked, and returns
+      # it every other time. Especially useful if invoking +name+ takes a long
+      # time.
+      def define_memoized_method(name, &method)
+        define_method name do
+          ivar = instance_variable_get "@#{name}"
+          instance_variable_set "@#{name}", ivar || instance_eval(&method)
+        end
+      end
+    end
+  end
+end

data/lib/yt/{associations/authentications.rb → modules/authentication.rb}

@@ -4,12 +4,12 @@ require 'yt/errors/no_items'
 require 'yt/errors/unauthorized'
 
 module Yt
-  module Associations
+  module Modules
     # Provides authentication methods to YouTube resources, which
     # allows to access to content detail set-specific methods like `access_token`.
     #
     # YouTube resources with authentication are: {Yt::Models::Account accounts}.
-    module Authentications
+    module Authentication
       delegate :access_token, :refresh_token, :expires_at, to: :authentication
 
       def initialize(options = {})

data/lib/yt/modules/reports.rb

@@ -0,0 +1,65 @@
+require 'yt/collections/reports'
+
+module Yt
+  module Modules
+    # Provides methods to to access the analytics reports of a resource.
+    #
+    # YouTube resources with reports are: {Yt::Models::Channel channels}.
+    module Reports
+      # @!macro has_report
+      #   @!method $1_on(date)
+      #     @return [Float] the $1 for a single day.
+      #     @param [#to_date] date The single day to get the $1 for.
+      #   @!method $1(options = {})
+      #     @return [Hash<Date, Float>] the $1 for a range of a days.
+      #     @param [Hash] options the range of days to get the $1 for.
+      #     @option options [#to_date] :since The first day of the range.
+      #       Also aliased as *:from*.
+      #     @option options [#to_date] :until The last day of the range.
+      #       Also aliased as *:to*.
+
+      # Defines two public instance methods to access the reports of a
+      # resource for a specific metric.
+      # @param [Symbol] metric the metric to access the reports of.
+      # @example Adds +earnings+ and +earnings_on+ on a Channel resource.
+      #   class Channel < Resource
+      #     has_report :earnings
+      #   end
+      def has_report(metric)
+        define_method "#{metric}_on" do |date|
+          send(metric, from: date, to: date).values.first
+        end
+
+        define_method metric do |options = {}|
+          from = options[:since] || options[:from] || 5.days.ago
+          to = options[:until] || options[:to] || 1.day.ago
+          range = Range.new *[from, to].map(&:to_date)
+
+          ivar = instance_variable_get "@#{metric}"
+          instance_variable_set "@#{metric}", ivar || {}
+
+          Hash[*range.flat_map do |date|
+            [date, instance_variable_get("@#{metric}")[date] ||= send("range_#{metric}", range)[date]]
+          end]
+        end
+
+        define_method "range_#{metric}" do |date_range|
+          ivar = instance_variable_get "@range_#{metric}"
+          instance_variable_set "@range_#{metric}", ivar || {}
+          instance_variable_get("@range_#{metric}")[date_range] ||= send("all_#{metric}").within date_range
+        end
+        private "range_#{metric}"
+
+        define_method "all_#{metric}" do
+          # @note Asking for the "earnings" metric of a day in which a channel
+          # made 0 USD returns the wrong "nil". But adding to the request the
+          # "estimatedMinutesWatched" metric returns the correct value 0.
+          query = metric
+          query = "estimatedMinutesWatched,#{metric}" if metric == :earnings
+          Collections::Reports.of(self).tap{|reports| reports.metric = query}
+        end
+        private "all_#{metric}"
+      end
+    end
+  end
+end

data/lib/yt/version.rb

@@ -1,3 +1,3 @@
 module Yt
-  VERSION = '0.7.3'
+  VERSION = '0.7.4'
 end

data/spec/{associations/device_auth → requests/as_account}/authentications_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
-require 'yt/associations/authentications'
+require 'yt/models/account'
 
-describe Yt::Associations::Authentications, :device_app do
+describe Yt::Account, :device_app do
   subject(:account) { Yt::Account.new attrs }
 
   describe '#refresh' do

data/spec/{associations/device_auth → requests/as_account}/channel_spec.rb

@@ -1,5 +1,4 @@
 # encoding: UTF-8
-
 require 'spec_helper'
 require 'yt/models/channel'
 

data/spec/requests/as_content_owner/channel_spec.rb

@@ -0,0 +1,245 @@
+# encoding: UTF-8
+require 'spec_helper'
+require 'yt/models/channel'
+
+describe Yt::Channel, :partner do
+  subject(:channel) { Yt::Channel.new id: id, auth: $content_owner }
+
+  context 'given a partnered channel', :partner do
+    context 'managed by the authenticated Content Owner' do
+      let(:id) { ENV['YT_TEST_PARTNER_CHANNEL_ID'] }
+
+      describe 'earnings can be retrieved for a specific day' do
+        context 'in which the channel made any money' do
+          let(:earnings) { channel.earnings_on 5.days.ago}
+          it { expect(earnings).to be_a Float }
+        end
+
+        # NOTE: This test sounds redundant, but it’s actually a reflection of
+        # another irrational behavior of YouTube API. In short, if you ask for
+        # the "earnings" metric of a day in which a channel made 0 USD, then
+        # the API returns "nil". But if you also for the "earnings" metric AND
+        # the "estimatedMinutesWatched" metric, then the API returns the
+        # correct value of "0", while still returning nil for those days in
+        # which the earnings have not been estimated yet.
+        context 'in which the channel did not make any money' do
+          let(:zero_date) { ENV['YT_TEST_PARTNER_CHANNEL_NO_EARNINGS_DATE'] }
+          let(:earnings) { channel.earnings_on zero_date}
+          it { expect(earnings).to eq 0 }
+        end
+
+        context 'in the future' do
+          let(:earnings) { channel.earnings_on 5.days.from_now}
+          it { expect(earnings).to be_nil }
+        end
+      end
+
+      describe 'earnings can be retrieved for a range of days' do
+        let(:date) { 4.days.ago }
+
+        specify 'with a given start (:since option)' do
+          expect(channel.earnings(since: date).keys.min).to eq date.to_date
+        end
+
+        specify 'with a given end (:until option)' do
+          expect(channel.earnings(until: date).keys.max).to eq date.to_date
+        end
+
+        specify 'with a given start (:from option)' do
+          expect(channel.earnings(from: date).keys.min).to eq date.to_date
+        end
+
+        specify 'with a given end (:to option)' do
+          expect(channel.earnings(to: date).keys.max).to eq date.to_date
+        end
+      end
+
+      describe 'views can be retrieved for a specific day' do
+        context 'in which the channel was partnered' do
+          let(:views) { channel.views_on 5.days.ago}
+          it { expect(views).to be_a Float }
+        end
+
+        context 'in which the channel was not partnered' do
+          let(:views) { channel.views_on 20.years.ago}
+          it { expect(views).to be_nil }
+        end
+      end
+
+      describe 'views can be retrieved for a range of days' do
+        let(:date) { 4.days.ago }
+
+        specify 'with a given start (:since option)' do
+          expect(channel.views(since: date).keys.min).to eq date.to_date
+        end
+
+        specify 'with a given end (:until option)' do
+          expect(channel.views(until: date).keys.max).to eq date.to_date
+        end
+
+        specify 'with a given start (:from option)' do
+          expect(channel.views(from: date).keys.min).to eq date.to_date
+        end
+
+        specify 'with a given end (:to option)' do
+          expect(channel.views(to: date).keys.max).to eq date.to_date
+        end
+      end
+
+      describe 'comments can be retrieved for a specific day' do
+        context 'in which the channel was partnered' do
+          let(:comments) { channel.comments_on 5.days.ago}
+          it { expect(comments).to be_a Float }
+        end
+
+        context 'in which the channel was not partnered' do
+          let(:comments) { channel.comments_on 20.years.ago}
+          it { expect(comments).to be_nil }
+        end
+      end
+
+      describe 'comments can be retrieved for a range of days' do
+        let(:date) { 4.days.ago }
+
+        specify 'with a given start (:since option)' do
+          expect(channel.comments(since: date).keys.min).to eq date.to_date
+        end
+
+        specify 'with a given end (:until option)' do
+          expect(channel.comments(until: date).keys.max).to eq date.to_date
+        end
+
+        specify 'with a given start (:from option)' do
+          expect(channel.comments(from: date).keys.min).to eq date.to_date
+        end
+
+        specify 'with a given end (:to option)' do
+          expect(channel.comments(to: date).keys.max).to eq date.to_date
+        end
+      end
+
+      describe 'likes can be retrieved for a specific day' do
+        context 'in which the channel was partnered' do
+          let(:likes) { channel.likes_on 5.days.ago}
+          it { expect(likes).to be_a Float }
+        end
+
+        context 'in which the channel was not partnered' do
+          let(:likes) { channel.likes_on 20.years.ago}
+          it { expect(likes).to be_nil }
+        end
+      end
+
+      describe 'likes can be retrieved for a range of days' do
+        let(:date) { 4.days.ago }
+
+        specify 'with a given start (:since option)' do
+          expect(channel.likes(since: date).keys.min).to eq date.to_date
+        end
+
+        specify 'with a given end (:until option)' do
+          expect(channel.likes(until: date).keys.max).to eq date.to_date
+        end
+
+        specify 'with a given start (:from option)' do
+          expect(channel.likes(from: date).keys.min).to eq date.to_date
+        end
+
+        specify 'with a given end (:to option)' do
+          expect(channel.likes(to: date).keys.max).to eq date.to_date
+        end
+      end
+
+      describe 'dislikes can be retrieved for a specific day' do
+        context 'in which the channel was partnered' do
+          let(:dislikes) { channel.dislikes_on 5.days.ago}
+          it { expect(dislikes).to be_a Float }
+        end
+
+        context 'in which the channel was not partnered' do
+          let(:dislikes) { channel.dislikes_on 20.years.ago}
+          it { expect(dislikes).to be_nil }
+        end
+      end
+
+      describe 'dislikes can be retrieved for a range of days' do
+        let(:date) { 4.days.ago }
+
+        specify 'with a given start (:since option)' do
+          expect(channel.dislikes(since: date).keys.min).to eq date.to_date
+        end
+
+        specify 'with a given end (:until option)' do
+          expect(channel.dislikes(until: date).keys.max).to eq date.to_date
+        end
+
+        specify 'with a given start (:from option)' do
+          expect(channel.dislikes(from: date).keys.min).to eq date.to_date
+        end
+
+        specify 'with a given end (:to option)' do
+          expect(channel.dislikes(to: date).keys.max).to eq date.to_date
+        end
+      end
+
+      describe 'shares can be retrieved for a range of days' do
+        let(:date) { 4.days.ago }
+
+        specify 'with a given start (:since option)' do
+          expect(channel.shares(since: date).keys.min).to eq date.to_date
+        end
+
+        specify 'with a given end (:until option)' do
+          expect(channel.shares(until: date).keys.max).to eq date.to_date
+        end
+
+        specify 'with a given start (:from option)' do
+          expect(channel.shares(from: date).keys.min).to eq date.to_date
+        end
+
+        specify 'with a given end (:to option)' do
+          expect(channel.shares(to: date).keys.max).to eq date.to_date
+        end
+      end
+
+      describe 'impressions can be retrieved for a specific day' do
+        context 'in which the channel was partnered' do
+          let(:impressions) { channel.impressions_on 5.days.ago}
+          it { expect(impressions).to be_a Float }
+        end
+
+        context 'in which the channel was not partnered' do
+          let(:impressions) { channel.impressions_on 20.years.ago}
+          it { expect(impressions).to be_nil }
+        end
+      end
+
+      describe 'impressions can be retrieved for a range of days' do
+        let(:date) { 4.days.ago }
+
+        specify 'with a given start (:since option)' do
+          expect(channel.impressions(since: date).keys.min).to eq date.to_date
+        end
+
+        specify 'with a given end (:until option)' do
+          expect(channel.impressions(until: date).keys.max).to eq date.to_date
+        end
+
+        specify 'with a given start (:from option)' do
+          expect(channel.impressions(from: date).keys.min).to eq date.to_date
+        end
+
+        specify 'with a given end (:to option)' do
+          expect(channel.impressions(to: date).keys.max).to eq date.to_date
+        end
+      end
+    end
+
+    context 'not managed by the authenticated Content Owner' do
+      let(:id) { 'UCBR8-60-B28hp2BmDPdntcQ' }
+
+      it { expect{channel.earnings}.to raise_error Yt::Errors::Forbidden }
+      it { expect{channel.views}.to raise_error Yt::Errors::Forbidden }
+    end
+  end
+end

data/spec/{associations/no_auth → requests/unauthenticated}/video_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 require 'yt/models/video'
 
-describe Yt::Video, :device_app do
-  subject(:video) { Yt::Video.new id: id, auth: $account }
+describe Yt::Video do
+  subject(:video) { Yt::Video.new id: id }
 
   context 'given a public video with annotations' do
     let(:id) { 'MESycYJytkU' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yt
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Claudio Baccigalupo
@@ -122,15 +122,11 @@ files:
 - lib/yt/actions/insert.rb
 - lib/yt/actions/list.rb
 - lib/yt/actions/update.rb
-- lib/yt/associations/authentications.rb
-- lib/yt/associations/earnings.rb
-- lib/yt/associations/views.rb
 - lib/yt/collections/annotations.rb
 - lib/yt/collections/authentications.rb
 - lib/yt/collections/base.rb
 - lib/yt/collections/channels.rb
 - lib/yt/collections/content_details.rb
-- lib/yt/collections/earnings.rb
 - lib/yt/collections/ids.rb
 - lib/yt/collections/partnered_channels.rb
 - lib/yt/collections/playlist_items.rb
@@ -143,7 +139,6 @@ files:
 - lib/yt/collections/subscriptions.rb
 - lib/yt/collections/user_infos.rb
 - lib/yt/collections/videos.rb
-- lib/yt/collections/views.rb
 - lib/yt/config.rb
 - lib/yt/errors/forbidden.rb
 - lib/yt/errors/no_items.rb
@@ -172,27 +167,13 @@ files:
 - lib/yt/models/url.rb
 - lib/yt/models/user_info.rb
 - lib/yt/models/video.rb
+- lib/yt/modules/associations.rb
+- lib/yt/modules/authentication.rb
+- lib/yt/modules/reports.rb
 - lib/yt/version.rb
-- spec/associations/device_auth/account_spec.rb
-- spec/associations/device_auth/authentications_spec.rb
-- spec/associations/device_auth/channel_spec.rb
-- spec/associations/device_auth/content_owner_spec.rb
-- spec/associations/device_auth/earnings_spec.rb
-- spec/associations/device_auth/playlist_item_spec.rb
-- spec/associations/device_auth/playlist_spec.rb
-- spec/associations/device_auth/resource_spec.rb
-- spec/associations/device_auth/video_spec.rb
-- spec/associations/device_auth/views_spec.rb
-- spec/associations/no_auth/video_spec.rb
-- spec/associations/server_auth/channel_spec.rb
-- spec/associations/server_auth/playlist_item_spec.rb
-- spec/associations/server_auth/playlist_spec.rb
-- spec/associations/server_auth/resource_spec.rb
-- spec/associations/server_auth/video_spec.rb
 - spec/collections/annotations_spec.rb
 - spec/collections/channels_spec.rb
 - spec/collections/content_details_spec.rb
-- spec/collections/earnings_spec.rb
 - spec/collections/playlist_items_spec.rb
 - spec/collections/playlists_spec.rb
 - spec/collections/ratings_spec.rb
@@ -221,6 +202,21 @@ files:
 - spec/models/url_spec.rb
 - spec/models/user_info_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/playlist_item_spec.rb
+- spec/requests/as_account/playlist_spec.rb
+- spec/requests/as_account/resource_spec.rb
+- spec/requests/as_account/video_spec.rb
+- spec/requests/as_content_owner/channel_spec.rb
+- spec/requests/as_content_owner/content_owner_spec.rb
+- spec/requests/as_server_app/channel_spec.rb
+- spec/requests/as_server_app/playlist_item_spec.rb
+- spec/requests/as_server_app/playlist_spec.rb
+- spec/requests/as_server_app/resource_spec.rb
+- spec/requests/as_server_app/video_spec.rb
+- spec/requests/unauthenticated/video_spec.rb
 - spec/spec_helper.rb
 - spec/support/fail_matcher.rb
 - spec/support/global_hooks.rb
@@ -251,26 +247,9 @@ 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/account_spec.rb
-- spec/associations/device_auth/authentications_spec.rb
-- spec/associations/device_auth/channel_spec.rb
-- spec/associations/device_auth/content_owner_spec.rb
-- spec/associations/device_auth/earnings_spec.rb
-- spec/associations/device_auth/playlist_item_spec.rb
-- spec/associations/device_auth/playlist_spec.rb
-- spec/associations/device_auth/resource_spec.rb
-- spec/associations/device_auth/video_spec.rb
-- spec/associations/device_auth/views_spec.rb
-- spec/associations/no_auth/video_spec.rb
-- spec/associations/server_auth/channel_spec.rb
-- spec/associations/server_auth/playlist_item_spec.rb
-- spec/associations/server_auth/playlist_spec.rb
-- spec/associations/server_auth/resource_spec.rb
-- spec/associations/server_auth/video_spec.rb
 - spec/collections/annotations_spec.rb
 - spec/collections/channels_spec.rb
 - spec/collections/content_details_spec.rb
-- spec/collections/earnings_spec.rb
 - spec/collections/playlist_items_spec.rb
 - spec/collections/playlists_spec.rb
 - spec/collections/ratings_spec.rb
@@ -299,6 +278,21 @@ test_files:
 - spec/models/url_spec.rb
 - spec/models/user_info_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/playlist_item_spec.rb
+- spec/requests/as_account/playlist_spec.rb
+- spec/requests/as_account/resource_spec.rb
+- spec/requests/as_account/video_spec.rb
+- spec/requests/as_content_owner/channel_spec.rb
+- spec/requests/as_content_owner/content_owner_spec.rb
+- spec/requests/as_server_app/channel_spec.rb
+- spec/requests/as_server_app/playlist_item_spec.rb
+- spec/requests/as_server_app/playlist_spec.rb
+- spec/requests/as_server_app/resource_spec.rb
+- spec/requests/as_server_app/video_spec.rb
+- spec/requests/unauthenticated/video_spec.rb
 - spec/spec_helper.rb
 - spec/support/fail_matcher.rb
 - spec/support/global_hooks.rb

data/lib/yt/associations/earnings.rb

@@ -1,44 +0,0 @@
-require 'yt/collections/earnings'
-
-module Yt
-  module Associations
-    # Provides methods which allows to access the earnings generated by a resource.
-    #
-    # YouTube resources with earning are: {Yt::Models::Channel channels}.
-    module Earnings
-      # @return [Float] the estimated earnings for one specific day in USD.
-      # @param [Date or Time or DateTime or String] date The date to obtain
-      #   the estimated earnings for. If +String+, must be Date-parseable.
-      def earnings_on(date)
-        earnings(from: date, to: date).values.first
-      end
-
-      # @return [Hash] the estimated earnings for a range of days. Each +key+ is a +Date+
-      #   and each +value+ is a +Float+, representing estimated earnings in USD.
-      # @param [Hash] options the range of days to get the earnings for.
-      # @option options [Date or Time or DateTime or String] :since The start
-      #   of the days range. If +String+, must be Date-parseable. Also aliased as *:from*.
-      # @option options [Date or Time or DateTime or String] :until The end
-      #   of the days range. If +String+, must be Date-parseable. Also aliased as *:to*.
-      def earnings(options = {})
-        from = options[:since] || options[:from] || 6.days.ago
-        to = options[:until] || options[:to] || 2.days.ago
-        range = Range.new *[from, to].map(&:to_date)
-
-        Hash[*range.flat_map do |date|
-          [date, (@earnings ||= {})[date] ||= range_earnings(range)[date]]
-        end]
-      end
-
-    private
-
-      def range_earnings(date_range)
-        (@range_earnings ||= {})[date_range] ||= all_earnings.within date_range
-      end
-
-      def all_earnings
-        Collections::Earnings.of self
-      end
-    end
-  end
-end

data/lib/yt/associations/views.rb

@@ -1,44 +0,0 @@
-require 'yt/collections/views'
-
-module Yt
-  module Associations
-    # Provides methods which allows to access the view count of a resource.
-    #
-    # YouTube resources with view counts are: {Yt::Models::Channel channels}.
-    module Views
-      # @return [Integer, nil] the view count for one specific day.
-      # @param [Date or Time or DateTime or String] date The date to obtain
-      #   the views for. If +String+, must be Date-parseable.
-      def views_on(date)
-        views(from: date, to: date).values.first
-      end
-
-      # @return [Hash] the view counts for a range of days. Each +key+ is a +Date+
-      #   and each +value+ is an +Integer+ or +nil+, representing the number of views.
-      # @param [Hash] options the range of days to get the view for.
-      # @option options [Date or Time or DateTime or String] :since The start
-      #   of the days range. If +String+, must be Date-parseable. Also aliased as *:from*.
-      # @option options [Date or Time or DateTime or String] :until The end
-      #   of the days range. If +String+, must be Date-parseable. Also aliased as *:to*.
-      def views(options = {})
-        from = options[:since] || options[:from] || 5.days.ago
-        to = options[:until] || options[:to] || 1.day.ago
-        range = Range.new *[from, to].map(&:to_date)
-
-        Hash[*range.flat_map do |date|
-          [date, (@views ||= {})[date] ||= range_views(range)[date]]
-        end]
-      end
-
-    private
-
-      def range_views(date_range)
-        (@range_views ||= {})[date_range] ||= all_views.within date_range
-      end
-
-      def all_views
-        Collections::Views.of self
-      end
-    end
-  end
-end

data/lib/yt/collections/earnings.rb

@@ -1,14 +0,0 @@
-require 'yt/collections/reports'
-
-module Yt
-  module Collections
-    class Earnings < Reports
-
-    private
-
-      def metrics
-        [:estimatedMinutesWatched, :earnings].join ','
-      end
-    end
-  end
-end

data/lib/yt/collections/views.rb

@@ -1,18 +0,0 @@
-require 'yt/collections/reports'
-
-module Yt
-  module Collections
-    class Views < Reports
-
-    private
-
-      def metrics
-        :views
-      end
-
-      def value_of(data)
-        data.last.to_i if data.last
-      end
-    end
-  end
-end

data/spec/associations/device_auth/earnings_spec.rb

@@ -1,67 +0,0 @@
-# encoding: UTF-8
-
-require 'spec_helper'
-
-describe Yt::Associations::Earnings, :partner do
-  context 'given a partnered channel' do
-    let(:channel) { Yt::Channel.new id: channel_id, auth: $content_owner }
-
-    context 'managed by the authenticated Content Owner' do
-      let(:channel_id) { ENV['YT_TEST_PARTNER_CHANNEL_ID'] }
-
-      describe '#earnings_on' do
-        context 'and a date in which the channel made any money' do
-          let(:earnings) { channel.earnings_on 5.days.ago}
-          it { expect(earnings).to be_a Float }
-        end
-
-        # NOTE: This test sounds redundant, but it’s actually a reflection of
-        # another irrational behavior of YouTube API. In short, if you ask for
-        # the "earnings" metric of a day in which a channel made 0 USD, then
-        # the API returns "nil". But if you also for the "earnings" metric AND
-        # the "estimatedMinutesWatched" metric, then the API returns the
-        # correct value of "0", while still returning nil for those days in
-        # which the earnings have not been estimated yet.
-        context 'and a date in which the channel did not make any money' do
-          let(:zero_date) { ENV['YT_TEST_PARTNER_CHANNEL_NO_EARNINGS_DATE'] }
-          let(:earnings) { channel.earnings_on zero_date}
-          it { expect(earnings).to eq 0 }
-        end
-
-        context 'and a date for which earnings have not yet been estimated' do
-          let(:earnings) { channel.earnings_on 5.days.from_now}
-          it { expect(earnings).to be_nil }
-        end
-      end
-
-      describe '#earnings' do
-        let(:date) { 4.days.ago }
-
-        context 'given a :since option' do
-          let(:earnings) { channel.earnings since: date}
-          it { expect(earnings.keys.min).to eq date.to_date }
-        end
-
-        context 'given a :from option' do
-          let(:earnings) { channel.earnings from: date}
-          it { expect(earnings.keys.min).to eq date.to_date }
-        end
-
-        context 'given a :until option' do
-          let(:earnings) { channel.earnings until: date}
-          it { expect(earnings.keys.max).to eq date.to_date }
-        end
-
-        context 'given a :to option' do
-          let(:earnings) { channel.earnings to: date}
-          it { expect(earnings.keys.max).to eq date.to_date }
-        end
-      end
-    end
-
-    context 'not managed by the authenticated Content Owner' do
-      let(:channel_id) { 'UCBR8-60-B28hp2BmDPdntcQ' }
-      it { expect{channel.earnings}.to raise_error Yt::Errors::Forbidden }
-    end
-  end
-end

data/spec/associations/device_auth/views_spec.rb

@@ -1,52 +0,0 @@
-require 'spec_helper'
-
-describe Yt::Associations::Views, :partner do
-  context 'given a partnered channel' do
-    let(:channel) { Yt::Channel.new id: channel_id, auth: $content_owner }
-
-    context 'managed by the authenticated Content Owner' do
-      let(:channel_id) { ENV['YT_TEST_PARTNER_CHANNEL_ID'] }
-
-      describe '#views_on' do
-        context 'and a date in which the channel was partnered' do
-          let(:views) { channel.views_on 5.days.ago}
-          it { expect(views).to be_an Integer }
-        end
-
-        context 'and a date in which the channel was not partnered' do
-          let(:views) { channel.views_on 20.years.ago}
-          it { expect(views).to be_nil }
-        end
-      end
-
-      describe '#views' do
-        let(:date) { 4.days.ago }
-
-        context 'given a :since option' do
-          let(:views) { channel.views since: date}
-          it { expect(views.keys.min).to eq date.to_date }
-        end
-
-        context 'given a :from option' do
-          let(:views) { channel.views from: date}
-          it { expect(views.keys.min).to eq date.to_date }
-        end
-
-        context 'given a :until option' do
-          let(:views) { channel.views until: date}
-          it { expect(views.keys.max).to eq date.to_date }
-        end
-
-        context 'given a :to option' do
-          let(:views) { channel.views to: date}
-          it { expect(views.keys.max).to eq date.to_date }
-        end
-      end
-    end
-
-    context 'not managed by the authenticated Content Owner' do
-      let(:channel_id) { 'UCBR8-60-B28hp2BmDPdntcQ' }
-      it { expect{channel.views}.to raise_error Yt::Errors::Forbidden }
-    end
-  end
-end

data/spec/collections/earnings_spec.rb

@@ -1,18 +0,0 @@
-require 'spec_helper'
-require 'yt/collections/earnings'
-
-describe Yt::Collections::Earnings do
-  subject(:collection) { Yt::Collections::Earnings.new parent: channel }
-  let(:channel) { Yt::Channel.new id: 'UCxO1tY8h1AhOz0T4ENwmpow' }
-  let(:date) { 1.day.ago.to_date }
-  let(:dollars) { 10 }
-  before { expect(collection).to behave }
-
-  describe '#within' do
-    context 'given YouTube responds with a list of earnings' do
-      let(:behave) { receive(:flat_map).and_return [date, dollars] }
-
-      it { expect(collection.within(date..date)[date]).to eq dollars }
-    end
-  end
-end