yt 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3db26d07a5ba0fed297bba2c49bf6d3124620f48
-  data.tar.gz: 9fdda77579c877c307fbd36880744ca89a925b29
+  metadata.gz: d346ffef89d5b5f77243722480b4182d31d23a7f
+  data.tar.gz: 1148ab3e8561f75edba5cf62dad118d0e4fe255d
 SHA512:
-  metadata.gz: ee58c92e64c053f44f05634012be1804841db856118917c9a02539a47267bedc1c3e4b2f662988fac7c33fd1688db71fe45f1aabed3773da78e0a8dfe3710d0a
-  data.tar.gz: 3fa6e55ee78ec12f9e9a6810f8a7260fd2d62313758324cb984e2f3655a784af60504614796d18f0107e9ad64ffa221df202283fb64537bcf1630e8d549a6746
+  metadata.gz: 7ab946dc91a6d0089042d33ada2939b0a8c6a2a8221360e3f9cd122c197cdf40835715d3b284b869c344de7af8260eaa305a83b76fddcff8fd29372dee876536
+  data.tar.gz: 1c9cbb659eddc7993dbd3f5c9e8206d2bed99639bfb189bf013565d7b9884773711e45f379f2ac491e3e92e4282a0b2b8b05d1692a6c8d4315d1997e433fcabb

data/.travis.yml

@@ -6,11 +6,11 @@ matrix:
   - rvm: 1.9.3
     gemfile: gemfiles/Gemfile.activesupport-3.x
     env:
-    - secure: Z93M7+GBYG8A7Dsjwcsgj/8AmdJ5X2KezBk9qelw89/OtAqIp1zMNQehTEg24p/NygkNjnGycb3DQuW++31v4c+mt5/MgDDhd2jXJ4+js+3gAMAIpiMtPJfEOvmKxLbC0uMaQhXLn7dGMnn8ed7hh6Zu/8P+17qZvVeI0thI3Dg=
+    - secure: OsmWyhhYNILEb1lhqxPX+iEfbWzC3dELuxQ7JGP9iN/FhqBtlV51cu+u2cBBdql6Gzuqi4VlMEeJSX0PQUmzOsMb0vHhOJDyp4a32NE+xry8LOT8XdCwni20ZBcUeFxC5hMUVebPuhqBTFjBWbXQKwKSXIdPnNWz31d9kyGIsxk=
   - rvm: 2.0.0
     gemfile: gemfiles/Gemfile.activesupport-4.x
     env:
-    - secure: eIxGZcTZFVMxn0cxjaknhflAR78L6q+Q2G6jCXnFxqj8ARfgAS1F8v7ErkGaJ9h6dxfsH+5evhj4ZUc/gvHaqs8jcT9CVGUZsC7jpZz3gkfQ9k7Tm3sTnSfv4HbqGM8OkCJkLNOUQypmGr+mkPQskroNPhm6WT9Ml1vGq1RSTow=
+    - secure: FrmFA2BE0FYyuKsf0FEO0EAXY+h048HbD1p3lu5XPo9/lxpAl7wM5m12HsnJQuNY6UlUmZ5bp9f8upCBZpz7cLZK5e/FWLWSvkv3Fts+NVsbAcVtFgvBKOCgTznZi/qgUtqbWBevkM3gyXyylzdB+c4wWjoOO/xSDVR227m8nMA=
 env:
   global:
   - secure: ApPj5c9h6xk+AbHHf4KXL10QnleYCWwcp2+qMFolrS6RWR5vhrnKq1UBo0h59HuvXeOQIgZ/GmocuSEZovS9c1hQP3n0PHSNEnGUNJyn6CS3BiPQSWmC3p2pONo1Xv+hVWfzDoEv80b82GX5P5x/l1BSqhpxLA9geITJprWsoLg=
@@ -22,4 +22,4 @@ env:
   - secure: Ejj8tsuwyrRVmCc/R9ubKWCHWhCGpe0Dy6fc1UuPCkcMZyXq9ZC02v2obWsTQQ7epEgsCYZAO4v/gWpuv1b1huGcWdfJzMW7RCoY87cEf9HnAK0lSwGx4+/pYkEMe8y5p149C3vAR8nqczvEavN1fUq/WwPUqp+JyDP7kwFTs2Y=
   - secure: gE5kAT1R54hmS+W3YYGcUtlD8ZskvTctVR3sr+C5CUjVPdq6Ktx5Q/a6EJyAVVrhxpaCOuk3LG+VkzdQIVFUNRiDPcOulkond4HkSQDoy+IJ/wTXvUS+lIJ1ERUnWega+APrQUjH5s2WayPGZUBqWt/u8Tt9EmSUZfuKZSEXqZk=
   - secure: ZUx5v/wHW/TENg8NfFINiiMoe2D031ntDTiuIBdf88c/bMClkEtRRgomtK9RBkFonEyGEOkXxUm2SLzRf340V3eIXWQhil7ab1lcYs8X59aVS/NK/GqChH8Nia17gc3OTQ9k6rYvj4Lp60Dh9WG1cijLPd4/OvPmf6qX9uYfJMw=
-  - secure: DumQVO01Y3Ki1skuOYOZzosDb6jS0XyG1O8Agy3mVxXGJzQE+s1z2UFz4gMpsU9o/gmiNMddp7I6+RtbZjo9hN3H7vlRRwEeB7tuUMiDyomSx1FlHcCFfPdTmhxGg8X78SErMWqNC6eReGrCTgBdIq1ho7dIu53qJNxTEFqx7eI=
+  - secure: DumQVO01Y3Ki1skuOYOZzosDb6jS0XyG1O8Agy3mVxXGJzQE+s1z2UFz4gMpsU9o/gmiNMddp7I6+RtbZjo9hN3H7vlRRwEeB7tuUMiDyomSx1FlHcCFfPdTmhxGg8X78SErMWqNC6eReGrCTgBdIq1ho7dIu53qJNxTEFqx7eI=

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    yt (0.7.4)
+    yt (0.7.5)
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.1)
+    activesupport (4.1.2)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -20,7 +20,7 @@ GEM
       term-ansicolor
       thor
     diff-lcs (1.2.5)
-    docile (1.1.4)
+    docile (1.1.5)
     i18n (0.6.9)
     json (1.8.1)
     mime-types (2.3)
@@ -33,14 +33,14 @@ GEM
       rspec-core (~> 3.0.0)
       rspec-expectations (~> 3.0.0)
       rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.1)
+    rspec-core (3.0.2)
       rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.1)
+    rspec-expectations (3.0.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.1)
+    rspec-mocks (3.0.2)
       rspec-support (~> 3.0.0)
-    rspec-support (3.0.0)
+    rspec-support (3.0.2)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json

data/HISTORY.md

@@ -12,6 +12,7 @@ v0.7 - 2014/06/18
 * 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
+* Allow both normal and partnered channels to retrieve reports about views, comments, likes, dislikes, shares
 
 v0.6 - 2014/06/05
 -----------------

data/README.md

@@ -122,6 +122,12 @@ channel.subscribe #=> true
 
 channel.create_playlist title: 'New playlist' #=> true
 channel.delete_playlists title: 'New playlist' #=> [true]
+
+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.likes from: 8.days.ago #=> {Tue, 27 May 2014 => 7.0, Wed, 28 May 2014 => 0.0, …}
+channel.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}
 ```
 
 *The methods above require to be authenticated as a YouTube account (see below).*
@@ -133,8 +139,8 @@ channel = Yt::Channel.new id: 'UCxO1tY8h1AhOz0T4ENwmpow', auth: content_owner
 channel.earnings_on 5.days.ago #=> 12.23
 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.likes from: 8.days.ago #=> {Tue, 27 May 2014 => 7.0, Wed, 28 May 2014 => 0.0, …}
+channel.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
 ```
@@ -394,7 +400,7 @@ with an extra `code` parameter that looks something like `4/Ja60jJ7_Kw0`.
 Just pass the code to the following method to authenticate and initialize the account:
 
 ```ruby
-account = Yt::Account.new authorization_code: '4/Ja60jJ7_Kw0'
+account = Yt::Account.new authorization_code: '4/Ja60jJ7_Kw0', redirect_uri: redirect_uri
 account.email #=> (retrieves the account’s e-mail address)
 account.videos #=> (lists a video to an account’s playlist)
 ```
@@ -433,7 +439,7 @@ To install on your system, run
 
 To use inside a bundled Ruby project, add this line to the Gemfile:
 
-    gem 'yt', '~> 0.7.4'
+    gem 'yt', '~> 0.7.5'
 
 Since the gem follows [Semantic Versioning](http://semver.org),
 indicating the full version in your Gemfile (~> *major*.*minor*.*patch*)

data/lib/yt/collections/authentications.rb

@@ -9,7 +9,7 @@ module Yt
     private
 
       def new_item(data)
-        data['refresh_token'] = auth_params[:refresh_token]
+        data['refresh_token'] ||= auth_params[:refresh_token]
         Yt::Authentication.new data
       end
 

data/lib/yt/collections/reports.rb

@@ -20,14 +20,16 @@ module Yt
       def list_params
         super.tap do |params|
           params[:path] = '/youtube/analytics/v1/reports'
-          params[:params] = {}.tap do |params|
-            params['ids'] = "contentOwner==#{@auth.owner_name}"
-            params['filters'] = "channel==#{@parent.id}"
-            params['start-date'] = @days_range.begin
-            params['end-date'] = @days_range.end
-            params['metrics'] = @metric
-            params['dimensions'] = :day
-          end
+          params[:params] = @parent.reports_params.merge reports_params
+        end
+      end
+
+      def reports_params
+        {}.tap do |params|
+          params['start-date'] = @days_range.begin
+          params['end-date'] = @days_range.end
+          params['metrics'] = @metric
+          params['dimensions'] = :day
         end
       end
 

data/lib/yt/models/account.rb

@@ -24,6 +24,10 @@ module Yt
       #   @return [Yt::Collections::Videos] the videos owned by the account.
       has_many :videos
 
+      # @return [String] name of the CMS account, if the account is partnered.
+      # @return [nil] if the account is not a partnered content owner.
+      attr_reader :owner_name
+
       # @private
       # Tells `has_many :videos` that account.videos should return all the
       # videos *owned by* the account (public, private, unlisted).

data/lib/yt/models/channel.rb

@@ -121,6 +121,21 @@ module Yt
       def videos_params
         {channelId: id}
       end
+
+      # @private
+      # Tells `has_reports` to retrieve the reports from YouTube Analytics API
+      # either as a Channel or as a Content Owner.
+      # @see https://developers.google.com/youtube/analytics/v1/reports
+      def reports_params
+        {}.tap do |params|
+          if auth.owner_name
+            params['ids'] = "contentOwner==#{auth.owner_name}"
+            params['filters'] = "channel==#{id}"
+          else
+            params['ids'] = "channel==#{id}"
+          end
+        end
+      end
     end
   end
 end

data/lib/yt/models/content_owner.rb

@@ -11,9 +11,6 @@ module Yt
       #   @return [Yt::Collection::PartneredChannels] the channels managed by the CMS account.
       has_many :partnered_channels
 
-      # @return [String] the name of the CMS account.
-      attr_reader :owner_name
-
       def initialize(options = {})
         super options
         @owner_name = options[:owner_name]

data/lib/yt/version.rb

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

data/spec/requests/as_account/channel_spec.rb

@@ -70,6 +70,26 @@ describe Yt::Channel, :device_app do
     # rather than a more logical 4xx error. Hopefully this will get fixed
     # and this code (and test) removed.
     it { expect{channel.subscribe}.to raise_error Yt::Errors::ServerError }
+
+    it 'returns valid reports for channel-related metrics' do
+      # Some reports are only available to Content Owners.
+      # See content ownere test for more details about what the methods return.
+      expect{channel.views}.not_to raise_error
+      expect{channel.comments}.not_to raise_error
+      expect{channel.likes}.not_to raise_error
+      expect{channel.dislikes}.not_to raise_error
+      expect{channel.shares}.not_to raise_error
+      expect{channel.earnings}.to raise_error Yt::Errors::Unauthorized
+      expect{channel.impressions}.to raise_error Yt::Errors::Unauthorized
+
+      expect{channel.views_on 3.days.ago}.not_to raise_error
+      expect{channel.comments_on 3.days.ago}.not_to raise_error
+      expect{channel.likes_on 3.days.ago}.not_to raise_error
+      expect{channel.dislikes_on 3.days.ago}.not_to raise_error
+      expect{channel.shares_on 3.days.ago}.not_to raise_error
+      expect{channel.earnings_on 3.days.ago}.to raise_error Yt::Errors::Unauthorized
+      expect{channel.impressions_on 3.days.ago}.to raise_error Yt::Errors::Unauthorized
+    end
   end
 
   context 'given an unknown channel' do

data/spec/requests/as_content_owner/channel_spec.rb

@@ -182,6 +182,18 @@ describe Yt::Channel, :partner do
         end
       end
 
+      describe 'shares can be retrieved for a specific day' do
+        context 'in which the channel was partnered' do
+          let(:shares) { channel.shares_on 5.days.ago}
+          it { expect(shares).to be_a Float }
+        end
+
+        context 'in which the channel was not partnered' do
+          let(:shares) { channel.shares_on 20.years.ago}
+          it { expect(shares).to be_nil }
+        end
+      end
+
       describe 'shares can be retrieved for a range of days' do
         let(:date) { 4.days.ago }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yt
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Claudio Baccigalupo