pageflow 0.10.0 → 0.11.0

data/lib/generators/pageflow/error_pages/templates/stylesheets/main.css

@@ -0,0 +1,40 @@
+@font-face {
+  font-family: SourceSansPro;
+  font-weight: normal;
+  font-style: normal;
+  src: url(/pageflow/error_pages/fonts/sourcesanspro-regular-webfont.eot);
+  src: url(/pageflow/error_pages/fonts/sourcesanspro-regular-webfont.eot?#iefix) format("embedded-opentype"), url(/pageflow/error_pages/fonts/sourcesanspro-regular-webfont.woff) format("woff"), url(/pageflow/error_pages/fonts/sourcesanspro-regular-webfont.ttf) format("truetype"), url(/pageflow/error_pages/fonts/sourcesanspro-regular-webfont.svg#SourceSansPro) format("svg");
+}
+
+@font-face {
+  font-family: SourceSansPro;
+  font-weight: bold;
+  font-style: normal;
+  src: url(/pageflow/error_pages/fonts/sourcesanspro-bold-webfont.eot);
+  src: url(/pageflow/error_pages/fonts/sourcesanspro-bold-webfont.eot?#iefix) format("embedded-opentype"), url(/pageflow/error_pages/fonts/sourcesanspro-bold-webfont.woff) format("woff"), url(/pageflow/error_pages/fonts/sourcesanspro-bold-webfont.ttf) format("truetype"), url(/pageflow/error_pages/fonts/sourcesanspro-bold-webfont.svg#SourceSansPro) format("svg");
+}
+
+html {
+  background-color: #252526;
+  background-image: url('/pageflow/error_pages/images/bg.jpg');
+  background-repeat: no-repeat;
+  background-position: center center;
+  height: 100%;
+}
+
+body {
+  font-size: 21px;
+  color: #fff;
+  font-family: "SourceSansPro";
+}
+
+div {
+  position: absolute;
+  top: 30%;
+  left: 30%;
+  max-width: 500px;
+}
+
+a {
+  color: #fff;
+}

data/lib/generators/pageflow/initializer/initializer_generator.rb

@@ -1,3 +1,5 @@
+require 'rails/generators'
+
 module Pageflow
   module Generators
     class InitializerGenerator < Rails::Generators::Base

data/lib/generators/pageflow/initializer/templates/pageflow.rb

@@ -1,6 +1,3 @@
-# Register admins for pageflow models with active admin.
-ActiveAdmin.application.load_paths.unshift(Dir[Pageflow::Engine.root.join('admins')])
-
 Pageflow.configure do |config|
   # The email address to use as from header in invitation mails to new
   # users.

data/lib/generators/pageflow/install/install_generator.rb

@@ -14,10 +14,12 @@ module Pageflow
 
         invoke 'pageflow:assets'
         invoke 'pageflow:initializer'
+        invoke 'pageflow:procfile'
         invoke 'pageflow:routes'
         invoke 'pageflow:user'
         invoke 'pageflow:seeds'
         invoke 'pageflow:active_admin_initializer'
+        invoke 'pageflow:error_pages'
 
         rake 'pageflow:install:migrations'
       end

data/lib/generators/pageflow/procfile/procfile_generator.rb

@@ -0,0 +1,15 @@
+require 'rails/generators'
+
+module Pageflow
+  module Generators
+    class ProcfileGenerator < Rails::Generators::Base
+      desc 'Generate a Procfile in Rails root.'
+
+      source_root File.expand_path('../templates', __FILE__)
+
+      def generate_procfile
+        copy_file 'Procfile', 'Procfile'
+      end
+    end
+  end
+end

data/lib/generators/pageflow/procfile/templates/Procfile

@@ -0,0 +1,3 @@
+web: bundle exec rails server
+worker: bundle exec rake resque:work QUEUE=*
+scheduler: bundle exec rake resque:scheduler QUEUE=*

data/lib/generators/pageflow/resque/resque_generator.rb

@@ -1,3 +1,5 @@
+require 'rails/generators'
+
 module Pageflow
   module Generators
     class ResqueGenerator < Rails::Generators::Base

data/lib/generators/pageflow/routes/routes_generator.rb

@@ -1,3 +1,5 @@
+require 'rails/generators'
+
 module Pageflow
   module Generators
     class RoutesGenerator < Rails::Generators::Base

data/lib/generators/pageflow/seeds/seeds_generator.rb

@@ -1,3 +1,5 @@
+require 'rails/generators'
+
 module Pageflow
   module Generators
     class SeedsGenerator < Rails::Generators::Base

data/lib/generators/pageflow/theme/templates/themes/%name%.scss.tt

@@ -0,0 +1,4 @@
+@import "./<%= name %>/variables";
+
+@import "pageflow/themes/default/base";
+// @import "pageflow/some_plugin/themes/default";

data/lib/generators/pageflow/theme/templates/themes/%name%/variables.scss.tt

@@ -0,0 +1,10 @@
+$theme-name: "<%= name %>";
+
+// $main-color: #e84d2c;
+// $main-color-dark: #b14a08;
+// $standard-font: "SourceSansPro";
+
+// For a full list of available variables see:
+//
+//   http://codevise.github.io/pageflow/theme/master/
+//

data/lib/generators/pageflow/theme/theme_generator.rb

@@ -1,28 +1,20 @@
+require 'rails/generators'
+
 module Pageflow
   module Generators
     class ThemeGenerator < Rails::Generators::Base
-      desc 'Copies a theme template to the app.'
+      desc 'Creates a configurable theme based on the default theme.'
 
-      argument :name, required: false, default: 'custom',
-               desc: 'The scope to copy views to'
+      argument :name,
+               required: false,
+               default: 'custom',
+               desc: 'The name of the new theme'
 
-      source_root File.expand_path("../../../../../app/assets", __FILE__)
+      source_root File.expand_path('../templates', __FILE__)
 
       def copy_template
-        directory('stylesheets/pageflow/themes/default', themes_path('stylesheets', name))
-        directory('images/pageflow/themes/default', themes_path('images', name))
-
-        template('stylesheets/pageflow/themes/default.css.scss', themes_path('stylesheets', "#{name}.css.scss")) do |content|
-          content.gsub!('@import "./default/', %Q'@import "./#{name}/')
-        end
-
-        gsub_file themes_path('stylesheets', "#{name}/variables.css.scss"), '$theme-name: "default";', %Q'$theme-name: "#{name}";'
-      end
-
-      private
-
-      def themes_path(type, path)
-        File.join('app', 'assets', type, 'pageflow', 'themes', path)
+        directory('themes', File.join('app', 'assets', 'stylesheets', 'pageflow', 'themes'))
+        empty_directory(File.join('app', 'assets', 'images', 'pageflow', 'themes', name))
       end
     end
   end

data/lib/generators/pageflow/user/user_generator.rb

@@ -1,3 +1,5 @@
+require 'rails/generators'
+
 module Pageflow
   module Generators
     class UserGenerator < Rails::Generators::Base

data/lib/pageflow.rb

@@ -25,4 +25,8 @@ module Pageflow
       I18n.locale = current_user.try(:locale) || http_accept_language.compatible_language_from(I18n.available_locales) || I18n.default_locale
     end
   end
+
+  def self.active_admin_load_path
+    Dir[Pageflow::Engine.root.join('admins')].first
+  end
 end

data/lib/pageflow/ability_mixin.rb

@@ -35,6 +35,10 @@ module Pageflow
 
       can :view, [Admin::MembersTab, Admin::RevisionsTab]
 
+      can :delete_own_user, ::User do |user_to_delete|
+        Pageflow.config.authorize_user_deletion.call(user_to_delete) == true
+      end
+
       if user.admin?
         can [:read, :create, :update], Account
         can :destroy, Account do |account|

data/lib/pageflow/active_admin_patches/views/attributes_table.rb

@@ -0,0 +1,31 @@
+module Pageflow
+  module ActiveAdminPatches
+    module Views
+      module AttributesTable
+        def boolean_status_tag_row(name, yes_state = :warning)
+          status_tag_row(name,
+                         [I18n.t('active_admin.status_tag.yes'), '-'],
+                         [yes_state, nil])
+        end
+
+        private
+
+        def status_tag_row(name, texts, types)
+          row(name, class: 'status_tag_row') do |record|
+            value = record.send(name)
+
+            status = value ? 'yes' : 'no'
+            text = value ? texts.first : texts.last
+            type = value ? types.first : types.last
+
+            if type
+              status_tag(status, type, class: name.to_s.gsub(/\?$/, ''), label: text)
+            else
+              text
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pageflow/active_admin_patches/views/pages/base.rb

@@ -0,0 +1,14 @@
+module Pageflow
+  module ActiveAdminPatches
+    module Views
+      module Pages
+        module Base
+          def build(*args)
+            super(*args)
+            set_attribute(:lang, I18n.locale)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pageflow/active_admin_patches/views/table_for.rb

@@ -0,0 +1,42 @@
+module Pageflow
+  module ActiveAdminPatches
+    module Views
+      module TableFor
+        def row_attributes
+          @collection.each_with_index do |item, i|
+            tr = @tbody.children[i]
+
+            attributes = yield(item)
+            attributes[:class] = [tr.attributes[:class], attributes[:class]].compact.join(' ')
+
+            tr.attributes.merge!(attributes)
+          end
+        end
+
+        def boolean_status_tag_column(name, yes_state = :warning)
+          status_tag_column(name,
+                            [I18n.t('active_admin.status_tag.yes'), '-'],
+                            [yes_state, nil])
+        end
+
+        private
+
+        def status_tag_column(name, texts, types)
+          column name do |resource|
+            value = resource.send(name)
+
+            status = value ? 'yes' : 'no'
+            text = value ? texts.first : texts.last
+            type = value ? types.first : types.last
+
+            if type
+              status_tag(status, type, class: name.to_s.gsub(/\?$/, ''), label: text)
+            else
+              text
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pageflow/built_in_widget_type.rb

@@ -13,7 +13,7 @@ module Pageflow
     end
 
     def render(template, entry)
-      template.render(partial_path, entry: entry)
+      template.render(partial_path, entry: entry, widget_type_name: name)
     end
 
     def self.navigation
@@ -23,5 +23,13 @@ module Pageflow
     def self.mobile_navigation
       new('default_mobile_navigation', ['mobile_navigation'], 'pageflow/entries/mobile_navigation')
     end
+
+    def self.classic_player_controls
+      new('classic_player_controls', ['player_controls'], 'pageflow/widgets/placeholder')
+    end
+
+    def self.slim_player_controls
+      new('slim_player_controls', ['player_controls'], 'pageflow/widgets/placeholder')
+    end
   end
 end

data/lib/pageflow/configuration.rb

@@ -228,6 +228,21 @@ module Pageflow
     attr_accessor :default_author_meta_tag
     attr_accessor :default_publisher_meta_tag
 
+    # Whether a user can be deleted.
+    #
+    # @example
+    #
+    #     config.authorize_user_deletion =
+    #       lambda do |user_to_delete|
+    #         if user_to_delete.account.users.length > 1
+    #           true
+    #         else
+    #           'Last user on account. Permission denied'
+    #         end
+    #       end
+    # @since 0.11
+    attr_accessor :authorize_user_deletion
+
     def initialize
       @paperclip_filesystem_default_options = {validate_media_type: false}
       @paperclip_s3_default_options = {validate_media_type: false}
@@ -265,6 +280,8 @@ module Pageflow
       @default_keywords_meta_tag = 'pageflow, multimedia, reportage'
       @default_author_meta_tag = 'Pageflow'
       @default_publisher_meta_tag = 'Pageflow'
+
+      @authorize_user_deletion = lambda { |_user| true }
     end
 
     # Activate a plugin.

data/lib/pageflow/engine.rb

@@ -14,9 +14,6 @@ require 'resque_mailer'
 require 'resque_scheduler'
 
 require 'active_admin'
-require 'active_admin/patches/views/attributes_table'
-require 'active_admin/patches/views/table_for'
-require 'active_admin/patches/views/pages/base'
 
 require 'jquery-layout-rails'
 require 'videojs_rails'
@@ -63,12 +60,17 @@ module Pageflow
                                    pageflow/lt_ie9.js pageflow/lt_ie9.css pageflow/ie9.js pageflow/ie9.css
                                    video-js.swf vjs.eot vjs.svg vjs.ttf vjs.woff)
 
-    config.assets.precompile << lambda do |path|
+    config.assets.precompile << lambda do |path, _filename|
       Pageflow.config.themes.any? do |theme|
         path == theme.stylesheet_path
       end
     end
 
+    config.assets.precompile << lambda do |path, filename|
+      filename.start_with?(Engine.root.join('app/assets').to_s) &&
+        !['.js', '.css', ''].include?(File.extname(path))
+    end
+
     # Make sure the configuration is recreated when classes are
     # reloded. Otherwise registered page types might still point to
     # unloaded classes in development mode.

data/lib/pageflow/theme.rb

@@ -16,6 +16,10 @@ module Pageflow
       !@options[:no_home_button]
     end
 
+    def has_overview_button?
+      !@options[:no_overview_button]
+    end
+
     def has_scroll_back_indicator?
       !!@options[:scroll_back_indicator]
     end

data/lib/pageflow/user_mixin.rb

@@ -9,20 +9,20 @@ module Pageflow
     include Suspendable
 
     included do
-      belongs_to :account, :class_name => 'Pageflow::Account'
+      belongs_to :account, counter_cache: true, class_name: 'Pageflow::Account'
 
-      has_many :memberships, :dependent => :destroy, :class_name => 'Pageflow::Membership'
-      has_many :entries, :through => :memberships, :class_name => 'Pageflow::Entry'
+      has_many :memberships, dependent: :destroy, class_name: 'Pageflow::Membership'
+      has_many :entries, through: :memberships, class_name: 'Pageflow::Entry'
 
-      has_many :revisions, :class_name => 'Pageflow::Revision', :foreign_key => :creator_id
+      has_many :revisions, class_name: 'Pageflow::Revision', foreign_key: :creator_id
 
-      validates :first_name, :last_name, :presence => true
-      validates :role, :inclusion => ROLES
-      validates :account, :presence => true
+      validates :first_name, :last_name, presence: true
+      validates :role, inclusion: ROLES
+      validates :account, presence: true
 
-      scope :admins, -> { where(:role => 'admin') }
-      scope :account_managers, -> { where(:role => 'account_manager') }
-      scope :editors, -> { where(:role => 'editor') }
+      scope :admins, -> { where(role: 'admin') }
+      scope :account_managers, -> { where(role: 'account_manager') }
+      scope :editors, -> { where(role: 'editor') }
     end
 
     def admin?

data/lib/pageflow/version.rb

@@ -1,3 +1,3 @@
 module Pageflow
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

data/spec/factories/revisions.rb

@@ -17,6 +17,24 @@ module Pageflow
         published
         published_until { 1.day.ago }
       end
+
+      trait :with_home_button do
+        home_button_enabled true
+        home_url 'http://example.com'
+      end
+
+      trait :without_home_button do
+        home_button_enabled false
+        home_url 'http://example.com'
+      end
+
+      trait :with_overview_button do
+        overview_button_enabled true
+      end
+
+      trait :without_overview_button do
+        overview_button_enabled false
+      end
     end
   end
 end