pageflow 0.10.0 → 0.11.0

data/app/helpers/pageflow/widgets_helper.rb

@@ -19,7 +19,7 @@ module Pageflow
     def present_widgets_css_class(entry)
       entry.resolve_widgets.map do |widget|
         "widget_#{widget.widget_type.name}_present"
-      end.join(' ')
+      end.push('widgets_present').join(' ')
     end
 
     def widget_types_json_seeds(config)

data/app/mailers/pageflow/user_mailer.rb

@@ -4,9 +4,11 @@ module Pageflow
 
     def invitation(options)
       @user = User.find(options['user_id'])
+      @password_token = options['password_token']
+
       I18n.with_locale(@user.locale) do
         headers('X-Language' => I18n.locale)
-        mail(:to => @user.email, :subject => t('.subject'), :from => Pageflow.config.mailer_sender)
+        mail(to: @user.email, subject: t('.subject'), from: Pageflow.config.mailer_sender)
       end
     end
   end

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

@@ -0,0 +1,63 @@
+module Pageflow
+  module EntryPublicationStates
+    extend ActiveSupport::Concern
+
+    included do
+      scope(:published, -> { joins(:published_revision) })
+
+      scope(:published_without_password_protection,
+            -> { published.merge(Revision.without_password_protection) })
+
+      scope(:published_with_password_protection,
+            -> { published.merge(Revision.with_password_protection) })
+
+      scope(:not_published,
+            lambda do
+              includes(:published_revision)
+                .references(:pageflow_revisions)
+                .where(pageflow_revisions: {id: nil})
+            end)
+    end
+
+    def publication_state
+      if published_with_password_protection?
+        'published_with_password_protection'
+      elsif published?
+        'published_without_password_protection'
+      else
+        'not_published'
+      end
+    end
+
+    def published_with_password_protection?
+      published? && published_revision.password_protected?
+    end
+
+    def published?
+      published_revision.present?
+    end
+
+    def published_at
+      published? ? published_revision.published_at : nil
+    end
+
+    def published_until
+      published? ? published_revision.published_until : nil
+    end
+
+    module ClassMethods
+      def with_publication_state(state)
+        case state
+        when 'published_with_password_protection'
+          published_with_password_protection
+        when 'published_without_password_protection'
+          published_without_password_protection
+        when 'not_published'
+          not_published
+        else
+          fail(ArgumentError, "Unknown publication state #{state}")
+        end
+      end
+    end
+  end
+end

data/app/models/pageflow/account.rb

@@ -2,8 +2,8 @@ module Pageflow
   class Account < ActiveRecord::Base
     include FeatureTarget
 
-    has_many :users
-    has_many :entries
+    has_many :users, dependent: :restrict_with_exception
+    has_many :entries, dependent: :restrict_with_exception
     has_many :folders, dependent: :destroy
 
     has_many :themings, dependent: :destroy

data/app/models/pageflow/draft_entry.rb

@@ -17,7 +17,7 @@ module Pageflow
              :storylines, :main_storyline_chapters, :chapters, :pages,
              :emphasize_chapter_beginning,
              :emphasize_new_pages,
-             :share_image_id, :share_image_x, :share_image_y,
+             :share_url, :share_image_id, :share_image_x, :share_image_y,
              :files,
              :image_files, :video_files, :audio_files,
              :locale,
@@ -88,6 +88,10 @@ module Pageflow
       HomeButton.new(draft, theming)
     end
 
+    def overview_button
+      OverviewButton.new(draft, theming)
+    end
+
     def resolve_widgets(options = {})
       widgets.resolve(Pageflow.config_for(entry), options)
     end

data/app/models/pageflow/entry.rb

@@ -4,11 +4,12 @@ module Pageflow
     end
 
     include FeatureTarget
+    include EntryPublicationStates
 
     extend FriendlyId
     friendly_id :slug_candidates, :use => [:finders, :slugged]
 
-    belongs_to :account
+    belongs_to :account, counter_cache: true
     belongs_to :folder
     belongs_to :theming
 
@@ -34,7 +35,6 @@ module Pageflow
     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) }
 
     attr_accessor :skip_draft_creation
@@ -42,7 +42,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)
+      theming.copy_defaults_to(draft)
     end
 
     def edit_lock
@@ -96,14 +96,6 @@ module Pageflow
       EntryDuplicate.of(self).create!
     end
 
-    def published?
-      published_revision.present?
-    end
-
-    def published_until
-      published? ? published_revision.published_until : nil
-    end
-
     def should_generate_new_friendly_id?
       slug.blank? || title_changed?
     end
@@ -112,6 +104,10 @@ module Pageflow
       [:title, [:title, :id]]
     end
 
+    def self.ransackable_scopes(_)
+      [:with_publication_state, :published]
+    end
+
     private
 
     def folder_belongs_to_same_account

data/app/models/pageflow/invited_user.rb

@@ -6,22 +6,32 @@ module Pageflow
     after_create :send_invitation
 
     def send_invitation!
-      generate_reset_password_token! if should_generate_reset_token?
+      prepare_invitation
+      save(validate: false)
       send_invitation
     end
 
     private
 
-    def password_required?
-      false
+    def prepare_invitation
+      @token = generate_reset_password_token
     end
 
-    def prepare_invitation
-      generate_reset_password_token if should_generate_reset_token?
+    def generate_reset_password_token
+      raw, enc = Devise.token_generator.generate(self.class, :reset_password_token)
+
+      self.reset_password_token = enc
+      self.reset_password_sent_at = Time.now.utc
+
+      raw
+    end
+
+    def password_required?
+      false
     end
 
     def send_invitation
-      UserMailer.invitation('user_id' => id).deliver
+      UserMailer.invitation('user_id' => id, 'password_token' => @token).deliver
     end
   end
 end

data/app/models/pageflow/overview_button.rb

@@ -0,0 +1,19 @@
+module Pageflow
+  class OverviewButton
+    attr_reader :revision, :theming
+
+    def initialize(revision, theming)
+      @revision = revision
+      @theming = theming
+    end
+
+    def enabled?
+      revision.overview_button_enabled? &&
+        theming.theme.has_overview_button?
+    end
+
+    def enabled_value
+      revision.overview_button_enabled?
+    end
+  end
+end

data/app/models/pageflow/published_entry.rb

@@ -20,7 +20,7 @@ module Pageflow
              :summary, :credits, :manual_start,
              :emphasize_chapter_beginning,
              :emphasize_new_pages,
-             :share_image_id, :share_image_x, :share_image_y,
+             :share_url, :share_image_id, :share_image_x, :share_image_y,
              :locale,
              :author, :publisher, :keywords,
              :password_protected?,
@@ -59,13 +59,18 @@ module Pageflow
     end
 
     def cache_key
-      "#{self.class.model_name.cache_key}/#{entry.cache_key}-#{revision.cache_key}"
+      "#{self.class.model_name.cache_key}/" \
+        "#{entry.cache_key}-#{revision.cache_key}-#{theming.cache_key}"
     end
 
     def home_button
       HomeButton.new(revision, theming)
     end
 
+    def overview_button
+      OverviewButton.new(revision, theming)
+    end
+
     def resolve_widgets(options = {})
       widgets.resolve(Pageflow.config_for(entry), options)
     end

data/app/models/pageflow/revision.rb

@@ -6,7 +6,7 @@ module Pageflow
       'pageflow_pages.position ASC'
     ].join(',')
 
-    belongs_to :entry, :touch => true
+    belongs_to :entry, touch: :edited_at
     belongs_to :creator, :class_name => 'User'
     belongs_to :restored_from, :class_name => 'Pageflow::Revision'
 
@@ -29,6 +29,9 @@ module Pageflow
               {:now => Time.now}])
     end
 
+    scope(:with_password_protection, -> { where('password_protected IS TRUE') })
+    scope(:without_password_protection, -> { where('password_protected IS NOT TRUE') })
+
     scope :editable, -> { where('frozen_at IS NULL') }
     scope :frozen, -> { where('frozen_at IS NOT NULL') }
 

data/app/models/pageflow/theming.rb

@@ -26,5 +26,18 @@ module Pageflow
     def name
       I18n.t('pageflow.admin.themings.name', :account_name => account.name, :theme_name => theme_name)
     end
+
+    def copy_defaults_to(revision)
+      widgets.copy_all_to(revision)
+      copy_default_meta_tags(revision)
+    end
+
+    def copy_default_meta_tags(revision)
+      revision.update(
+        author: default_author.presence || Pageflow.config.default_author_meta_tag,
+        publisher: default_publisher.presence || Pageflow.config.default_publisher_meta_tag,
+        keywords: default_keywords.presence || Pageflow.config.default_keywords_meta_tag
+      )
+    end
   end
 end

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

@@ -1,4 +1,4 @@
-<%= semantic_form_for [:admin, resource] do |f| %>
+<%= admin_form_for [:admin, resource] do |f| %>
   <% account_config = Pageflow.config_for(f.object) %>
 
   <%= f.inputs do %>
@@ -18,6 +18,18 @@
       <%= theming.input :home_url, hint: t('pageflow.admin.themings.home_url_hint') %>
     <% end %>
 
+    <%= f.inputs do %>
+      <%= theming.input :default_author,
+        hint: t('pageflow.admin.themings.default_author_hint'),
+        placeholder: Pageflow.config.default_author_meta_tag %>
+      <%= theming.input :default_publisher,
+        hint: t('pageflow.admin.themings.default_publisher_hint'),
+        placeholder: Pageflow.config.default_publisher_meta_tag %>
+      <%= theming.input :default_keywords,
+        hint: t('pageflow.admin.themings.default_keywords_hint'),
+        placeholder: Pageflow.config.default_keywords_meta_tag %>
+    <% end %>
+
     <%= f.inputs do %>
       <%= theming.input :home_button_enabled_by_default %>
       <%= theming.input :imprint_link_label %>

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

@@ -3,4 +3,7 @@ attributes_table_for account.default_theming do
   row :theme, :class => 'theme' do
     account.default_theming.theme.name
   end
+  row :default_author, class: 'default_author'
+  row :default_publisher, class: 'default_publisher'
+  row :default_keywords, class: 'default_keywords'
 end

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

@@ -4,7 +4,7 @@ attributes_table_for entry do
     row :account, :class => 'account'
   end
   row :created_at
-  row :updated_at
+  row :edited_at
   row :published?, :class => 'published' do
     span :'data-published' => entry.published? do
       if entry.published?

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

@@ -1,9 +1,17 @@
 para do
   if authorized?(:edit, Pageflow::Entry)
-    span(link_to(I18n.t('pageflow.admin.entries.editor'), pageflow.edit_entry_path(entry), :class => 'editor button'))
+    span(link_to(I18n.t('pageflow.admin.entries.editor'),
+                 pageflow.edit_entry_path(entry),
+                 class: 'editor icon_button button'))
   end
-  span(link_to(I18n.t('pageflow.admin.entries.preview'), preview_admin_entry_path(entry), :class => 'preview button'))
+
+  span(link_to(I18n.t('pageflow.admin.entries.preview'),
+               preview_admin_entry_path(entry),
+               class: 'preview icon_button button'))
+
   if entry.published?
-    span(link_to(I18n.t('pageflow.admin.entries.show_public'), pretty_entry_url(entry), :class => 'show_public button'))
+    span(link_to(I18n.t('pageflow.admin.entries.show_public'),
+                 pretty_entry_url(entry),
+                 class: 'show_public icon_button button'))
   end
 end

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

@@ -1,4 +1,4 @@
-<%= semantic_form_for [:admin, resource], html: {class: 'features'}  do |f| %>
+<%= admin_form_for [:admin, resource], html: {class: 'features'}  do |f| %>
   <%= hidden_field_tag('tab', params[:tab]) %>
 
   <%= f.inputs do %>

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

@@ -1,4 +1,4 @@
-<%= semantic_form_for [:admin, parent, resource] do |f| %>
+<%= admin_form_for [:admin, parent, resource] do |f| %>
   <%= f.inputs do %>
     <%= f.input :user,
                 :input_html => { :disabled => (parent_type == :user) },

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

@@ -1,4 +1,4 @@
-<%= semantic_form_for [:admin, resource] do |f| %>
+<%= admin_form_for [:admin, resource] do |f| %>
   <%= f.inputs do %>
     <%= f.input(:published_until,
                 :as => :string,

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

@@ -1,7 +1,7 @@
 <% 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| %>
+  <%= admin_form_for([:admin, @user.becomes(User)]) do |f| %>
     <%= f.inputs "Details" do %>
       <% if @user.new_record? %>
         <%= quota_state_description(:users, @user.account) %>

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

@@ -1,4 +1,4 @@
-<%= semantic_form_for current_user, :url => delete_me_admin_users_path, :method => 'delete', :html => {:class => 'delete_account'} do |form| %>
+<%= admin_form_for current_user, :url => delete_me_admin_users_path, :method => 'delete', :html => {:class => 'delete_account'} do |form| %>
   <%= form.inputs do %>
     <li>
       <p><%= t('pageflow.admin.users.delete_me.warning_html') %></p>

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

@@ -1,7 +1,7 @@
-<%= semantic_form_for current_user, :url => me_admin_users_path, :html => {:class => 'profile'} do |form| %>
+<%= admin_form_for current_user, :url => me_admin_users_path, :html => {:class => 'profile'} do |form| %>
   <%= form.inputs :first_name, :last_name %>
 
-  <%= form.inputs  do %>
+  <%= form.inputs do %>
     <%= form.input :locale,
                    as: :select,
                    include_blank: false,
@@ -13,9 +13,8 @@
     <%= form.input :password %>
     <%= form.input :password_confirmation %>
   <% end %>
+
   <%= form.actions %>
-  <p>
-    <%= t('pageflow.admin.users.me.delete_account_hint') %>
-    <%= link_to(t('pageflow.admin.users.me.delete_account'), delete_me_admin_users_path, :class => 'delete_account') %>
-  </p>
+
+  <%= delete_own_user_section %>
 <% end %>

data/app/views/components/pageflow/admin/embedded_index_table.rb

@@ -8,6 +8,7 @@ module Pageflow
       def build(base_collection, options = {})
         @base_collection = base_collection
         @scopes = []
+        @sort_columns = []
         @blank_slate_text = options[:blank_slate_text]
         super()
       end
@@ -16,13 +17,15 @@ module Pageflow
         scopes << ActiveAdmin::Scope.new(*args)
       end
 
-      def table_for_collection(*args, &block)
+      def table_for_collection(options = {}, &block)
         if scopes.any?
-          custom_scopes_renderer(scopes, :default_scope => scopes.first.id)
+          custom_scopes_renderer(scopes, default_scope: scopes.first.id)
         end
 
+        record_sort_columns(&block) if options[:sortable]
+
         if scoped_collection.any?
-          build_table(*args, &block)
+          build_table(options, &block)
         else
           build_blank_slate
         end
@@ -30,16 +33,16 @@ module Pageflow
 
       private
 
-      def build_table(*args, &block)
-        paginated_collection(scoped_collection.page(params[:page]).per(10),
-                             :download_links => false) do
-          table_for(collection, *args, &block)
+      def build_table(options, &block)
+        paginated_collection(paginate(apply_sorting(scoped_collection)),
+                             download_links: false) do
+          table_for(collection, options, &block)
         end
       end
 
       def build_blank_slate
-        div :class => "blank_slate_container" do
-          span :class => "blank_slate" do
+        div class: 'blank_slate_container' do
+          span class: 'blank_slate' do
             @blank_slate_text
           end
         end
@@ -50,10 +53,64 @@ module Pageflow
       end
 
       def current_scope
-        scopes.find do |scope|
+        scopes.detect do |scope|
           scope.id.to_s == params[:scope]
         end || scopes.first
       end
+
+      def paginate(collection)
+        collection.page(params[:page]).per(10)
+      end
+
+      def apply_sorting(collection)
+        if has_sort_columns?
+          collection.reorder(order_clause)
+        else
+          collection
+        end
+      end
+
+      def has_sort_columns?
+        @sort_columns.any?
+      end
+
+      def order_clause
+        if valid_order?
+          params[:order].gsub('_asc', ' ASC').gsub('_desc', ' DESC')
+        else
+          "#{@sort_columns.first} ASC"
+        end
+      end
+
+      def valid_order?
+        params[:order] &&
+          @sort_columns.include?(params[:order].gsub('_asc', '').gsub('_desc', ''))
+      end
+
+      def record_sort_columns(&block)
+        recorder = SortColumnRecorder.new
+        recorder.instance_eval(&block)
+        @sort_columns = recorder.columns
+      end
+
+      class SortColumnRecorder
+        attr_reader :columns
+
+        def initialize
+          @columns = []
+        end
+
+        def column(name = nil, options = {})
+          if options[:sortable].is_a?(String) || options[:sortable].is_a?(Symbol)
+            @columns << options[:sortable].to_s
+          elsif options[:sortable] != false && name
+            @columns << name.to_s
+          end
+        end
+
+        def row_attributes
+        end
+      end
     end
   end
 end