pageflow-internal-links 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a24a0e3ee46c6a17e1c5558a32ea08a334c117dde8003f21753c9c08b534ddd
-  data.tar.gz: 8638cddf9198cafa697dfb9ba4348d461506d13a553519b95f78acc43bf4cd58
+  metadata.gz: 97724ff942ba0daa911807073d14a9c8e0b9a39eb9f46d052791e8647224f2e5
+  data.tar.gz: 26567ba7d3c678627b68f647ed43dc21fa5de0cb282aa24cd2665946728adc1c
 SHA512:
-  metadata.gz: cac06878b7958f08327d22374f8d40b6de5cab63cac49c911a1d59c28a53d5a63917fddc808e7a5970fdfd3f09debaf9ff47cc1d16f44c16ddf585a8156cc248
-  data.tar.gz: f9e33adc8e4aee1bdddd26c7d0850b9439121315de0c04337584e46474d1dc7ce81c8354625373ecb3a9ccc4947ea9b08ac86b52bed753784906d64bff622a3b
+  metadata.gz: feb875f9c915927689fc905d0ece8c57c6a8aad3fe2e4c445f456195a8d988ebe120ee560e8155254b23a0cf54c92bdd98efe794bb3975929b1bb15343f41be1
+  data.tar.gz: 5eb81ad126c6f12ab82450f6ff309162d2c12081fb4eb63acb7731519dd8090089695609d8187ba068a5c92e8d626df73b47bedb84e342f1aef02da9302c5465

data/.travis.yml

@@ -8,3 +8,6 @@ cache: bundler
 
 script:
   - bin/rspec
+
+services:
+  - mysql

data/CHANGELOG.md

@@ -1,16 +1,20 @@
 # CHANGELOG
 
-### Version 1.2.0
+### Version 1.3.0
 
-2019-04-08
+2019-11-04
 
-[Compare changes](https://github.com/codevise/pageflow-internal-links/compare/1-1-stable...v1.2.0)
+[Compare changes](https://github.com/codevise/pageflow-internal-links/compare/1-2-stable...v1.3.0)
 
-- Adapt page dom for pageflow 14
-  ([#17](https://github.com/codevise/pageflow-internal-links/pull/17))
-- Setup page type lint specs
-  ([#16](https://github.com/codevise/pageflow-internal-links/pull/16))
+- Rewrite helpers to use image file perma ids
+  ([#21](https://github.com/codevise/pageflow-internal-links/pull/21))
+- Specify mysql service for Travis build
+  ([#20](https://github.com/codevise/pageflow-internal-links/pull/20))
+- Specify export_version
+  ([#19](https://github.com/codevise/pageflow-internal-links/pull/19))
+- Extend pageflow version requirement to < 16
+  ([#18](https://github.com/codevise/pageflow-internal-links/pull/18))
 
 See
-[1-1-stable branch](https://github.com/codevise/pageflow-internal-links/blob/1-1-stable/CHANGELOG.md)
+[1-2-stable branch](https://github.com/codevise/pageflow-internal-links/blob/1-2-stable/CHANGELOG.md)
 for previous changes.

data/app/helpers/pageflow/internal_links/grid_helper.rb

@@ -3,7 +3,7 @@ module Pageflow
     module GridHelper
       def internal_links_grid(entry, configuration)
         Grid.new(self,
-                 InternalLinks::PageLinks.deserialize(entry, configuration),
+                 InternalLinks::PageLinks.deserialize(self, entry, configuration),
                  configuration['linked_pages_layout']).render
       end
 

data/app/helpers/pageflow/internal_links/list_helper.rb

@@ -3,7 +3,7 @@ module Pageflow
     module ListHelper
       def internal_links_list(entry, configuration)
         render('pageflow/internal_links/list/list',
-               page_links: InternalLinks::PageLinks.deserialize(entry, configuration))
+               page_links: InternalLinks::PageLinks.deserialize(self, entry, configuration))
       end
     end
   end

data/app/helpers/pageflow/internal_links/page_links.rb

@@ -1,8 +1,8 @@
 module Pageflow
   module InternalLinks
-    class PageLinks < Struct.new(:entry, :configuration)
-      def self.deserialize(entry, configuration)
-        new(entry, configuration).deserialize
+    class PageLinks < Struct.new(:template, :entry, :configuration)
+      def self.deserialize(template, entry, configuration)
+        new(template, entry, configuration).deserialize
       end
 
       def deserialize
@@ -29,7 +29,8 @@ module Pageflow
 
       def parse_collection(collection)
         collection.map do |attributes|
-          PageLink.new(attributes['target_page_id'],
+          PageLink.new(template,
+                       attributes['target_page_id'],
                        attributes['position'].to_i,
                        attributes['page_transition'],
                        attributes['description'],
@@ -39,12 +40,13 @@ module Pageflow
 
       def parse_legacy_hash(hash)
         hash.map do |position, target_page_id|
-          PageLink.new(target_page_id, (position.to_i - 1), nil, nil, nil)
+          PageLink.new(template, target_page_id, (position.to_i - 1), nil, nil, nil)
         end
       end
     end
 
-    class PageLink < Struct.new(:target_page_id,
+    class PageLink < Struct.new(:template,
+                                :target_page_id,
                                 :position,
                                 :page_transition,
                                 :optional_description,
@@ -62,7 +64,7 @@ module Pageflow
 
       def thumbnail_file
         custom_thumbnail_file ||
-          (target_page && target_page.thumbnail_file)
+          (target_page && template.page_thumbnail_file(target_page))
       end
 
       def css_class
@@ -87,7 +89,8 @@ module Pageflow
       private
 
       def custom_thumbnail_file
-        @custom_thumbnail_file = ImageFile.find_by_id(custom_thumbnail_image_id)
+        @custom_thumbnail_file = template.find_file_in_entry(ImageFile,
+                                                             custom_thumbnail_image_id)
       end
 
       def target_page_description

data/lib/pageflow/internal_links/grid_page_type.rb

@@ -14,6 +14,10 @@ module Pageflow
       def view_helpers
         [GridHelper]
       end
+
+      def export_version
+        VERSION
+      end
     end
   end
 end

data/lib/pageflow/internal_links/list_page_type.rb

@@ -14,6 +14,10 @@ module Pageflow
       def view_helpers
         [InternalLinks::ListHelper]
       end
+
+      def export_version
+        VERSION
+      end
     end
   end
 end

data/lib/pageflow/internal_links/version.rb

@@ -1,5 +1,5 @@
 module Pageflow
   module InternalLinks
-    VERSION = '1.2.0'.freeze
+    VERSION = '1.3.0'.freeze
   end
 end

data/pageflow-internal-links.gemspec

@@ -18,10 +18,10 @@ 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_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_types_spec.rb

@@ -1,5 +1,90 @@
 require 'spec_helper'
 require 'pageflow/lint'
+require 'pageflow/used_file_test_helper'
 
 Pageflow::Lint.page_type(Pageflow::InternalLinks.grid_page_type)
 Pageflow::Lint.page_type(Pageflow::InternalLinks.list_page_type)
+
+module Pageflow
+  module InternalLinks
+    describe 'page type', type: :helper do
+      include RenderPageTestHelper
+      include UsedFileTestHelper
+
+      before do
+        pageflow_configure do |config|
+          config.plugin(InternalLinks.plugin)
+          config.features.enable_by_default('page_type.internal_links_list')
+        end
+
+        helper.extend(Pageflow::FileThumbnailsHelper)
+        helper.extend(Pageflow::PagesHelper)
+      end
+
+      describe 'grid' do
+        it 'renders internal links' do
+          revision = create(:revision)
+          other_page = create(:page, revision: revision)
+          page = create(:page,
+                        template: InternalLinks.grid_page_type.name,
+                        revision: revision,
+                        configuration: {
+                          internal_links: [
+                            {
+                              target_page_id: other_page.perma_id
+                            }
+                          ]
+                        })
+
+          html = render_page(page)
+
+          expect(html).to have_selector("nav a[data-page=#{other_page.perma_id}]")
+        end
+      end
+
+      describe 'list' do
+        it 'renders internal links' do
+          revision = create(:revision)
+          other_page = create(:page, revision: revision)
+          page = create(:page,
+                        template: InternalLinks.list_page_type.name,
+                        revision: revision,
+                        configuration: {
+                          internal_links: [
+                            {
+                              target_page_id: other_page.perma_id
+                            }
+                          ]
+                        })
+
+          html = render_page(page)
+
+          expect(html).to have_selector("nav a[data-page=#{other_page.perma_id}]")
+        end
+
+        it 'looks up custom thumbnail by perma id' do
+          revision = create(:revision)
+          entry = Pageflow::PublishedEntry.new(create(:entry), revision)
+          other_page = create(:page, revision: revision)
+          image_file = create_used_file(:image_file, entry: entry)
+          page = create(:page,
+                        template: InternalLinks.list_page_type.name,
+                        revision: revision,
+                        configuration: {
+                          internal_links: [
+                            {
+                              target_page_id: other_page.perma_id,
+                              thumbnail_image_id: image_file.perma_id
+                            }
+                          ]
+                        })
+
+          html = render_page(page)
+
+          expect(html)
+            .to have_selector("nav a .pageflow_image_file_link_thumbnail_large_#{image_file.perma_id}")
+        end
+      end
+    end
+  end
+end

data/spec/support/config/factory_bot.rb

@@ -0,0 +1,6 @@
+require 'factory_bot_rails'
+
+RSpec.configure do |config|
+  # Allow to use build and create methods without FactoryBot prefix.
+  config.include FactoryBot::Syntax::Methods
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-internal-links
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Codevise Solutions
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-08 00:00:00.000000000 Z
+date: 2019-11-04 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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +50,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
@@ -181,6 +181,7 @@ files:
 - pageflow-internal-links.gemspec
 - spec/integration/page_types_spec.rb
 - spec/spec_helper.rb
+- spec/support/config/factory_bot.rb
 homepage: https://github.com/codevise/pageflow-internal-links
 licenses:
 - MIT
@@ -208,3 +209,4 @@ summary: Pageflow page types for linking to other pages.
 test_files:
 - spec/integration/page_types_spec.rb
 - spec/spec_helper.rb
+- spec/support/config/factory_bot.rb