pageflow-external-links 2.1.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 346615b36f62575e6dbf43cf2237c045115587a4c5ce9a7de865e4687c21de06
-  data.tar.gz: 53c3e0204212221068c292f7443bdc53d1a6e91543aa6716c0a751f7c64de35f
+  metadata.gz: 0c12b927a2072019bb2e7a9d9c9ea717ee56af93fa7703ede0d3233be892d1cf
+  data.tar.gz: b123367dc4d2075c96732cf654115f161da86e848b0415f28da9ac1988efa75e
 SHA512:
-  metadata.gz: d2f7bbb58e4e469a3aca88fa8639752a71a06003fb9580c12313829cb89a5a8fe6a2cb95b5d95feb06662ea28381c8ebf7fa25e5df85e215d928a9cf40e4a0cf
-  data.tar.gz: 752cb59f5cea9a2b9c938db024c24bc0b81f29fcd32a15871ce569b5db9dc6798e6ed15983f366bcb47ad8a8ab666ad056abbd8f7a948712e55b78ef4d457f74
+  metadata.gz: 6cc118d9fdbfcadd3c0ab1b2f20d0a6b8a316d1e7bdfb23688d60f433f5c3687e57b538a88c9c91516cd8877939c3fe9ef4b7f113de10a5cd3753f09c488066f
+  data.tar.gz: 9ecd9cbb770216ce76286b88529a69f0ce17359821cd50794abf6629580ab871db6497ba7bda8626b9934f5ab6963a9b0209404de81c4343e3df9decd41af715

data/.travis.yml

@@ -15,3 +15,6 @@ before_install:
 script:
 - bin/rspec
 - bundle exec publish-pageflow-theme-doc
+
+services:
+  - mysql

data/CHANGELOG.md

@@ -1,16 +1,16 @@
 # CHANGELOG
 
-### Version 2.1.0
+### Version 2.3.0
 
-2019-04-04
+2022-03-29
 
-[Compare changes](https://github.com/codevise/pageflow-external-links/compare/2-0-stable...v2.1.0)
+[Compare changes](https://github.com/codevise/pageflow-external-links/compare/2-2-stable...v2.3.0)
 
-- 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))
+- Add border-radius theme option
+  ([#46](https://github.com/codevise/pageflow-external-links/pull/46))
+- Prevent error with missing site urls in Pageflow 15.1
+  ([#44](https://github.com/codevise/pageflow-external-links/pull/44))
 
 See
-[2-0-stable branch](https://github.com/codevise/pageflow-external-links/blob/2-0-stable/CHANGELOG.md)
+[2-2-stable branch](https://github.com/codevise/pageflow-external-links/blob/2-2-stable/CHANGELOG.md)
 for previous changes.

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in chart.gemspec
 gemspec
+
+# Give a hint to Bundler to prevent endless loop
+gem 'rails', '~> 5.2.0'

data/Gemfile.ci

@@ -3,3 +3,6 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'pageflow-theme-doc-publisher', git: 'https://github.com/tf/pageflow-theme-doc-publisher'
+
+# Give a hint to Bundler to prevent endless loop
+gem 'rails', '~> 5.2.0'

data/app/assets/stylesheets/pageflow/external_links/themes/default.scss

@@ -38,6 +38,9 @@ $external-links-item-hover-underline: true !default;
 /// Padding around the text inside an item.
 $external-links-item-padding: 20px !default;
 
+/// Border radius of items.
+$external-links-item-border-radius: null !default;
+
 @include pageflow-page-type-pictograms("external_links");
 
 .external-links-page {
@@ -45,6 +48,7 @@ $external-links-item-padding: 20px !default;
     background-color: $external-links-item-background-color;
     color: $external-links-item-text-color;
     text-decoration: none;
+    border-radius: $external-links-item-border-radius;
 
     &:hover {
       background-color: $external-links-item-active-background-color;

data/app/helpers/pageflow/external_links/sites_helper.rb

@@ -1,6 +1,8 @@
 module Pageflow
   module ExternalLinks
     module SitesHelper
+      include RevisionFileHelper
+
       def external_links_site_css_class(site)
         ['link-item', site.title.blank? && site.description.blank? ? 'no_text' : ''].compact.join(' ')
       end
@@ -9,7 +11,7 @@ module Pageflow
       def external_links_site_thumbnail_css_class(site)
         classes = ['link-thumbnail']
 
-        if file = site.thumbnail_file
+        if file = find_file_in_entry(ImageFile, site.thumbnail)
           classes << file_thumbnail_css_class(file, :link_thumbnail_large)
         end
 

data/app/models/pageflow/external_links/site.rb

@@ -2,10 +2,6 @@ module Pageflow
   module ExternalLinks
     class Site < ActiveRecord::Base
       include RevisionComponent
-
-      def thumbnail_file
-        ImageFile.find_by_id(thumbnail)
-      end
     end
   end
 end

data/app/views/pageflow/external_links/sites/_site.html.erb

@@ -1,4 +1,4 @@
-<%= link_to(site.url,
+<%= link_to(site.url || '',
             class: external_links_site_css_class(site),
             target: site.open_in_new_tab? ? '_blank' : nil) do %>
 

data/lib/generators/pageflow_external_links/install/install_generator.rb

@@ -1,5 +1,30 @@
 module PageflowExternalLinks
-  class InstallGenerator < Pageflow::PageTypeInstallGenerator
+  class InstallGenerator < Rails::Generators::Base
+    desc 'Install the Pageflow plugin and the necessary migrations.'
+
+    def register_plugin
+      inject_into_file('config/initializers/pageflow.rb',
+                       after: "Pageflow.configure do |config|\n") do
+
+        "  config.plugin(Pageflow::#{engine_name_suffix.camelize}.plugin)\n"
+      end
+    end
+
+    def mount_engine
+      route("mount #{engine.name}, at: '/#{engine_name_suffix}'\n")
+    end
+
+    def install_migrations
+      rake "pageflow_#{engine_name_suffix}:install:migrations"
+      rake 'pageflow_external_links:install:migrations'
+    end
+
+    private
+
+    def engine_name_suffix
+      engine.engine_name.gsub(/^pageflow_/, '')
+    end
+
     def engine
       Pageflow::ExternalLinks::Engine
     end

data/lib/pageflow/external_links/version.rb

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

data/pageflow-external-links.gemspec

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

data/spec/integration/page_type_spec.rb

@@ -2,3 +2,49 @@ require 'spec_helper'
 require 'pageflow/lint'
 
 Pageflow::Lint.page_type(Pageflow::ExternalLinks.page_type)
+
+module Pageflow
+  module ExternalLinks
+    describe 'built in video page type', type: :helper do
+      include RenderPageTestHelper
+
+      it 'renders links to referenced sites' do
+        revision = FactoryBot.create(:revision, :published)
+        Site.create!(revision: revision,
+                     perma_id: 10,
+                     url: 'https://example.com',
+                     title: 'Example')
+
+        page = FactoryBot.create(:page,
+                                 template: 'external_links',
+                                 revision: revision,
+                                 configuration: {
+                                   linked_external_site_perma_ids: [10]
+                                 })
+
+        html = render_page(page)
+
+        expect(html).to have_selector('.link-title', text: 'Example')
+      end
+
+      it 'can handle sites with missing url' do
+        revision = FactoryBot.create(:revision, :published)
+        Site.create!(revision: revision,
+                     perma_id: 10,
+                     url: nil,
+                     title: 'Example')
+
+        page = FactoryBot.create(:page,
+                                 template: 'external_links',
+                                 revision: revision,
+                                 configuration: {
+                                   linked_external_site_perma_ids: [10]
+                                 })
+
+        html = render_page(page)
+
+        expect(html).to have_selector('.link-title', text: 'Example')
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-external-links
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2022-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pageflow
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 14.x
+        version: 15.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 14.x
+        version: 15.x
 - !ruby/object:Gem::Dependency
   name: pageflow-public-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 14.x
+        version: 15.x
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 14.x
+        version: 15.x
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -214,8 +214,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: Pageflow Page Type for links to external sites