pageflow 0.1.0 → 0.2.0

data/app/assets/stylesheets/pageflow/themes/default/overview.css.scss

@@ -21,7 +21,11 @@ $overview-header-font: $standard-font;
   }
 
   .close {
-    background-image: image-url('pageflow/themes/#{$theme-name}/close_sprite.png');
+    background-image: none;
+    background-color: #dbdbdb !important;
+    border-radius: 20px;
+    text-align: center;
+    @include shine-gradient;
 
     &:before {
       content: " ";
@@ -34,15 +38,53 @@ $overview-header-font: $standard-font;
 
       background-image: image-url('pageflow/close_text.png');
     }
+    &:after {
+      content: "\F00d";
+      font-family: "FontAwesome";
+      line-height: 31px;
+      font-size: 22px;
+      color: black;
+    }
+    &:hover {
+      background-color: $overview-color !important;
+
+      &:after {
+        color: white;
+      }
+    }
   }
 
   .scroll_indicator {
-    &.left {
-      background-image: image-url('pageflow/themes/#{$theme-name}/arrow_left_sprite.png');
-    }
+    &.left, &.right {
+      background-image: none;
+      background-color: #dbdbdb !important;
+      border-radius: 20px;
+      text-align: center;
+      @include shine-gradient;
 
-    &.right {
-      background-image: image-url('pageflow/themes/#{$theme-name}/arrow_right_sprite.png');
+      &:after {
+        font-family: "FontAwesome";
+        line-height: 31px;
+        font-size: 29px;
+        color: black;
+        font-weight: bold;
+      }
+
+      &:hover {
+        background-color: $overview-color !important;
+
+        &:after {
+          color: white;
+        }
+      }
+    }
+    &.left:after {
+      content: "\f104";
+      margin-right: 3px;
+    }
+    &.right:after {
+      content: "\f105";
+      margin-left: 4px;
     }
   }
 

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

@@ -38,7 +38,6 @@ $page-color: $main-color;
       font-weight: normal;
       margin-top: 0;
       letter-spacing: 0em;
-      text-transform: uppercase;
   }
 
   h2 .title {
@@ -50,7 +49,6 @@ $page-color: $main-color;
       margin-bottom: 0.4em;
       letter-spacing: 0em;
       line-height: 1em;
-      text-transform: uppercase;
       @include phone {
         font-size: 1.8em;
       }
@@ -83,12 +81,11 @@ $page-color: $main-color;
     background-repeat: no-repeat;
     top: 50px;
     z-index: 200;
-    background-size: auto;
-    background-size: 100% auto;
-    padding-top: 25.8%;
+    background-size: contain;
+    background-position: left top;
+    padding-top: 6.8%;
     min-width: 100px;
     max-width: 221px;
-    background-size: 100% auto;
     width: 13%;
   }
 

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

@@ -0,0 +1,31 @@
+.js .vjs-play-control {
+  background-image: none;
+  width: 36px;
+  height: 36px;
+  margin-top: 12px;
+  margin-left: 13px;
+
+  @include fa-play-icon;
+
+  &:before {
+    color: white;
+    font-size: 34px;
+    top: -15px;
+    left: 3px;
+    text-shadow: 0px 0px 2px black;
+  }
+
+  &.vjs-playing, &.vjs-pause {
+    &:before {
+      left: 0px;
+    }
+    @include fa-pause-icon;
+  }
+
+  &:hover, &:active {
+    &:before {
+      color: $main-color;
+      text-shadow: 0px 0px 2px black;
+    }
+  }
+}

data/app/controllers/concerns/pageflow/quota_verification.rb

@@ -3,16 +3,16 @@ module Pageflow
     extend ActiveSupport::Concern
 
     included do
-      rescue_from Quota::ExceededError do |exception|
+      rescue_from Quota::ExhaustedError do |exception|
         respond_to do |format|
           format.html do
-            redirect_to :back, :alert => t('quotas.exceeded')
+            redirect_to :back, :alert => t('quotas.exhausted')
           end
           format.json do
             render(:status => :forbidden,
                    :json => {
                      :error_message => exception.message,
-                     :quota_name => exception.quota_name
+                     :quota_name => exception.quota.name
                    })
           end
         end
@@ -22,7 +22,7 @@ module Pageflow
     protected
 
     def verify_quota!(name, account)
-      Pageflow.config.quota.verify!(name, account)
+      Pageflow.config.quotas.get(name, account).verify_available!
     end
   end
 end

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

@@ -0,0 +1,45 @@
+module Pageflow
+  module Editor
+    class EncodingConfirmationsController < Pageflow::ApplicationController
+      respond_to :json
+
+      before_filter :authenticate_user!
+
+      def create
+        entry = DraftEntry.find(params[:entry_id])
+
+        authorize!(:confirm_encoding, entry.to_model)
+        @encoding_confirmation = build_encoding_confirmation(entry)
+        @encoding_confirmation.save!
+
+        head :ok
+      rescue EncodingConfirmation::QuotaExceededError
+        render(action: :check, status: :forbidden)
+      end
+
+      def check
+        entry = DraftEntry.find(params[:entry_id])
+
+        authorize!(:confirm_encoding, entry.to_model)
+        @encoding_confirmation = build_encoding_confirmation(entry)
+      end
+
+      private
+
+      def build_encoding_confirmation(entry)
+        EncodingConfirmation.new(entry,
+                                 encoding_confirmation_params,
+                                 encoding_quota,
+                                 current_user)
+      end
+
+      def encoding_confirmation_params
+        params.require(:encoding_confirmation).permit(video_file_ids: [], audio_file_ids: [])
+      end
+
+      def encoding_quota
+        Pageflow.config.quotas.get(:encoding, current_user.account)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+module Pageflow
+  module Editor
+    class EntryPublicationsController < Pageflow::ApplicationController
+      respond_to :json
+
+      before_filter :authenticate_user!
+
+      def create
+        entry = Entry.find(params[:entry_id])
+
+        authorize!(:publish, entry)
+        verify_edit_lock!(entry)
+
+        @entry_publication = build_entry_publication(entry)
+        @entry_publication.save!
+
+        render(action: :check)
+      rescue Quota::ExceededError
+        render(action: :check, status: :forbidden)
+      end
+
+      def check
+        entry = Entry.find(params[:entry_id])
+
+        authorize!(:publish, entry)
+
+        @entry_publication = build_entry_publication(entry)
+      end
+
+      private
+
+      def build_entry_publication(entry)
+        EntryPublication.new(entry,
+                             entry_publication_params,
+                             published_entries_quota,
+                             current_user)
+      end
+
+      def entry_publication_params
+        params.fetch(:entry_publication, {}).permit(:published_until)
+      end
+
+      def published_entries_quota
+        Pageflow.config.quotas.get(:published_entries, current_user.account)
+      end
+    end
+  end
+end

data/app/controllers/pageflow/entries_controller.rb

@@ -11,7 +11,8 @@ module Pageflow
     helper RenderJsonHelper
 
     def index
-      @account = Account.with_landing_page.find_by_cname!(request.host)
+      theming = Theming.find_by_cname!(request.host)
+      @account = Account.with_landing_page.find_by_theming!(theming)
 
       respond_to do |format|
         format.html {
@@ -23,7 +24,7 @@ module Pageflow
     def show
       respond_to do |format|
         format.any(:html, :css) do
-          @entry = PublishedEntry.find(params[:id])
+          @entry = PublishedEntry.find(params[:id], entry_request_scope)
         end
         format.json do
           authenticate_user!
@@ -37,7 +38,7 @@ module Pageflow
     end
 
     def page
-      entry = PublishedEntry.find(params[:id])
+      entry = PublishedEntry.find(params[:id], entry_request_scope)
       index = params[:page_index].split('-').first.to_i
 
       redirect_to(short_entry_path(entry.to_model, :anchor => entry.pages[index].try(:perma_id)))
@@ -72,5 +73,9 @@ module Pageflow
     def entry_params
       params.require(:entry).permit(:title, :summary, :credits, :manual_start)
     end
+
+    def entry_request_scope
+      Pageflow.config.public_entry_request_scope.call(Entry, request)
+    end
   end
 end

data/app/controllers/pageflow/revisions_controller.rb

@@ -6,16 +6,6 @@ module Pageflow
 
     respond_to :json
 
-    def create
-      entry = Entry.find(params[:entry_id])
-
-      authorize!(:publish, entry)
-      verify_edit_lock!(entry)
-      verify_quota!(:published_entries, entry.account)
-
-      @revision = entry.publish(revision_params.merge(:creator => current_user))
-    end
-
     def show
       revision = Revision.find(params[:id])
       authorize!(:show, revision) unless request.format.css?

data/app/controllers/pageflow/video_files_controller.rb

@@ -5,10 +5,16 @@ module Pageflow
     def show
       respond_to do |format|
         format.html do
-          entry = PublishedEntry.find(params[:entry_id])
+          entry = PublishedEntry.find(params[:entry_id], entry_request_scope)
           @video_file = entry.video_files.find(params[:id])
         end
       end
     end
+
+    protected
+
+    def entry_request_scope
+      Pageflow.config.public_entry_request_scope.call(Entry, request)
+    end
   end
 end

data/app/helpers/pageflow/config_helper.rb

@@ -0,0 +1,9 @@
+module Pageflow
+  module ConfigHelper
+    include RenderJsonHelper
+
+    def editor_config_seeds
+      render_json_partial('pageflow/config/editor_seeds')
+    end
+  end
+end

data/app/helpers/pageflow/entries_helper.rb

@@ -1,8 +1,8 @@
 module Pageflow
   module EntriesHelper
     def pretty_entry_url(entry)
-      if entry.account.cname.present?
-        short_entry_url(entry.to_model, :host => entry.account.cname)
+      if entry.theming.cname.present?
+        short_entry_url(entry.to_model, :host => entry.theming.cname)
       else
         short_entry_url(entry.to_model)
       end
@@ -25,7 +25,7 @@ module Pageflow
     end
 
     def entry_theme_stylesheet_link_tag(entry)
-      stylesheet_link_tag("pageflow/themes/#{entry.theme.name}.css", :media => 'all')
+      stylesheet_link_tag(entry.theming.theme.stylesheet_path, :media => 'all')
     end
 
     def entry_stylesheet_link_tag(entry)

data/app/helpers/pageflow/pages_helper.rb

@@ -140,9 +140,9 @@ module Pageflow
     end
 
     def page_thumbnail_image_class(page, hero)
-      model, attachment, property = page.thumbnail_definition
+      model, attachment, property, model_class = page.thumbnail_definition
       size = hero ? 'large_' : ''
-      "#{model}_link_thumbnail_#{size}#{page.configuration[property]}"
+      "#{model_class}_link_thumbnail_#{size}#{page.configuration[property]}"
     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.quota.state_description(:users, @user.account)
+      description = Pageflow.config.quotas.get(:users, @user.account).state_description
 
       if description
         content_tag(:p, description, :class => 'quota_state')

data/app/jobs/pageflow/poll_meta_data_from_zencoder_job.rb

@@ -0,0 +1,9 @@
+module Pageflow
+  class PollMetaDataFromZencoderJob < PollZencoderJob
+    @queue = :resizing
+
+    def self.perform_with_result(file, options)
+      super(file, :skip_thumbnail => true)
+    end
+  end
+end

data/app/jobs/pageflow/poll_zencoder_job.rb

@@ -5,12 +5,12 @@ module Pageflow
     extend StateMachineJob
 
     def self.perform_with_result(file, options, api = ZencoderApi.instance)
+      options ||= {}
+
       result = catch(:halt) do
         poll_zencoder(file, api)
         fetch_input_details(file, api)
-        fetch_thumbnail(file)
-
-        Pageflow.config.hooks.invoke(:file_encoded, file: file)
+        fetch_thumbnail(file) unless options[:skip_thumbnail]
 
         :ok
       end

data/app/jobs/pageflow/request_meta_data_from_zencoder_job.rb

@@ -0,0 +1,14 @@
+module Pageflow
+  class RequestMetaDataFromZencoderJob
+    @queue = :default
+
+    extend StateMachineJob
+
+    def self.perform_with_result(file, options, api = ZencoderApi.instance)
+      file.job_id = api.create_job(ZencoderMetaDataOutputDefinition.new(file))
+      file.save!
+
+      :ok
+    end
+  end
+end

data/app/jobs/pageflow/submit_file_to_zencoder_job.rb

@@ -8,8 +8,6 @@ module Pageflow
       file.job_id = api.create_job(file.output_definition)
       file.save!
 
-      Pageflow.config.hooks.invoke(:file_submitted, file: file)
-
       :ok
     end
   end

data/app/models/pageflow/account.rb

@@ -4,14 +4,19 @@ module Pageflow
     has_many :entries
     has_many :folders
 
-    belongs_to :default_theme, :class_name => 'Theme'
+    has_many :themings
+    belongs_to :default_theming, :class_name => 'Theming'
 
-    validates :default_theme, :presence => true
+    validates :default_theming, :presence => true
+
+    accepts_nested_attributes_for :default_theming, :update_only => true
 
     scope :with_landing_page, -> { where.not(:landing_page_name => '') }
 
-    def cname_domain
-      cname.split('.').pop(2).join('.')
+    def build_default_theming(*args)
+      super.tap do |theming|
+        theming.account = self
+      end
     end
   end
 end