yt 0.25.31 → 0.25.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5112275b960c0a74c635c08e48280553d397766
-  data.tar.gz: eaa061ab2f0bb09c39cc7d0d6b898ac0f009773b
+  metadata.gz: 7575ef55d789bc1593546bcf77b7b5848c368b28
+  data.tar.gz: 5f5ced71d9ecc23625250b485051d3570ca85fc2
 SHA512:
-  metadata.gz: 53d8901fd8f0359de6c065ee43a89ca54b66466db6db76d8ed22a9d8d4fe98f9d78d4ddcbbf9f34b6ea5365ccfd883e1558700777214d054589726bf93cf800d
-  data.tar.gz: 3503b64bc60c66ff51ce7998cc3b83785529edee66cc63882a6930833ac100a8bf785b3fcb5c16313f86b5a84debe6a8e3b2e702c469e9d6a6f5f57491acf7f3
+  metadata.gz: beed739ec7eee33a1eea1cfcce8e23094b2516ebb469ab212b3508f57a2db6b2cbbcbb3f6d8caf90b2b5f6ab35136fa052d947a8c1cbd18e36b82dee5fd9459a
+  data.tar.gz: d59ecde5eefcfec8e43ec2bbccd130273240ea21b94f8d62e086b61a29f3a3bfbc5b765f4dc3992aa83129dc8ed241d5d26fb68a9617fb19e83694c58f30751d

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.32 - 2016-04-12
+
+* [BUGFIX] Fix where videos did not eager load claims or categories in subsequent requests.
+
 ## 0.25.31 - 2016-04-11
 
 * [BUGFIX] Don’t try to instantiate video.claim if a video does not have a claim.

data/lib/yt/collections/videos.rb

@@ -33,13 +33,16 @@ module Yt
 
       def eager_load_items_from(items)
         if included_relationships.any?
-          include_category = included_relationships.delete(:category)
-          include_claim = included_relationships.delete(:claim)
-          included_relationships.append(:snippet).uniq! if include_category || include_claim
+          associations = [:claim, :category]
+          if (included_relationships & associations).any?
+            included_relationships.append(:snippet).uniq!
+          end
 
           ids = items.map{|item| item['id']['videoId']}
-          parts = included_relationships.map{|r| r.to_s.camelize(:lower)}
-          conditions = {id: ids.join(','), part: parts.join(',')}
+          parts = (included_relationships - associations).map do |r|
+            r.to_s.camelize(:lower)
+          end
+          conditions = { id: ids.join(','), part: parts.join(',') }
           videos = Collections::Videos.new(auth: @auth).where conditions
 
           items.each do |item|
@@ -54,7 +57,7 @@ module Yt
             end if video
           end
 
-          if include_claim
+          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
@@ -64,7 +67,7 @@ module Yt
             end
           end
 
-          if include_category
+          if included_relationships.include? :category
             category_ids = items.map{|item| item['snippet']['categoryId']}.uniq
             conditions = {id: category_ids.join(',')}
             video_categories = Collections::VideoCategories.new(auth: @auth).where conditions

data/lib/yt/version.rb

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

metadata

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