pageflow 0.1.0 → 0.2.0

data/app/models/pageflow/audio_file.rb

@@ -3,6 +3,8 @@ module Pageflow
     include EncodedFileStateMachine
     include UploadedFile
 
+    belongs_to :confirmed_by, :class_name => 'User'
+
     has_attached_file(:attachment_on_filesystem, Pageflow.config.paperclip_filesystem_default_options)
     has_attached_file(:attachment_on_s3, Pageflow.config.paperclip_s3_default_options)
 

data/app/models/pageflow/draft_entry.rb

@@ -5,7 +5,7 @@ module Pageflow
     attr_reader :entry, :draft
 
     delegate(:id,
-             :edit_lock, :account, :theme, :slug,
+             :edit_lock, :account, :theming, :slug,
              :published_until, :published?,
              :to_model, :to_key, :persisted?, :to_json,
              :to => :entry)
@@ -62,6 +62,10 @@ module Pageflow
       end
     end
 
+    def stylesheet_model
+      @draft
+    end
+
     private
 
     def collection_containing(file)

data/app/models/pageflow/edit_lock.rb

@@ -2,6 +2,8 @@ module Pageflow
   class EditLock < ActiveRecord::Base
     TIME_TO_LIVE = 10.seconds
 
+    scope :active, ->(time = Time.now - TIME_TO_LIVE) { where('pageflow_edit_locks.updated_at >= ?', time) }
+
     class Error < RuntimeError
       def code
         self.class.name.split('::').last.underscore

data/app/models/pageflow/encoding_confirmation.rb

@@ -0,0 +1,40 @@
+module Pageflow
+  class EncodingConfirmation
+    class QuotaExceededError < RuntimeError
+    end
+
+    attr_reader :entry, :attributes, :encoding_quota, :user
+
+    def initialize(entry, attributes, encoding_quota, user)
+      @entry = entry
+      @attributes = attributes
+      @encoding_quota = encoding_quota
+      @user = user
+    end
+
+    def exceeding?
+      assumed_quota.exceeded?
+    end
+
+    def save!
+      ActiveRecord::Base.transaction do
+        raise(QuotaExceededError) if exceeding?
+
+        files.each do |file|
+          file.confirmed_by = user
+          file.confirm_encoding!
+        end
+      end
+    end
+
+    def assumed_quota
+      @assumed_quota ||= encoding_quota.assume(files: files)
+    end
+
+    def files
+      @files ||=
+        entry.video_files.find(attributes.fetch(:video_file_ids, [])) +
+        entry.audio_files.find(attributes.fetch(:audio_file_ids, []))
+    end
+  end
+end

data/app/models/pageflow/entry.rb

@@ -5,7 +5,7 @@ module Pageflow
 
     belongs_to :account
     belongs_to :folder
-    belongs_to :theme
+    belongs_to :theming
 
     has_many :revisions, -> { order('frozen_at DESC') }
 
@@ -19,16 +19,16 @@ module Pageflow
     has_many :video_files
     has_many :audio_files
 
-
     has_one :draft, -> { editable }, :class_name => 'Revision'
     has_one :published_revision, -> { published }, :class_name => 'Revision'
 
     has_one :edit_lock, :dependent => :destroy
 
-    validates :account, :theme, :presence => true
+    validates :account, :theming, :presence => true
     validate :folder_belongs_to_same_account
 
     scope :published, -> { joins(:published_revision) }
+    scope :editing, -> { joins(:edit_lock).merge(Pageflow::EditLock.active) }
 
     after_create :create_draft!
 

data/app/models/pageflow/entry_publication.rb

@@ -0,0 +1,27 @@
+module Pageflow
+  class EntryPublication
+    attr_reader :entry, :attributes, :quota, :user
+
+    def initialize(entry, attributes, published_entries_quota, user)
+      @entry = entry
+      @attributes = attributes
+      @quota = published_entries_quota
+      @user = user
+    end
+
+    def exceeding?
+      assumed_quota.exceeded?
+    end
+
+    def save!
+      assumed_quota.verify_not_exceeded!
+      entry.publish(attributes.merge(creator: user))
+    end
+
+    private
+
+    def assumed_quota
+      quota.assume(published_entry: entry)
+    end
+  end
+end

data/app/models/pageflow/page.rb

@@ -17,7 +17,7 @@ module Pageflow
     end
 
     def thumbnail
-      model_name, attachment, property = thumbnail_definition
+      model_name, attachment, property, model_class = thumbnail_definition
 
       begin
         model_name.to_s.camelcase.constantize.find(configuration[property]).send(attachment)
@@ -30,17 +30,17 @@ module Pageflow
       # TODO: this has to be refactored to be page type agnostic
       if template == 'video' || template == 'background_video'
         if configuration['poster_image_id'].present?
-          ['pageflow/image_file', :attachment, 'poster_image_id']
+          ['pageflow/image_file', :processed_attachment, 'poster_image_id', 'image_file']
         else
-          ['pageflow/video_file', :poster, 'video_file_id']
+          ['pageflow/video_file', :poster, 'video_file_id', 'video_file']
         end
       else
         if configuration['thumbnail_image_id'].present?
-          ['pageflow/image_file', :attachment, 'thumbnail_image_id']
+          ['pageflow/image_file', :processed_attachment, 'thumbnail_image_id', 'image_file']
         elsif configuration['after_image_id'].present?
-          ['pageflow/image_file', :attachment, 'after_image_id']
+          ['pageflow/image_file', :processed_attachment, 'after_image_id','image_file']
         else
-          ['pageflow/image_file', :attachment, 'background_image_id']
+          ['pageflow/image_file', :processed_attachment, 'background_image_id', 'image_file']
         end
       end
     end

data/app/models/pageflow/published_entry.rb

@@ -5,7 +5,7 @@ module Pageflow
 
     attr_reader :entry, :revision
 
-    delegate(:account, :theme, :to_model, :to_key, :persisted?, :to => :entry)
+    delegate(:account, :theming, :to_model, :to_key, :persisted?, :to => :entry)
 
     delegate(:chapters, :pages,
              :image_files, :video_files, :audio_files,
@@ -26,8 +26,8 @@ module Pageflow
       pages.first.try(:thumbnail) || ImageFile.new.processed_attachment
     end
 
-    def self.find(id)
-      PublishedEntry.new(Entry.published.find(id))
+    def self.find(id, scope = Entry)
+      PublishedEntry.new(scope.published.find(id))
     end
 
     def cache_key

data/app/models/pageflow/theming.rb

@@ -0,0 +1,20 @@
+module Pageflow
+  class Theming < ActiveRecord::Base
+    belongs_to :account
+
+    validates :account, :presence => true
+    validates_inclusion_of :theme_name, :in => ->(_) { Pageflow.config.themes.names }
+
+    def cname_domain
+      cname.split('.').pop(2).join('.')
+    end
+
+    def theme
+      Pageflow.config.themes.get(theme_name)
+    end
+
+    def name
+      I18n.t('admin.themings.name', :account_name => account.name, :theme_name => theme_name)
+    end
+  end
+end

data/app/models/pageflow/video_file.rb

@@ -3,6 +3,8 @@ module Pageflow
     include EncodedFileStateMachine
     include UploadedFile
 
+    belongs_to :confirmed_by, :class_name => 'User'
+
     has_attached_file(:attachment_on_filesystem, Pageflow.config.paperclip_filesystem_default_options)
 
     has_attached_file(:attachment_on_s3, Pageflow.config.paperclip_s3_default_options)

data/app/state_machines/pageflow/encoded_file_state_machine.rb

@@ -8,11 +8,15 @@ module Pageflow
 
         state 'not_uploaded_to_s3'
         state 'uploading_to_s3'
+        state 'waiting_for_meta_data'
+        state 'fetching_meta_data'
+        state 'waiting_for_confirmation'
         state 'waiting_for_encoding'
         state 'encoding'
         state 'encoded'
 
         state 'upload_to_s3_failed'
+        state 'fetching_meta_data_failed'
         state 'encoding_failed'
 
         event :publish do
@@ -21,6 +25,10 @@ module Pageflow
 
         event :retry do
           transition 'upload_to_s3_failed' => 'uploading_to_s3'
+
+          transition 'encoding_failed' => 'waiting_for_confirmation', :if => lambda { Pageflow.config.confirm_encoding_jobs }
+          transition 'encoded' => 'waiting_for_confirmation', :if => lambda { Pageflow.config.confirm_encoding_jobs }
+
           transition 'encoding_failed' => 'waiting_for_encoding'
           transition 'encoded' => 'waiting_for_encoding'
         end
@@ -28,10 +36,34 @@ module Pageflow
         job UploadFileToS3Job do
           on_enter 'uploading_to_s3'
           result :pending, :retry_after => 30.seconds
-          result :ok => 'waiting_for_encoding'
+
+          result :ok, :state => 'waiting_for_meta_data', :if => lambda { Pageflow.config.confirm_encoding_jobs }
+          result :ok, :state => 'waiting_for_encoding'
+
           result :error => 'uploading_to_s3_failed'
         end
 
+        job RequestMetaDataFromZencoderJob do
+          on_enter 'waiting_for_meta_data'
+          result :ok => 'fetching_meta_data'
+          result :error => 'fetching_meta_data_failed'
+        end
+
+        job PollMetaDataFromZencoderJob do
+          on_enter 'fetching_meta_data'
+          result :pending, :retry_after => 2.seconds
+          result :ok => 'waiting_for_confirmation'
+          result :error => 'fetching_meta_data_failed'
+        end
+
+        event :confirm_encoding do
+          transition 'waiting_for_confirmation' => 'waiting_for_encoding'
+        end
+
+        after_transition 'waiting_for_confirmation' => 'waiting_for_encoding' do |file|
+          Pageflow.config.hooks.invoke(:file_encoding_confirmed, :file => file)
+        end
+
         job SubmitFileToZencoderJob do
           on_enter 'waiting_for_encoding'
           result :ok => 'encoding'
@@ -44,6 +76,14 @@ module Pageflow
           result :ok => 'encoded'
           result :error => 'encoding_failed'
         end
+
+        after_transition any => 'encoded' do |file|
+          Pageflow.config.hooks.invoke(:file_encoded, :file => file)
+        end
+
+        after_transition any => 'encoding_failed' do |file|
+          Pageflow.config.hooks.invoke(:file_encoding_failed, :file => file)
+        end
       end
     end
   end

data/app/views/admin/accounts/_account_details.html.arb

@@ -0,0 +1,5 @@
+attributes_table_for account do
+  row :name, :class => 'name'
+  row :default_file_rights, :class => 'default_file_rights'
+  row :created_at
+end

data/app/views/admin/accounts/_entries_panel.html.arb

@@ -0,0 +1,15 @@
+panel t('activerecord.models.entry.other') do
+  if account.entries.any?
+    table_for account.entries, :i18n => Pageflow::Entry do
+      column :title do |entry|
+        link_to(entry.title, admin_entry_path(entry))
+      end
+    end
+  else
+    div :class => "blank_slate_container" do
+      span :class => "blank_slate" do
+        I18n.t('admin.accounts.no_entries')
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+<%= semantic_form_for [:admin, resource] do |f| %>
+  <%= f.inputs do %>
+    <%= f.input :name %>
+    <%= f.input :default_file_rights %>
+    <%= f.semantic_fields_for :default_theming do |theming| %>
+      <%= theming.input :cname %>
+      <%= theming.input :theme_name, :include_blank => false, :collection => Pageflow.config.themes.names %>
+      <%= theming.input :imprint_link_label %>
+      <%= theming.input :imprint_link_url %>
+      <%= theming.input :copyright_link_label %>
+      <%= theming.input :copyright_link_url %>
+    <% end %>
+  <% end %>
+  <%= f.actions do %>
+    <%= f.action(:submit) %>
+    <%= f.action(:cancel, :wrapper_html => {:class => 'cancel'}) %>
+  <% end %>
+<% end %>

data/app/views/admin/accounts/_theming_details.html.arb

@@ -0,0 +1,6 @@
+attributes_table_for account.default_theming do
+  row :cname, :class => 'cname'
+  row :theme, :class => 'theme' do
+    account.default_theming.theme.name
+  end
+end

data/app/views/admin/accounts/_users_panel.html.arb

@@ -0,0 +1,15 @@
+panel I18n.t('activerecord.models.user.other') do
+  if account.users.any?
+    table_for account.users, :i18n => User do
+      column :full_name do |user|
+        link_to user.full_name, admin_user_path(user)
+      end
+    end
+  else
+    div :class => "blank_slate_container" do
+      span :class => "blank_slate" do
+        I18n.t('admin.accounts.no_members')
+      end
+    end
+  end
+end

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

@@ -1,8 +1,9 @@
 para do
   if authorized?(:edit, Pageflow::Entry)
-    span(link_to(I18n.t("admin.entries.editor"), pageflow.edit_entry_path(entry), :class => 'button'))
+    span(link_to(I18n.t("admin.entries.editor"), pageflow.edit_entry_path(entry), :class => 'editor button'))
   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 => 'button'))
+    span(link_to(I18n.t("admin.entries.show_public"), pageflow.short_entry_path(entry), :class => 'show_public button'))
   end
 end

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

@@ -1,5 +1,5 @@
-<% if @user.new_record? && Pageflow.config.quota.exceeded?(:users, @user.account) %>
-  <%= render 'admin/users/quota_exceeded' %>
+<% if @user.new_record? && Pageflow.config.quotas.get(:users, @user.account).exhausted? %>
+  <%= render 'admin/users/quota_exhausted' %>
 <% else %>
   <%= semantic_form_for([:admin, @user.becomes(User)]) do |f| %>
     <%= f.inputs "Details" do %>

data/app/views/admin/users/_quota_exhausted.html.erb

@@ -0,0 +1 @@
+<p>Replace by creating <code>app/views/admin/users/_quota_exhausted.html.erb</code></p>

data/app/views/pageflow/config/_editor_seeds.json.jbuilder

@@ -0,0 +1,2 @@
+json.key_format!(camelize: :lower)
+json.(Pageflow.config, :confirm_encoding_jobs)

data/app/views/pageflow/editor/encoding_confirmations/_summary.html.erb

@@ -0,0 +1 @@
+<p>Replace by creating <code>app/views/pageflow/editor/encoding_confirmations/_summary.html.erb</code></p>

data/app/views/pageflow/editor/encoding_confirmations/check.json.jbuilder

@@ -0,0 +1,3 @@
+json.exceeding(@encoding_confirmation.exceeding?)
+json.summary_html(render_html_partial('pageflow/editor/encoding_confirmations/summary',
+                                      encoding_confirmation: @encoding_confirmation))

data/app/views/pageflow/editor/entry_publications/check.json.jbuilder

@@ -0,0 +1,11 @@
+json.exceeding(@entry_publication.exceeding?)
+json.quota do
+  json.(@entry_publication.quota, :state_description, :state)
+end
+json.entry do
+  json.(@entry_publication.entry, :published_until)
+  json.published(@entry_publication.entry.published?)
+end
+json.exhausted_html(render_html_partial('pageflow/editor/quotas/published_entries_exhausted',
+                                        quota: @entry_publication.quota,
+                                        account: @entry_publication.quota.account))

data/app/views/pageflow/editor/quotas/{_published_entries_exceeded.html.erb → _published_entries_exhausted.html.erb}

@@ -1 +1 @@
-<p>Replace by creating <code>app/views/pageflow/editor/quotas/_published_entries_exceeded.html.erb</code></p>
+<p>Replace by creating <code>app/views/pageflow/editor/quotas/_published_entries_exhausted.html.erb</code></p>

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

@@ -1,7 +1,7 @@
 <div id="outer_wrapper">
   <%= render 'pageflow/entries/skip_links' %>
   <h1 class="hidden"><%= entry.title %></h1>
-  <img src="<%= image_path("pageflow/themes/#{entry.theme.name}/logo_print.png") %>" class="print_image" alt="Logo image for print version">
+  <img src="<%= image_path("pageflow/themes/#{entry.theming.theme.directory_name}/logo_print.png") %>" class="print_image" alt="Logo image for print version">
   <span class="print_only page_url"><%= request.original_url %></span>
   <%= content_tag :div, :id => 'content', :class => 'entry', :data => {:role => 'slideshow'} do %>
     <%= render entry.pages %>

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

@@ -60,8 +60,8 @@
               Bildrechte:
               <%= entry_file_rights(entry) %>
             </p>
-            <%= link_to(raw(entry.theme.imprint_link_label), entry.theme.imprint_link_url, :target => '_blank') %>
-            <%= link_to(raw(entry.theme.copyright_link_label), entry.theme.copyright_link_url, :target => '_blank', :class => 'copy') %>
+            <%= link_to(raw(entry.theming.imprint_link_label), entry.theming.imprint_link_url, :target => '_blank') %>
+            <%= link_to(raw(entry.theming.copyright_link_label), entry.theming.copyright_link_url, :target => '_blank', :class => 'copy') %>
           </li>
         </ul>
       </div>

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

@@ -2,8 +2,8 @@
 
 <%= tag :meta, :property => "og:image:url", :content => entry.thumbnail.url(:medium).gsub('https://', 'http://') %>
 
-<%= tag :meta, :property => "og:title", :content => "#{entry.title} - #{entry.account.cname_domain}" %>
+<%= tag :meta, :property => "og:title", :content => "#{entry.title} - #{entry.theming.cname_domain}" %>
 <%= tag :meta, :property => "og:description", :content => entry_summary(entry) %>
 <%= tag :meta, :property => "og:url", :content => pretty_entry_url(entry) %>
-<%= tag :meta, :property => "og:site_name", :content => entry.account.cname_domain %>
+<%= tag :meta, :property => "og:site_name", :content => entry.theming.cname_domain %>
 <%= tag :meta, :property => "og:type", :content => "article" %>