yt 0.24.6 → 0.24.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d676620de210d93c367be31ffddc1021b99d8408
-  data.tar.gz: 0984d490fcafdac190230bb010ca406b8e662e2c
+  metadata.gz: 8fdec6049878d1f96dfb941ab2716fc3146e61c7
+  data.tar.gz: e7d54a900325067ba66fd17e42138dbb197ffec2
 SHA512:
-  metadata.gz: a337c85ea2a024edf0ec05ca3ff6767b42e5439994b4e19e0cc23595372ea4f3edf742b56a871313f596c1a9887566040e130f0f4c7bdd390fcc60cb09ddba77
-  data.tar.gz: 457231ab1328d8ef4704dbc3df67b2831d8c624c5ecc57e2ebeb53317031bdec1ea2e7b9326739386d0c85614e353c37dc10dea305504f8439aeee16469802bf
+  metadata.gz: 80cd1f43b207221e568aad90ab1fba921b44a3d33a7265a7d58303b76e5a322e2734872d4a6d825f41fdf8ee01b1e224ad6426dd4cc08199e2e57b1bf849b344
+  data.tar.gz: e2cc67add9e2b91a4f0770c31df76d54579d3f0034a4b8aef74783a3f76f0f1afd638d39275396954d0a07886aba39701c46294764eb7f1ee42763b5560ed2a4

data/CHANGELOG.md

@@ -6,6 +6,10 @@ For more information about changelogs, check
 [Keep a Changelog](http://keepachangelog.com) and
 [Vandamme](http://tech-angels.github.io/vandamme).
 
+## 0.24.7 - 2015-06-08
+
+* [ENHANCEMENT] Add `:videos` option to limit channel reports to subset of videos
+
 ## 0.24.6 - 2015-06-08
 
 * [ENHANCEMENT] When grouping by day, return results in chronological order

data/README.md

@@ -41,7 +41,7 @@ To install on your system, run
 
 To use inside a bundled Ruby project, add this line to the Gemfile:
 
-    gem 'yt', '~> 0.24.6'
+    gem 'yt', '~> 0.24.7'
 
 Since the gem follows [Semantic Versioning](http://semver.org),
 indicating the full version in your Gemfile (~> *major*.*minor*.*patch*)

data/lib/yt/associations/has_reports.rb

@@ -236,6 +236,7 @@ module Yt
           country = location.is_a?(Hash) ? location[:country] : location
           state = location[:state] if location.is_a?(Hash)
           dimension = options[:by] || (metric == :viewer_percentage ? :gender_age_group : :range)
+          videos = options[:videos]
           if dimension == :month
             from = from.to_date.beginning_of_month
             to = to.to_date.beginning_of_month
@@ -246,7 +247,7 @@ module Yt
           reports = Collections::Reports.of(self).tap do |reports|
             reports.metrics =  self.class.instance_variable_get(:@metrics).select{|k, v| k.in? only}
           end
-          reports.within date_range, country, state, dimension
+          reports.within date_range, country, state, dimension, videos
         end unless defined?(reports)
       end
 
@@ -258,6 +259,7 @@ module Yt
           country = location.is_a?(Hash) ? location[:country] : location
           state = location[:state] if location.is_a?(Hash)
           dimension = options[:by] || (metric == :viewer_percentage ? :gender_age_group : :range)
+          videos = options[:videos]
           if dimension == :month
             from = from.to_date.beginning_of_month
             to = to.to_date.beginning_of_month
@@ -269,10 +271,10 @@ module Yt
           results = case dimension
           when :day
             Hash[*range.flat_map do |date|
-              [date, instance_variable_get("@#{metric}_#{dimension}_#{country}_#{state}")[date] ||= send("range_#{metric}", range, dimension, country, state)[date]]
+              [date, instance_variable_get("@#{metric}_#{dimension}_#{country}_#{state}")[date] ||= send("range_#{metric}", range, dimension, country, state, videos)[date]]
             end]
           else
-            instance_variable_get("@#{metric}_#{dimension}_#{country}_#{state}")[range] ||= send("range_#{metric}", range, dimension, country, state)
+            instance_variable_get("@#{metric}_#{dimension}_#{country}_#{state}")[range] ||= send("range_#{metric}", range, dimension, country, state, videos)
           end
           lookup_class = case options[:by]
             when :video, :related_video then Yt::Collections::Videos
@@ -289,10 +291,10 @@ module Yt
       end
 
       def define_range_metric_method(metric)
-        define_method "range_#{metric}" do |date_range, dimension, country, state|
+        define_method "range_#{metric}" do |date_range, dimension, country, state, videos|
           ivar = instance_variable_get "@range_#{metric}_#{dimension}_#{country}_#{state}"
           instance_variable_set "@range_#{metric}_#{dimension}_#{country}_#{state}", ivar || {}
-          instance_variable_get("@range_#{metric}_#{dimension}_#{country}_#{state}")[date_range] ||= send("all_#{metric}").within date_range, country, state, dimension
+          instance_variable_get("@range_#{metric}_#{dimension}_#{country}_#{state}")[date_range] ||= send("all_#{metric}").within date_range, country, state, dimension, videos
         end
         private "range_#{metric}"
       end

data/lib/yt/collections/reports.rb

@@ -56,11 +56,12 @@ module Yt
 
       attr_writer :metrics
 
-      def within(days_range, country, state, dimension, try_again = true)
+      def within(days_range, country, state, dimension, videos, try_again = true)
         @days_range = days_range
         @dimension = dimension
         @country = country
         @state = state
+        @videos = videos
         if dimension == :gender_age_group # array of array
           Hash.new{|h,k| h[k] = Hash.new 0.0}.tap do |hash|
             each{|gender, age_group, value| hash[gender][age_group[3..-1]] = value}
@@ -90,7 +91,7 @@ module Yt
       # same query is a workaround that works and can hardly cause any damage.
       # Similarly, once in while YouTube responds with a random 503 error.
       rescue Yt::Error => e
-        try_again && rescue?(e) ? sleep(3) && within(days_range, country, state, dimension, false) : raise
+        try_again && rescue?(e) ? sleep(3) && within(days_range, country, state, dimension, videos, false) : raise
       end
 
     private
@@ -125,6 +126,7 @@ module Yt
           params['max-results'] = 200 if @dimension == :playlist
           params['max-results'] = 25 if @dimension.in? [:embedded_player_location, :related_video, :search_term, :referrer]
           params['sort'] = "-#{@metrics.keys.join(',').to_s.camelize(:lower)}" if @dimension.in? [:video, :playlist, :embedded_player_location, :related_video, :search_term, :referrer]
+          params[:filters] = "video==#{@videos.join ','}" if @videos
           params[:filters] = ((params[:filters] || '').split(';') + ["country==US"]).compact.uniq.join(';') if @dimension == :state && !@state
           params[:filters] = ((params[:filters] || '').split(';') + ["country==#{@country}"]).compact.uniq.join(';') if @country && !@state
           params[:filters] = ((params[:filters] || '').split(';') + ["province==US-#{@state}"]).compact.uniq.join(';') if @state

data/lib/yt/version.rb

@@ -1,3 +1,3 @@
 module Yt
-  VERSION = '0.24.6'
+  VERSION = '0.24.7'
 end

data/spec/collections/reports_spec.rb

@@ -9,7 +9,7 @@ describe Yt::Collections::Reports do
   let(:msg) { {response_body: {error: {errors: [error]}}}.to_json }
 
   describe '#within' do
-    let(:result) { reports.within Range.new(5.days.ago, 4.days.ago), nil, nil, :day }
+    let(:result) { reports.within Range.new(5.days.ago, 4.days.ago), nil, nil, :day, nil }
     context 'given the request raises error 400 with "Invalid Query" message' do
       let(:reason) { 'badRequest' }
       let(:message) { 'Invalid query. Query did not conform to the expectations' }

data/spec/requests/as_content_owner/channel_spec.rb

@@ -449,6 +449,17 @@ describe Yt::Channel, :partner do
         end
       end
 
+      describe 'views can be limited to a subset of videos' do
+        let(:range) { {since: ENV['YT_TEST_PARTNER_VIDEO_DATE']} }
+        let(:videos) { channel.videos.first(2) }
+
+        specify 'with the :videos option listing the video IDs' do
+          video_views = videos.inject(0){|total, video| total + video.views(range)[:total]}
+          views = channel.views range.merge videos: videos.map(&:id)
+          expect(views[:total]).to eq video_views
+        end
+      end
+
       describe 'uniques can be retrieved for a single country' do
         let(:country_code) { 'US' }
         let(:uniques) { channel.uniques since: date, by: by, in: location }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yt
 version: !ruby/object:Gem::Version
-  version: 0.24.6
+  version: 0.24.7
 platform: ruby
 authors:
 - Claudio Baccigalupo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport