pageflow 0.8.2 → 0.9.0

data/app/models/pageflow/account.rb

@@ -1,5 +1,7 @@
 module Pageflow
   class Account < ActiveRecord::Base
+    include FeatureTarget
+
     has_many :users
     has_many :entries
     has_many :folders

data/app/models/pageflow/chapter.rb

@@ -5,6 +5,12 @@ module Pageflow
 
     delegate :entry, :to => :revision
 
+    serialize :configuration, JSON
+
+    def configuration
+      super || {}
+    end
+
     def copy_to(revision)
       chapter = dup
       revision.chapters << chapter

data/app/models/pageflow/draft_entry.rb

@@ -6,7 +6,9 @@ module Pageflow
 
     delegate(:id,
              :edit_lock, :account, :theming, :slug,
+             :enabled_feature_names,
              :published_until, :published?,
+             :password_digest,
              :to_model, :to_key, :persisted?, :to_json,
              :to => :entry)
 

data/app/models/pageflow/entry.rb

@@ -1,5 +1,10 @@
 module Pageflow
   class Entry < ActiveRecord::Base
+    class PasswordMissingError < StandardError
+    end
+
+    include FeatureTarget
+
     extend FriendlyId
     friendly_id :slug_candidates, :use => [:finders, :slugged]
 
@@ -24,13 +29,17 @@ module Pageflow
 
     has_one :edit_lock, :dependent => :destroy
 
+    has_secure_password validations: false
+
     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 do
+    attr_accessor :skip_draft_creation
+
+    after_create unless: :skip_draft_creation do
       create_draft!(home_button_enabled: theming.home_button_enabled_by_default)
       theming.widgets.copy_all_to(draft)
     end
@@ -39,15 +48,25 @@ module Pageflow
       super || EditLock::Null.new(self)
     end
 
-    def publish(options = {})
-      revisions.depublish_all
-      association(:published_revision).reset
+    def feature_state(name)
+      super(name) || account.feature_state(name)
+    end
 
-      draft.copy do |revision|
-        revision.creator = options[:creator]
-        revision.frozen_at = Time.now
-        revision.published_at = Time.now
-        revision.published_until = options[:published_until]
+    def publish(options = {})
+      ActiveRecord::Base.transaction do
+        self.first_published_at ||= Time.now
+        update_password!(options.slice(:password, :password_protected))
+
+        revisions.depublish_all
+        association(:published_revision).reset
+
+        draft.copy do |revision|
+          revision.creator = options[:creator]
+          revision.frozen_at = Time.now
+          revision.published_at = Time.now
+          revision.published_until = options[:published_until]
+          revision.password_protected = options[:password_protected]
+        end
       end
     end
 
@@ -68,9 +87,14 @@ module Pageflow
         revision.frozen_at = nil
         revision.published_at = nil
         revision.published_until = nil
+        revision.password_protected = nil
       end
     end
 
+    def duplicate
+      EntryDuplicate.of(self).create!
+    end
+
     def published?
       published_revision.present?
     end
@@ -92,5 +116,19 @@ module Pageflow
     def folder_belongs_to_same_account
       errors.add(:folder, :must_be_same_account) if folder.present? && folder.account_id != account_id
     end
+
+    def update_password!(options)
+      if options[:password].present?
+        self.password = options[:password]
+      end
+
+      if options[:password_protected]
+        raise PasswordMissingError if password_digest.blank?
+      else
+        self.password_digest = nil
+      end
+
+      save!
+    end
   end
 end

data/app/models/pageflow/entry_duplicate.rb

@@ -0,0 +1,51 @@
+module Pageflow
+  class EntryDuplicate < Struct.new(:original_entry)
+    def create!
+      create_entry
+
+      copy_draft
+      copy_memberships
+
+      new_entry
+    end
+
+    def self.of(entry)
+      new(entry)
+    end
+
+    private
+
+    attr_reader :new_entry
+
+    def create_entry
+      @new_entry = Entry.create!(new_attributes)
+    end
+
+    def copy_draft
+      original_entry.draft.copy do |revision|
+        revision.entry = new_entry
+      end
+    end
+
+    def copy_memberships
+      original_entry.users.each do |member|
+        new_entry.memberships.create(user: member)
+      end
+    end
+
+    def new_attributes
+      {
+        title: new_title,
+        account: original_entry.account,
+        theming: original_entry.theming,
+        features_configuration: original_entry.features_configuration,
+
+        skip_draft_creation: true
+      }
+    end
+
+    def new_title
+      I18n.t('pageflow.entry.duplicated_title', title: original_entry.title)
+    end
+  end
+end

data/app/models/pageflow/image_file.rb

@@ -3,19 +3,33 @@ module Pageflow
     include ImageFileStateMachine
     include UploadedFile
 
-    has_attached_file(:unprocessed_attachment, Pageflow.config.paperclip_s3_default_options)
-
-    has_attached_file(:processed_attachment, Pageflow.config.paperclip_s3_default_options
-                        .merge(:default_url => ':pageflow_placeholder',
-                               :styles => Pageflow.config.thumbnail_styles
-                                 .merge(:print => ['300x300>', :JPG],
-                                        :medium => ['1024x1024>', :JPG],
-                                        :large => ['1920x1920>', :JPG]),
-                               :convert_options => {
-                                 :print => "-quality 10 -interlace Plane",
-                                 :medium => "-quality 70 -interlace Plane",
-                                 :large => "-quality 70 -interlace Plane"
-                               }))
+    STYLES = lambda do |attachment|
+      panorama_format = File.extname(attachment.original_filename) == '.png' ? :PNG : :JPG
+
+      Pageflow.config.thumbnail_styles
+        .merge(print: ['300x300>', :JPG],
+               medium: ['1024x1024>', :JPG],
+               large: ['1920x1920>', :JPG],
+               panorama_medium: ['1024x1024^', panorama_format],
+               panorama_large: ['1920x1080^', panorama_format])
+    end
+
+    CONVERT_OPTIONS = {
+      print: '-quality 10 -interlace Plane',
+      medium: '-quality 70 -interlace Plane',
+      large: '-quality 70 -interlace Plane',
+      panorama_medium: '-quality 70 -interlace Plane',
+      panorama_large: '-quality 70 -interlace Plane'
+    }
+
+    has_attached_file(:unprocessed_attachment,
+                      Pageflow.config.paperclip_s3_default_options)
+
+    has_attached_file(:processed_attachment,
+                      Pageflow.config.paperclip_s3_default_options
+                        .merge(default_url: ':pageflow_placeholder',
+                               styles: STYLES,
+                               convert_options: CONVERT_OPTIONS))
 
     do_not_validate_attachment_file_type(:unprocessed_attachment)
     do_not_validate_attachment_file_type(:processed_attachment)
@@ -40,6 +54,12 @@ module Pageflow
       end
     end
 
+    def panorama_url
+      if processed_attachment.present?
+        attachment.url(:panorama_large)
+      end
+    end
+
     private
 
     def save_image_dimensions

data/app/models/pageflow/page.rb

@@ -4,7 +4,7 @@ module Pageflow
 
     attr_accessor :is_first
 
-    validates_inclusion_of :template, :in => ->(_) { Pageflow.config.page_type_names }
+    validates_inclusion_of :template, :in => ->(_) { Pageflow.config.page_types.names }
 
     serialize :configuration, JSON
 
@@ -25,7 +25,7 @@ module Pageflow
     end
 
     def page_type
-      Pageflow.config.lookup_page_type(template)
+      Pageflow.config.page_types.find_by_name!(template)
     end
 
     def configuration

data/app/models/pageflow/published_entry.rb

@@ -6,7 +6,12 @@ module Pageflow
     attr_reader :entry, :revision
     attr_accessor :share_target
 
-    delegate(:id, :account, :theming, :to_model, :to_key, :persisted?, :to => :entry)
+    delegate(:id,
+             :account, :theming,
+             :enabled_feature_names,
+             :to_model, :to_key, :persisted?,
+             :authenticate,
+             :to => :entry)
 
     delegate(:widgets, :chapters, :pages, :files,
              :image_files, :video_files, :audio_files,
@@ -15,6 +20,7 @@ module Pageflow
              :emphasize_new_pages,
              :share_image_id, :share_image_x, :share_image_y,
              :locale,
+             :password_protected?,
              :to => :revision)
 
     def initialize(entry, revision = nil)

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

@@ -1,7 +1,13 @@
 <%= semantic_form_for [:admin, resource] do |f| %>
+  <% account_config = Pageflow.config_for(f.object) %>
+
   <%= f.inputs do %>
     <%= f.input :name %>
     <%= f.input :default_file_rights %>
+
+    <% account_config.admin_form_inputs.find_all_for(:account).each do |form_input| %>
+      <%= form_input.build(f) %>
+    <% end %>
   <% end %>
 
   <%= f.semantic_fields_for :default_theming do |theming| %>
@@ -18,13 +24,17 @@
       <%= theming.input :copyright_link_label %>
       <%= theming.input :copyright_link_url %>
 
+      <% account_config.admin_form_inputs.find_all_for(:theming).each do |form_input| %>
+        <%= form_input.build(theming) %>
+      <% end %>
+
       <% theming.object.widgets.resolve(:include_placeholders => true).each do |widget| %>
         <%= f.semantic_fields_for(widget) do |w| %>
           <%= w.input(:type_name,
                       :label => t(widget.role, :scope => 'pageflow.widgets.roles'),
                       :input_html => {:name => "widgets[#{widget.role}]"},
                       :include_blank => t('pageflow.widgets.none'),
-                      :collection => widget_types_collection_for_role(widget.role)) %>
+                      :collection => widget_types_collection_for_role(account_config, widget.role)) %>
         <% end %>
       <% end %>
     <% end %>

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

@@ -0,0 +1,16 @@
+<%= semantic_form_for [:admin, resource], html: {class: 'features'}  do |f| %>
+  <%= hidden_field_tag('tab', params[:tab]) %>
+
+  <%= f.inputs do %>
+    <% Pageflow.config.features.each do |feature| %>
+      <li>
+        <%= label_tag(feature_state_input_name(resource, feature.name),
+                      t(feature.name_translation_key)) %>
+        <%= feature_state_select_tag(resource, feature.name) %>
+      </li>
+    <% end %>
+  <% end %>
+  <%= f.actions do %>
+    <%= f.action(:submit) %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,10 @@
+module Pageflow
+  module Admin
+    class FeaturesTab < ViewComponent
+      def build(resource)
+        feature_target = resource.is_a?(Theming) ? resource.account : resource
+        render('admin/features/form', resource: feature_target)
+      end
+    end
+  end
+end

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

@@ -32,6 +32,10 @@ module Pageflow
             column :created_with do |revision|
               span(I18n.t(revision.created_with, :scope => 'pageflow.admin.entries.revision_created_with'),
                    :title => I18n.t(revision.created_with, :scope => 'pageflow.admin.entries.revision_created_with_hint'))
+
+              if revision.password_protected?
+                span('', :class => 'password_protected', :title => t('pageflow.admin.entries.password_protected'))
+              end
             end
             column do |revision|
               text_node(link_to(t('pageflow.admin.entries.show'), pageflow.revision_path(revision), :class => 'show'))

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

@@ -1,4 +1,4 @@
-  <meta name="dc.language" content="de" />
+  <meta name="dc.language" content="<%= I18n.locale %>" />
   <meta name="keywords" content="pageflow, multimedia, reportage">
   <meta name="description" content="">
   <meta name="author" content="Pageflow">

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

@@ -17,9 +17,9 @@
 
   <%= render 'layouts/pageflow/ie_include_tags' %>
 </head>
-<%= content_tag :body, :class => [@body_class, 'load_images has_no_mobile_platform non_js'].compact.flatten.join(' ') do %>
+<%= content_tag :body, :class => [@body_class, 'load_all_images has_no_mobile_platform non_js'].compact.flatten.join(' ') do %>
   <script>
-    jQuery('body').removeClass('load_images');
+    jQuery('body').removeClass('load_all_images');
     jQuery("body").removeClass('non_js').addClass('js');
   </script>
   <%= yield %>

data/app/views/pageflow/editor/accounts/_account.json.jbuilder

@@ -0,0 +1 @@
+json.(account, :name)

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

@@ -1,9 +1,10 @@
-json.(entry, :id, :published_until, :slug)
+json.(entry, :id, :published_until, :slug, :enabled_feature_names)
 
 json.pretty_url pretty_entry_url(entry)
 
 json.default_file_rights entry.account.default_file_rights
 json.published(entry.published?)
+json.password_protected(entry.password_digest.present?)
 
 json.configuration do
   json.(entry, :title, :summary, :credits, :manual_start, :emphasize_chapter_beginning, :emphasize_new_pages, :share_image_id, :share_image_x, :share_image_y, :locale)

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

@@ -1,6 +1,6 @@
 <div id="help_entries_seed">
   <nav>
-    <%= help_entries_menu %>
+    <%= help_entries_menu(config) %>
   </nav>
-  <%= help_entry_sections %>
+  <%= help_entry_sections(config) %>
 </div>

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

@@ -0,0 +1,3 @@
+<div id="indicators_seed">
+  <%= render('pageflow/entries/indicators', theme: theme) %>
+</div>

data/app/views/pageflow/editor/entries/seed.json.erb

@@ -8,7 +8,8 @@
 
   "files": <%= files_json_seeds(@entry) %>,
 
+  "account": <%= render_json_seed(@entry.account) %>,
   "theming": <%= render_json_seed(@entry.theming) %>,
-  "widget_types": <%= widget_types_json_seeds %>,
-  "page_types": <%= page_type_json_seeds %>
+  "widget_types": <%= widget_types_json_seeds(@entry_config) %>,
+  "page_types": <%= page_type_json_seeds(@entry_config) %>
 }

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

@@ -5,6 +5,7 @@ end
 json.entry do
   json.(@entry_publication.entry, :published_until)
   json.published(@entry_publication.entry.published?)
+  json.password_protected(@entry_publication.entry.password_digest.present?)
 end
 json.exhausted_html(render_html_partial('pageflow/editor/quotas/published_entries_exhausted',
                                         entry: @entry_publication.entry,

data/app/views/pageflow/editor/image_files/_image_file.json.jbuilder

@@ -1,3 +1,3 @@
-json.(image_file, :width, :height)
+json.(image_file, :width, :height, :panorama_url)
 
 json.dimensions(file_dimensions(image_file))

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

@@ -1,2 +1,6 @@
 json.pretty_url pretty_theming_url(theming)
 json.home_button theming.theme.has_home_button?
+json.page_change_by_scrolling theming.theme.page_change_by_scrolling?
+json.hide_text_on_swipe theming.theme.hide_text_on_swipe?
+json.emphasized_pages theming.theme.supports_emphasized_pages?
+json.scroll_indicator_modes theming.theme.supports_scroll_indicator_modes?