yt 0.25.30 → 0.25.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28a685b003b607412601a4b2c4cc2858bcc9a83d
-  data.tar.gz: 15134a642f1c55adef761e87e0c51cf872bad12a
+  metadata.gz: f5112275b960c0a74c635c08e48280553d397766
+  data.tar.gz: eaa061ab2f0bb09c39cc7d0d6b898ac0f009773b
 SHA512:
-  metadata.gz: 9a7e2a387afa16cce3d6614df7381096d097c5e45856efdb94e1746c1f2138c6631d2fd652ac9ce2715dfeed8f9fd6bf516b24c7cbcb74b399d58ca4c8579c6f
-  data.tar.gz: 39e7426f7eae5d73daa453643fc145fc87608cccadfbfa693a22658849218998ca9c4934c13341b06fa52490b55922a19ee3243c1c6e83f0410c480ec71d0e94
+  metadata.gz: 53d8901fd8f0359de6c065ee43a89ca54b66466db6db76d8ed22a9d8d4fe98f9d78d4ddcbbf9f34b6ea5365ccfd883e1558700777214d054589726bf93cf800d
+  data.tar.gz: 3503b64bc60c66ff51ce7998cc3b83785529edee66cc63882a6930833ac100a8bf785b3fcb5c16313f86b5a84debe6a8e3b2e702c469e9d6a6f5f57491acf7f3

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.25.31 - 2016-04-11
+
+* [BUGFIX] Don’t try to instantiate video.claim if a video does not have a claim.
+
 ## 0.25.30 - 2016-04-07
 
 * [FEATURE] Add ability for videos to eager load claims. For example, `$content_owner.videos.includes(:claim).first.claim.id`.

data/lib/yt/collections/claims.rb

@@ -37,12 +37,7 @@ module Yt
       end
 
       def claims_params
-        if @parent.respond_to? :owner_name
-          owner_name = @parent.owner_name
-        else
-          owner_name = @auth.owner_name
-        end
-        apply_where_params! on_behalf_of_content_owner: owner_name
+        apply_where_params! on_behalf_of_content_owner: @parent.owner_name
       end
 
       # @private

data/lib/yt/collections/videos.rb

@@ -26,8 +26,8 @@ module Yt
           attributes[:content_details] = data['contentDetails']
           attributes[:statistics] = data['statistics']
           attributes[:video_category] = data['videoCategory']
-          attributes[:auth] = @auth
           attributes[:claim] = data['claim']
+          attributes[:auth] = @auth
         end
       end
 
@@ -57,7 +57,7 @@ module Yt
           if include_claim
             video_ids = items.map{|item| item['id']['videoId']}.uniq
             conditions = { video_id: video_ids.join(',') }
-            claims = Collections::Claims.new(auth: @auth, parent: @parent).where conditions
+            claims = @parent.claims.where conditions
             items.each do |item|
               claim = claims.find { |c| c.video_id == item['id']['videoId']}
               item['claim'] = claim

data/lib/yt/models/video.rb

@@ -379,6 +379,13 @@ module Yt
 
       has_many :resumable_sessions
 
+      # @!attribute [r] channel
+      #   @return [Yt::Models::Claim, nil] the first claim on the video by
+      #     the content owner of the video, if eagerly loaded.
+      def claim
+        @claim
+      end
+
     ### ANALYTICS ###
 
       # @macro reports
@@ -554,10 +561,6 @@ module Yt
         super
       end
 
-    ### Claim ###
-
-      has_one :claim
-
     ### PRIVATE API ###
 
       # @private

data/lib/yt/version.rb

@@ -1,3 +1,3 @@
 module Yt
-  VERSION = '0.25.30'
+  VERSION = '0.25.31'
 end

data/spec/requests/as_content_owner/content_owner_spec.rb

@@ -51,12 +51,13 @@ describe Yt::ContentOwner, :partner do
     end
 
     describe '.includes(:claim)' do
-      let(:video) { $content_owner.videos.includes(:claim).first }
+      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
-        expect(video.instance_variable_defined? :@claim).to be true
-        expect(video.claim.id).to be_a String
-        expect(video.claim.video_id).to eq video.id
+        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
       end
     end
   end

metadata

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