pageflow-embedded-video 1.7.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67184b3cc1cfd459b6d6db35a0bb6ed2b566db5b885d85e776146387f897a83b
-  data.tar.gz: 8a8fd6aedb40f7ddfe37e1d7b6242368ac425c969b967d9faea829ffd9d7b6fa
+  metadata.gz: 1f403dddb6b8a214e146199922addf412fb39de8e9f5b84b5ff53d639f3234fa
+  data.tar.gz: 163cab3bd1a89bebddc0c7bfa592aadbe45911658fd36c3dddb6ef42b4604a7a
 SHA512:
-  metadata.gz: 45b2f659be5ad09e7934b5ee69f338d80e4b59e7e43433f084698611a8f14507eb941b9034c7e83910dea7a44631215ff118dc4d5507ff587ca0694ebc7ad74f
-  data.tar.gz: 4bc0cb16cccf6a2556f4157a73ce8a56b051e1f290788f044eb6da3a1c65c3976da7bfd0f796fafd3276cd2a44ba3a253b36bb31fd7c66583e00f35019c31cc7
+  metadata.gz: 56823041b09bb58663993d15214cf8f8d531398060f5e1ca64e03c8ea0427d17390bf1c656b63cc85e5d2ee3f30e5c855892e790777ddc3cb595a6962729375f
+  data.tar.gz: 24909a4216df799209a3403a9d8be343b2cb9bf3b280387f30e47f0b8d3168daa4561614f355d1d232d9a69f45c4e9780575a6ff274848c23db31bb6069c8d4c

data/.github/workflows/tests.yml

@@ -0,0 +1,6 @@
+name: tests
+on: [push, pull_request]
+
+jobs:
+  call-workflow:
+    uses: codevise/pageflow/.github/workflows/reusable-workflow-rspec.yml@master

data/CHANGELOG.md

@@ -1,14 +1,14 @@
 # CHANGELOG
 
-### Version 1.7.0
+### Version 1.9.0
 
-2019-11-04
+2022-12-28
 
-[Compare changes](https://github.com/codevise/pageflow-embedded-video/compare/1-6-stable...v1.7.0)
+[Compare changes](https://github.com/codevise/pageflow-embedded-video/compare/1-8-stable...v1.9.0)
 
-- Extend pageflow version requirement to < 16
-  ([#36](https://github.com/codevise/pageflow-embedded-video/pull/36))
+- Add support for Pageflow 16
+  ([#38](https://github.com/codevise/pageflow-embedded-video/pull/38))
 
 See
-[1-6-stable branch](https://github.com/codevise/pageflow-embedded-video/blob/1-6-stable/CHANGELOG.md)
+[1-8-stable branch](https://github.com/codevise/pageflow-embedded-video/blob/1-8-stable/CHANGELOG.md)
 for previous changes.

data/README.md

@@ -1,7 +1,7 @@
 # Pageflow Embedded Video
 
 [![Gem Version](https://badge.fury.io/rb/pageflow-embedded-video.svg)](http://badge.fury.io/rb/pageflow-embedded-video)
-[![Build Status](https://travis-ci.org/codevise/pageflow-embedded-video.svg?branch=master)](https://travis-ci.org/codevise/pageflow-embedded-video)
+[![Build Status](https://github.com/codevise/pageflow-embedded-video/workflows/tests/badge.svg)](https://github.com/codevise/pageflow-embedded-video/actions)
 
 Page type showing Youtube/Vimeo videos in an embedded iframe.
 
@@ -14,11 +14,11 @@ Add this line to your application's Gemfile:
 
 Run `bundle install`
 
-Register the page type:
+Register the plugin:
 
     # config/initializers/pageflow.rb
     Pageflow.configure do |config|
-      config.page_types.register(Pageflow::EmbeddedVideo.page_type)
+      config.plugin(Pageflow::EmbeddedVideo.plugin)
     end
 
 Include javascript/stylesheets:

data/app/assets/javascript/pageflow/embedded_video/consent.js

@@ -0,0 +1,41 @@
+pageflow.embeddedVideo.consent = new (pageflow.Object.extend({
+  accepted: {},
+  promises: {},
+  registered: {},
+
+  ensureVendorRegistered: function(options) {
+    var name = options.name;
+
+    if (!name || this.registered[name]) {
+      return;
+    }
+
+    this.registered[name] = true;
+
+    pageflow.consent.registerVendor(name, {
+      paradigm: options.skip ? 'skip' : 'lazy opt-in',
+      displayName: I18n.t(
+        'pageflow.public.embedded_video.consent.' + name + '.vendor_name'
+      ),
+      description: I18n.t(
+        'pageflow.public.embedded_video.consent.' + name + '.vendor_description'
+      )
+    });
+  },
+
+  setup: function(name) {
+    if (!name) {
+      return;
+    }
+
+    var that = this;
+
+    this.promises[name] = this.promises[name] ||
+      pageflow.consent.requireAccepted(name).then(function(result) {
+        if (result == 'fulfilled') {
+          that.accepted[name] = true;
+          that.trigger('accepted:' + name);
+        }
+      });
+  }
+}));

data/app/assets/javascript/pageflow/embedded_video/page_type.js

@@ -1,15 +1,40 @@
 /*global YT, URI, $f */
 
+pageflow.pageType.registerInitializer('embedded_video', function(configuration) {
+  var url = configuration.display_embedded_video_url;
+
+  pageflow.embeddedVideo.consent.ensureVendorRegistered({
+    name: pageflow.embeddedVideo.providerFromUrl(url),
+    skip: !pageflow.features.isEnabled('embedded_video_opt_in')
+  });
+});
+
 pageflow.react.registerPageTypeWithDefaultBackground('embedded_video', _.extend({
   prepareNextPageTimeout: 0,
 
   enhance: function(pageElement, configuration) {
+    var url = configuration.display_embedded_video_url;
+
+    pageflow.embeddedVideo.consent.setup(
+      pageflow.embeddedVideo.providerFromUrl(url)
+    );
+
+    pageElement.thirdPartyEmbedConsent();
+
+    if (!pageflow.features.isEnabled('embedded_video_opt_in')) {
+      pageElement.find('.opt_out_wrapper').hide();
+    }
+
     var that = this;
 
     pageElement.addClass('no_hidden_text_indicator');
 
     if (pageflow.features.has('mobile platform')) {
       pageElement.find('.close_button, .iframe_container').click(function(event) {
+        if ($(event.target).parents('.third_party_embed_opt_in').length) {
+          return;
+        }
+
         event.stopPropagation();
         that._pauseVideo();
         pageElement.find('.iframe_container, .close_button').removeClass('show');
@@ -101,22 +126,11 @@ pageflow.react.registerPageTypeWithDefaultBackground('embedded_video', _.extend(
     var that = this,
         iframeWrapper = pageElement.find('.iframe_wrapper'),
         captionElement = pageElement.find('.video_caption'),
+        captionTextElement = pageElement.find('.video_caption_text'),
         caption = configuration.get('video_caption');
 
-    if ((caption || '').trim() !== '') {
-      if (!captionElement.length) {
-        captionElement = $('<div class="video_caption"></div>');
-
-        if (pageElement.find('.scroller iframe').length) {
-          captionElement.insertAfter(iframeWrapper);
-        } else {
-          captionElement.appendTo(iframeWrapper);
-        }
-      }
-      captionElement.text(caption || '');
-    } else {
-      captionElement.remove();
-    }
+    captionElement.toggleClass('video_caption_blank', (caption || '').trim() === '');
+    captionTextElement.text(caption || '');
 
     if (this.active) {
       if (configuration.hasChanged('display_embedded_video_url') ||
@@ -140,6 +154,17 @@ pageflow.react.registerPageTypeWithDefaultBackground('embedded_video', _.extend(
         url = configuration.display_embedded_video_url,
         provider = pageflow.embeddedVideo.providerFromUrl(url);
 
+    pageflow.embeddedVideo.consent.setup(
+      pageflow.embeddedVideo.providerFromUrl(url)
+    );
+
+    if (!pageflow.embeddedVideo.consent.accepted[provider]) {
+      pageflow.embeddedVideo.consent.once('accepted:' + provider, function() {
+        this._createPlayer(pageElement, configuration);
+      }, this);
+      return;
+    }
+
     if (provider === 'youtube') {
       this.ytApiInitialize().done(function () {
         that._createYouTubePlayer(pageElement, url, configuration);
@@ -255,6 +280,8 @@ pageflow.react.registerPageTypeWithDefaultBackground('embedded_video', _.extend(
   },
 
   _removePlayer: function (pageElement, callback) {
+    pageflow.embeddedVideo.consent.off(null, null, this);
+
     if (this.player && typeof this.player.destroy === 'function') {
       this.player.destroy();
     }

data/app/assets/javascript/pageflow/embedded_video.js

@@ -1,4 +1,5 @@
 //= require_self
+//= require ./embedded_video/consent
 //= require ./embedded_video/page_type
 //= require ./URI.js
 //= require ./froogaloop.js

data/app/assets/stylesheets/pageflow/embedded_video.scss

@@ -76,6 +76,7 @@
     height: initial;
     padding-top: 56.25%;
     position: relative;
+    color: #fff;
 
     iframe {
       position: absolute;
@@ -214,6 +215,8 @@
     position: relative;
     display: block;
     margin-bottom: 40px;
+    padding-right: 40px;
+    box-sizing: border-box;
 
     &:before {
       content: "";
@@ -244,10 +247,22 @@
     }
   }
 
+  .video_caption_blank:before {
+    display: none;
+  }
+
   .widescreened .video_caption {
     position: absolute;
     top: 100%;
     width: 100%;
     margin-bottom: 0;
   }
+
+  .opt_out_wrapper {
+    position: absolute;
+    top: -10px;
+    right: -10px;
+    bottom: -10px;
+    left: -10px;
+  }
 }

data/app/helpers/pageflow/embedded_video/consent_helper.rb

@@ -0,0 +1,33 @@
+module Pageflow
+  module EmbeddedVideo
+    # @api private
+    module ConsentHelper
+      include PageflowPaged::ThirdPartyEmbedConsentHelper
+
+      def embedded_video_opt_in(entry, configuration)
+        vendor_name = embedded_video_consent_vendor_name(configuration)
+        return unless vendor_name
+
+        vendor_display_name = I18n.t(
+          "pageflow.public.embedded_video.consent.#{vendor_name}.vendor_name"
+        )
+
+        third_party_embed_opt_in(
+          entry: entry,
+          vendor_name: vendor_name,
+          message: t('pageflow.public.embedded_video.opt_in_prompt',
+                     vendor: vendor_display_name)
+        )
+      end
+
+      def embedded_video_consent_vendor_name(configuration)
+        if configuration['display_embedded_video_url'] =~ /youtube\.com/ ||
+           configuration['display_embedded_video_url'] =~ /youtu\.be/
+          'youtube'
+        elsif configuration['display_embedded_video_url'] =~ /vimeo\.com/
+          'vimeo'
+        end
+      end
+    end
+  end
+end

data/app/views/pageflow/embedded_video/page.html.erb

@@ -20,10 +20,18 @@
       </div>
     </div>
     <div class="iframe_container">
-      <div class="iframe_wrapper"></div>
-      <% if configuration['video_caption'].present? %>
-        <div class="video_caption"><%= configuration['video_caption'] %></div>
-      <% end %>
+      <div class="iframe_wrapper">
+        <%= embedded_video_opt_in(entry, configuration) %>
+      </div>
+      <div class="video_caption
+                  <%= configuration['video_caption'].blank? ? 'video_caption_blank' : ''%>">
+        <span class="video_caption_text">
+          <%= configuration['video_caption'] %>
+        </span>
+        <div class="opt_out_wrapper">
+          <%= third_party_embed_opt_out_info(entry) %>
+        </div>
+      </div>
     </div>
   </div>
 </div>

data/config/locales/de.yml

@@ -29,6 +29,8 @@ de:
       page_type_category_name: Media
       page_type_description: Bettet ein externes Video von YouTube oder Vimeo ein
       page_type_name: Embedded Video
+    embedded_video_opt_in:
+      feature_name: Opt-In für YouTube/Vimeo Embeds
     ui:
       configuration_editor:
         tabs:

data/config/locales/en.yml

@@ -29,6 +29,8 @@ en:
       page_type_category_name: Media
       page_type_description: Embed YouTube or Vimeo videos
       page_type_name: Embedded Video
+    embedded_video_opt_in:
+      feature_name: Opt-in for YouTube/Vimeo embeds
     ui:
       configuration_editor:
         tabs:

data/lib/pageflow/embedded_video/page_type.rb

@@ -3,10 +3,13 @@ module Pageflow
     class PageType < Pageflow::PageType
       name 'embedded_video'
 
+      def view_helpers
+        [ConsentHelper]
+      end
+
       def json_seed_template
         'pageflow/embedded_video/page_type.json.jbuilder'
       end
-
     end
   end
 end

data/lib/pageflow/embedded_video/plugin.rb

@@ -0,0 +1,10 @@
+module Pageflow
+  module EmbeddedVideo
+    class Plugin < Pageflow::Plugin
+      def configure(config)
+        config.page_types.register(EmbeddedVideo.page_type)
+        config.features.register('embedded_video_opt_in')
+      end
+    end
+  end
+end

data/lib/pageflow/embedded_video/version.rb

@@ -1,5 +1,5 @@
 module Pageflow
   module EmbeddedVideo
-    VERSION = '1.7.0'.freeze
+    VERSION = '1.9.0'.freeze
   end
 end

data/lib/pageflow-embedded-video.rb

@@ -10,6 +10,10 @@ module Pageflow
       block.call(config)
     end
 
+    def self.plugin
+      EmbeddedVideo::Plugin.new
+    end
+
     def self.page_type
       EmbeddedVideo::PageType.new
     end

data/pageflow-embedded-video.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.1'
 
-  spec.add_runtime_dependency 'pageflow', ['>= 14', '< 16']
+  spec.add_runtime_dependency 'pageflow', ['>= 15.7', '< 17']
   spec.add_runtime_dependency 'pageflow-public-i18n', '~> 1.0'
 
   spec.add_development_dependency 'bundler', ['>= 1.0', '< 3']
-  spec.add_development_dependency 'pageflow-support', ['>= 14', '< 16']
+  spec.add_development_dependency 'pageflow-support', ['>= 14', '< 17']
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec-rails', '~> 3.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-embedded-video
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-04 00:00:00.000000000 Z
+date: 2022-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pageflow
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '14'
+        version: '15.7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '16'
+        version: '17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '14'
+        version: '15.7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '16'
+        version: '17'
 - !ruby/object:Gem::Dependency
   name: pageflow-public-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +73,7 @@ dependencies:
         version: '14'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '16'
+        version: '17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
         version: '14'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '16'
+        version: '17'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -133,10 +133,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".jshintignore"
 - ".jshintrc"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -150,6 +150,7 @@ files:
 - app/assets/images/pageflow/ov-embedded_video.png
 - app/assets/javascript/pageflow/URI.js
 - app/assets/javascript/pageflow/embedded_video.js
+- app/assets/javascript/pageflow/embedded_video/consent.js
 - app/assets/javascript/pageflow/embedded_video/editor.js
 - app/assets/javascript/pageflow/embedded_video/editor/collections/embedded_videos_collection.js
 - app/assets/javascript/pageflow/embedded_video/editor/initializers/setup_collections.js
@@ -164,6 +165,7 @@ files:
 - app/assets/stylesheets/pageflow/embedded_video/custom.scss
 - app/assets/stylesheets/pageflow/embedded_video/editor.scss
 - app/assets/stylesheets/pageflow/embedded_video/themes/default.scss
+- app/helpers/pageflow/embedded_video/consent_helper.rb
 - app/views/pageflow/embedded_video/page.html.erb
 - app/views/pageflow/embedded_video/page_type.json.jbuilder
 - bin/rails-cmd
@@ -174,6 +176,7 @@ files:
 - lib/pageflow/embedded_video/configuration.rb
 - lib/pageflow/embedded_video/engine.rb
 - lib/pageflow/embedded_video/page_type.rb
+- lib/pageflow/embedded_video/plugin.rb
 - lib/pageflow/embedded_video/version.rb
 - pageflow-embedded-video.gemspec
 - spec/integration/page_type_spec.rb
@@ -197,8 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Pagetype for embedded youtube/vimeo videos

data/.travis.yml

@@ -1,13 +0,0 @@
-language: ruby
-rvm: 2.5
-
-# User container based travis infrastructure which allows caching
-# features for open source projects.
-sudo: false
-cache: bundler
-
-script:
-  - bin/rspec
-
-services:
-  - mysql