pageflow 0.8.2 → 0.9.0

data/app/controllers/pageflow/editor/entries_controller.rb

@@ -13,6 +13,8 @@ module Pageflow
       def seed
         @entry = DraftEntry.find(params[:id])
         authorize!(:edit, @entry.to_model)
+
+        @entry_config = Pageflow.config_for(@entry)
       end
     end
   end

data/app/controllers/pageflow/editor/entry_publications_controller.rb

@@ -17,6 +17,8 @@ module Pageflow
         render(action: :check)
       rescue Quota::ExceededError
         render(action: :check, status: :forbidden)
+      rescue Entry::PasswordMissingError
+        head(:bad_request)
       end
 
       def check
@@ -37,7 +39,7 @@ module Pageflow
       end
 
       def entry_publication_params
-        params.fetch(:entry_publication, {}).permit(:published_until)
+        params.fetch(:entry_publication, {}).permit(:published_until, :password, :password_protected)
       end
 
       def published_entries_quota

data/app/controllers/pageflow/entries_controller.rb

@@ -1,8 +1,10 @@
 module Pageflow
   class EntriesController < Pageflow::ApplicationController
+    include PublicHttpsMode
+
     before_filter :authenticate_user!, :except => [:index, :show, :page]
 
-    before_filter :prevent_ssl, :only => [:index, :show], :unless => lambda { |controller| controller.request.format.json? }
+    before_filter :check_public_https_mode, only: [:index, :show], unless: lambda { |controller| controller.request.format.json? }
 
     helper_method :render_to_string
 
@@ -22,12 +24,15 @@ module Pageflow
           @entry = PublishedEntry.find(params[:id], entry_request_scope)
           I18n.locale = @entry.locale
 
+          if request.format.html? && @entry.password_protected?
+            check_entry_password(@entry)
+          end
+
           if params[:page].present?
-            @entry.share_target = Page.find_by_perma_id(params[:page])
+            @entry.share_target = @entry.pages.find_by_perma_id(params[:page])
           else
             @entry.share_target = @entry
           end
-
         end
         format.json do
           authenticate_user!
@@ -61,6 +66,8 @@ module Pageflow
     def edit
       @entry = DraftEntry.find(params[:id])
       authorize!(:edit, @entry.to_model)
+
+      @entry_config = Pageflow.config_for(@entry)
     end
 
     def update
@@ -83,5 +90,11 @@ module Pageflow
     def entry_request_scope
       Pageflow.config.public_entry_request_scope.call(Entry, request)
     end
+
+    def check_entry_password(entry)
+      authenticate_or_request_with_http_basic('Pageflow') do |_, password|
+        entry.authenticate(password)
+      end
+    end
   end
 end

data/app/controllers/pageflow/files_controller.rb

@@ -1,6 +1,8 @@
 module Pageflow
   class FilesController < Pageflow::ApplicationController
-    before_filter :prevent_ssl
+    include PublicHttpsMode
+
+    before_filter :check_public_https_mode
 
     def show
       respond_to do |format|

data/app/helpers/pageflow/admin/features_helper.rb

@@ -0,0 +1,25 @@
+module Pageflow
+  module Admin
+    module FeaturesHelper
+      def feature_state_select_tag(feature_target, feature_name)
+        value = FeatureTarget::STATE_MAPPING[feature_target.feature_state(feature_name)]
+
+        select_tag(feature_state_input_name(feature_target, feature_name),
+                   options_for_select(feature_states_collection, value))
+      end
+
+      def feature_state_input_name(feature_target, feature_name)
+        param_key = feature_target.class.model_name.param_key
+        "#{param_key}[feature_states][#{feature_name}]"
+      end
+
+      def feature_states_collection
+        {
+          I18n.t('pageflow.admin.features.states.undefined') => nil,
+          I18n.t('pageflow.admin.features.states.enabled') => FeatureTarget::STATE_MAPPING[true],
+          I18n.t('pageflow.admin.features.states.disabled') => FeatureTarget::STATE_MAPPING[false]
+        }
+      end
+    end
+  end
+end

data/app/helpers/pageflow/background_image_helper.rb

@@ -16,7 +16,17 @@ module Pageflow
       end
     end
 
+    def background_image_lazy_loading_css_class(prefix, model)
+      css_class = [prefix, model.id].join('_')
+      ".load_all_images .#{css_class}, .load_image.#{css_class}"
+    end
+
     class Div
+      FILE_TYPE_CSS_CLASS_PREFIXES = {
+        'image_file' => 'image',
+        'video_file' => 'video_poster',
+      }
+
       attr_reader :configuration, :property_base_name, :options
 
       delegate :content_tag, :to => :@template
@@ -35,9 +45,10 @@ module Pageflow
       protected
 
       def data_attributes
+        options.slice(:style_group)
       end
 
-      def image_id
+      def file_id
         configuration["#{property_base_name}_id"]
       end
 
@@ -48,7 +59,15 @@ module Pageflow
       private
 
       def css_class
-        ["background background_image image_#{image_id || 'none'}", options[:class]].compact.join(' ')
+        ["background background_image #{image_css_class}", options[:class]].compact.join(' ')
+      end
+
+      def image_css_class
+        [image_css_class_prefix, options[:style_group], file_id || 'none'].compact.join('_')
+      end
+
+      def image_css_class_prefix
+        FILE_TYPE_CSS_CLASS_PREFIXES.fetch(options.fetch(:file_type, 'image_file'))
       end
 
       def background_position(coord)
@@ -59,8 +78,10 @@ module Pageflow
 
     class DivWithSizeAttributes < Div
       def data_attributes
-        if image_file
-          {:width => image_file.width, :height => image_file.height}
+        if file
+          super.merge(:width => file.width, :height => file.height)
+        else
+          super
         end
       end
 
@@ -72,17 +93,27 @@ module Pageflow
         end
       end
 
+      private
+
       def padding_top
-        if image_file
-          image_file.height / image_file.width.to_f * 100
+        if file
+          file.height / file.width.to_f * 100
         else
           0
         end
       end
 
-      def image_file
-        @image_file ||= (ImageFile.find_by_id(image_id) || :none)
-        @image_file == :none ? nil : @image_file
+      def file
+        @file ||= (find_file || :none)
+        @file == :none ? nil : @file
+      end
+
+      def find_file
+        file_type.model.find_by_id(file_id)
+      end
+
+      def file_type
+        Pageflow.config.file_types.find_by_collection_name!(options.fetch(:file_type, 'image_file').pluralize)
       end
     end
   end

data/app/helpers/pageflow/entries_helper.rb

@@ -1,17 +1,15 @@
 module Pageflow
   module EntriesHelper
-    include RenderJsonHelper
-
     def pretty_entry_url(entry)
       pageflow.short_entry_url(entry.to_model, Pageflow.config.theming_url_options(entry.theming))
     end
 
     def entry_file_rights(entry)
-      rights = [:audio_files, :image_files, :video_files].map do |collection|
-        entry.send(collection).map do |file|
-          file.rights.presence || entry.account.default_file_rights
+      rights = Pageflow.config.file_types.map do |file_type|
+        entry.files(file_type.model).map do |file|
+          file.rights.presence || entry.account.default_file_rights.presence
         end
-      end.flatten.sort.uniq
+      end.flatten.compact.sort.uniq
 
       if rights.any?
         content_tag :p, class: 'rights' do
@@ -43,7 +41,12 @@ module Pageflow
     end
 
     def entry_stylesheet_link_tag(entry)
-      stylesheet_link_tag(polymorphic_path(entry.stylesheet_model, v: entry.stylesheet_cache_key, format: 'css'), media: 'all')
+      url = polymorphic_path(entry.stylesheet_model,
+                             v: entry.stylesheet_cache_key,
+                             p: Pageflow::VERSION,
+                             format: 'css')
+
+      stylesheet_link_tag(url, media: 'all')
     end
 
     def entry_mobile_navigation_pages(entry)
@@ -73,9 +76,5 @@ module Pageflow
       return '' if entry.summary.blank?
       strip_tags(entry.summary.gsub(/<br ?\/?>/, ' ').squish)
     end
-
-    def entry_pages_json_seed(entry)
-      sanitize_json(entry.pages.to_json(only: [:id, :perma_id, :configuration])).html_safe
-    end
   end
 end

data/app/helpers/pageflow/entry_json_seed_helper.rb

@@ -0,0 +1,44 @@
+module Pageflow
+  # Render seed data for published entries.
+  #
+  # @api private
+  module EntryJsonSeedHelper
+    include RenderJsonHelper
+
+    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(seed.to_json).html_safe
+    end
+
+    def entry_theming_seed(entry)
+      {
+        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
+      end
+    end
+
+    def entry_pages_seed(entry)
+      attributes = [:id, :perma_id, :chapter_id, :configuration]
+      entry.pages.as_json(only: attributes)
+    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)
+      end
+
+      sanitize_json(seed.to_json).html_safe
+    end
+  end
+end

data/app/helpers/pageflow/help_entries_helper.rb

@@ -1,14 +1,14 @@
 module Pageflow
   # @api private
   module HelpEntriesHelper
-    def help_entry_sections
+    def help_entry_sections(config)
       render(partial: 'pageflow/help_entries/section',
-             collection: Pageflow.config.help_entries.flat,
+             collection: config.help_entries.flat,
              as: :help_entry)
     end
 
-    def help_entries_menu
-      render('pageflow/help_entries/menu', help_entries: Pageflow.config.help_entries)
+    def help_entries_menu(config)
+      render('pageflow/help_entries/menu', help_entries: config.help_entries)
     end
 
     def help_entry_li(help_entry, &block)

data/app/helpers/pageflow/page_types_helper.rb

@@ -2,8 +2,10 @@ module Pageflow
   module PageTypesHelper
     include RenderJsonHelper
 
-    def page_type_json_seeds
-      render_json_partial('pageflow/page_types/page_type', :collection => Pageflow.config.page_types, :as => :page_type)
+    def page_type_json_seeds(config)
+      render_json_partial('pageflow/page_types/page_type',
+                          collection: config.page_types,
+                          as: :page_type)
     end
 
     def page_type_templates

data/app/helpers/pageflow/pages_helper.rb

@@ -5,13 +5,29 @@ module Pageflow
       classes << 'invert' if page.configuration['invert']
       classes << 'hide_title' if page.configuration['hide_title']
       classes << "text_position_#{page.configuration['text_position']}" if page.configuration['text_position'].present?
+      classes << "scroll_indicator_mode_#{page.configuration['scroll_indicator_mode']}" if page.configuration['scroll_indicator_mode'].present?
+      classes << "scroll_indicator_orientation_#{page.configuration['scroll_indicator_orientation']}" if page.configuration['scroll_indicator_orientation'].present?
+      classes << "delayed_text_fade_in_#{page.configuration['delayed_text_fade_in']}" if page.configuration['delayed_text_fade_in'].present?
       classes << 'chapter_beginning' if page.position == 0
+      classes << 'no_text_content' if !page_has_content(page)
       classes.join(' ')
     end
 
+    # @api private
+    def page_has_content(page)
+      has_title = ['title','subtitle','tagline'].any? do |attribute|
+        page.configuration[attribute].present?
+      end
+
+      has_text = strip_tags(page.configuration['text']).present?
+
+      (has_title && !page.configuration['hide_title']) || has_text
+    end
+
     def page_navigation_css_class(page)
       classes = [page.template]
       classes << 'chapter_beginning' if page.position == 0
+      classes << 'emphasized' if page.configuration['emphasize_in_navigation']
       classes << "chapter_#{page.chapter.position}"
       page.chapter.position % 2 == 0 ? classes << 'chapter_even' : classes << 'chapter_odd'
       classes.join(' ')
@@ -19,7 +35,9 @@ module Pageflow
 
     def shadow_div(options = {})
       style = options[:opacity] ? "opacity: #{options[:opacity] / 100.0};" : nil
-      content_tag(:div, '', :class => 'shadow', :style => style)
+      content_tag(:div, '', :class => 'shadow_wrapper') do
+        content_tag(:div, '', :class => 'shadow', :style => style)
+      end
     end
 
     def mobile_poster_image_div(config = {})
@@ -124,33 +142,8 @@ module Pageflow
       }
     end
 
-    def page_thumbnail_item(page_ids, index, layout_name)
-      page_ids ||= {}
-      page = @entry.pages.find_by_perma_id(page_ids[index.to_s])
-
-      content_tag(:li,
-                  page ? page_thumbnail_link(page, page_thumbnail_hero?(index, layout_name)) : '',
-                  :data => {:reference_key => index},
-                  :class => page ? 'title_hover' : 'title_hover empty')
-    end
-
-    def page_thumbnail_hero?(index, layout_name)
-      index == {
-        'hero_top_left' => 1,
-        'hero_top_right' => 1
-      }[layout_name]
-    end
-
-    def page_thumbnail_link(page, hero = false)
-      link_to(content_tag(:span, raw(page.configuration['description']), :class => 'title'),
-              "##{page.perma_id}",
-              :title => page.title,
-              :data => {:page => page.id},
-              :class => ['thumbnail', page_thumbnail_image_class(page, hero)] * ' ')
-    end
-
     def page_thumbnail_image_class(page, hero)
-      file_thumbnail_css_class(page.thumbnail_file, hero ? :link_thumbnail : :link_thumbnail_large)
+      file_thumbnail_css_class(page.thumbnail_file, hero ? :link_thumbnail_large : :link_thumbnail)
     end
 
     CSS_RENDERED_THUMBNAIL_STYLES = [:link_thumbnail, :link_thumbnail_large]

data/app/helpers/pageflow/widgets_helper.rb

@@ -22,8 +22,8 @@ module Pageflow
       end.join(' ')
     end
 
-    def widget_types_json_seeds
-      Pageflow.config.widget_types.each_with_object({}) do |widget_type, result|
+    def widget_types_json_seeds(config)
+      config.widget_types.each_with_object({}) do |widget_type, result|
         widget_type.roles.each do |role|
           result[role] ||= []
           result[role] << {
@@ -34,8 +34,8 @@ module Pageflow
       end.to_json.html_safe
     end
 
-    def widget_types_collection_for_role(role)
-      Pageflow.config.widget_types.find_all_by_role(role).each_with_object({}) do |widget_type, result|
+    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

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

@@ -0,0 +1,37 @@
+module Pageflow
+  # @api private
+  module FeatureTarget
+    STATE_MAPPING = {
+      true => 'enabled',
+      false => 'disabled'
+    }
+
+    extend ActiveSupport::Concern
+
+    included do
+      serialize :features_configuration, JSON
+    end
+
+    def enabled_feature_names
+      Pageflow.config.features.select do |feature|
+        feature_state(feature.name) == true
+      end.map(&:name)
+    end
+
+    def feature_state(name)
+      features_configuration[name]
+    end
+
+    def feature_states=(states)
+      boolean_states = states.each_with_object({}) do |(key, value), result|
+        result[key] = (value == true || value == STATE_MAPPING[true])
+      end
+
+      self.features_configuration = features_configuration.merge(boolean_states)
+    end
+
+    def features_configuration
+      super || {}
+    end
+  end
+end