pulitzer 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 390dd38dec3f03235c0f3801eb739c41253ac58e
-  data.tar.gz: d5abe8e354d0d7799ef8f877bee732cf181c0e1e
+  metadata.gz: d1a21389d2d52313083f4e7d7ea067ac90ae0dab
+  data.tar.gz: 52b6aa62689710bdd817773fdb4384aa18c3d8d7
 SHA512:
-  metadata.gz: 13325afd994d30604ee3199fa24a4b4cd417f63379ac50177834b3fbe98d880b1fe1eec3215a7bfb869f1f7543fdaf7a626439297c6080dafbed7450989d551b
-  data.tar.gz: 7aeabb4cbf40a7c17815d930787870647d00389e0d2d4fbe0ac420d8f05ea593c0d038b3c9a9b435ba3a486989533e0edd1014e2d9a209900fa887284372f589
+  metadata.gz: cc2ee6693517dcf76fe0ec32f6f090e5fef6b71bfdeb663bfc68f1078164e5f17856202b2057a9ac276d51be45af18e7d0171c4411104dcd11bb03de1af23b4a
+  data.tar.gz: 71c364ad79775cca1f5141bc79a2e0d40eb7c9dad265b77f4173727b1964ae867b7c8223bf6a22373d3bc552defefdb5078170da249c6ce7f5af02fa5cb28c8b

data/app/assets/stylesheets/pulitzer.scss

@@ -159,3 +159,17 @@ textarea {
 .wysihtml5-sandbox {
   width: 100% !important;
 }
+
+.drag_handle {
+	margin-top: 6px;
+	width: 12px;
+	height: 9px;
+	.drag_handle_indent {
+		width: 100%;
+		height: 2px;
+		margin-bottom: 1px;
+		background-color: #e6e6e6;
+		border-top: 1px solid #636564;
+		border-left: 1px solid #636564;
+	}
+}

data/app/controllers/pulitzer/content_elements_controller.rb

@@ -1,11 +1,24 @@
 class Pulitzer::ContentElementsController < Pulitzer::ApplicationController
-  before_filter :get_content_element, only: [:show, :edit, :update]
+  before_filter :set_content_element, only: [:show, :edit, :update]
 
   def index
-    @post             = Pulitzer::Post.find(params[:post_id])
-    @content_elements = @post.preview_version.content_elements
-    route             = "pulitzer_preview_#{@post.title.parameterize('_')}_path"
-    @preview_path     = main_app.public_send(route) if main_app.respond_to?(route)
+    @post                       = Pulitzer::Post.find(params[:post_id])
+    @content_elements           = @post.preview_version.template_content_elements
+    @free_form_content_elements = @post.preview_version.free_form_content_elements
+    route                       = "pulitzer_preview_#{@post.title.parameterize('_')}_path"
+    @preview_path               = main_app.public_send(route) if main_app.respond_to?(route)
+  end
+
+  def new
+    @version          = Pulitzer::Version.find params[:version_id]
+    @content_element  = @version.content_elements.build
+    render partial: 'new', locals: { content_element: @content_element, version: @version }
+  end
+
+  def create
+    @version         = Pulitzer::Version.find content_element_params[:version_id]
+    @content_element = @version.content_elements.create content_element_params
+    render partial: 'show_wrapper', locals: { content_element: @content_element }
   end
 
   def show
@@ -21,13 +34,22 @@ class Pulitzer::ContentElementsController < Pulitzer::ApplicationController
     render partial: 'show', locals: { content_element: @content_element }
   end
 
+  def update_all
+    content_elements = Pulitzer::ContentElement.find params[:content_element]
+    content_elements.each do |ce|
+      new_sort_order = params[:content_element].index(ce.id.to_s)
+      ce.update_attribute(:sort_order, new_sort_order)
+    end
+    render nothing: true
+  end
+
   protected
 
   def content_element_params
     params[:content_element].permit!
   end
 
-  def get_content_element
+  def set_content_element
     @content_element = Pulitzer::ContentElement.find(params[:id])
   end
 end

data/app/controllers/pulitzer/posts_controller.rb

@@ -13,7 +13,7 @@ class Pulitzer::PostsController < Pulitzer::ApplicationController
 
   def create
     @post = Pulitzer::Post.create(post_params)
-    Pulitzer::SetupPostElements.new(@post).call if @post
+    Pulitzer::CreatePostContentElements.new(@post).call if @post
     render partial: 'show_wrapper', locals: { post: @post }
   end
 

data/app/controllers/pulitzer/versions_controller.rb

@@ -8,7 +8,7 @@ class Pulitzer::VersionsController < Pulitzer::ApplicationController
     if @active_version
       Pulitzer::CloneVersion.new(@active_version, new_version).call
     else
-      Pulitzer::SetupPostElements.new(@post).call
+      Pulitzer::CreatePostContentElements.new(@post).call
     end
     redirect_to post_content_elements_path(@post), notice: "Post #{@status}"
   end

data/app/interactions/pulitzer/create_post_content_elements.rb

@@ -0,0 +1,20 @@
+class Pulitzer::CreatePostContentElements
+  attr_accessor :post
+
+  def initialize(post)
+    self.post = post
+  end
+
+  def call
+    post.post_type_content_element_types.each do |cet|
+      post.preview_version.content_elements.create do |ce|
+        ce.label                          = cet.label
+        ce.height                         = cet.height
+        ce.width                          = cet.width
+        ce.text_editor                    = cet.text_editor
+        ce.content_element_type           = cet.content_element_type
+        ce.post_type_content_element_type = cet
+      end
+    end
+  end
+end

data/app/interactions/pulitzer/create_post_type_content_elements.rb

@@ -9,8 +9,11 @@ class Pulitzer::CreatePostTypeContentElements
   def call
     post_type.posts.each do |post|
       post.preview_version.content_elements.create do |ce|
-        ce.label = ptcet.label
-        ce.content_element_type = ptcet.content_element_type
+        ce.label                          = ptcet.label
+        ce.height                         = ptcet.height
+        ce.width                          = ptcet.width
+        ce.text_editor                    = ptcet.text_editor
+        ce.content_element_type           = ptcet.content_element_type
         ce.post_type_content_element_type = ptcet
       end
     end

data/app/interactions/pulitzer/create_singleton_post.rb

@@ -9,7 +9,7 @@ class Pulitzer::CreateSingletonPost
   def call
     if post_type.singular? && !post_type.singleton_post?
       singleton_post = post_type.posts.create(title: title)
-      Pulitzer::SetupPostElements.new(singleton_post).call
+      Pulitzer::CreatePostContentElements.new(singleton_post).call
     end
   end
 end

data/app/interactions/pulitzer/update_post_type_content_elements.rb

@@ -9,8 +9,13 @@ class Pulitzer::UpdatePostTypeContentElements
 
   def call
     post_type.posts.each do |post|
-      post.preview_version.content_elements.where(label: old_label).each do |ce|
-        ce.update(label: ptcet.label, content_element_type: ptcet.content_element_type, post_type_content_element_type: ptcet)
+      post.preview_version.content_elements.where(label: old_label).each do |content_element|
+        content_element.update(label: ptcet.label,
+          height: ptcet.height,
+          width: ptcet.width,
+          text_editor: ptcet.text_editor,
+          content_element_type: ptcet.content_element_type,
+          post_type_content_element_type: ptcet)
       end
     end
   end

data/app/models/pulitzer/content_element.rb

@@ -1,13 +1,18 @@
 module Pulitzer
   class ContentElement < ActiveRecord::Base
     mount_uploader :image, Pulitzer::ImageUploader
+    enum kind: [ :template, :free_form ]
+
     belongs_to :version
     belongs_to :content_element_type
     belongs_to :post_type_content_element_type
     delegate :type, :text_type?, :image_type?, :video_type?, to: :content_element_type
-    delegate :height, :width, :text_editor, to: :post_type_content_element_type
     delegate :post, to: :version
+
+    before_save :handle_sort_order
+
     default_scope { order(id: :asc) }
+    scope :free_form, -> { unscoped.where(kind: kinds[:free_form]).order(sort_order: :asc) }
 
     def video_link
       if video_type? && !body.nil?
@@ -36,5 +41,11 @@ private
       end
     end
 
+    def handle_sort_order
+      if new_record? && sort_order.nil? && free_form?
+        self.sort_order = version.free_form_content_elements.maximum(:sort_order).to_i + 1
+      end
+    end
+
   end
 end

data/app/models/pulitzer/post_type.rb

@@ -1,10 +1,15 @@
 class Pulitzer::PostType < ActiveRecord::Base
+  enum kind: [ :template, :free_form, :hybrid ]
   has_many :posts, dependent: :destroy
   has_many :post_type_content_element_types, dependent: :destroy
   has_many :content_element_types, through: :post_type_content_element_types
 
   validates :name, presence: true
 
+  def self.named(label)
+    self.find_by(name: label)
+  end
+
   def singular?
     !plural
   end
@@ -17,7 +22,11 @@ class Pulitzer::PostType < ActiveRecord::Base
     !!singleton_post
   end
 
-  def self.named(label)
-    self.find_by(name: label)
+  def allow_template?
+    template? || hybrid?
+  end
+
+  def allow_free_form?
+    free_form? || hybrid?
   end
 end

data/app/models/pulitzer/post_type_content_element_type.rb

@@ -2,6 +2,7 @@ module Pulitzer
   class PostTypeContentElementType < ActiveRecord::Base
     belongs_to :post_type
     belongs_to :content_element_type
+    has_one :content_element
     delegate :type, :image_type?, to: :content_element_type
 
     default_scope { order(id: :asc) }

data/app/models/pulitzer/version.rb

@@ -8,5 +8,13 @@ module Pulitzer
     def content_element(label)
       self.content_elements.find_by(label: label)
     end
+
+    def template_content_elements
+      content_elements.template
+    end
+
+    def free_form_content_elements
+      content_elements.free_form
+    end
   end
 end

data/app/views/pulitzer/content_elements/_form.html.erb

@@ -1,6 +1,5 @@
 <%= form_for content_element, html: ajax_form_hash(dom_target(content_element)), multipart: true,
   data: { server_endpoint: content_element_path(content_element) } do |f| %>
-  <%= f.label content_element.label %>
   <%= f.text_field :title, placeholder: 'Title' %>
   <%= render partial: "#{content_element.type}_fields", locals: { f: f, content_element: content_element } %>
   <%= submit_tag "Update" %>

data/app/views/pulitzer/content_elements/_new.html.erb

@@ -0,0 +1,25 @@
+<%= form_for content_element, html: ajax_form_hash("#version_content_element_container_#{dom_id(version)}", insert_method: 'append', sub_class: "AddALineForm", container: "#new_version_content_element_#{dom_id(version)}") do |f| %>
+  <%= f.collection_select :content_element_type_id, Pulitzer::ContentElementType.all, :id, :name, {},
+  { data: { "revealer" => true, "sub-type" => "FormFieldRevealer", "revealer-children-id" => dom_id(version, :revealer) }} %>
+
+  <div data-revealer-target="<%= dom_id(version, :revealer) %>"></div>
+
+  <div data-revealer_id="<%= dom_id(version, :revealer) %>" data-revealer-triggers="['<%= Pulitzer::ContentElementType.find_by(name: 'Image').id %>']">
+    <%= f.label :height %>
+    <%= f.text_field :height, placeholder: 'Height' %>
+    <%= f.label :width %>
+    <%= f.text_field :width, placeholder: 'Width' %>
+  </div>
+
+  <div data-revealer_id="<%= dom_id(version, :revealer) %>" data-revealer-triggers="['<%= Pulitzer::ContentElementType.find_by(name: 'Text').id %>']">
+    <%= f.label :text_editor, "Text editor" %>
+    <%= f.select :text_editor, Pulitzer.text_editor_toolbars.map { |t| t[:name] } %>
+  </div>
+
+  <%= f.hidden_field :version_id %>
+  <%= f.hidden_field :kind, value: :free_form %>
+
+  <%= submit_tag "Create" %>
+  <%= link_to('Cancel', '#', :class => 'button',
+    data: { emptier: true, target: "#new_version_content_element_#{dom_id(version)}" } ) %>
+<% end %>

data/app/views/pulitzer/content_elements/_show.html.erb

@@ -1,6 +1,15 @@
+<% if content_element.free_form? %>
+  <div class="pulitzer-row">
+    <div class="pulitzer-span right">
+      <%= render partial: '/pulitzer/shared/drag_handle' %>
+    </div>
+  </div>
+<% end %>
 <div class="pulitzer-row">
   <ul class="list">
-    <li><h2><%= content_element.label %></h2></li>
+    <% if content_element.free_form? %>
+      <li><h2><%= content_element.label %></h2></li>
+    <% end %>
     <li><%= render_element(content_element) %></li>
     <li><%= ajax_link "Edit", edit_post_content_element_path(content_element.post, content_element), {}, dom_target(content_element) %></li>
   </ul>

data/app/views/pulitzer/content_elements/index.html.erb

@@ -4,17 +4,34 @@
   <%= link_back_to_posts(@post.post_type, "Back to #{@post.post_type.name.singularize} Posts", 'Back to post types') %>
 </div>
 
+<% if @post.post_type.allow_free_form? %>
+  <div class="pulitzer-row margin-bottom list-item">
+    <%= ajax_link "add a new content element for #{@post.title}", new_content_element_path(version_id: @post.preview_version), {}, "#new_version_content_element_#{dom_id(@post.preview_version)}" %>
+    <div id="new_version_content_element_<%= dom_id(@post.preview_version) %>"></div>
+  </div>
+<% end %>
+
 <div class="pulitzer-row margin-bottom list-item">
   <h2>Tags</h2>
-
   <% Pulitzer::Post::TAG_MODELS.each do |tag_model| %>
     <%= render partial: 'pulitzer/post_tags/show_wrapper', locals: { post: @post, tag_model: tag_model } %>
   <% end %>
+</div>
 
+<div class="pulitzer-row margin-bottom list-item">
+  <h2>Template content elements</h2>
+  <% @content_elements.each do |content_element| %>
+    <%= render partial: 'show_wrapper', locals: { content_element: content_element } %>
+  <% end %>
 </div>
 
-<% @content_elements.each do |content_element| %>
-  <%= render partial: 'show_wrapper', locals: {content_element: content_element } %>
+<% if @post.post_type.allow_free_form? %>
+  <h2>Free form content elements</h2>
+  <div class="pulitzer-row margin-bottom list-item" id="version_content_element_container_<%= dom_id(@post.preview_version) %>" id="content_element_list" data-sorter href="<%= update_all_content_elements_path %>">
+    <% @free_form_content_elements.each do |content_element| %>
+      <%= render partial: 'show_wrapper', locals: { content_element: content_element } %>
+    <% end %>
+  </div>
 <% end %>
 
 <div class="pulitzer-row">

data/app/views/pulitzer/post_types/_form.html.erb

@@ -1,11 +1,6 @@
 <%= form_for post_type, html: ajax_form_hash(dom_target(post_type)) do |f| %>
-  <%= f.label :name %>
-  <%= f.text_field :name %>
-  <%= f.label :plural %>
-  <%= f.check_box :plural %>
-  <%= f.label :template %>
-  <%= f.check_box :template %>
-  <%= f.submit "Update post type" %>
+  <%= render partial: 'form_fields', locals: { f: f } %>
+  <%= f.submit "Update" %>
   <%= link_to('Cancel', post_type_path(post_type), :class => 'button',
     data: { ajax_link: true, ajax_target: dom_target(post_type) } ) %>
 <% end %>

data/app/views/pulitzer/post_types/_form_fields.html.erb

@@ -0,0 +1,5 @@
+<%= f.label :name %>
+<%= f.text_field :name %>
+<%= f.label :plural %>
+<%= f.check_box :plural %>
+<%= f.select :kind, Pulitzer::PostType.kinds.keys.map { |m| [m.humanize, m] } %>

data/app/views/pulitzer/post_types/_new.html.erb

@@ -1,11 +1,6 @@
 <%= form_for post_type, html: ajax_form_hash('#post_types_container', insert_method: 'append', sub_class: "AddALineForm", container: '#new_post_type') do |f| %>
-  <%= f.label :name %>
-  <%= f.text_field :name %>
-  <%= f.label :plural %>
-  <%= f.check_box :plural %>
-  <%= f.label :template %>
-  <%= f.check_box :template %>
-  <%= f.submit %>
+  <%= render partial: 'form_fields', locals: { f: f } %>
+  <%= f.submit "Create" %>
   <%= link_to('Cancel', '#', :class => 'button',
     data: { emptier: true, target: '#new_post_type' } ) %>
 <% end %>

data/app/views/pulitzer/post_types/_show.html.erb

@@ -2,9 +2,11 @@
   <ul class="inline-list">
     <li><%= post_type.name %></li>
     <li><%= link_to_posts(post_type, 'Index', 'Manage') %></li>
-    <li <%= expander("post_type_content_element_types_#{dom_id(post_type)}") %>>
-      <%= link_to "Template", '#', class: 'toggle-post-type-content-elements', data: { post_types: post_type.id } %>
-    </li>
+    <% if post_type.allow_template? %>
+      <li <%= expander("post_type_content_element_types_#{dom_id(post_type)}") %>>
+        <%= link_to "Template", '#', class: 'toggle-post-type-content-elements', data: { post_types: post_type.id } %>
+      </li>
+    <% end %>
     <li>
       <% if Pulitzer.skip_metadata_auth? || self.instance_eval(&Pulitzer.metadata_closure) %>
         <%= ajax_link "Details", edit_post_type_path(post_type), {}, dom_target(post_type) %>

data/app/views/pulitzer/shared/_drag_handle.html.erb

@@ -0,0 +1,5 @@
+<div class="drag_handle" data-drag-handle>
+  <div class="drag_handle_indent"></div>
+  <div class="drag_handle_indent"></div>
+  <div class="drag_handle_indent"></div>
+</div>

data/config/routes.rb

@@ -3,7 +3,11 @@ Pulitzer::Engine.routes.draw do
     resources :content_elements
     resources :post_tags
   end
-  resources :content_elements
+  resources :content_elements do
+    collection do
+      patch :update_all
+    end
+  end
   resources :post_types
   resources :versions
   resources :content_element_types

data/db/migrate/20151113183344_add_post_type_content_element_attributes_to_content_elements.rb

@@ -0,0 +1,21 @@
+class AddPostTypeContentElementAttributesToContentElements < ActiveRecord::Migration
+  def up
+    add_column :pulitzer_content_elements, :text_editor, :string
+    add_column :pulitzer_content_elements, :height, :integer, default: 100
+    add_column :pulitzer_content_elements, :width, :integer, default: 100
+    add_column :pulitzer_content_elements, :sort_order, :integer
+    Pulitzer::ContentElement.reset_column_information
+    Pulitzer::ContentElement.find_each do |ce|
+      if ptce = ce.post_type_content_element_type
+        ce.update(text_editor: ptce.text_editor, height: ptce.height, width: ptce.width)
+      end
+    end
+  end
+
+  def down
+    remove_column :pulitzer_content_elements, :text_editor
+    remove_column :pulitzer_content_elements, :height
+    remove_column :pulitzer_content_elements, :width
+    remove_column :pulitzer_content_elements, :sort_order
+  end
+end