pageflow 0.9.2 → 0.10.0

data/app/helpers/pageflow/entries_helper.rb

@@ -1,5 +1,9 @@
 module Pageflow
   module EntriesHelper
+    def pretty_entry_title(entry)
+      [entry.title, entry.theming.cname_domain.presence].compact.join(' - ')
+    end
+
     def pretty_entry_url(entry)
       pageflow.short_entry_url(entry.to_model, Pageflow.config.theming_url_options(entry.theming))
     end
@@ -46,7 +50,9 @@ module Pageflow
                              p: Pageflow::VERSION,
                              format: 'css')
 
-      stylesheet_link_tag(url, media: 'all')
+      stylesheet_link_tag(url,
+                          media: 'all',
+                          data: {name: 'entry'})
     end
 
     def entry_mobile_navigation_pages(entry)

data/app/helpers/pageflow/entry_json_seed_helper.rb

@@ -4,35 +4,52 @@ module Pageflow
   # @api private
   module EntryJsonSeedHelper
     include RenderJsonHelper
+    include CommonEntrySeedHelper
 
     def entry_json_seed(entry)
-      seed = {
-        theming: entry_theming_seed(entry),
-        chapter_configurations: entry_chapter_configurations_seed(entry),
-        pages: entry_pages_seed(entry)
-      }
+      sanitize_json(entry_seed(entry).to_json).html_safe
+    end
 
-      sanitize_json(seed.to_json).html_safe
+    def entry_seed(entry)
+      common_entry_seed(entry).merge(
+        theming: entry_theming_seed(entry),
+        storyline_configurations: entry_storyline_configurations_seed(entry),
+        chapters: entry_chapters_seed(entry),
+        pages: entry_pages_seed(entry),
+        file_ids: entry_file_ids_seed(entry)
+      )
     end
 
     def entry_theming_seed(entry)
       {
+        change_to_parent_page_at_storyline_boundary: entry.theming.theme.change_to_parent_page_at_storyline_boundary?,
         page_change_by_scrolling: entry.theming.theme.page_change_by_scrolling?,
         hide_text_on_swipe: entry.theming.theme.hide_text_on_swipe?
       }
     end
 
-    def entry_chapter_configurations_seed(entry)
-      entry.chapters.each_with_object({}) do |chapter, result|
-        result[chapter.id] = chapter.configuration
+    def entry_storyline_configurations_seed(entry)
+      entry.storylines.each_with_object({}) do |storyline, result|
+        result[storyline.id] = storyline.configuration
       end
     end
 
+    def entry_chapters_seed(entry)
+      attributes = [:id, :storyline_id, :title, :configuration]
+      entry.chapters.as_json(only: attributes)
+    end
+
     def entry_pages_seed(entry)
-      attributes = [:id, :perma_id, :chapter_id, :configuration]
+      attributes = [:id, :perma_id, :chapter_id, :template, :configuration]
       entry.pages.as_json(only: attributes)
     end
 
+    def entry_file_ids_seed(entry)
+      Pageflow.config.file_types.with_thumbnail_support.each_with_object({}) do |file_type, result|
+        result[file_type.collection_name] = entry.files(file_type.model).map(&:id)
+      end
+    end
+
     def entry_audio_files_json_seed(entry)
       seed = entry.audio_files.each_with_object({}) do |audio_file, result|
         result[audio_file.id] = audio_file_sources(audio_file)

data/app/helpers/pageflow/meta_tags_helper.rb

@@ -0,0 +1,11 @@
+module Pageflow
+  module MetaTagsHelper
+    def meta_tags_for_entry(entry)
+      render partial: 'pageflow/meta_tags/entry', locals: {
+        keywords: entry.keywords.presence || Pageflow.config.default_keywords_meta_tag,
+        author: entry.author.presence || Pageflow.config.default_author_meta_tag,
+        publisher: entry.publisher.presence || Pageflow.config.default_publisher_meta_tag
+      }
+    end
+  end
+end

data/app/helpers/pageflow/page_types_helper.rb

@@ -8,13 +8,17 @@ module Pageflow
                           as: :page_type)
     end
 
-    def page_type_templates
+    def page_type_templates(entry)
       safe_join(Pageflow.config.page_types.map do |page_type|
         content_tag(:script,
-                    render_to_string(:template => page_type.template_path,
-                                     :locals => {:configuration => {}, :page => Page.new},
-                                     :layout => false).to_str,
-                    :type => 'text/html', :data => {:template => "#{page_type.name}_page"})
+                    render_to_string(template: page_type.template_path,
+                                     locals: {
+                                       configuration: {},
+                                       page: Page.new,
+                                       entry: entry
+                                     },
+                                     layout: false).to_str,
+                    type: 'text/html', data: {template: "#{page_type.name}_page"})
       end)
     end
   end

data/app/helpers/pageflow/pages_helper.rb

@@ -1,5 +1,13 @@
 module Pageflow
   module PagesHelper
+    def render_page_template(page, locals = {})
+      page_type = Pageflow.config.page_types.find_by_name!(page.template)
+
+      render(template: page_type.template_path,
+             locals: locals.merge(page: page,
+                                  configuration: page.configuration))
+    end
+
     def page_css_class(page)
       classes = ['page']
       classes << 'invert' if page.configuration['invert']
@@ -40,101 +48,6 @@ module Pageflow
       end
     end
 
-    def mobile_poster_image_div(config = {})
-      classes = ['background', 'background_image']
-      position = {x: 50, y: 50}
-
-      if config['mobile_poster_image_id']
-        classes << "image_#{config['mobile_poster_image_id']}"
-        position[:x] = config['mobile_poster_image_x'] || 50
-        position[:y] = config['mobile_poster_image_y'] || 50
-      elsif config['poster_image_id']
-        classes << "image_#{config['poster_image_id']}"
-        position[:x] = config['poster_image_x'] || 50
-        position[:y] = config['poster_image_y'] || 50
-      elsif config['video_file_id']
-        classes << "video_poster_#{config['video_file_id']}"
-        position[:x] = config['video_file_x'] || 50
-        position[:y] = config['video_file_y'] || 50
-      else
-        classes << 'video_poster_none'
-      end
-
-      content_tag(:div, '', :class => classes.join(' '),
-                  :style => "background-position: #{position[:x]}% #{position[:y]}%;")
-    end
-
-    def poster_image_tag(video_id, poster_image_id, options = {})
-      video_file = VideoFile.find_by_id(video_id)
-      poster = ImageFile.find_by_id(poster_image_id)
-
-      if poster
-        options = options.merge('data-src' => poster.attachment.url(:medium))
-        options = options.merge('data-printsrc' => poster.attachment.url(:print))
-      elsif video_file
-        options = options.merge('data-src' => video_file.poster.url(:medium))
-        options = options.merge('data-printsrc' => video_file.poster.url(:print))
-      end
-
-      image_tag('', options)
-    end
-
-    def lookup_video_tag(video_id, poster_image_id, options = {})
-
-      defaults = {:class => ['player video-js video-viewport vjs-default-skin', options.delete(:class)].compact * ' ',
-        :preload =>  options.delete(:preload) ? 'metadata' : 'none'}
-
-      options.reverse_merge! defaults
-      url_options = {:unique_id => options.delete(:unique_id)}
-
-      video_file = VideoFile.find_by_id(video_id)
-      poster = ImageFile.find_by_id(poster_image_id)
-      mobile_poster = ImageFile.find_by_id(options.delete(:mobile_poster_image_id))
-
-      options[:data] = {}
-      script_tag_data = {:template => 'video'}
-
-      if mobile_poster
-        options[:data][:mobile_poster] = mobile_poster.attachment.url(:medium)
-        options[:data][:mobile_large_poster] = mobile_poster.attachment.url(:large)
-      end
-
-      if poster
-        options[:data][:poster] = poster.attachment.url(:medium)
-        options[:data][:large_poster] = poster.attachment.url(:large)
-      elsif video_file
-        options[:data][:poster] = video_file.poster.url(:medium)
-        options[:data][:large_poster] = video_file.poster.url(:large)
-      end
-
-      if video_file && video_file.width.present? && video_file.height.present?
-        script_tag_data[:video_width] = options[:data][:width] = video_file.width
-        script_tag_data[:video_height] = options[:data][:height] = video_file.height
-      end
-
-      render('pageflow/pages/video_tag',
-             :video_file => video_file, :script_tag_data => script_tag_data,
-             :options => options, :url_options => url_options)
-    end
-
-    def video_file_sources(video_file, options = {})
-      [{
-          :type => 'video/webm',
-          :src => video_file.webm_medium.url(options),
-          :high_src => video_file.webm_high.url(options)
-        },
-        {
-          :type => 'application/x-mpegURL',
-          :src => video_file.hls_playlist.url(options),
-          :high_src => video_file.hls_playlist.url(options)
-        },
-        {
-          :type => 'video/mp4',
-          :src => video_file.mp4_medium.url(options),
-          :high_src => video_file.mp4_high.url(options)
-        }]
-    end
-
     def page_media_breakpoints
       {
         :large => :default,
@@ -146,6 +59,6 @@ module Pageflow
       file_thumbnail_css_class(page.thumbnail_file, hero ? :link_thumbnail_large : :link_thumbnail)
     end
 
-    CSS_RENDERED_THUMBNAIL_STYLES = [:link_thumbnail, :link_thumbnail_large]
+    CSS_RENDERED_THUMBNAIL_STYLES = [:thumbnail_large, :navigation_thumbnail_large, :link_thumbnail, :link_thumbnail_large]
   end
 end

data/app/helpers/pageflow/public_i18n_helper.rb

@@ -0,0 +1,13 @@
+module Pageflow
+  module PublicI18nHelper
+    def public_i18n_javascript_tag(entry)
+      render('pageflow/public_i18n/javascript_tag',
+             entry_locale: entry.locale,
+             translations: {
+               pageflow: {
+                 public: I18n.t('pageflow.public', locale: entry.locale)
+               }
+             })
+    end
+  end
+end

data/app/helpers/pageflow/social_share_helper.rb

@@ -64,7 +64,7 @@ module Pageflow
     private
 
     def social_share_sanitize(text)
-      strip_tags(text.gsub(/<br ?\/?>/, ' ').squish)
+      HTMLEntities.new.decode(strip_tags(text.gsub(/<br ?\/?>|&nbsp;/, ' ').squish))
     end
   end
 end

data/app/helpers/pageflow/video_files_helper.rb

@@ -0,0 +1,133 @@
+module Pageflow
+  module VideoFilesHelper
+    def mobile_poster_image_div(config = {})
+      classes = ['background', 'background_image']
+      position = {x: 50, y: 50}
+
+      if config['mobile_poster_image_id']
+        classes << "image_#{config['mobile_poster_image_id']}"
+        position[:x] = config['mobile_poster_image_x'] || 50
+        position[:y] = config['mobile_poster_image_y'] || 50
+      elsif config['poster_image_id']
+        classes << "image_#{config['poster_image_id']}"
+        position[:x] = config['poster_image_x'] || 50
+        position[:y] = config['poster_image_y'] || 50
+      elsif config['video_file_id']
+        classes << "video_poster_#{config['video_file_id']}"
+        position[:x] = config['video_file_x'] || 50
+        position[:y] = config['video_file_y'] || 50
+      else
+        classes << 'video_poster_none'
+      end
+
+      content_tag(:div, '',
+                  class: classes.join(' '),
+                  style: "background-position: #{position[:x]}% #{position[:y]}%;")
+    end
+
+    def poster_image_tag(video_id, poster_image_id, options = {})
+      video_file = VideoFile.find_by_id(video_id)
+      poster = ImageFile.find_by_id(poster_image_id)
+
+      if poster
+        options = options.merge('data-src' => poster.attachment.url(:medium))
+        options = options.merge('data-printsrc' => poster.attachment.url(:print))
+      elsif video_file
+        options = options.merge('data-src' => video_file.poster.url(:medium))
+        options = options.merge('data-printsrc' => video_file.poster.url(:print))
+      end
+
+      image_tag('', options)
+    end
+
+    def video_file_video_tag(video_file, options = {})
+      defaults = {
+        class: [
+          'player video-js video-viewport vjs-default-skin',
+          options.delete(:class)
+        ].compact * ' ',
+        preload:  options.delete(:preload) ? 'metadata' : 'none'
+      }
+
+      options.reverse_merge! defaults
+      url_options = {unique_id: options.delete(:unique_id)}
+
+      poster = ImageFile.find_by_id(options.delete(:poster_image_id))
+      mobile_poster = ImageFile.find_by_id(options.delete(:mobile_poster_image_id))
+
+      options[:data] = {}
+
+      if mobile_poster
+        options[:data][:mobile_poster] = mobile_poster.attachment.url(:medium)
+        options[:data][:mobile_large_poster] = mobile_poster.attachment.url(:large)
+      end
+
+      if poster
+        options[:data][:poster] = poster.attachment.url(:medium)
+        options[:data][:large_poster] = poster.attachment.url(:large)
+      elsif video_file
+        options[:data][:poster] = video_file.poster.url(:medium)
+        options[:data][:large_poster] = video_file.poster.url(:large)
+      end
+
+      if video_file && video_file.width.present? && video_file.height.present?
+        options[:data][:width] = video_file.width
+        options[:data][:height] = video_file.height
+      end
+
+      render('pageflow/video_files/video_tag',
+             video_file: video_file,
+             options: options,
+             url_options: url_options)
+    end
+
+    # @deprecated
+    def lookup_video_tag(video_id, poster_image_id, options = {})
+      video_file_script_tag(video_id, options.merge(poster_image_id: poster_image_id))
+    end
+
+    def video_file_script_tag(video_id, options = {})
+      video_file = VideoFile.find_by_id(video_id)
+
+      script_tag_data = {template: 'video'}
+
+      if video_file && video_file.width.present? && video_file.height.present?
+        script_tag_data[:video_width] = video_file.width
+        script_tag_data[:video_height] = video_file.height
+      end
+
+      render('pageflow/video_files/script_tag',
+             script_tag_data: script_tag_data,
+             video_file: video_file,
+             options: options)
+    end
+
+    def video_file_non_js_link(entry, video_file_id)
+      if (video_file = VideoFile.find_by_id(video_file_id))
+        link_to(t('pageflow.public.play_video'),
+                short_video_file_path(entry, video_file),
+                class: 'hint')
+      end
+    end
+
+    def video_file_sources(video_file, options = {})
+      [
+        {
+          type: 'video/webm',
+          src: video_file.webm_medium.url(options),
+          high_src: video_file.webm_high.url(options)
+        },
+        {
+          type: 'application/x-mpegURL',
+          src: video_file.hls_playlist.url(options),
+          high_src: video_file.hls_playlist.url(options)
+        },
+        {
+          type: 'video/mp4',
+          src: video_file.mp4_medium.url(options),
+          high_src: video_file.mp4_high.url(options)
+        }
+      ]
+    end
+  end
+end

data/app/helpers/pageflow/widgets_helper.rb

@@ -1,7 +1,7 @@
 module Pageflow
   module WidgetsHelper
     def render_widget_head_fragments(entry, options = {})
-      fragments = entry.widgets.resolve(options).map do |widget|
+      fragments = entry.resolve_widgets(options).map do |widget|
         widget.widget_type.render_head_fragment(self, entry)
       end
 
@@ -9,7 +9,7 @@ module Pageflow
     end
 
     def render_widgets(entry, options = {})
-      fragments = entry.widgets.resolve(options).map do |widget|
+      fragments = entry.resolve_widgets(options).map do |widget|
         widget.widget_type.render(self, entry)
       end
 
@@ -17,7 +17,7 @@ module Pageflow
     end
 
     def present_widgets_css_class(entry)
-      entry.widgets.resolve.map do |widget|
+      entry.resolve_widgets.map do |widget|
         "widget_#{widget.widget_type.name}_present"
       end.join(' ')
     end
@@ -33,11 +33,5 @@ module Pageflow
         end
       end.to_json.html_safe
     end
-
-    def widget_types_collection_for_role(config, role)
-      config.widget_types.find_all_by_role(role).each_with_object({}) do |widget_type, result|
-        result[I18n.t(widget_type.translation_key)] = widget_type.name
-      end
-    end
   end
 end

data/app/models/concerns/pageflow/feature_target.rb

@@ -3,7 +3,8 @@ module Pageflow
   module FeatureTarget
     STATE_MAPPING = {
       true => 'enabled',
-      false => 'disabled'
+      false => 'disabled',
+      nil => 'default'
     }
 
     extend ActiveSupport::Concern
@@ -19,15 +20,32 @@ module Pageflow
     end
 
     def feature_state(name)
+      state = own_feature_state(name)
+      state == nil ? inherited_feature_state(name) : state
+    end
+
+    def own_feature_state(name)
       features_configuration[name]
     end
 
+    def inherited_feature_state(name)
+      Pageflow.config.features.enabled_by_default?(name)
+    end
+
     def feature_states=(states)
       boolean_states = states.each_with_object({}) do |(key, value), result|
-        result[key] = (value == true || value == STATE_MAPPING[true])
+        if value == true || value == STATE_MAPPING[true]
+          result[key] = true
+        elsif value == false || value == STATE_MAPPING[false]
+          result[key] = false
+        elsif value.blank? || value == STATE_MAPPING[nil]
+          result[key] = nil
+        end
       end
 
-      self.features_configuration = features_configuration.merge(boolean_states)
+      self.features_configuration = features_configuration
+        .merge(boolean_states)
+        .reject { |_, value| value.nil? }
     end
 
     def features_configuration