pageflow 0.2.1 → 0.3.0

data/app/controllers/pageflow/entries_controller.rb

@@ -2,7 +2,7 @@ module Pageflow
   class EntriesController < Pageflow::ApplicationController
     before_filter :authenticate_user!, :except => [:index, :show, :page]
 
-#    before_filter :prevent_ssl, :only => [:index, :show], :unless => lambda { |controller| controller.request.format.json? }
+    before_filter :prevent_ssl, :only => [:index, :show], :unless => lambda { |controller| controller.request.format.json? }
 
     helper_method :render_to_string
 
@@ -11,14 +11,9 @@ module Pageflow
     helper RenderJsonHelper
 
     def index
-      theming = Theming.find_by_cname!(request.host)
-      @account = Account.with_landing_page.find_by_theming!(theming)
+      theming = Theming.for_request(request).with_home_url.first!
 
-      respond_to do |format|
-        format.html {
-          render :template => "pageflow/entries/index/#{@account.landing_page_name}", :layout => "pageflow/basic"
-        }
-      end
+      redirect_to(theming.home_url)
     end
 
     def show
@@ -71,7 +66,7 @@ module Pageflow
     protected
 
     def entry_params
-      params.require(:entry).permit(:title, :summary, :credits, :manual_start)
+      params.require(:entry).permit(:title, :summary, :credits, :manual_start, :home_url, :home_button_enabled)
     end
 
     def entry_request_scope

data/app/helpers/pageflow/entries_helper.rb

@@ -1,11 +1,7 @@
 module Pageflow
   module EntriesHelper
     def pretty_entry_url(entry)
-      if entry.theming.cname.present?
-        short_entry_url(entry.to_model, :host => entry.theming.cname)
-      else
-        short_entry_url(entry.to_model)
-      end
+      pageflow.short_entry_url(entry.to_model, Pageflow.config.theming_url_options(entry.theming))
     end
 
     def entry_collection_for_parent(parent)
@@ -29,7 +25,7 @@ module Pageflow
     end
 
     def entry_stylesheet_link_tag(entry)
-      stylesheet_link_tag(polymorphic_path(entry.stylesheet_model, :format => 'css'), :media => 'all')
+      stylesheet_link_tag(polymorphic_path(entry.stylesheet_model, v: entry.stylesheet_cache_key, format: 'css'), media: 'all')
     end
 
     def entry_mobile_navigation_pages(entry)

data/app/helpers/pageflow/themes_helper.rb

@@ -0,0 +1,9 @@
+module Pageflow
+  module ThemesHelper
+    def themes_options_json_seed
+      Pageflow.config.themes.each_with_object({}) do |theme, options|
+        options[theme.name] = theme.options
+      end.to_json.html_safe
+    end
+  end
+end

data/app/helpers/pageflow/themings_helper.rb

@@ -0,0 +1,11 @@
+module Pageflow
+  module ThemingsHelper
+    DEFAULT_PUBLIC_ENTRY_OPTIONS = lambda do |theming|
+      theming.cname.present? ? {host: theming.cname} : nil
+    end
+
+    def pretty_theming_url(theming)
+      public_root_url(Pageflow.config.theming_url_options(theming))
+    end
+  end
+end

data/app/jobs/pageflow/poll_zencoder_job.rb

@@ -41,8 +41,8 @@ module Pageflow
 
     def self.fetch_thumbnail(file)
       return unless file.respond_to?(:thumbnail)
-      file.thumbnail = URI.parse(file.zencoder_thumbnail.url)
-      file.poster = URI.parse(file.zencoder_poster.url)
+      file.thumbnail = URI.parse(file.zencoder_thumbnail.url(default_protocol: 'http'))
+      file.poster = URI.parse(file.zencoder_poster.url(default_protocol: 'http'))
     rescue OpenURI::HTTPError
       throw(:halt, :pending)
     end

data/app/models/pageflow/cname_theming_request_scope.rb

@@ -0,0 +1,7 @@
+module Pageflow
+  class CnameThemingRequestScope
+    def call(themings, request)
+      themings.where(cname: request.host)
+    end
+  end
+end

data/app/models/pageflow/draft_entry.rb

@@ -63,7 +63,15 @@ module Pageflow
     end
 
     def stylesheet_model
-      @draft
+      draft
+    end
+
+    def stylesheet_cache_key
+      draft.cache_key
+    end
+
+    def home_button
+      HomeButton.new(draft, theming)
     end
 
     private

data/app/models/pageflow/entry.rb

@@ -30,7 +30,9 @@ module Pageflow
     scope :published, -> { joins(:published_revision) }
     scope :editing, -> { joins(:edit_lock).merge(Pageflow::EditLock.active) }
 
-    after_create :create_draft!
+    after_create do
+      create_draft!(home_button_enabled: theming.home_button_enabled_by_default)
+    end
 
     def edit_lock
       super || EditLock::Null.new(self)

data/app/models/pageflow/home_button.rb

@@ -0,0 +1,37 @@
+module Pageflow
+  class HomeButton
+    attr_reader :revision, :theming
+
+    def initialize(revision, theming)
+      @revision = revision
+      @theming = theming
+    end
+
+    def url
+      revision.home_url.presence || theming_home_button_url
+    end
+
+    def enabled?
+      revision.home_button_enabled? &&
+        theming.theme.has_home_button? &&
+        url.present?
+    end
+
+    def url_value
+      revision.home_url
+    end
+
+    def enabled_value
+      revision.home_button_enabled?
+    end
+
+    private
+
+    def theming_home_button_url
+      if theming.home_url.present?
+        options = Pageflow.config.theming_url_options(theming) || {}
+        options.merge(controller: 'entries', action: 'index')
+      end
+    end
+  end
+end

data/app/models/pageflow/published_entry.rb

@@ -22,6 +22,10 @@ module Pageflow
       custom_revision? ? revision : entry
     end
 
+    def stylesheet_cache_key
+      revision.cache_key
+    end
+
     def thumbnail
       pages.first.try(:thumbnail) || ImageFile.new.processed_attachment
     end
@@ -34,6 +38,10 @@ module Pageflow
       "#{self.class.model_name.cache_key}/#{entry.cache_key}-#{revision.cache_key}"
     end
 
+    def home_button
+      HomeButton.new(revision, theming)
+    end
+
     private
 
     def custom_revision?

data/app/models/pageflow/revision.rb

@@ -74,6 +74,12 @@ module Pageflow
         file_usage.copy_to(revision)
       end
 
+      Pageflow.config.revision_components.each do |model|
+        model.all_for_revision(self).each do |record|
+          record.copy_to(revision)
+        end
+      end
+
       revision.save!
       revision
     end

data/app/models/pageflow/theming.rb

@@ -2,6 +2,9 @@ module Pageflow
   class Theming < ActiveRecord::Base
     belongs_to :account
 
+    scope :with_home_url, -> { where.not(home_url: '') }
+    scope :for_request, ->(request) { Pageflow.config.theming_request_scope.call(all, request) }
+
     validates :account, :presence => true
     validates_inclusion_of :theme_name, :in => ->(_) { Pageflow.config.themes.names }
 

data/app/models/pageflow/zencoder_attachment.rb

@@ -1,16 +1,20 @@
 module Pageflow
   class ZencoderAttachment
-    PATH = "/:zencoder_asset_version/:host/:class/:id_partition/:filename"
-    URL = ":zencoder_protocol://:zencoder_host_alias#{PATH}"
-    HLS_URL = ":zencoder_protocol://:zencoder_hls_host_alias#{PATH}"
-    HLS_ORIGIN_URL = ":zencoder_protocol://:zencoder_hls_origin_host_alias#{PATH}"
+
+    cattr_accessor :default_options
+    self.default_options = {
+      path: "/:zencoder_asset_version/:host/:class/:id_partition/:filename",
+      url: ":zencoder_protocol//:zencoder_host_alias:zencoder_path",
+      hls_url: ":zencoder_protocol//:zencoder_hls_host_alias:zencoder_path",
+      hls_origin_url: ":zencoder_protocol//:zencoder_hls_origin_host_alias:zencoder_path"
+    }
 
     attr_reader :file_name_pattern, :instance, :options, :styles
 
     def initialize(instance, file_name_pattern, options = {})
       @instance = instance
       @file_name_pattern = file_name_pattern
-      @options = options
+      @options = options.merge(default_options)
 
       @styles = {}
     end
@@ -32,30 +36,44 @@ module Pageflow
     end
 
     def path
-      Paperclip::Interpolations.interpolate(PATH, self, 'default')
+      Paperclip::Interpolations.interpolate(options[:path], self, 'default')
     end
 
     def url(url_options = {})
-      base_url =
-        case (url_options[:host] || options[:host])
-        when :hls
-          HLS_URL
-        when :hls_origin
-          HLS_ORIGIN_URL
-        else
-          URL
-        end
-
-      Paperclip::Interpolations.interpolate(base_url + suffix(url_options), self, 'default')
+      ensure_default_protocol(interpolate(url_pattern(url_options)),
+                              url_options)
     end
 
     private
 
+    def ensure_default_protocol(url, url_options)
+      url =~ /^http/ ? url : [url_options[:default_protocol], url].compact.join(':')
+    end
+
+    def url_pattern(url_options)
+      base_url(url_options) + suffix(url_options)
+    end
+
+    def base_url(url_options)
+      case (url_options[:host] || options[:host])
+      when :hls
+        options[:hls_url]
+      when :hls_origin
+        options[:hls_origin_url]
+      else
+        options[:url]
+      end
+    end
+
     def suffix(url_options)
       [
         options[:url_suffix],
         url_options[:unique_id] ? "?n=#{url_options[:unique_id]}" : nil
       ].compact.join
     end
+
+    def interpolate(url)
+      Paperclip::Interpolations.interpolate(url, self, 'default')
+    end
   end
 end

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

@@ -2,9 +2,17 @@
   <%= f.inputs do %>
     <%= f.input :name %>
     <%= f.input :default_file_rights %>
-    <%= f.semantic_fields_for :default_theming do |theming| %>
-      <%= theming.input :cname %>
+  <% end %>
+
+  <%= 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 %>
+    <% end %>
+
+    <%= f.inputs do %>
+      <%= theming.input :home_button_enabled_by_default %>
       <%= theming.input :imprint_link_label %>
       <%= theming.input :imprint_link_url %>
       <%= theming.input :copyright_link_label %>
@@ -15,4 +23,8 @@
     <%= f.action(:submit) %>
     <%= f.action(:cancel, :wrapper_html => {:class => 'cancel'}) %>
   <% end %>
+
+  <script id="theme_options" type="application/json">
+    <%= themes_options_json_seed %>
+  </script>
 <% end %>

data/app/views/admin/entries/_attributes_table.html.arb

@@ -19,6 +19,6 @@ attributes_table_for entry do
     end
   end
   row :url do
-    pageflow.short_entry_url(entry)
+    pretty_entry_url(entry)
   end
 end

data/app/views/admin/entries/_links.html.arb

@@ -4,6 +4,6 @@ para do
   end
   span(link_to(I18n.t("admin.entries.preview"), preview_admin_entry_path(entry), :class => 'preview button'))
   if entry.published?
-    span(link_to(I18n.t("admin.entries.show_public"), pageflow.short_entry_path(entry), :class => 'show_public button'))
+    span(link_to(I18n.t("admin.entries.show_public"), pretty_entry_url(entry), :class => 'show_public button'))
   end
 end

data/app/views/layouts/pageflow/_ie_include_tags.html.erb

@@ -1,8 +1,8 @@
 <!--[if lt IE 9]>
-  <%= stylesheet_link_tag "lt_ie9", :media => 'all' %>
-  <%= javascript_include_tag "lt_ie9" %>
+  <%= stylesheet_link_tag "pageflow/lt_ie9", :media => 'all' %>
+  <%= javascript_include_tag "pageflow/lt_ie9" %>
 <![endif]-->
 <!--[if IE 9]>
-  <%= stylesheet_link_tag "ie9", :media => 'all' %>
-  <%= javascript_include_tag "ie9" %>
+  <%= stylesheet_link_tag "pageflow/ie9", :media => 'all' %>
+  <%= javascript_include_tag "pageflow/ie9" %>
 <![endif]-->

data/app/views/pageflow/editor/entries/_analytics.html.erb

@@ -0,0 +1 @@
+<% # To be overriden in application views %>

data/app/views/pageflow/editor/entries/_entry.json.jbuilder

@@ -1,3 +1,7 @@
 json.(entry, :id, :title, :summary, :credits, :published_until, :manual_start, :slug)
+
+json.home_url entry.home_button.url_value
+json.home_button_enabled entry.home_button.enabled_value
+
 json.default_file_rights entry.account.default_file_rights
 json.published(entry.published?)

data/app/views/pageflow/editor/themings/_theming.json.jbuilder

@@ -0,0 +1,2 @@
+json.pretty_url pretty_theming_url(theming)
+json.home_button theming.theme.has_home_button?

data/app/views/pageflow/entries/_navigation.html.erb

@@ -1,4 +1,4 @@
-<div class="navigation">
+<%= content_tag :div, class: ["navigation", entry.home_button.enabled? ? 'with_home_button' : nil].compact.join(' ') do %>
   <%= render 'pageflow/entries/navigation/bar_top', :entry => entry %>
   <div class="scroller">
     <ul class="navigation_thumbnails">
@@ -66,4 +66,4 @@
         </ul>
       </div>
   </div>
-</div>
+<% end %>

data/app/views/pageflow/entries/edit.html.erb

@@ -41,6 +41,7 @@
         videoFiles: <%= render_json_seed(@entry.video_files.with_usage_id) %>,
         audioFiles: <%= render_json_seed(@entry.audio_files.with_usage_id) %>,
 
+        theming: <%= render_json_seed(@entry.theming) %>,
         page_types: <%= page_type_json_seeds %>
       });
     });
@@ -48,3 +49,5 @@
 </script>
 
 <%= page_type_templates %>
+
+<%= render('pageflow/editor/entries/analytics', entry: @entry) %>

data/app/views/pageflow/entries/navigation/_bar_top.html.erb

@@ -5,8 +5,9 @@
       <span class="button"></span>
     </a>
   </li>
+  <%= render('pageflow/entries/navigation/home_button', home_button: entry.home_button) %>
   <li>
-    <a class="navigation_bullet navigation_home" <%= "href=##{entry.pages.first.perma_id} data-link=#{entry.pages.first.id}" unless entry.pages.nil? || entry.pages.first.nil? %> tabindex="2" title="Startseite anzeigen">
+    <a class="navigation_bullet navigation_top" <%= "href=##{entry.pages.first.perma_id} data-link=#{entry.pages.first.id}" unless entry.pages.nil? || entry.pages.first.nil? %> tabindex="2" title="Zur ersten Seite">
       <span class="hint">zum Anfang</span>
       <span class="button"></span>
     </a>

data/app/views/pageflow/entries/navigation/_home_button.html.erb

@@ -0,0 +1,8 @@
+<% if home_button.enabled? %>
+  <li>
+    <%= link_to(home_button.url, class: "navigation_bullet navigation_home", tabindex: "2", title: "Startseite anzeigen") do %>
+      <span class="hint">zurück zur Startseite</span>
+      <span class="button"></span>
+    <% end %>
+  </li>
+<% end %>

data/config/initializers/zencoder.rb

@@ -9,9 +9,14 @@ Pageflow.after_configure do
 
   Pageflow::ZencoderOutputDefinition.default_output_bucket_name = zencoder_options.fetch(:output_bucket) { raise "Missing output_bucket option in Pageflow.config.zencoder_options." }
   Pageflow::ZencoderOutputDefinition.default_sftp_host = zencoder_options[:sftp_host]
+  Pageflow::ZencoderOutputDefinition.default_akamai_host = zencoder_options[:akamai_host]
+  Pageflow::ZencoderOutputDefinition.default_akamai_credentials = zencoder_options[:akamai_credentials]
+  Pageflow::ZencoderVideoOutputDefinition.skip_hls = zencoder_options.fetch(:skip_hls, false)
 
   raise "Missing s3_host_alias option in Pageflow.config.zencoder_options." unless zencoder_options.has_key?(:s3_host_alias)
   raise "Missing s3_protocol option in Pageflow.config.zencoder_options." unless zencoder_options.has_key?(:s3_protocol)
+
+  Pageflow::ZencoderAttachment.default_options.merge!(zencoder_options.slice(:path))
 end
 
 Paperclip.interpolates(:zencoder_host_alias) do |attachment, style|
@@ -27,9 +32,14 @@ Paperclip.interpolates(:zencoder_hls_origin_host_alias) do |attachment, style|
 end
 
 Paperclip.interpolates(:zencoder_protocol) do |attachment, style|
-  Pageflow.config.zencoder_options.fetch(:s3_protocol)
+  protocol = Pageflow.config.zencoder_options.fetch(:s3_protocol)
+  protocol.empty? ? protocol : "#{protocol}:"
 end
 
 Paperclip.interpolates(:zencoder_asset_version) do |attachment, style|
   Pageflow.config.zencoder_options.fetch(:attachments_version)
 end
+
+Paperclip.interpolates(:zencoder_path) do |attachment, style|
+  attachment.path
+end