pageflow 13.5.0 → 13.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d65914a5c0e8255f5d2791a221435172ad9c71a413be337da5797ca121b3aa08
-  data.tar.gz: 97c08215f8fffd43e31a7e7f2d6df5cda9235a4806aae88e1def9fc56535fdf7
+  metadata.gz: 9e9dac37ddc4c26d594df5452f6bcf4a972fbccdc46538e764938984d93f6792
+  data.tar.gz: faf7217c3dd9128b6ab5ddf303a62f3a9df0364063ef0ba2e7156390660385be
 SHA512:
-  metadata.gz: 3925ed6f51dca3e7143deeeb1f828038d1587cc1dd8215542f3f8aef0f1a4cb9950c55ff41488b56ffd86c41de92c9f6eb147e78ebd8d5e119f65bd995b2f7a7
-  data.tar.gz: 8039b72eed4a82ca24cf6c3789b5bcf0fbaa230c21b906a58d454a5deca8e8d15a2bc151ceb86d674c1980069fbf74269b009ef5b8bba0386571dc7c5bb9e950
+  metadata.gz: b8fbafc373c8c663037d5b67b27df6ad5df0586da48e286cd456c218a76f4a63a249a3097948aa27ef31aa36204b626c8a2d32633054d4692c5fd239d3458a94
+  data.tar.gz: c8190274933517b76c164c13fb78423341af6b37989a760a8ba466dfd183df293b11bdda3c2df117a49694637cd5843dd41a2519e2d8c42c5adbaf0bed38625f

data/CHANGELOG.md

@@ -1,18 +1,14 @@
 # CHANGELOG
 
-### Version 13.5.0
+### Version 13.6.0
 
-2019-03-05
+2019-03-07
 
-[Compare changes](https://github.com/codevise/pageflow/compare/13-4-stable...v13.5.0)
+[Compare changes](https://github.com/codevise/pageflow/compare/13-5-stable...v13.6.0)
 
-- Improve text area link dialog
-  ([#1130](https://github.com/codevise/pageflow/pull/1130))
-- Allow setting browser feature flags via query string in debug mode
-  ([#1130](https://github.com/codevise/pageflow/pull/1130))
-- Fix cracking noises in audios on Safari
-  ([#1127](https://github.com/codevise/pageflow/pull/1127))
+- Add shared specs to pageflow-support to lint page types
+  ([#1134](https://github.com/codevise/pageflow/pull/1134))
 
 See
-[13-4-stable branch](https://github.com/codevise/pageflow/blob/13-4-stable/CHANGELOG.md)
+[13-5-stable branch](https://github.com/codevise/pageflow/blob/13-5-stable/CHANGELOG.md)
 for previous changes.

data/app/helpers/pageflow/page_types_helper.rb

@@ -8,6 +8,12 @@ module Pageflow
                           as: :page_type)
     end
 
+    def page_type_json_seed(json, page_type)
+      if page_type.json_seed_template
+        json.partial!(template: page_type.json_seed_template, locals: {page_type: page_type})
+      end
+    end
+
     def page_type_templates(entry)
       safe_join(Pageflow.config.page_types.map do |page_type|
         content_tag(:script,

data/app/views/pageflow/page_types/_page_type.json.jbuilder

@@ -17,6 +17,4 @@ json.thumbnail_candidates(page_type.thumbnail_candidates) do |candidate|
   end
 end
 
-if page_type.json_seed_template
-  json.partial!(:template => page_type.json_seed_template, :locals => {:page_type => page_type})
-end
+page_type_json_seed(json, page_type)

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

@@ -1,6 +1,6 @@
 <% if page.template.present? %>
   <% concat React::ServerRendering.render(
      'pageflow.react.ServerSidePage',
-     %Q'{ "resolverSeed": #{@_pageflow_react_entry_seed ||= entry_json_seed(@entry)}, "pageId": #{page.perma_id}, "pageType": "#{page.template}" }',
+     %Q'{ "resolverSeed": #{@_pageflow_react_entry_seed ||= entry_json_seed(entry)}, "pageId": #{page.perma_id}, "pageType": "#{page.template}" }',
      true) %>
 <% end %>

data/lib/pageflow/built_in_page_type.rb

@@ -0,0 +1,73 @@
+module Pageflow
+  # @api private
+  module BuiltInPageType
+    def self.plain
+      Pageflow::React.create_page_type('background_image',
+                                       thumbnail_candidates: default_thumbnail_candidates,
+                                       file_types: [
+                                         BuiltInFileType.image,
+                                         BuiltInFileType.video
+                                       ])
+    end
+
+    def self.video
+      Pageflow::React.create_page_type('video',
+                                       thumbnail_candidates: video_thumbnail_candidates,
+                                       file_types: [
+                                         BuiltInFileType.image,
+                                         BuiltInFileType.video
+                                       ])
+    end
+
+    def self.audio
+      Pageflow::React.create_page_type('audio',
+                                       thumbnail_candidates: default_thumbnail_candidates,
+                                       file_types: [
+                                         BuiltInFileType.audio,
+                                         BuiltInFileType.image,
+                                         BuiltInFileType.video
+                                       ])
+    end
+
+    def self.video_thumbnail_candidates
+      [
+        {file_collection: 'image_files', attribute: 'thumbnail_image_id'},
+        {file_collection: 'image_files', attribute: 'poster_image_id'},
+        {file_collection: 'video_files', attribute: 'video_file_id'}
+      ]
+    end
+
+    def self.default_thumbnail_candidates
+      [
+        {
+          file_collection: 'image_files',
+          attribute: 'thumbnail_image_id'
+        },
+        {
+          file_collection: 'image_files',
+          attribute: 'background_image_id',
+          unless: {
+            attribute: 'background_type',
+            value: 'video'
+          }
+        },
+        {
+          file_collection: 'image_files',
+          attribute: 'poster_image_id',
+          if: {
+            attribute: 'background_type',
+            value: 'video'
+          }
+        },
+        {
+          file_collection: 'video_files',
+          attribute: 'video_file_id',
+          if: {
+            attribute: 'background_type',
+            value: 'video'
+          }
+        }
+      ]
+    end
+  end
+end

data/lib/pageflow/built_in_page_types_plugin.rb

@@ -1,80 +1,9 @@
 module Pageflow
   class BuiltInPageTypesPlugin < Plugin
     def configure(config)
-      config.page_types.register(plain_page_type)
-      config.page_types.register(video_page_type)
-      config.page_types.register(audio_page_type)
-    end
-
-    private
-
-    def plain_page_type
-      Pageflow::React.create_page_type('background_image',
-                                       thumbnail_candidates: default_thumbnail_candidates,
-                                       file_types: [
-                                         BuiltInFileType.image,
-                                         BuiltInFileType.video
-                                       ])
-    end
-
-    def video_page_type
-      Pageflow::React.create_page_type('video',
-                                       thumbnail_candidates: video_thumbnail_candidates,
-                                       file_types: [
-                                         BuiltInFileType.image,
-                                         BuiltInFileType.video
-                                       ])
-    end
-
-    def audio_page_type
-      Pageflow::React.create_page_type('audio',
-                                       thumbnail_candidates: default_thumbnail_candidates,
-                                       file_types: [
-                                         BuiltInFileType.audio,
-                                         BuiltInFileType.image,
-                                         BuiltInFileType.video
-                                       ])
-    end
-
-    def video_thumbnail_candidates
-      [
-        {file_collection: 'image_files', attribute: 'thumbnail_image_id'},
-        {file_collection: 'image_files', attribute: 'poster_image_id'},
-        {file_collection: 'video_files', attribute: 'video_file_id'}
-      ]
-    end
-
-    def default_thumbnail_candidates
-      [
-        {
-          file_collection: 'image_files',
-          attribute: 'thumbnail_image_id'
-        },
-        {
-          file_collection: 'image_files',
-          attribute: 'background_image_id',
-          unless: {
-            attribute: 'background_type',
-            value: 'video'
-          }
-        },
-        {
-          file_collection: 'image_files',
-          attribute: 'poster_image_id',
-          if: {
-            attribute: 'background_type',
-            value: 'video'
-          }
-        },
-        {
-          file_collection: 'video_files',
-          attribute: 'video_file_id',
-          if: {
-            attribute: 'background_type',
-            value: 'video'
-          }
-        }
-      ]
+      config.page_types.register(BuiltInPageType.plain)
+      config.page_types.register(BuiltInPageType.video)
+      config.page_types.register(BuiltInPageType.audio)
     end
   end
 end

data/lib/pageflow/version.rb

@@ -1,3 +1,3 @@
 module Pageflow
-  VERSION = '13.5.0'.freeze
+  VERSION = '13.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow
 version: !ruby/object:Gem::Version
-  version: 13.5.0
+  version: 13.6.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2019-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1964,6 +1964,7 @@ files:
 - lib/pageflow/admin/tab.rb
 - lib/pageflow/admin/tabs.rb
 - lib/pageflow/built_in_file_type.rb
+- lib/pageflow/built_in_page_type.rb
 - lib/pageflow/built_in_page_types_plugin.rb
 - lib/pageflow/built_in_widget_type.rb
 - lib/pageflow/built_in_widget_types_plugin.rb