yt 0.25.32 → 0.25.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7575ef55d789bc1593546bcf77b7b5848c368b28
-  data.tar.gz: 5f5ced71d9ecc23625250b485051d3570ca85fc2
+  metadata.gz: 6e07affd7b6d4df0e69e0ab16d65a959be125294
+  data.tar.gz: f29044dea895dfce5e8dee70f81e7583b84cb5ae
 SHA512:
-  metadata.gz: beed739ec7eee33a1eea1cfcce8e23094b2516ebb469ab212b3508f57a2db6b2cbbcbb3f6d8caf90b2b5f6ab35136fa052d947a8c1cbd18e36b82dee5fd9459a
-  data.tar.gz: d59ecde5eefcfec8e43ec2bbccd130273240ea21b94f8d62e086b61a29f3a3bfbc5b765f4dc3992aa83129dc8ed241d5d26fb68a9617fb19e83694c58f30751d
+  metadata.gz: a9c7378a1167c85d6329d8477eead541168cfeeece66cbafbe75eceea23740b3c5ec3b927d95fab7eebe51e70adfcc020a150c67e289e7dbdd720323a244fb4a
+  data.tar.gz: c71329c0e58166f21c494028c5da4659a3d2c5dc75e3458d6fc7c7dccbcd8e821998454f1365eda0a68ad02f7952740eca42944582d8603f5b4c8ae70f7159ff

data/CHANGELOG.md

@@ -6,6 +6,11 @@ For more information about changelogs, check
 [Keep a Changelog](http://keepachangelog.com) and
 [Vandamme](http://tech-angels.github.io/vandamme).
 
+## 0.25.33 - 2016-04-15
+
+* [FEATURE] Eager-loading claims from videos will also eager-load assets.
+* [FEATURE] New method - `Claim#source` will return the source of the claim.
+
 ## 0.25.32 - 2016-04-12
 
 * [BUGFIX] Fix where videos did not eager load claims or categories in subsequent requests.

data/lib/yt/collections/claims.rb

@@ -17,6 +17,27 @@ module Yt
 
     private
 
+      def attributes_for_new_item(data)
+        {}.tap do |attributes|
+          attributes[:id] = data['id']
+          attributes[:auth] = @auth
+          attributes[:data] = data
+          attributes[:asset] = data['asset']
+        end
+      end
+
+      def eager_load_items_from(items)
+        if included_relationships.include? :asset
+          asset_ids = items.map { |item| item['assetId'] }.uniq
+          conditions = { id: asset_ids.join(','), fetch_metadata: 'effective' }
+          assets = @parent.assets.where conditions
+          items.each do |item|
+            item['asset'] = assets.find { |a| a.id == item['assetId'] }
+          end
+        end
+        super
+      end
+
       # @return [Hash] the parameters to submit to YouTube to list claims
       #   administered by the content owner.
       # @see https://developers.google.com/youtube/partner/docs/v1/claims/list

data/lib/yt/collections/videos.rb

@@ -59,8 +59,11 @@ module Yt
 
           if included_relationships.include? :claim
             video_ids = items.map{|item| item['id']['videoId']}.uniq
-            conditions = { video_id: video_ids.join(',') }
-            claims = @parent.claims.where conditions
+            conditions = {
+              video_id: video_ids.join(','),
+              include_third_party_claims: false
+            }
+            claims = @parent.claims.includes(:asset).where conditions
             items.each do |item|
               claim = claims.find { |c| c.video_id == item['id']['videoId']}
               item['claim'] = claim

data/lib/yt/models/claim.rb

@@ -11,6 +11,7 @@ module Yt
         @data = options[:data]
         @id = options[:id]
         @auth = options[:auth]
+        @asset = options[:asset] if options[:asset]
       end
 
       # @!attribute [r] claim_history
@@ -113,6 +114,16 @@ module Yt
         content_type == 'audiovisual'
       end
 
+      # @return [String] the source of the claim
+      def source
+        @data.fetch('origin', {})['source']
+      end
+
+      # @return [Yt::Models::Asset] the asset of the claim
+      def asset
+        @asset
+      end
+
       # @return [Time] the date and time that the claim was created.
       has_attribute :created_at, type: Time, from: :time_created
 
@@ -153,4 +164,4 @@ module Yt
       end
     end
   end
-end
+end

data/lib/yt/version.rb

@@ -1,3 +1,3 @@
 module Yt
-  VERSION = '0.25.32'
+  VERSION = '0.25.33'
 end

data/spec/models/claim_spec.rb

@@ -208,4 +208,16 @@ describe Yt::Claim do
       it { expect(claim.third_party?).to be false }
     end
   end
-end
+
+  describe '#source' do
+    context 'given fetching a claim returns a source' do
+      let(:data) { {"origin"=>{"source"=>"webUpload"}} }
+      it { expect(claim.source).to eq 'webUpload' }
+    end
+
+    context 'given fetching a claim does not return a source' do
+      let(:data) { {"origin"=>{}} }
+      it { expect(claim.source).to eq nil }
+    end
+  end
+end

data/spec/requests/as_content_owner/content_owner_spec.rb

@@ -54,10 +54,12 @@ describe Yt::ContentOwner, :partner do
       let(:videos) { $content_owner.videos.includes(:claim) }
       let(:video_with_claim) { videos.find{|v| v.claim.present?} }
 
-      specify 'eager-loads the claim of each video' do
+      specify 'eager-loads the claim of each video and its asset' do
         expect(video_with_claim.claim).to be_a Yt::Claim
         expect(video_with_claim.claim.id).to be_a String
         expect(video_with_claim.claim.video_id).to eq video_with_claim.id
+        expect(video_with_claim.claim.asset).to be_a Yt::Asset
+        expect(video_with_claim.claim.asset.id).to be_a String
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yt
 version: !ruby/object:Gem::Version
-  version: 0.25.32
+  version: 0.25.33
 platform: ruby
 authors:
 - Claudio Baccigalupo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport