pageflow-external-links 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ec1da87ff4117c96c6fa68d3b269212cafe78d582e488a42048005d93c2ad54
-  data.tar.gz: 980158d0537f81fa66dbbe55e3ea6272ea7c92b7f5e9e54bbcdb30ffd42be13f
+  metadata.gz: 346615b36f62575e6dbf43cf2237c045115587a4c5ce9a7de865e4687c21de06
+  data.tar.gz: 53c3e0204212221068c292f7443bdc53d1a6e91543aa6716c0a751f7c64de35f
 SHA512:
-  metadata.gz: d7319c479fdd7308b460efefc355935c8dcb4fcc33c6c3a8bb203659eb4e7bcfa28148bda2335cdba4d4429493a4f1444ab546d817034ca76b69dfdba689abd9
-  data.tar.gz: f506de9aecfaf3ee09064b1ad326399aa31cec73bbb5b6398c572e17148366f270e112cf6c07f8e42b76028dca0369552ba07139a02d53678bc15728e0ab68da
+  metadata.gz: d2f7bbb58e4e469a3aca88fa8639752a71a06003fb9580c12313829cb89a5a8fe6a2cb95b5d95feb06662ea28381c8ebf7fa25e5df85e215d928a9cf40e4a0cf
+  data.tar.gz: 752cb59f5cea9a2b9c938db024c24bc0b81f29fcd32a15871ce569b5db9dc6798e6ed15983f366bcb47ad8a8ab666ad056abbd8f7a948712e55b78ef4d457f74

data/.gitignore

@@ -13,6 +13,7 @@ lib/bundler/man
 pkg
 rdoc
 spec/reports
+spec/dummy
 test/tmp
 test/version_tmp
 tmp

data/.travis.yml

@@ -13,4 +13,5 @@ before_install:
 - nvm install stable
 
 script:
+- bin/rspec
 - bundle exec publish-pageflow-theme-doc

data/CHANGELOG.md

@@ -1,16 +1,16 @@
 # CHANGELOG
 
-### Version 2.0.0
+### Version 2.1.0
 
-2018-07-31
+2019-04-04
 
-[Compare changes](https://github.com/codevise/pageflow-external-links/compare/1-x-stable...v2.0.0)
+[Compare changes](https://github.com/codevise/pageflow-external-links/compare/2-0-stable...v2.1.0)
 
-- Upgrade to Rails 5/Pageflow 13
-  ([#37](https://github.com/codevise/pageflow-external-links/pull/37))
-- Fix template file extension
-  ([#38](https://github.com/codevise/pageflow-external-links/pull/38))
+- Adapt page dom for Pageflow 14
+  ([#40](https://github.com/codevise/pageflow-external-links/pull/40))
+- Setup page type lint specs
+  ([#39](https://github.com/codevise/pageflow-external-links/pull/39))
 
 See
-[1-x-stable branch](https://github.com/codevise/pageflow-external-links/blob/1-x-stable/CHANGELOG.md)
+[2-0-stable branch](https://github.com/codevise/pageflow-external-links/blob/2-0-stable/CHANGELOG.md)
 for previous changes.

data/Gemfile.ci

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
+gemspec
+
 gem 'pageflow-theme-doc-publisher', git: 'https://github.com/tf/pageflow-theme-doc-publisher'

data/README.md

@@ -1,6 +1,7 @@
 # Pageflow External Links
 
 [![Gem Version](https://badge.fury.io/rb/pageflow-external-links.svg)](http://badge.fury.io/rb/pageflow-external-links)
+[![Build Status](https://travis-ci.org/codevise/pageflow-external-links.svg?branch=master)](https://travis-ci.org/codevise/pageflow-external-links)
 
 Page type to display links to external pages.
 

data/app/assets/javascripts/pageflow/external_links/page_type.js

@@ -1,13 +1,13 @@
 /*global IScroll*/
 
-pageflow.react.registerPageTypeWithDefaultBackground('external_links', {
+pageflow.react.registerPageTypeWithDefaultBackground('external_links', _.extend({
   prepareNextPageTimeout: 0,
 
   enhance: function(pageElement, configuration) {
     var scrollerElement = pageElement.find('.ext-links'),
         that = this,
         innerScroller = pageElement.find('#horizontal_scroller'),
-        contentWrapper = pageElement.find('.contentWrapper');
+        contentWrapper = pageElement.find('.content_wrapper');
 
     this.linkScroller = new IScroll(scrollerElement[0], {
       mouseWheel: true,
@@ -123,10 +123,7 @@ pageflow.react.registerPageTypeWithDefaultBackground('external_links', {
   },
 
   update: function(pageElement, configuration) {
-    pageElement.find('h2 .tagline').text(configuration.get('tagline') || '');
-    pageElement.find('h2 .title').text(configuration.get('title') || '');
-    pageElement.find('h2 .subtitle').text(configuration.get('subtitle') || '');
-    pageElement.find('.contentText p').html(configuration.get('text') || '');
+    this.updateDefaultPageContent(pageElement, configuration);
 
     pageElement.find('.shadow').css({
       opacity: configuration.get('gradient_opacity') / 100
@@ -144,4 +141,4 @@ pageflow.react.registerPageTypeWithDefaultBackground('external_links', {
       }
     };
   }
-});
+}, pageflow.defaultPageContent));

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

@@ -1,25 +1,16 @@
-<div class="blackLayer"></div>
+<div class="black_layer"></div>
 <div class="content_and_background external-links-page">
-  <div class="backgroundArea">
-    <%= page_background_asset(configuration) %>
+  <div class="page_background">
+    <%= page_background_asset(page) %>
     <%= shadow_div :opacity => configuration['gradient_opacity'] %>
   </div>
 
   <div class="content">
     <div class="scroller">
       <div>
-        <div class="contentWrapper">
-          <div class="page_header">
-            <h2>
-              <span class="tagline"><%= configuration['tagline'] %></span>
-              <span class="title"><%= configuration['title'] %></span>
-              <span class="subtitle"><%= configuration['subtitle'] %></span>
-            </h2>
-            <%= background_image_tag(configuration['background_image_id'], {"class" => "print_image"}) %>
-          </div>
-          <div class="contentText">
-            <p><%= raw configuration['text'] %></p>
-          </div>
+        <div class="content_wrapper">
+          <%= page_default_content(page) %>
+
           <div class="ext-links" id="ext-links">
             <div id="horizontal_scroller">
               <%= render Pageflow::ExternalLinks::Site.from_perma_ids(@entry.try(:revision), configuration['linked_external_site_perma_ids']) %>

data/bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 150) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/lib/pageflow/external_links/version.rb

@@ -1,5 +1,5 @@
 module Pageflow
   module ExternalLinks
-    VERSION = '2.0.0'.freeze
+    VERSION = '2.1.0'.freeze
   end
 end

data/pageflow-external-links.gemspec

@@ -18,11 +18,13 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.1'
 
-  spec.add_runtime_dependency 'pageflow', '~> 13.x'
+  spec.add_runtime_dependency 'pageflow', '~> 14.x'
   spec.add_runtime_dependency 'pageflow-public-i18n', '~> 1.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.0'
+  spec.add_development_dependency 'bundler', ['>= 1.0', '< 3']
+  spec.add_development_dependency 'pageflow-support', '~> 14.x'
   spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rspec-rails', '~> 3.0'
 
   # Semantic versioning rake tasks
   spec.add_development_dependency 'semmy', '~> 1.0'

data/spec/integration/page_type_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+require 'pageflow/lint'
+
+Pageflow::Lint.page_type(Pageflow::ExternalLinks.page_type)

data/spec/spec_helper.rb

@@ -0,0 +1,14 @@
+ENV['RAILS_ENV'] ||= 'test'
+ENV['PAGEFLOW_PLUGIN_ENGINE'] = 'pageflow_external_links'
+
+require 'pageflow/support'
+Pageflow::Dummy.setup
+
+require 'rspec/rails'
+
+engine_root = File.join(File.dirname(__FILE__), '..')
+Dir[File.join(engine_root, 'spec/support/**/*.rb')].each { |file| require(file) }
+
+RSpec.configure do |config|
+  config.use_transactional_fixtures = true
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-external-links
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pageflow
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.x
+        version: 14.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.x
+        version: 14.x
 - !ruby/object:Gem::Dependency
   name: pageflow-public-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,36 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: pageflow-support
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 14.x
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 14.x
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +86,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: semmy
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +180,7 @@ files:
 - app/models/pageflow/external_links/site.rb
 - app/views/pageflow/external_links/page.html.erb
 - app/views/pageflow/external_links/sites/_site.html.erb
+- bin/rspec
 - config/locales/de.yml
 - config/locales/en.yml
 - config/routes.rb
@@ -158,6 +193,8 @@ files:
 - lib/pageflow/external_links/plugin.rb
 - lib/pageflow/external_links/version.rb
 - pageflow-external-links.gemspec
+- spec/integration/page_type_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/codevise/pageflow-external-links
 licenses:
 - MIT
@@ -182,4 +219,6 @@ rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Pageflow Page Type for links to external sites
-test_files: []
+test_files:
+- spec/integration/page_type_spec.rb
+- spec/spec_helper.rb