Merge branch 'master' of github.com:theonion/django-bulbs into ellipsis

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Development
 
+## Version 3.5.1
+
+- Update homepage_player template and pull in entire video object in special coverage context
+
+## Version 3.4.1
+
+- removed `dfp_instant_article`
+
 ## Version 3.4.0
 
 - moved share tools for homepage player outside of bulbs-video-meta, this effects styling

bulbs/__init__.py

@@ -1 +1 @@
-__version__ = "3.4.0"
+__version__ = "3.5.1"

bulbs/homepage_player/templates/homepage_player/bulbs_homepage_player.html

@@ -64,6 +64,7 @@
               {# TODO implement /v/2323 redirect route in urls.py #}
               {# see: https://trello.com/c/3bT7Xuc9/60 #}
               share-url="{% build_video_share_uri video.videohub_ref.id %}"
+              share-title="{{ video.title }}"
               video-url="{{ VIDEOHUB_BASE_URL }}/video/{{ video.videohub_ref.id }}.json"
               campaign-url="{% if video.tunic_campaign_id %}{% content_tunic_campaign_url video.tunic_campaign_id %}{% endif %}"
               data-track-action="HP: Carousel Item"

bulbs/instant_articles/views.py

@@ -95,8 +95,6 @@ def get_context_data(self, *args, **kwargs):
         context["fire_pageview"] = True
         context["platform"] = "Instant Articles"
         context["path"] = self.request.GET.get("path", "")
-        if context["targeting"]:
-            context["targeting"]["dfp_instant_article"] = True
         return context
 
 

bulbs/special_coverage/templates/special_coverage/bulbs_sc_landing.html

@@ -29,7 +29,7 @@ <h1>{{ special_coverage.name }}</h1>
     </div>
   </div>
 
-{% if video.videohub_ref_id %}
+{% if video %}
   <bulbs-video-carousel class="video-carousel sc-carousel">
     <div class='video-carousel-player sc-video-player'>
       <bulbs-video

bulbs/special_coverage/views.py

@@ -4,7 +4,7 @@
 
 from bulbs.special_coverage.models import SpecialCoverage
 from bulbs.content.views import BaseContentDetailView
-from bulbs.utils.methods import get_video_object
+from bulbs.utils.methods import get_video_object_from_videohub_id
 
 
 class SpecialCoverageView(BaseContentDetailView):
@@ -33,7 +33,7 @@ def get_context_data(self, *args, **kwargs):
         context["targeting"] = {}
 
         try:
-            context["video"] = get_video_object(self.special_coverage.videos[0])
+            context["video"] = get_video_object_from_videohub_id(self.special_coverage.videos[0])
         except IndexError:
             context["video"] = None
 
@@ -52,7 +52,7 @@ def get_context_data(self, *args, **kwargs):
         if video_id not in self.special_coverage.videos:
             raise Http404('Video with id={} not in SpecialCoverage'.format(video_id))
 
-        context['video'] = get_video_object(video_id).title
+        context['video'] = get_video_object_from_videohub_id(video_id)
 
         return context
 

bulbs/utils/methods.py

@@ -6,6 +6,7 @@
 from django.conf import settings
 from django.utils import timezone
 from django.apps import apps
+from django.shortcuts import get_object_or_404
 
 
 INVALID_TEMPLATE_CHOICE = """Choices for template values must be non-zero integers."""
@@ -102,10 +103,6 @@ def get_overridable_template_name(parent_name, child_name):
     return template_name
 
 
-def get_video_object(videohub_id):
+def get_video_object_from_videohub_id(videohub_id):
     video_model = apps.get_model(settings.VIDEO_MODEL)
-    try:
-        video = video_model.objects.get(videohub_ref_id=int(videohub_id))
-    except:
-        video = None
-    return video
+    return get_object_or_404(video_model, videohub_ref_id=int(videohub_id))

tests/instant_articles/test_instant_article_analytics.py

@@ -41,4 +41,3 @@ def test_analytics(self):
         self.assertEqual(self.content.id, targeting.get("dfp_contentid"))
         self.assertEqual(self.content.__class__.__name__.lower(), targeting.get("dfp_pagetype"))
         self.assertEqual(self.content.slug, targeting.get("dfp_slug"))
-        self.assertTrue(targeting.get("dfp_instant_article"))

tests/special_coverage/test_spec_cov_views.py

@@ -52,8 +52,6 @@ def test_sets_first_video_to_video(self):
         content.__class__.search_objects.refresh()
 
         video = VideohubVideo.objects.create(id=4348)
-        # model mommy
-        # import ipdb; ipdb.set_trace()
 
         sc = SpecialCoverage.objects.create(
             name="Test Coverage",
@@ -66,7 +64,7 @@ def test_sets_first_video_to_video(self):
             start_date=timezone.now() - timezone.timedelta(days=10),
             end_date=timezone.now() + timezone.timedelta(days=10)
         )
-        with patch("bulbs.special_coverage.views.get_video_object") as mock_get_vid:
+        with patch("bulbs.special_coverage.views.get_video_object_from_videohub_id") as mock_get_vid:
             mock_get_vid.return_value = video
             response = self.client.get(reverse("special", kwargs={"slug": sc.slug}))
             self.assertEqual(response.context['video'], video)