pageflow 0.9.2 → 0.10.0

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

@@ -59,6 +59,10 @@ module Pageflow
       end
     end
 
+    def original_url
+      url
+    end
+
     def self.columns(t)
       t.belongs_to(:entry, index: true)
       t.belongs_to(:uploader, index: true)

data/app/models/pageflow/account.rb

@@ -4,9 +4,9 @@ module Pageflow
 
     has_many :users
     has_many :entries
-    has_many :folders
+    has_many :folders, dependent: :destroy
 
-    has_many :themings
+    has_many :themings, dependent: :destroy
     belongs_to :default_theming, :class_name => 'Theming'
 
     validates :default_theming, :presence => true

data/app/models/pageflow/chapter.rb

@@ -1,9 +1,9 @@
 module Pageflow
   class Chapter < ActiveRecord::Base
-    belongs_to :revision, :touch => true
+    belongs_to :storyline, touch: true
     has_many :pages, -> { order('position ASC') }
 
-    delegate :entry, :to => :revision
+    delegate :entry, to: :storyline
 
     serialize :configuration, JSON
 
@@ -11,9 +11,9 @@ module Pageflow
       super || {}
     end
 
-    def copy_to(revision)
+    def copy_to(storyline)
       chapter = dup
-      revision.chapters << chapter
+      storyline.chapters << chapter
 
       pages.each do |page|
         page.copy_to(chapter)

data/app/models/pageflow/chapter_scaffold.rb

@@ -0,0 +1,33 @@
+module Pageflow
+  class ChapterScaffold
+    def initialize(chapter, options)
+      @chapter = chapter
+      @options = options
+    end
+
+    delegate :save!, to: :@chapter
+
+    def build
+      if @options[:depth] == 'page'
+        @page = @chapter.pages.build(template: 'background_image')
+      end
+
+      self
+    end
+
+    def as_json(_ = {})
+      {
+        chapter: @chapter,
+        page: @page
+      }
+    end
+
+    def to_model
+      @chapter
+    end
+
+    def self.build(storyline, attributes, options)
+      new(storyline.chapters.build(attributes), options).build
+    end
+  end
+end

data/app/models/pageflow/cname_theming_request_scope.rb

@@ -1,7 +1,13 @@
 module Pageflow
   class CnameThemingRequestScope
     def call(themings, request)
-      themings.where(cname: request.host)
+      themings.where(<<-SQL, host: request.host)
+        cname = :host OR
+        FIND_IN_SET(
+          :host,
+          REPLACE(additional_cnames, SPACE(1), "")
+        )
+      SQL
     end
   end
 end

data/app/models/pageflow/draft_entry.rb

@@ -13,13 +13,15 @@ module Pageflow
              :to => :entry)
 
     delegate(:title, :summary, :credits, :manual_start,
-             :widgets, :chapters, :pages,
+             :widgets,
+             :storylines, :main_storyline_chapters, :chapters, :pages,
              :emphasize_chapter_beginning,
              :emphasize_new_pages,
              :share_image_id, :share_image_x, :share_image_y,
              :files,
              :image_files, :video_files, :audio_files,
              :locale,
+             :author, :publisher, :keywords,
              :to => :draft)
 
     def initialize(entry, draft = nil)
@@ -27,6 +29,11 @@ module Pageflow
       @draft = draft || entry.draft
     end
 
+    # So we can always get to the original Entry title.
+    def entry_title
+      entry.title
+    end
+
     def create_file(model, attributes)
       file = model.create(attributes) do |f|
         f.entry = entry
@@ -64,7 +71,7 @@ module Pageflow
     end
 
     def self.accessible_by(ability, action)
-      Entry.accessible_by(ability, action).map do |entry|
+      Entry.includes(:draft).accessible_by(ability, action).map do |entry|
         DraftEntry.new(entry)
       end
     end
@@ -80,5 +87,9 @@ module Pageflow
     def home_button
       HomeButton.new(draft, theming)
     end
+
+    def resolve_widgets(options = {})
+      widgets.resolve(Pageflow.config_for(entry), options)
+    end
   end
 end

data/app/models/pageflow/edit_lock.rb

@@ -36,7 +36,7 @@ module Pageflow
       Time.now > self.updated_at + TIME_TO_LIVE
     end
 
-    def aquire(current_user, options = {})
+    def acquire(current_user, options = {})
       verify!(current_user, options)
     rescue Error
       if options[:force] || timed_out?
@@ -73,7 +73,7 @@ module Pageflow
         true
       end
 
-      def aquire(user, options = {})
+      def acquire(user, options = {})
         entry.create_edit_lock!(:user => user)
       end
 

data/app/models/pageflow/entry.rb

@@ -41,6 +41,7 @@ module Pageflow
 
     after_create unless: :skip_draft_creation do
       create_draft!(home_button_enabled: theming.home_button_enabled_by_default)
+      draft.storylines.create!(configuration: {main: true})
       theming.widgets.copy_all_to(draft)
     end
 
@@ -48,8 +49,8 @@ module Pageflow
       super || EditLock::Null.new(self)
     end
 
-    def feature_state(name)
-      super(name) || account.feature_state(name)
+    def inherited_feature_state(name)
+      account.feature_state(name)
     end
 
     def publish(options = {})

data/app/models/pageflow/image_file.rb

@@ -54,6 +54,12 @@ module Pageflow
       end
     end
 
+    def original_url
+      if processed_attachment.present?
+        attachment.url
+      end
+    end
+
     def panorama_url
       if processed_attachment.present?
         attachment.url(:panorama_large)

data/app/models/pageflow/published_entry.rb

@@ -13,13 +13,16 @@ module Pageflow
              :authenticate,
              :to => :entry)
 
-    delegate(:widgets, :chapters, :pages, :files,
+    delegate(:widgets,
+             :storylines, :main_storyline_chapters, :chapters, :pages,
+             :files,
              :image_files, :video_files, :audio_files,
-             :title, :summary, :credits, :manual_start,
+             :summary, :credits, :manual_start,
              :emphasize_chapter_beginning,
              :emphasize_new_pages,
              :share_image_id, :share_image_x, :share_image_y,
              :locale,
+             :author, :publisher, :keywords,
              :password_protected?,
              :to => :revision)
 
@@ -29,6 +32,10 @@ module Pageflow
       @custom_revision = !!revision
     end
 
+    def title
+      revision.title.presence || entry.title
+    end
+
     def stylesheet_model
       custom_revision? ? revision : entry
     end
@@ -59,6 +66,10 @@ module Pageflow
       HomeButton.new(revision, theming)
     end
 
+    def resolve_widgets(options = {})
+      widgets.resolve(Pageflow.config_for(entry), options)
+    end
+
     private
 
     def custom_revision?

data/app/models/pageflow/revision.rb

@@ -1,12 +1,19 @@
 module Pageflow
   class Revision < ActiveRecord::Base
+    PAGE_ORDER = [
+      'pageflow_storylines.position ASC',
+      'pageflow_chapters.position ASC',
+      'pageflow_pages.position ASC'
+    ].join(',')
+
     belongs_to :entry, :touch => true
     belongs_to :creator, :class_name => 'User'
     belongs_to :restored_from, :class_name => 'Pageflow::Revision'
 
     has_many :widgets, :as => :subject
-    has_many :chapters, -> { order('position ASC') }
-    has_many :pages, -> { reorder('pageflow_chapters.position ASC, pageflow_pages.position ASC') }, :through => :chapters
+    has_many :storylines, -> { order('pageflow_storylines.position ASC') }
+    has_many :chapters, -> { order('position ASC') }, through: :storylines
+    has_many :pages, -> { reorder(PAGE_ORDER) }, through: :storylines
 
     has_many :file_usages
 
@@ -34,6 +41,11 @@ module Pageflow
     validate :published_until_unchanged, :if => :published_until_was_in_past?
     validate :published_until_blank, :if => :published_at_blank?
 
+    def main_storyline_chapters
+      main_storyline = storylines.first
+      main_storyline ? main_storyline.chapters : Chapter.none
+    end
+
     def files(model)
       model
         .select("#{model.table_name}.*, pageflow_file_usages.id AS usage_id")
@@ -76,14 +88,15 @@ module Pageflow
 
     def copy(&block)
       revision = dup
+
       yield(revision) if block_given?
 
       widgets.each do |widget|
         widget.copy_to(revision)
       end
 
-      chapters.each do |chapter|
-        chapter.copy_to(revision)
+      storylines.each do |storyline|
+        storyline.copy_to(revision)
       end
 
       file_usages.each do |file_usage|

data/app/models/pageflow/storyline.rb

@@ -0,0 +1,23 @@
+module Pageflow
+  class Storyline < ActiveRecord::Base
+    include RevisionComponent
+
+    belongs_to :revision, touch: true
+
+    has_many :chapters, -> { order('pageflow_chapters.position ASC') }
+    has_many :pages, through: :chapters
+
+    delegate :entry, to: :revision
+
+    serialize :configuration, JSON
+
+    def copy_to(revision)
+      storyline = dup
+      revision.storylines << storyline
+
+      chapters.each do |chapter|
+        chapter.copy_to(storyline)
+      end
+    end
+  end
+end

data/app/models/pageflow/storyline_scaffold.rb

@@ -0,0 +1,27 @@
+module Pageflow
+  class StorylineScaffold
+    def initialize(storyline, options)
+      @storyline = storyline
+      @options = options
+    end
+
+    delegate :save!, to: :@storyline
+
+    def build
+      @chapter_scaffold = ChapterScaffold.build(@storyline, {}, @options)
+      self
+    end
+
+    def as_json(_ = {})
+      @chapter_scaffold.as_json.merge(storyline: @storyline)
+    end
+
+    def to_model
+      @storyline
+    end
+
+    def self.build(revision, attributes, options)
+      new(revision.storylines.build(attributes), options).build
+    end
+  end
+end

data/app/models/pageflow/theming.rb

@@ -11,6 +11,10 @@ module Pageflow
     validates :account, :presence => true
     validates_inclusion_of :theme_name, :in => ->(_) { Pageflow.config.themes.names }
 
+    def resolve_widgets(options = {})
+      widgets.resolve(Pageflow.config_for(account), options)
+    end
+
     def cname_domain
       cname.split('.').pop(2).join('.')
     end

data/app/models/pageflow/widget.rb

@@ -4,6 +4,8 @@ module Pageflow
 
     validates :subject, presence: true
 
+    attr_accessor :widget_type
+
     def copy_to(subject)
       record = dup
       record.subject = subject
@@ -20,12 +22,6 @@ module Pageflow
       end
     end
 
-    def widget_type
-      Pageflow.config.widget_types.fetch_by_name(type_name) do
-        WidgetType::Null.new(role)
-      end
-    end
-
     def self.copy_all_to(subject)
       all.each do |widget|
         widget.copy_to(subject)
@@ -38,13 +34,13 @@ module Pageflow
       end
     end
 
-    def self.resolve(options = {})
-      Resolver.new(options).result
+    def self.resolve(config, options = {})
+      Resolver.new(config, options).result
     end
 
-    class Resolver < Struct.new(:options)
+    Resolver = Struct.new(:config, :options) do
       def result
-        all.select do |widget|
+        assign_widget_types(all).select do |widget|
           widget.enabled?(options)
         end
       end
@@ -63,7 +59,7 @@ module Pageflow
       end
 
       def defaults_by_role
-        Pageflow.config.widget_types.defaults_by_role.each_with_object({}) do |(role, widget_type), result|
+        config.widget_types.defaults_by_role.each_with_object({}) do |(role, widget_type), result|
           result[role] = Widget.new(role: role, type_name: widget_type.name, subject: nil)
         end
       end
@@ -71,10 +67,18 @@ module Pageflow
       def placeholders_by_role
         return {} unless options[:include_placeholders]
 
-        Pageflow.config.widget_types.roles.each_with_object({}) do |role, result|
+        config.widget_types.roles.each_with_object({}) do |role, result|
           result[role] = Widget.new(role: role, type_name: nil, subject: nil)
         end
       end
+
+      def assign_widget_types(widgets)
+        widgets.each do |widget|
+          widget.widget_type = config.widget_types.fetch_by_name(widget.type_name) do
+            WidgetType::Null.new(widget.role)
+          end
+        end
+      end
     end
   end
 end

data/app/views/admin/accounts/_form.html.erb

@@ -12,9 +12,10 @@
 
   <%= f.semantic_fields_for :default_theming do |theming| %>
     <%= f.inputs do %>
-      <%= theming.input :theme_name, :include_blank => false, :collection => Pageflow.config.themes.names %>
-      <%= theming.input :cname %>
-      <%= theming.input :home_url %>
+      <%= theming.input :theme_name, include_blank: false, collection: Pageflow.config.themes.names %>
+      <%= theming.input :cname, hint: t('pageflow.admin.themings.cname_hint') %>
+      <%= theming.input :additional_cnames, hint: t('pageflow.admin.themings.additional_cnames_hint') %>
+      <%= theming.input :home_url, hint: t('pageflow.admin.themings.home_url_hint') %>
     <% end %>
 
     <%= f.inputs do %>
@@ -27,16 +28,11 @@
       <% account_config.admin_form_inputs.find_all_for(:theming).each do |form_input| %>
         <%= form_input.build(theming) %>
       <% end %>
+    <% end %>
 
-      <% theming.object.widgets.resolve(:include_placeholders => true).each do |widget| %>
-        <%= f.semantic_fields_for(widget) do |w| %>
-          <%= w.input(:type_name,
-                      :label => t(widget.role, :scope => 'pageflow.widgets.roles'),
-                      :input_html => {:name => "widgets[#{widget.role}]"},
-                      :include_blank => t('pageflow.widgets.none'),
-                      :collection => widget_types_collection_for_role(account_config, widget.role)) %>
-        <% end %>
-      <% end %>
+    <%= f.inputs do %>
+      <%= render('admin/accounts/widgets_inline_help') %>
+      <%= admin_widgets_fields(theming, account_config) %>
     <% end %>
   <% end %>
   <%= f.actions do %>