pageflow 0.11.4 → 12.0.0.rc1

data/app/helpers/pageflow/common_entry_seed_helper.rb

@@ -5,17 +5,37 @@ module Pageflow
   # @api private
   module CommonEntrySeedHelper
     def common_entry_seed(entry)
+      config = Pageflow.config_for(entry)
+
       {
         locale: entry.locale,
-        page_types: PageTypesSeed.new(entry, Pageflow.config_for(entry)).as_json
+        slug: entry.slug,
+        page_types: PageTypesSeed.new(config).as_json,
+        file_url_templates: FileUrlTemplatesSeed.new(config).as_json,
+        file_model_types: config.file_types
+                                .index_by(&:collection_name)
+                                .transform_values { |file_type| file_type.model.name }
       }
     end
 
+    class FileUrlTemplatesSeed
+      attr_reader :config
+
+      def initialize(config)
+        @config = config
+      end
+
+      def as_json
+        config.file_types.each_with_object({}) do |file_type, result|
+          result[file_type.collection_name] = file_type.url_templates.call
+        end
+      end
+    end
+
     class PageTypesSeed
-      attr_reader :entry, :config
+      attr_reader :config
 
-      def initialize(entry, config)
-        @entry = entry
+      def initialize(config)
         @config = config
       end
 
@@ -38,7 +58,8 @@ module Pageflow
           {
             attribute: candidate[:attribute],
             collection_name: candidate[:file_collection],
-            css_class_prefix: thumbnail_candidate_css_class_prefix(candidate)
+            css_class_prefix: thumbnail_candidate_css_class_prefix(candidate),
+            condition: condition(candidate)
           }
         end
       end
@@ -47,6 +68,16 @@ module Pageflow
         file_type = config.file_types.find_by_collection_name!(candidate[:file_collection])
         file_type.model.model_name.singular
       end
+
+      def condition(candidate)
+        result = candidate[:unless] || candidate[:if]
+
+        if result
+          result[:negated] = !!candidate[:unless]
+        end
+
+        result
+      end
     end
   end
 end

data/app/helpers/pageflow/embed_code_helper.rb

@@ -0,0 +1,32 @@
+module Pageflow
+  module EmbedCodeHelper
+    def embed_code_entry_snippet(entry)
+      Pageflow::EmbedCodeHelper::EntrySnippet.new(pageflow, entry)
+    end
+
+    class EntrySnippet
+      def initialize(routes, entry)
+        @routes = routes
+        @entry = entry
+      end
+
+      def call
+        %'<iframe src="#{url(entry)}" scrolling="no" allowfullscreen></iframe>'
+      end
+
+      private
+
+      attr_reader :routes, :entry
+
+      def url(entry)
+        routes.entry_embed_url(entry, entry_embed_url_options(entry))
+      end
+
+      def entry_embed_url_options(entry)
+        options = Pageflow.config.entry_embed_url_options
+        options = options.call(entry.theming) if options.respond_to?(:call)
+        options
+      end
+    end
+  end
+end

data/app/helpers/pageflow/entries_helper.rb

@@ -11,7 +11,7 @@ module Pageflow
 
     def entry_file_rights(entry)
       rights = Pageflow.config.file_types.map do |file_type|
-        entry.files(file_type.model).map do |file|
+        entry.find_files(file_type.model).map do |file|
           file.rights.presence || entry.account.default_file_rights.presence
         end
       end.flatten.compact.sort.uniq

data/app/helpers/pageflow/entry_json_seed_helper.rb

@@ -7,17 +7,8 @@ module Pageflow
     include CommonEntrySeedHelper
 
     def entry_json_seed(entry)
-      sanitize_json(entry_seed(entry).to_json).html_safe
-    end
-
-    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)
-      )
+      sanitize_json(render_json_partial('pageflow/entry_json_seed/entry',
+                                        entry: entry)).html_safe
     end
 
     def entry_theming_seed(entry)
@@ -28,10 +19,9 @@ module Pageflow
       }
     end
 
-    def entry_storyline_configurations_seed(entry)
-      entry.storylines.each_with_object({}) do |storyline, result|
-        result[storyline.id] = storyline.configuration
-      end
+    def entry_storylines_seed(entry)
+      attributes = [:id, :configuration]
+      entry.storylines.as_json(only: attributes)
     end
 
     def entry_chapters_seed(entry)
@@ -46,7 +36,7 @@ module Pageflow
 
     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)
+        result[file_type.collection_name] = entry.find_files(file_type.model).map(&:id)
       end
     end
 

data/app/helpers/pageflow/files_helper.rb

@@ -1,5 +1,8 @@
 module Pageflow
   module FilesHelper
+    include RenderJsonHelper
+    include VideoFilesHelper
+
     def file_format(file)
       file.format.presence || '-'
     end
@@ -26,9 +29,9 @@ module Pageflow
     end
 
     def files_json_seeds(entry)
-      inner = Pageflow.config.file_types.map do |file_type, result|
+      inner = Pageflow.config.file_types.map do |file_type|
         json = render_json_partial(partial: 'pageflow/editor/files/file',
-                                   collection: entry.files(file_type.model),
+                                   collection: entry.find_files(file_type.model),
                                    locals: {file_type: file_type},
                                    as: :file)
 

data/app/helpers/pageflow/folders_helper.rb

@@ -1,7 +1,31 @@
 module Pageflow
   module FoldersHelper
-    def collection_for_folders(account)
-      account.folders.order('name ASC')
+    def collection_for_folders(current_account, current_folder = nil)
+      accounts = AccountPolicy::Scope.new(current_user, Pageflow::Account)
+                 .entry_creatable.includes(:folders).where('pageflow_folders.id IS NOT NULL')
+                 .order(:name, 'pageflow_folders.name')
+
+      option_groups_from_collection_for_select(accounts,
+                                               :folders,
+                                               :name,
+                                               :id,
+                                               :name,
+                                               selected: current_folder.try(:id),
+                                               disabled: disabled_ids(accounts, current_account))
+    end
+
+    private
+
+    def disabled_ids(accounts, current_account)
+      folders_array = accounts.map(&:folders).to_a
+
+      folders_array.delete_if do |account_folders|
+        account_folders[0][:account_id] == current_account.id
+      end
+
+      folders_array.map(&:to_a).map do |account_folders|
+        account_folders.map(&:id)
+      end.flatten
     end
   end
 end

data/app/helpers/pageflow/page_background_asset_helper.rb

@@ -0,0 +1,8 @@
+module Pageflow
+  module PageBackgroundAssetHelper
+    def page_background_asset(configuration)
+      render('pageflow/page_background_asset/element',
+             configuration: configuration)
+    end
+  end
+end

data/app/helpers/pageflow/quota_helper.rb

@@ -1,7 +1,7 @@
 module Pageflow
   module QuotaHelper
     def quota_state_description(name, account)
-      description = Pageflow.config.quotas.get(:users, @user.account).state_description
+      description = Pageflow.config.quotas.get(:users, account).state_description
 
       if description
         content_tag(:p, description, :class => 'quota_state')

data/app/helpers/pageflow/video_files_helper.rb

@@ -112,11 +112,6 @@ module Pageflow
 
     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),

data/app/jobs/pageflow/poll_zencoder_job.rb

@@ -48,7 +48,7 @@ module Pageflow
     end
 
     def self.fetch_input_details(file, api)
-      file.meta_data_attributes = api.get_input_details(file.job_id)
+      file.meta_data_attributes = api.get_details(file.job_id)
     rescue ZencoderApi::RecoverableError => e
       file.encoding_error_message = e.message
       throw(:halt, :pending)

data/app/jobs/pageflow/process_file_job.rb

@@ -0,0 +1,18 @@
+module Pageflow
+  class ProcessFileJob
+    @queue = :resizing
+
+    extend StateMachineJob
+
+    def self.perform_with_result(file, _options)
+      file.processed_attachment = file.unprocessed_attachment
+      file.save!
+
+      :ok
+    rescue ActiveRecord::RecordInvalid, Errno::ENAMETOOLONG
+      file.processed_attachment = nil
+      file.save!
+      :error
+    end
+  end
+end

data/app/mailers/pageflow/user_mailer.rb

@@ -3,8 +3,10 @@ module Pageflow
     include Resque::Mailer
 
     def invitation(options)
-      @user = User.find(options['user_id'])
-      @password_token = options['password_token']
+      options.symbolize_keys!
+
+      @user = User.find(options[:user_id])
+      @password_token = options[:password_token]
 
       I18n.with_locale(@user.locale) do
         headers('X-Language' => I18n.locale)

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

@@ -53,6 +53,14 @@ module Pageflow
       can_retry?
     end
 
+    def ready?
+      attachment_on_s3.present?
+    end
+
+    def basename
+      File.basename(attachment.original_filename, '.*')
+    end
+
     def url
       if attachment_on_s3.present?
         attachment.url
@@ -63,6 +71,7 @@ module Pageflow
       url
     end
 
+    # @deprecated Write a migration instead
     def self.columns(t)
       t.belongs_to(:entry, index: true)
       t.belongs_to(:uploader, index: true)

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

@@ -0,0 +1,60 @@
+module Pageflow
+  module OutputSource
+    STATE_MAPPING = {
+      true => 'finished',
+      false => 'skipped'
+    }.freeze
+
+    extend ActiveSupport::Concern
+
+    included do
+      serialize :output_presences, JSON
+    end
+
+    def present_outputs
+      present_outputs_label_state_array = output_presences.select do |output_label, _output_state|
+        output_present?(output_label) == true
+      end
+
+      present_outputs_label_state_array.map { |output_label_state| output_label_state[0].to_sym }
+    end
+
+    def output_present?(type)
+      output_presences[type.to_s]
+    end
+
+    def output_presences=(presences)
+      boolean_presences = presences.stringify_keys.each_with_object({}) do |(key, value), result|
+        if value == true || value == STATE_MAPPING[true]
+          result[key] = true
+        elsif value == false || value == STATE_MAPPING[false]
+          result[key] = false
+        elsif value.blank?
+          result[key] = nil
+        end
+      end
+
+      self[:output_presences] = output_presences
+                                .merge(boolean_presences)
+                                .reject { |_key, value| value.nil? }
+    end
+
+    def output_presences
+      (super || {}).merge(externally_generated_output_presences)
+    end
+
+    def externally_generated_outputs
+      []
+    end
+
+    private
+
+    def externally_generated_output_presences
+      pairs = externally_generated_outputs.map do |label|
+        [label.to_s, true]
+      end
+
+      Hash[pairs]
+    end
+  end
+end

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

@@ -3,20 +3,48 @@ module Pageflow
     extend ActiveSupport::Concern
 
     included do
-      attr_writer :usage_id
-
       belongs_to :uploader, :class_name => 'User'
       belongs_to :entry
+      belongs_to :parent_file, polymorphic: true, foreign_type: :parent_file_model_type
 
       has_many :usages, :as => :file, :class_name => 'Pageflow::FileUsage', :dependent => :destroy
       has_many :using_revisions, :through => :usages, :source => :revision
       has_many :using_entries, :through => :using_revisions, :source => :entry
       has_many :using_accounts, :through => :using_entries, :source => :account
+
+      validate :parent_allows_type_for_nesting, :parent_belongs_to_same_entry
+    end
+
+    def parent_allows_type_for_nesting
+      if parent_file.present?
+        parent_class = parent_file.class
+        file_type_of_parent = Pageflow.config.file_types.find_by_model!(parent_class)
+        models_of_nested_file_types = file_type_of_parent.nested_file_types.map(&:model)
+        unless models_of_nested_file_types.include?(self.class)
+          errors[:base] << 'File type of provided parent file does not permit nesting files of '\
+                           "type #{self.class.name}"
+        end
+      end
+    end
+
+    def parent_belongs_to_same_entry
+      if parent_file.present?
+        unless parent_file.using_entries.include?(entry)
+          errors[:base] << 'Parent file does not belong to same entry as nested file'
+        end
+      end
+    end
+
+    def nested_files(model)
+      model_table_name = model.table_name
+      model
+        .select("#{model_table_name}.*")
+        .where("#{model_table_name}.parent_file_id = #{id} AND "\
+               "#{model_table_name}.parent_file_model_type = '#{self.class.name}'")
     end
 
-    # this prevents shadowing of usage_id that may be provided by SELECT alias
-    def usage_id
-      @usage_id || read_attribute(:usage_id)
+    def file_type
+      Pageflow.config.file_types.find_by_model!(self.class)
     end
   end
 end

data/app/models/pageflow/account.rb

@@ -2,9 +2,11 @@ module Pageflow
   class Account < ActiveRecord::Base
     include FeatureTarget
 
-    has_many :users, dependent: :restrict_with_exception
     has_many :entries, dependent: :restrict_with_exception
     has_many :folders, dependent: :destroy
+    has_many :memberships, as: :entity, dependent: :restrict_with_exception
+    has_many :users, through: :memberships, source: :user, class_name: '::User'
+    has_many :entry_memberships, through: :entries, source: :memberships
 
     has_many :themings, dependent: :destroy
     belongs_to :default_theming, :class_name => 'Theming'

data/app/models/pageflow/audio_file_url_templates.rb

@@ -0,0 +1,21 @@
+module Pageflow
+  class AudioFileUrlTemplates
+    def call
+      {
+        m4a: url_template(:m4a),
+        mp3: url_template(:mp3),
+        ogg: url_template(:ogg),
+      }
+    end
+
+    private
+
+    def url_template(attachment_name, *style)
+      UrlTemplate.from_attachment(example_file.send(attachment_name), *style)
+    end
+
+    def example_file
+      @example_file ||= AudioFile.new(id: 0, attachment_on_s3_file_name: ':basename.mp3')
+    end
+  end
+end