pugin 1.6.12 → 1.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e00adc9a1c608d0b974890ba950dcb920c1898f7
-  data.tar.gz: 80ecd37c11b6c65e406c989f50fd60cf6614bb93
+  metadata.gz: aa2303a50ba0e6a86c506265d2748664a39f4a35
+  data.tar.gz: d4bd50bd73a9840757aa22c9239e5a3e9a611668
 SHA512:
-  metadata.gz: da6a6127ed456c16f3a905154fc7835ea642e31c0b2adee5aabead2eef6073399a0d6b98b94b90dc6d93cd969e3a52cc74853c6a9490f4fa0ee518e97eaffb8a
-  data.tar.gz: 4a05e93ee90275f2cb28eec79048882f6f045955dda61cc0c87dec099b8f6293c2e7e6936156ee4d0f52455a3b736b88e5a25e227fd04b14a93d05166b457d63
+  metadata.gz: 8e78cd869d87ac8109d970b7b57138e10640b65189d9653a5720f7065d74c713bdf4f145b892e77e2886e6a0327c3c7c2fa9d7bff4418614ffe8d2190557835f
+  data.tar.gz: 25fe2cac9ce5486dfff96aae00dba787e460d54e29be49b0f5cb4b837638d325d37da7accbfb9da99309ad4bbfb184519e125822c516185c5b4da66ca02405d3

data/app/views/pugin/layouts/_layout.html.haml

@@ -1,7 +1,9 @@
+- page_title = content_for(:title).nil? ? I18n.t('pugin.layouts.pugin.website_brand') : "#{content_for(:title)} - #{ I18n.t('pugin.layouts.pugin.website_brand')}"
+
 !!! 5
 %html{lang:'en'}
   %head
-    %title= content_for(:title).nil? ? I18n.t('pugin.layouts.pugin.website_brand') : content_for(:title) + ' - ' + I18n.t('pugin.layouts.pugin.website_brand')
+    %title= page_title
     %link{rel: 'stylesheet', href: "#{Pugin::ASSET_LOCATION_URL}/#{Pugin::ASSET_VERSION}/stylesheets/main.css" }
     - if Pugin::Feature::AssetOverrides.enabled?
       %link{rel: 'stylesheet', href: "https://s3-eu-west-1.amazonaws.com/web1live.static-assets-public/_hybrid-bills/stylesheets/main.css" }
@@ -17,6 +19,7 @@
       / ========================
     - Pugin.alternates.each do |alternate|
       %link{rel: 'alternate', type: alternate[:type], href: alternate[:href].html_safe}
+    = render partial: 'pugin/meta/opengraph', locals: { page_title: page_title }
   %body
     - if ENV['GTM_KEY']
       = render partial: 'pugin/javascript/google_tag_manager_noscript'

data/app/views/pugin/meta/_opengraph.html.haml

@@ -0,0 +1,7 @@
+%meta{ property: 'og:title', content: page_title }
+%meta{ property: 'og:type', content: 'website' }
+%meta{ property: 'og:url', content: request.original_url }
+%meta{ property: 'og:image', content: opengraph_image[:url].html_safe }
+%meta{ property: 'og:image:width', content: opengraph_image[:width] }
+%meta{ property: 'og:image:height', content: opengraph_image[:height] }
+%meta{ name: 'twitter:card', content: opengraph_image[:twitter_card] }

data/lib/pugin.rb

@@ -4,6 +4,7 @@ module Pugin
   ASSET_VERSION = '1.7.5'.freeze
   ASSET_LOCATION_URL = ENV.fetch('ASSET_LOCATION_URL', 'https://s3-eu-west-1.amazonaws.com/web1live.pugin-website')
   STATIC_ASSET_LOCATION_URL = ENV.fetch('STATIC_ASSET_LOCATION_URL', 'https://s3-eu-west-1.amazonaws.com/web1live.static-assets')
+  STATIC_ASSET_PUBLIC_LOCATION_URL = ENV.fetch('STATIC_ASSET_PUBLIC_LOCATION_URL', 'https://s3-eu-west-1.amazonaws.com/web1live.static-assets-public')
   class << self
 		attr_writer :alternates
 

data/lib/pugin/version.rb

@@ -1,3 +1,3 @@
 module Pugin
-  VERSION = '1.6.12'.freeze
+  VERSION = '1.6.13'.freeze
 end

data/lib/pugin/view_helpers.rb

@@ -1,10 +1,25 @@
 module Pugin
-    module ViewHelpers
-        def navigation_link(route_symbol:, route_args:, letter:)
-            url = send(route_symbol, *route_args, letter) unless route_args.empty?
-            url = send(route_symbol, letter) unless url
+  module ViewHelpers
+    def navigation_link(route_symbol:, route_args:, letter:)
+      url = send(route_symbol, *route_args, letter) unless route_args.empty?
+      url = send(route_symbol, letter) unless url
+      return link_to(letter, url, data: { 'atoz-see': 'true' })
+    end
+
+    def opengraph_image_standards
+      { width: '400', height: '400', twitter_card: 'summary', url: "#{STATIC_ASSET_PUBLIC_LOCATION_URL}/opengraph-oblong.png" }
+    end
+
+    def opengraph_image
+      image_hash = if @image
+                     {url: "#{ENV['IMAGE_SERVICE_URL']}/#{@image.graph_id}.jpeg?crop=CU_1:1&width=400&quality=100"}
+                   elsif @person && !@image
+                     {url: "#{ENV['IMAGE_SERVICE_URL']}/#{@person.image_id}.jpeg?crop=CU_1:1&width=400&quality=100"}
+                   else
+                     {width: '1200', height: '630', twitter_card: 'summary_large_image' }
+                   end
 
-            return link_to(letter, url, data: { 'atoz-see': 'true' })
-        end
+      opengraph_image_standards.merge(image_hash)
     end
+  end
 end

data/spec/views/pugin/layouts/_layout.html.haml_spec.rb

@@ -69,4 +69,63 @@ describe 'pugin/layouts/_layout.html.haml', type: :view do
       expect(rendered).not_to include('<link href=\'https://api.example.com/\' rel=\'alternate\' type=\'application/bar\'>')
     end
   end
+
+  context 'renders OpenGraph tags' do
+    before :each do
+      render
+    end
+
+    it 'renders og:title' do
+      expect(rendered).to include("<meta content='UK Parliament' property='og:title'>")
+    end
+    it 'renders og:type' do
+      expect(rendered).to include("<meta content='website' property='og:type'>")
+    end
+    it 'renders og:url' do
+      expect(rendered).to include("property='og:url'")
+    end
+
+    context 'correctly on person' do
+      let(:member) { Class.new }
+
+      before :each do
+        allow(member).to receive(:image_id).and_return('1234')
+        @person = member
+        render
+      end
+
+      it 'renders og:image' do
+        expect(response).to include("<meta content='https://api.parliament.uk/Staging/photo/1234.jpeg?crop=CU_1:1&width=400&quality=100' property='og:image'>")
+        expect(response).to include("<meta content='400' property='og:image:width'>")
+        expect(response).to include("<meta content='400' property='og:image:height'>")
+        expect(response).to include("<meta content='summary' name='twitter:card'>")
+      end
+    end
+
+    context 'correctly on media' do
+      let(:media) { Class.new }
+
+      before :each do
+        allow(media).to receive(:graph_id).and_return('5678')
+        @image = media
+        render
+      end
+
+      it 'renders og:image' do
+        expect(response).to include("<meta content='https://api.parliament.uk/Staging/photo/5678.jpeg?crop=CU_1:1&width=400&quality=100' property='og:image'>")
+        expect(response).to include("<meta content='400' property='og:image:width'>")
+        expect(response).to include("<meta content='400' property='og:image:height'>")
+        expect(response).to include("<meta content='summary' name='twitter:card'>")
+      end
+    end
+
+    context 'correctly on other pages' do
+      it 'renders og:image' do
+        expect(rendered).to include("<meta content='#{Pugin::STATIC_ASSET_PUBLIC_LOCATION_URL}/opengraph-oblong.png' property='og:image'>")
+        expect(response).to include("<meta content='1200' property='og:image:width'>")
+        expect(response).to include("<meta content='630' property='og:image:height'>")
+        expect(response).to include("<meta content='summary_large_image' name='twitter:card'>")
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pugin
 version: !ruby/object:Gem::Version
-  version: 1.6.12
+  version: 1.6.13
 platform: ruby
 authors:
 - Matt Rayner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-13 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -215,6 +215,7 @@ files:
 - app/views/pugin/javascript/_pingdom.haml
 - app/views/pugin/layouts/_layout.html.haml
 - app/views/pugin/layouts/pugin.html.erb
+- app/views/pugin/meta/_opengraph.html.haml
 - app/views/pugin/parties/list/_list.html.haml
 - app/views/pugin/parties/list/current/current_party.html.haml
 - app/views/pugin/parties/list/former/former_party.html.haml