pageflow 13.6.0 → 14.0.0.beta1

data/app/assets/stylesheets/pageflow/themes/default/page/hyphenate.scss

@@ -9,7 +9,7 @@
 $page-hyphenate-header: "narrow" !default;
 
 .page {
-  h2 {
+  .page_header {
     @if $page-hyphenate-header == "always" {
 
       hyphens: auto;

data/app/assets/stylesheets/pageflow/themes/default/page/line_lengths.scss

@@ -19,10 +19,9 @@ $page-header-title-min-width-for-split-layout: 525px !default;
 $page-content-width: 60% !default;
 
 .page {
-  h1,
-  h2 .subtitle,
-  h2 .tagline,
-  h3,
+  &_header-subtitle,
+  &_header-tagline,
+  &_sub_header,
   p {
     max-width: $page-content-max-width;
     width: $page-content-width;
@@ -32,7 +31,7 @@ $page-content-width: 60% !default;
     }
   }
 
-  h2 .title {
+  &_header-title {
     max-width: $page-header-title-max-width;
     width: 100%;
   }
@@ -70,10 +69,10 @@ $page-content-width: 60% !default;
 
   @media screen and (min-width: $page-min-width-for-split-layout) {
     &-with_split_layout {
-      h2 .subtitle,
-      h2 .title,
-      h2 .tagline,
-      h3,
+      .page_header-subtitle,
+      .page_header-title,
+      .page_header-tagline,
+      .page_sub_header,
       p {
         width: $page-content-split-layout-width;
       }
@@ -81,11 +80,10 @@ $page-content-width: 60% !default;
   }
 
   &.text_position_right {
-    h1,
-    h2 .subtitle,
-    h2 .title,
-    h2 .tagline,
-    h3,
+    .page_header-subtitle,
+    .page_header-title,
+    .page_header-tagline,
+    .page_sub_header,
     p {
       @include margin-start(auto);
       max-width: $page-content-position-right-max-width;

data/app/assets/stylesheets/pageflow/themes/default/player_controls/vjs_mapping.scss

@@ -1,8 +1,8 @@
 // Map placeholder names to concrete vjs css class names.
 
 $vjs-selector-mapping: (
-  page-with_progress_bar: ".audioPage, .videoPage",
-  page-audio: ".audioPage",
+  page-with_progress_bar: ".audio_page, .video_page",
+  page-audio: ".audio_page",
 
   background: ".page_background-for_page_with_player_controls",
 
@@ -14,12 +14,12 @@ $vjs-selector-mapping: (
   // Use playing class that is removed with delay to prevent
   // mask image on scroller from being removed too early in slim
   // player controls.
-  scroller-playing: ".videoPage .scroller.is_playing_delayed, .audioPage .scroller.is_playing_delayed",
+  scroller-playing: ".video_page .scroller.is_playing_delayed, .audio_page .scroller.is_playing_delayed",
 
   // If video has played, content is faded immediately. This can be
   // used by the slim player controls to not display the scroller mask
   // if the content fades anyway.
-  scroller-fading: ".videoPage.has_played .scroller",
+  scroller-fading: ".video_page.has_played .scroller",
 
   container: ".controls",
 
@@ -31,8 +31,8 @@ $vjs-selector-mapping: (
   container-hover: ".is_control_bar_hovered .controls",
   container-focused: ".is_control_bar_focused .controls",
 
-  container-video: ".videoPage .controls",
-  container-fading: ".videoPage .controls",
+  container-video: ".video_page .controls",
+  container-fading: ".video_page .controls",
 
   container-unplayed: ".unplayed .controls",
 

data/app/assets/stylesheets/pageflow/themes/default/{video_wrapper.scss → uncropped_media_wrapper.scss}

@@ -1,4 +1,4 @@
-.videoWrapper {
+.uncropped_media_wrapper {
   @extend %pageflow_widget_margin_right !optional;
 
   position: relative;

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

@@ -20,7 +20,6 @@ module Pageflow
         verify_edit_lock!(entry)
 
         @file = entry.create_file!(file_type.model, create_params)
-        @file.publish!
 
         respond_with(:editor, @file)
       rescue ActiveRecord::RecordInvalid => e
@@ -57,6 +56,16 @@ module Pageflow
                                                      collection_name: params[:collection_name]))
       end
 
+      def publish
+        entry = DraftEntry.find(params[:entry_id])
+        file = entry.find_file(file_type.model, params[:id])
+
+        authorize!(:update, file.to_model)
+        file.publish!
+
+        head(:no_content)
+      end
+
       def update
         entry = DraftEntry.find(params[:entry_id])
         file = entry.find_file(file_type.model, params[:id])
@@ -81,7 +90,7 @@ module Pageflow
       private
 
       def create_params
-        file_attachment_params
+        file_params.permit(:file_name, :content_type, :file_size)
           .merge(file_configuration_params)
           .merge(file_parent_file_params)
           .merge(file_custom_params)
@@ -95,12 +104,6 @@ module Pageflow
         file_configuration_params
       end
 
-      def file_attachment_params
-        file_params
-          .permit(attachment: [:tmp_path, :original_name, :content_type])
-          .merge(file_params.permit(:attachment))
-      end
-
       def file_configuration_params
         configuration = file_params[:configuration].try(:permit!)
 

data/app/helpers/pageflow/background_image_helper.rb

@@ -9,7 +9,8 @@ module Pageflow
     end
 
     def background_image_tag(image_id, options = {})
-      if image = ImageFile.find_by_id(image_id)
+      image = ImageFile.find_by_id(image_id)
+      if image&.ready?
         options = options.merge(:'data-src' => image.attachment.url(:medium))
         options = options.merge(:'data-printsrc' => image.attachment.url(:print))
         image_tag('', options)

data/app/helpers/pageflow/files_helper.rb

@@ -2,6 +2,7 @@ module Pageflow
   module FilesHelper
     include RenderJsonHelper
     include VideoFilesHelper
+    include AudioFilesHelper
 
     def file_format(file)
       file.format.presence || '-'

data/app/helpers/pageflow/pages_helper.rb

@@ -21,6 +21,37 @@ module Pageflow
       classes.join(' ')
     end
 
+    def page_default_content(page)
+      safe_join([
+                  page_header(page),
+                  page_print_image(page),
+                  page_text(page)
+                ])
+    end
+
+    def page_header(page)
+      content_tag(:h3, class: 'page_header') do
+        safe_join([
+                    content_tag(:span, page.configuration['tagline'],
+                                class: 'page_header-tagline'),
+                    content_tag(:span, page.configuration['title'],
+                                class: 'page_header-title'),
+                    content_tag(:span, page.configuration['subtitle'],
+                                class: 'page_header-subtitle')
+                  ])
+      end
+    end
+
+    def page_print_image(page)
+      background_image_tag(page.configuration['background_image_id'], 'class' => 'print_image')
+    end
+
+    def page_text(page)
+      content_tag(:div, class: 'page_text') do
+        content_tag(:p, raw(page.configuration['text']))
+      end
+    end
+
     # @api private
     def page_has_content(page)
       has_title = ['title','subtitle','tagline'].any? do |attribute|

data/app/helpers/pageflow/video_files_helper.rb

@@ -29,7 +29,7 @@ module Pageflow
       video_file = VideoFile.find_by_id(video_id)
       poster = ImageFile.find_by_id(poster_image_id)
 
-      if poster
+      if poster&.ready?
         options = options.merge('data-src' => poster.attachment.url(:medium))
         options = options.merge('data-printsrc' => poster.attachment.url(:print))
       elsif video_file
@@ -58,12 +58,12 @@ module Pageflow
 
       options[:data] = {}
 
-      if mobile_poster
+      if mobile_poster&.ready?
         options[:data][:mobile_poster] = mobile_poster.attachment.url(:medium)
         options[:data][:mobile_large_poster] = mobile_poster.attachment.url(:large)
       end
 
-      if poster
+      if poster&.ready?
         options[:data][:poster] = poster.attachment.url(:medium)
         options[:data][:large_poster] = poster.attachment.url(:large)
       elsif video_file

data/app/jobs/pageflow/process_file_job.rb

@@ -5,14 +5,24 @@ module Pageflow
     include StateMachineJob
 
     def perform_with_result(file, _options)
-      file.processed_attachment = file.unprocessed_attachment
-      file.save!
+      file.attachment.reprocess!
 
-      :ok
+      if file.valid?
+        :ok
+      else
+        reset_invalid_attachment(file)
+        :error
+      end
     rescue ActiveRecord::RecordInvalid, Errno::ENAMETOOLONG
-      file.processed_attachment = nil
-      file.save!
+      reset_invalid_attachment(file)
+
       :error
     end
+
+    def reset_invalid_attachment(file)
+      file_name = file.file_name
+      file.attachment = nil
+      file.file_name = file_name
+    end
   end
 end

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

@@ -4,35 +4,34 @@ module Pageflow
     include UploadedFile
 
     included do
-      has_attached_file(:attachment_on_filesystem, Pageflow.config.paperclip_filesystem_default_options)
-      has_attached_file(:attachment_on_s3, Pageflow.config.paperclip_s3_default_options)
-
-      validates :attachment, presence: true
-
-      do_not_validate_attachment_file_type(:attachment_on_filesystem)
-      do_not_validate_attachment_file_type(:attachment_on_s3)
-
-      state_machine initial: 'not_uploaded_to_s3' do
+      alias_attribute :file_name, :attachment_on_s3_file_name
+      alias_attribute :content_type, :attachment_on_s3_content_type
+      alias_attribute :file_size, :attachment_on_s3_file_size
+
+      has_attached_file(:attachment_on_s3,
+                        Pageflow.config.paperclip_s3_default_options
+                          .merge(
+                            default_url: lambda do |attachment|
+                              attachment.instance.attachment_default_url
+                            end,
+                            styles: lambda do |attachment|
+                              attachment.instance.attachment_styles(attachment)
+                            end
+                          ))
+
+      validates_attachment_presence :attachment_on_s3
+      validates_attachment_file_name :attachment_on_s3, matches: %r{^[^\/\\]+\.[\w]{3,4}$}
+      do_not_validate_attachment_file_type :attachment_on_s3
+
+      state_machine initial: 'uploading' do
         extend StateMachineJob::Macro
 
-        state 'not_uploaded_to_s3'
-        state 'uploading_to_s3'
-        state 'uploaded_to_s3'
-        state 'uploading_to_s3_failed'
+        state 'uploading'
+        state 'uploaded'
+        state 'uploading_failed'
 
         event :publish do
-          transition 'not_uploaded_to_s3' => 'uploading_to_s3'
-        end
-
-        event :retry do
-          transition 'uploading_to_s3_failed' => 'uploading_to_s3'
-        end
-
-        job UploadFileToS3Job do
-          on_enter 'uploading_to_s3'
-          result :pending, retry_after: 30.seconds
-          result :ok, state: 'uploaded_to_s3'
-          result :error, state: 'uploading_to_s3_failed'
+          transition 'uploading' => 'uploaded'
         end
 
         event :process
@@ -40,19 +39,31 @@ module Pageflow
     end
 
     def attachment
-      attachment_on_s3.present? ? attachment_on_s3 : attachment_on_filesystem
+      attachment_on_s3
     end
 
     def attachment=(value)
-      self.attachment_on_filesystem = value
+      self.attachment_on_s3 = value
+    end
+
+    def attachment_default_url
+      ''
+    end
+
+    def attachment_styles(_attachment)
+      {}
+    end
+
+    def can_upload?
+      uploading?
     end
 
     def retryable?
-      can_retry?
+      false
     end
 
     def ready?
-      attachment_on_s3.present?
+      attachment.present?
     end
 
     def basename
@@ -60,7 +71,7 @@ module Pageflow
     end
 
     def url
-      if attachment_on_s3.present?
+      if attachment.present?
         attachment.url
       end
     end
@@ -74,9 +85,7 @@ module Pageflow
         state_machine do
           extend StateMachineJob::Macro
 
-          after_transition(any => 'uploaded_to_s3') do |hosted_file|
-            hosted_file.process!
-          end
+          after_transition(any => 'uploaded', &:process!)
 
           instance_eval(&block)
         end

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

@@ -55,5 +55,15 @@ module Pageflow
       # prevent caching outdated information.
       "#{super}-#{state}"
     end
+
+    def can_upload?
+      # Overwritten in HostedFile based on initial state_machine-state.
+      # Only true directly after creation.
+      false
+    end
+
+    def direct_upload_config
+      Pageflow.config.paperclip_direct_upload_options.call(attachment)
+    end
   end
 end

data/app/models/pageflow/audio_file.rb

@@ -6,7 +6,7 @@ module Pageflow
     belongs_to :confirmed_by, class_name: 'User', optional: true
 
     def attachment_s3_url
-      "s3://#{File.join(attachment_on_s3.bucket_name, attachment_on_s3.path)}"
+      "s3://#{File.join(attachment.bucket_name, attachment.path)}"
     end
 
     def m4a

data/app/models/pageflow/audio_file_url_templates.rb

@@ -15,7 +15,7 @@ module Pageflow
     end
 
     def example_file
-      @example_file ||= AudioFile.new(id: 0, attachment_on_s3_file_name: ':basename.mp3')
+      @example_file ||= AudioFile.new(id: 0, file_name: ':basename.mp3')
     end
   end
 end

data/app/models/pageflow/draft_entry.rb

@@ -57,7 +57,7 @@ module Pageflow
           .destroy_all
       end
 
-      file.destroy if file.usages.empty?
+      file.destroy if file.usages.reload.empty?
     end
 
     def use_file(file)

data/app/models/pageflow/image_file.rb

@@ -1,84 +1,70 @@
 module Pageflow
   class ImageFile < ApplicationRecord
-    include ImageFileStateMachine
-    include UploadedFile
+    include HostedFile
+    include ProcessedFileStateMachine
 
-    STYLES = lambda do |attachment|
+    def attachment_styles(attachment)
       panorama_format = File.extname(attachment.original_filename) == '.png' ? :PNG : :JPG
 
       Pageflow
         .config.thumbnail_styles
-        .merge(print: ['300x300>', :JPG],
-               medium: ['1024x1024>', :JPG],
-               large: ['1920x1920>', :JPG],
-               ultra: ['3840x3840>', :JPG],
-               panorama_medium: ['1024x1024^', panorama_format],
-               panorama_large: ['1920x1080^', panorama_format])
+        .merge(
+          print: {geometry: '300x300>',
+                  format: :JPG,
+                  convert_options: '-quality 10 -interlace Plane'},
+          medium: {geometry: '1024x1024>',
+                   format: :JPG,
+                   convert_options: '-quality 70 -interlace Plane'},
+          large: {geometry: '1920x1920>',
+                  format: :JPG,
+                  convert_options: '-quality 70 -interlace Plane'},
+          ultra: {geometry: '3840x3840>',
+                  format: :JPG,
+                  convert_options: '-quality 90 -interlace Plane'},
+          panorama_medium: {geometry: '1024x1024^',
+                            format: panorama_format,
+                            convert_options: '-quality 90 -interlace Plane'},
+          panorama_large: {geometry: '1920x1080^',
+                           format: panorama_format,
+                           convert_options: '-quality 90 -interlace Plane'}
+        )
     end
 
-    CONVERT_OPTIONS = {
-      print: '-quality 10 -interlace Plane',
-      medium: '-quality 70 -interlace Plane',
-      large: '-quality 70 -interlace Plane',
-      ultra: '-quality 90 -interlace Plane',
-      panorama_medium: '-quality 90 -interlace Plane',
-      panorama_large: '-quality 90 -interlace Plane'
-    }.freeze
-
-    has_attached_file(:unprocessed_attachment,
-                      Pageflow.config.paperclip_s3_default_options)
-
-    has_attached_file(:processed_attachment,
-                      Pageflow.config.paperclip_s3_default_options
-                        .merge(default_url: ':pageflow_placeholder',
-                               styles: STYLES,
-                               convert_options: CONVERT_OPTIONS))
-
-    validates :attachment, presence: true
-
-    do_not_validate_attachment_file_type(:unprocessed_attachment)
-    do_not_validate_attachment_file_type(:processed_attachment)
-
-    after_unprocessed_attachment_post_process :save_image_dimensions
-
-    def attachment
-      processed_attachment.present? ? processed_attachment : unprocessed_attachment
+    def attachment_default_url
+      ':pageflow_placeholder'
     end
 
-    def attachment=(value)
-      self.unprocessed_attachment = value
+    # used in paperclip initializer to interpolate the storage path
+    # needs to be "processed_attachments" for images for legacy reasons
+    def attachments_path_name
+      'processed_attachments'
     end
 
-    def basename
-      File.basename(attachment.original_filename, '.*')
-    end
+    after_attachment_on_s3_post_process :save_image_dimensions
 
     def thumbnail_url(*args)
-      processed_attachment.url(*args)
+      unless ready?
+        return Pageflow::PaperclipInterpolations::Support.pageflow_placeholder(attachment, *args)
+      end
+      attachment.url(*args)
     end
 
     def url
-      if processed_attachment.present?
-        attachment.url(:large)
-      end
+      attachment.url(:large) if ready?
     end
 
     def original_url
-      if processed_attachment.present?
-        attachment.url
-      end
+      attachment.url if ready?
     end
 
     def panorama_url
-      if processed_attachment.present?
-        attachment.url(:panorama_large)
-      end
+      attachment.url(:panorama_large) if ready?
     end
 
     private
 
     def save_image_dimensions
-      geo = Paperclip::Geometry.from_file(unprocessed_attachment.queued_for_write[:original])
+      geo = Paperclip::Geometry.from_file(attachment.queued_for_write[:original])
       self.width = geo.width
       self.height = geo.height
     rescue Paperclip::Errors::NotIdentifiedByImageMagickError