effective_posts 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11c1c38bb1cb3976cf832a0e195990c8ec092ce3
-  data.tar.gz: e7c14e2c912bb93409deb13bef22ec6128b89c8e
+  metadata.gz: b6c0cbc8c247c67715094aba5e52ea2f212cdbe3
+  data.tar.gz: a67ae4457e20eb7675c78dc1c769a1b1cc84595b
 SHA512:
-  metadata.gz: 5793b3006b5dc1583d20a24bad119c9cc478a0fa53f281fcea25148c212ac74ea720da4ca8490a6c05481ea9412aea7f7892d87c0b7bde459e3277b6709ff49a
-  data.tar.gz: 613e891c1f32be3c11e7bb4ccb23ecd59be1ed8b06795843dc5bbaab04ed41175a50a88cbc8b5eb86d20506808f0faffea4512a0ca33061358b7556a74e3ed3b
+  metadata.gz: 1999a9f99ca390aab1e0576f8a1d5df86b0d33ccc7b29ea66b3903dd69777ac0ba29341a91f18abd1dc9e8360c98f5409d93cdeb4fe5f088d861cff8ae6b27e0
+  data.tar.gz: b09a6b63101b33d938f70230485668f0c2c1dd1b34d1bd01650a04757c9aa01d1943e9a5226af362d4826bff0ba9f4931bcb2d04b3621a7946b65956872eba3c

data/app/controllers/admin/posts_controller.rb

@@ -12,7 +12,7 @@ module Admin
     end
 
     def new
-      @post = Effective::Post.new(:published_at => Time.zone.now)
+      @post = Effective::Post.new(published_at: Time.zone.now)
       @page_title = 'New Post'
 
       EffectivePosts.authorized?(self, :new, @post)
@@ -30,6 +30,7 @@ module Admin
         if params[:commit] == 'Save and Edit Content' && defined?(EffectiveRegions)
           redirect_to effective_regions.edit_path(effective_posts.post_path(@post), :exit => effective_posts.edit_admin_post_path(@post))
         elsif params[:commit] == 'Save and Add New'
+          flash[:success] = 'Successfully created post'
           redirect_to effective_posts.new_admin_post_path
         else
           flash[:success] = 'Successfully created post'
@@ -58,6 +59,7 @@ module Admin
         if params[:commit] == 'Save and Edit Content' && defined?(EffectiveRegions)
           redirect_to effective_regions.edit_path(effective_posts.post_path(@post), :exit => effective_posts.edit_admin_post_path(@post))
         elsif params[:commit] == 'Save and Add New'
+          flash[:success] = 'Successfully updated post'
           redirect_to effective_posts.new_admin_post_path
         else
           flash[:success] = 'Successfully updated post'
@@ -83,6 +85,20 @@ module Admin
       redirect_to effective_posts.admin_posts_path
     end
 
+    def approve
+      @post = Effective::Post.find(params[:id])
+
+      EffectivePosts.authorized?(self, :approve, @post)
+
+      if @post.update_attributes(draft: false)
+        flash[:success] = 'Successfully approved post.  It is now displayed on the website.'
+      else
+        flash[:danger] = "Unable to approve post: #{@post.errors.full_messages.join(', ')}"
+      end
+
+      redirect_to(:back) rescue redirect_to(effective_posts.admin_posts_path)
+    end
+
     def excerpts
       @page_title = 'Post Excerpts'
 
@@ -91,13 +107,10 @@ module Admin
       @posts = Effective::Post.includes(:regions)
     end
 
-
     private
 
     def post_params
-      params.require(:effective_post).permit(
-        :title, :draft, :category, :published_at, :roles => []
-      )
+      params.require(:effective_post).permit(EffectivePosts.permitted_params)
     end
 
   end

data/app/controllers/effective/posts_controller.rb

@@ -2,34 +2,25 @@ module Effective
   class PostsController < ApplicationController
     layout (EffectivePosts.layout.kind_of?(Hash) ? EffectivePosts.layout[:posts] : EffectivePosts.layout)
 
-    after_action :monkey_patch_for_kaminari, :only => [:index]
+    before_action :authenticate_user!, only: [:new, :create, :edit, :update],
+      if: -> { EffectivePosts.submissions_require_current_user }
 
-    def index
-      @posts = (Rails::VERSION::MAJOR > 3 ? Effective::Post.all : Effective::Post.scoped)
-
-      @posts = @posts.for_role(current_user.try(:roles)) if defined?(EffectiveRoles)
-      @posts = @posts.with_category(params[:category]) if params[:category]
-      @posts = @posts.published
-      @posts = @posts.includes(:regions)
+    after_action :monkey_patch_for_kaminari, only: [:index]
 
-      @posts = @posts.order("#{EffectivePosts.posts_table_name}.published_at DESC")
+    def index
+      @posts ||= Effective::Post.posts(user: current_user, category: params[:category])
       @posts = @posts.page(params[:page]).per(EffectivePosts.per_page)
 
       EffectivePosts.authorized?(self, :index, Effective::Post)
 
-      @page_title = (params[:category] || 'Posts').titleize
+      @page_title = (params[:page_title] || params[:category] || 'Posts').titleize
     end
 
     def show
-      @posts = (Rails::VERSION::MAJOR > 3 ? Effective::Post.all : Effective::Post.scoped)
-
-      @posts = @posts.with_category(params[:category]) if params[:category]
-      @posts = @posts.published if params[:edit].to_s != 'true'
-      @posts = @posts.includes(:regions)
-
+      @posts ||= Effective::Post.posts(user: current_user, category: params[:category], drafts: (params[:edit].to_s == 'true' || params[:preview].to_s == 'true'))
       @post = @posts.find(params[:id])
 
-      if defined?(EffectiveRoles)
+      if @post.respond_to?(:roles_permit?)
         raise Effective::AccessDenied unless @post.roles_permit?(current_user)
       end
 
@@ -38,8 +29,87 @@ module Effective
       @page_title = @post.title
     end
 
+    # Public user submit a post functionality
+    def new
+      @post ||= Effective::Post.new(published_at: Time.zone.now)
+      @page_title = 'New Post'
+
+      EffectivePosts.authorized?(self, :new, @post)
+    end
+
+    def create
+      @post ||= Effective::Post.new(post_params)
+      @post.user = current_user if defined?(current_user)
+      @post.draft = (EffectivePosts.submissions_require_approval == true)
+
+      EffectivePosts.authorized?(self, :create, @post)
+
+      if @post.save
+        @page_title ||= 'Post Submitted'
+        flash.now[:success] = 'Successfully submitted post'
+
+        if EffectivePosts.submissions_require_approval
+          @post.send_post_submitted_to_admin!
+        end
+
+        render :submitted
+      else
+        @page_title ||= 'New Post'
+        flash.now[:danger] = 'Unable to submit post'
+        render action: :new
+      end
+    end
+
+    def edit
+      @post ||= Effective::Post.find(params[:id])
+      @page_title ||= 'Edit Post'
+
+      EffectivePosts.authorized?(self, :edit, @post)
+    end
+
+    def update
+      @post ||= Effective::Post.find(params[:id])
+      draft_was = @post.draft
+      @post.draft = (EffectivePosts.submissions_require_approval == true)
+
+      EffectivePosts.authorized?(self, :update, @post)
+
+      if @post.update_attributes(post_params)
+        @page_title ||= 'Post Submitted'
+        flash.now[:success] = 'Successfully re-submitted post'
+
+        if EffectivePosts.submissions_require_approval && draft_was != true
+          @post.send_post_submitted_to_admin!
+        end
+
+        render :submitted
+      else
+        @page_title ||= 'Edit Post'
+        flash.now[:danger] = 'Unable to update post'
+        render action: :edit
+      end
+    end
+
+    def destroy
+      @post ||= Effective::Post.find(params[:id])
+
+      EffectivePosts.authorized?(self, :destroy, @post)
+
+      if @post.destroy
+        flash[:success] = 'Successfully deleted post'
+      else
+        flash[:danger] = 'Unable to delete post'
+      end
+
+      redirect_to effective_posts.posts_path
+    end
+
     private
 
+    def post_params
+      params.require(:effective_post).permit(EffectivePosts.permitted_params)
+    end
+
     def monkey_patch_for_kaminari
       @template = @template.tap { |template| template.extend(EffectiveKaminariHelper) }
     end

data/app/helpers/effective_posts_helper.rb

@@ -1,6 +1,17 @@
 require 'cgi'
 
 module EffectivePostsHelper
+  def effective_post_path(post, opts = nil)
+    category = post.category.to_s.downcase
+    opts ||= {}
+
+    if EffectivePosts.use_category_routes
+      "/#{category}" + effective_posts.post_path(post, opts)
+    else
+      effective_posts.post_path(post, opts.merge(category: category))
+    end
+  end
+
   def render_post(post)
     render(partial: 'effective/posts/post', locals: { post: post })
   end
@@ -19,33 +30,37 @@ module EffectivePostsHelper
   # :omission => '...' passed to the final text node's truncate
   # :length => 200 to set the max inner_text length of the content
   # All other options are passed to the link_to 'Read more'
-  def post_excerpt(post, opts = {})
-    content = effective_region(post, :content, :editable => false) { '<p>Default content</p>'.html_safe }
-
-    options = {
-      :label => 'Read more',
-      :omission => '...',
-      :length => 200
-    }.merge(opts)
+  def post_excerpt(post, read_more_link: true, label: 'Read more', omission: '...', length: 200)
+    content = effective_region(post, :body, :editable => false) { '<p>Default content</p>'.html_safe }
 
     divider = content.index(Effective::Snippets::ReadMoreDivider::TOKEN)
-    length = options.delete(:length)
-    omission = options.delete(:omission)
+    read_more = (read_more_link && label.present?) ? readmore_link(post, label: label) : ''
 
     CGI.unescapeHTML(if divider.present?
-      truncate_html(content, Effective::Snippets::ReadMoreDivider::TOKEN, '') + readmore_link(post, options)
+      truncate_html(content, Effective::Snippets::ReadMoreDivider::TOKEN, '') + readmore
     elsif length.present?
-      truncate_html(content, length, omission) + readmore_link(post, options)
+      truncate_html(content, length, omission) + read_more
     else
       content
     end).html_safe
   end
 
-  def readmore_link(post, options)
+  def read_more_link(post, options)
     content_tag(:p, class: 'post-read-more') do
       link_to((options.delete(:label) || 'Read more'), effective_posts.post_path(post), options)
     end
   end
+  alias_method :readmore_link, :read_more_link
+
+  ### Post Categories
+
+  def post_categories
+    categories = EffectivePosts.categories
+  end
+
+  def render_post_categories
+    render(partial: '/effective/posts/categories', locals: { categories: post_categories })
+  end
 
   def link_to_post_category(category, options = {})
     category = category.to_s.downcase
@@ -54,9 +69,21 @@ module EffectivePostsHelper
     link_to(category.to_s.titleize, href, options)
   end
 
-  def effective_post_path(post)
-    category = post.category.to_s.downcase
-    EffectivePosts.use_category_routes ? "/#{category}/#{post.to_param}" : effective_posts.post_path(post, category: category.to_s)
+  ### Recent Posts
+
+  def recent_posts(user: current_user, category: nil, limit: EffectivePosts.per_page)
+    @recent_posts ||= Effective::Post.posts(user: user, category: category).limit(limit)
+  end
+
+  def render_recent_posts(user: current_user, category: nil, limit: EffectivePosts.per_page)
+    posts = recent_posts(user: user, category: category, limit: limit)
+
+    render partial: '/effective/posts/recent_posts', locals: { posts: posts }
+  end
+
+  ### Submitting a Post
+  def link_to_submit_post(label = 'Submit a post', options = {})
+    link_to(label, effective_posts.new_post_path, options)
   end
 
 end

data/app/mailers/effective/posts_mailer.rb

@@ -0,0 +1,34 @@
+module Effective
+  class PostsMailer < ActionMailer::Base
+    helper EffectivePostsHelper
+
+    layout EffectivePosts.mailer[:layout].presence || 'effective_posts_mailer_layout'
+
+    def post_submitted_to_admin(post_param)
+      @post = (post_param.kind_of?(Effective::Post) ? post_param : Effective::Post.find(post_param))
+
+      mail(
+        to: EffectivePosts.mailer[:admin_email],
+        from: EffectivePosts.mailer[:default_from],
+        subject: subject_for_post_submitted_to_admin(@post)
+      )
+    end
+
+    private
+
+    def subject_for_post_submitted_to_admin(post)
+      string_or_callable = EffectivePosts.mailer[:subject_for_post_submitted_to_admin]
+
+      if string_or_callable.respond_to?(:call) # This is a Proc or a function, not a string
+        string_or_callable = self.instance_exec(post, &string_or_callable)
+      end
+
+      prefix_subject(string_or_callable.presence || "A new post has been submitted that needs approval")
+    end
+
+    def prefix_subject(text)
+      prefix = (EffectivePosts.mailer[:subject_prefix].to_s rescue '')
+      prefix.present? ? (prefix.chomp(' ') + ' ' + text) : text
+    end
+  end
+end

data/app/models/effective/datatables/posts.rb

@@ -6,14 +6,24 @@ if defined?(EffectiveDatatables)
           default_order :published_at, :desc
 
           table_column :published_at
-          table_column :id, :visible => false
+          table_column :id, visible: false
 
           table_column :title
-          table_column :category, :filter => {:type => :select, :values => EffectivePosts.categories }
+          table_column :category, filter: { type: :select, values: EffectivePosts.categories }
 
-          table_column :draft
+          if EffectivePosts.submissions_enabled
+            table_column :approved, column: 'NOT(draft)', as: :boolean do |post|
+              post.draft ? 'No' : 'Yes'
+            end
 
-          table_column :actions, :sortable => false, :filter => false, :partial => '/admin/posts/actions'
+            table_column :draft, visible: false
+          else
+            table_column :draft
+          end
+
+          table_column :created_at, label: 'Submitted at', visible: false
+
+          table_column :actions, sortable: false, filter: false, partial: '/admin/posts/actions'
         end
 
         def collection

data/app/models/effective/post.rb

@@ -17,12 +17,48 @@ module Effective
     #   timestamps
     # end
 
-    validates_presence_of :title, :category, :published_at
-    validates_length_of :title, maximum: 255
+    validates :title, presence: true, length: { maximum: 255 }
+    validates :category, presence: true
+    validates :published_at, presence: true
 
-    scope :drafts, -> { where(:draft => true) }
-    scope :published, -> { where(:draft => false).where("#{EffectivePosts.posts_table_name}.published_at < ?", Time.zone.now) }
-    scope :with_category, proc { |category| where(:category => category.to_s.downcase) }
+    scope :drafts, -> { where(draft: true) }
+    scope :published, -> { where(draft: false).where("#{EffectivePosts.posts_table_name}.published_at < ?", Time.zone.now) }
+    scope :with_category, -> (category) { where(category: category.to_s.downcase) }
+
+    scope :posts, -> (user: nil, category: nil, drafts: false) {
+      scope = (Rails::VERSION::MAJOR > 3 ? all : scoped)
+      scope = scope.includes(:regions).order(published_at: :desc)
+
+      if user.present? && user.respond_to?(:roles) && defined?(EffectiveRoles)
+        scope = scope.for_role(user.roles)
+      end
+
+      if category.present?
+        scope = scope.with_category(category)
+      end
+
+      if drafts.blank?
+        scope = scope.published
+      end
+
+      scope
+    }
+
+    def to_s
+      title.presence || 'New Post'
+    end
+
+    def approved?
+      draft == false
+    end
+
+    def body
+      region(:body).content
+    end
+
+    def body=(input)
+      region(:body).content = input
+    end
 
     def to_param
       "#{id}-#{title.parameterize}"
@@ -32,5 +68,27 @@ module Effective
     def time_to_read_in_seconds(reading_speed = 3.333)
       (regions.to_a.sum { |region| (region.content || '').scan(/\w+/).size } / reading_speed).seconds
     end
+
+    def send_post_submitted_to_admin!
+      send_email(:post_submitted_to_admin, to_param)
+    end
+
+    private
+
+    def send_email(email, *mailer_args)
+      begin
+        if EffectivePosts.mailer[:delayed_job_deliver] && EffectivePosts.mailer[:deliver_method] == :deliver_later
+          Effective::PostsMailer.delay.public_send(email, *mailer_args)
+        elsif EffectivePosts.mailer[:deliver_method].present?
+          Effective::PostsMailer.public_send(email, *mailer_args).public_send(EffectivePosts.mailer[:deliver_method])
+        else
+          Effective::PostsMailer.public_send(email, *mailer_args).deliver_now
+        end
+      rescue => e
+        raise e unless Rails.env.production?
+        return false
+      end
+    end
+
   end
 end

data/app/views/admin/posts/_actions.html.haml

@@ -1,9 +1,16 @@
-%span.actions
-  = link_to 'Visit', effective_post_path(post), :target => '_blank'
-  = '-'
-  - if defined?(EffectiveRegions)
-    = link_to 'Edit Content', '/edit' + effective_posts.post_path(post), 'data-no-turbolink' => true
-    = '-'
-  = link_to 'Edit', effective_posts.edit_admin_post_path(post.id)
-  = '-'
-  = link_to 'Delete', effective_posts.admin_post_path(post.id), :data => {:method => :delete, :confirm => "Are you sure?  This post will be made unavailable."}
+- if EffectivePosts.submissions_enabled && EffectivePosts.submissions_require_approval && !post.approved?
+  = link_to effective_posts.admin_approve_post_path(post.id), title: 'Approve' do
+    %span.glyphicon.glyphicon-ok
+
+= link_to effective_posts.edit_admin_post_path(post.id), title: 'Settings' do
+  %span.glyphicon.glyphicon-cog
+
+= link_to effective_post_path(post, (post.draft? ? {preview: true} : nil)), title: 'View', target: '_blank' do
+  %span.glyphicon.glyphicon-eye-open
+
+- if defined?(EffectiveRegions)
+  = link_to effective_post_path(post, edit: true), title: 'Edit Content', 'data-no-turbolink': true, target: '_blank' do
+    %span.glyphicon.glyphicon-edit
+
+= link_to effective_posts.admin_post_path(post.id), title: 'Delete', data: { method: :delete, confirm: 'Are you sure you want to delete? This cannot be undone.' } do
+  %span.glyphicon.glyphicon-trash

data/app/views/admin/posts/_form.html.haml

@@ -1,28 +1,35 @@
-= simple_form_for(post, (EffectivePosts.simple_form_options || {}).merge(:url => (post.persisted? ? effective_posts.admin_post_path(post.id) : effective_posts.admin_posts_path))) do |f|
-  = f.input :title, :hint => "Give this post a title"
+= simple_form_for(post, (EffectivePosts.admin_simple_form_options || {}).merge(:url => (post.persisted? ? effective_posts.admin_post_path(post.id) : effective_posts.admin_posts_path))) do |f|
+  = f.input :title, hint: 'The title of your post.'
 
   - if Array(EffectivePosts.categories).length > 0
-    = f.input :category, :collection => EffectivePosts.categories, :as => :select, :include_blank => false
+    = f.input :category,
+      as: (defined?(EffectiveFormInputs) ? :effective_select : :select),
+      collection: EffectivePosts.categories,
+      include_blank: false
   - else
-    = f.input :category, :as => :hidden, :input_html => {:value => 'posts'}
+    = f.input :category, as: :hidden, input_html: { value: 'posts' }
 
-  %h4 Publish
-  = f.input :draft, :hint => "Save this post as a draft.  It will not be accessible on the website."
+  = render partial: '/effective/posts/additional_fields', locals: { post: post, form: f, f: f }
 
-  - if defined?(EffectiveFormInputs)
-    = f.input :published_at, :as => :effective_date_time_picker, :hint => "Set this to a future date to schedule a post to appear in the future."
-  - else
-    = f.input :published_at, :hint => "Set this to a future date to schedule a post to appear in the future."
+  = f.input :draft, hint: 'Save this post as a draft.  It will not be accessible on the website.'
+
+  = f.input :published_at,
+    as: (defined?(EffectiveFormInputs) ? :effective_date_time_picker : :datetime),
+    label: 'Publish date',
+    hint: 'When your post will be displayed on the website.'
+
+  = f.input :body,
+    as: (defined?(EffectiveFormInputs) ? :effective_ckeditor_text_area : :text),
+    hint: 'The body of your post.',
+    toolbar: 'simple',
+    required: true
 
-  - if defined?(EffectiveRoles) and f.object.respond_to?(:roles)
-    = f.input :roles, :collection => EffectiveRoles.roles_collection(f.object), :as => :check_boxes, :hint => '* leave blank for a regular public post that anyone can view'
+  - if defined?(EffectiveRoles) and f.object.respond_to?(:roles) && EffectivePosts.use_effective_roles
+    = f.input :roles, collection: EffectiveRoles.roles_collection(f.object), as: :check_boxes, hint: '* leave blank for a regular public post that anyone can view'
 
-  .form-group
-    .col-xs-12
-      .form-group
-        .pull-right
-          = f.button :submit, 'Save', data: { disable_with: 'Saving...' }
-          - if defined?(EffectiveRegions)
-            = f.button :submit, 'Save and Edit Content', data: { disable_with: 'Saving...' }
-          = f.button :submit, 'Save and Add New', data: { disable_with: 'Saving...' }
-          = link_to 'Cancel', effective_posts.admin_posts_path
+  .effective-post-actions.pull-right
+    = f.button :submit, 'Save', data: { disable_with: 'Saving...' }
+    - if defined?(EffectiveRegions)
+      = f.button :submit, 'Save and Edit Content', data: { disable_with: 'Saving...' }
+    = f.button :submit, 'Save and Add New', data: { disable_with: 'Saving...' }
+    = link_to 'Cancel', effective_posts.admin_posts_path

data/app/views/admin/posts/edit.html.haml

@@ -1,2 +1,2 @@
 %h2= @page_title
-= render :partial => 'form', :as => :post, :object => @post
+= render partial: 'form', as: :post, object: @post

data/app/views/admin/posts/excerpts.html.haml

@@ -9,7 +9,7 @@
             = post.title
   .row
     .col-sm-6
-      %pre= effective_region(post, :content, :editable => false)
+      %pre= effective_region(post, :body, :editable => false)
 
     .col-sm-6
       %pre= post_excerpt(post)

data/app/views/admin/posts/new.html.haml

@@ -1,2 +1,2 @@
 %h2= @page_title
-= render :partial => 'form', :as => :post, :object => @post
+= render partial: 'form', as: :post, object: @post

data/app/views/effective/posts/_additional_fields.html.haml

@@ -0,0 +1,2 @@
+-# intentionally left blank
+-# = form.input :start_at

data/app/views/effective/posts/_categories.html.haml

@@ -0,0 +1,4 @@
+.effective-posts-categories
+  - categories.each do |category|
+    .effective-post-category
+      = link_to_post_category(category)

data/app/views/effective/posts/_form.html.haml

@@ -0,0 +1,27 @@
+= simple_form_for(post, (EffectivePosts.simple_form_options || {}).merge(:url => (post.persisted? ? effective_posts.post_path(post.id) : effective_posts.posts_path))) do |f|
+  = f.input :title, hint: 'The title of your post.'
+
+  - if Array(EffectivePosts.categories).length > 0
+    = f.input :category,
+      as: (defined?(EffectiveFormInputs) ? :effective_select : :select),
+      collection: EffectivePosts.categories,
+      include_blank: false
+  - else
+    = f.input :category, as: :hidden, input_html: { value: 'posts' }
+
+  = render partial: '/effective/posts/additional_fields', locals: { post: post, form: f, f: f }
+
+  = f.input :published_at,
+    as: (defined?(EffectiveFormInputs) ? :effective_date_time_picker : :datetime),
+    label: 'Publish date',
+    hint: 'When your post will be displayed on the website.'
+
+  = f.input :body,
+    as: (defined?(EffectiveFormInputs) ? :effective_ckeditor_text_area : :text),
+    hint: 'The body of your post.',
+    toolbar: 'simple',
+    required: true
+
+  %p.effective-post-actions.pull-right
+    = f.button :submit, 'Save', data: { disable_with: 'Saving...' }
+    = link_to 'Cancel', effective_posts.posts_path

data/app/views/effective/posts/_recent_posts.html.haml

@@ -0,0 +1,5 @@
+.effective-posts-recent-posts
+  - posts.each do |post|
+    .effective-post
+      %p= link_to post, effective_post_path(post)
+

data/app/views/effective/posts/_spacer.html.haml

@@ -0,0 +1 @@
+- # intentionally left blank

data/app/views/effective/posts/edit.html.haml

@@ -0,0 +1,2 @@
+%h2= @page_title
+= render partial: 'form', as: :post, object: @post

data/app/views/effective/posts/index.html.haml

@@ -1,4 +1,9 @@
+- if EffectivePosts.submissions_enabled
+  %p.text-right= link_to 'Submit New Post', effective_posts.new_post_path, class: 'btn btn-primary'
+
+%nav= paginate @posts
+
 .effective-posts
-  = render :partial => @posts, :spacer_template => 'spacer'
+  = render partial: @posts, spacer_template: 'spacer'
 
-  %nav= paginate @posts
+%nav= paginate @posts

data/app/views/effective/posts/new.html.haml

@@ -0,0 +1,2 @@
+%h2= @page_title
+= render partial: 'form', as: :post, object: @post

data/app/views/effective/posts/show.html.haml

@@ -1,12 +1,12 @@
 .effective-post
   %h2.post-title
-    %a{:href => effective_post_path(@post)}
+    %a{href: effective_post_path(@post)}
       = simple_effective_region @post, :title do
         = @post.title
 
   %p.post-meta= post_meta(@post)
 
-  .post-content
-    = effective_region @post, :content do
+  .post-body.post-content
+    = effective_region @post, :body do
       %p Default content
 

data/app/views/effective/posts/submitted.html.haml

@@ -0,0 +1,10 @@
+%h2= @page_title
+
+%p= EffectivePosts.submissions_note
+
+- if (EffectivePosts.authorized?(controller, :edit, @post) rescue false)
+  %p= link_to 'Edit Post', effective_posts.edit_post_path(@post), class: 'btn btn-primary btn-edit-post'
+
+%hr
+
+= render file: '/effective/posts/show'

data/app/views/effective/posts_mailer/post_submitted_to_admin.html.haml

@@ -0,0 +1,22 @@
+%p A new post has been submitted and needs your approval before it may be displayed on the website:
+
+%p= link_to 'Approve Post', effective_posts.admin_approve_post_path(@post)
+
+%hr
+
+%h3 Title
+%p= @post.title
+
+%h3 Category
+%p= @post.category
+
+- if @post.user.present?
+  %h3 Submitted by
+  %p= @post.user
+
+%h3 Body
+%p= @post.body
+
+%hr
+
+%p= link_to 'Approve Post', effective_posts.admin_approve_post_path(@post)

data/app/views/layouts/effective_posts_mailer_layout.html.haml

@@ -0,0 +1,7 @@
+!!!
+%html{style: 'background: #fff;'}
+  %head
+    %meta{:content => 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type'}
+
+  %body{style: 'background: #fff;'}
+    = yield

data/config/routes.rb

@@ -1,18 +1,23 @@
 EffectivePosts::Engine.routes.draw do
   namespace :admin do
-    resources :posts, :except => [:show]
-    match 'posts/excerpts', :to => 'posts#excerpts', :via => [:get]
+    resources :posts, except: [:show]
+
+    if EffectivePosts.submissions_enabled && EffectivePosts.submissions_require_approval
+      match 'posts/:id/approve', to: 'posts#approve', via: :get, as: :approve_post
+    end
+
+    match 'posts/excerpts', to: 'posts#excerpts', via: :get
   end
 
   scope :module => 'effective' do
-    resources :posts, :only => [:index, :show]
+    resources :posts, only: ([:index, :show] unless EffectivePosts.submissions_enabled)
 
     if EffectivePosts.use_category_routes
-      EffectivePosts.categories.each do |category|
-        next if category.to_s == 'posts'
+      Array(EffectivePosts.categories).map { |category| category.to_s }.each do |category|
+        next if category == 'posts'
 
-        match "#{category}", :to => 'posts#index', :via => [:get], :defaults => {:category => category.to_s }
-        match "#{category}/:id", :to => 'posts#show', :via => [:get], :defaults => {:category => category.to_s }
+        match category, to: 'posts#index', via: :get, defaults: {:category => category }
+        match "#{category}/:id", to: 'posts#show', via: :get, defaults: {:category => category }
       end
     end
   end

data/lib/effective_posts.rb

@@ -10,15 +10,28 @@ module EffectivePosts
   mattr_accessor :posts_table_name
 
   mattr_accessor :authorization_method
-  mattr_accessor :simple_form_options
+  mattr_accessor :permitted_params
+
   mattr_accessor :layout
+  mattr_accessor :simple_form_options
+  mattr_accessor :admin_simple_form_options
 
   mattr_accessor :categories
   mattr_accessor :use_category_routes
 
+  mattr_accessor :use_effective_roles
+
   mattr_accessor :per_page
   mattr_accessor :post_meta_author
 
+  mattr_accessor :submissions_enabled
+  mattr_accessor :submissions_require_current_user
+  mattr_accessor :submissions_require_approval
+  mattr_accessor :submissions_note
+
+  # These are hashes of configs
+  mattr_accessor :mailer
+
   def self.setup
     yield self
   end
@@ -29,4 +42,9 @@ module EffectivePosts
     end
     true
   end
+
+  def self.permitted_params
+    @@permitted_params ||= [:title, :draft, :category, :published_at, :body, roles: []]
+  end
+
 end

data/lib/effective_posts/version.rb

@@ -1,3 +1,3 @@
 module EffectivePosts
-  VERSION = '0.4.6'.freeze
+  VERSION = '0.4.7'.freeze
 end

data/lib/generators/effective_posts/install_generator.rb

@@ -25,6 +25,16 @@ module EffectivePosts
         migration_template '../../../db/migrate/01_create_effective_posts.rb.erb', 'db/migrate/create_effective_posts.rb'
       end
 
+      def copy_mailer_preview
+        mailer_preview_path = (Rails.application.config.action_mailer.preview_path rescue nil)
+
+        if mailer_preview_path.present?
+          template 'effective_posts_mailer_preview.rb', File.join(mailer_preview_path, 'effective_posts_mailer_preview.rb')
+        else
+          puts "couldn't find action_mailer.preview_path.  Skipping effective_posts_mailer_preview."
+        end
+      end
+
       def show_readme
         readme "README" if behavior == :invoke
       end

data/lib/generators/templates/effective_posts.rb

@@ -31,22 +31,65 @@ EffectivePosts.setup do |config|
   # Layout Settings
   # Configure the Layout per controller, or all at once
   config.layout = {
-    :pages => 'application',
-    :admin => 'application'
+    posts: 'application',
+    admin: 'application'
   }
 
   # SimpleForm Options
-  # This Hash of options will be passed into any simple_form_for() calls
+  # This Hash of options will be passed into any client facing simple_form_for() calls
   config.simple_form_options = {}
+  config.admin_simple_form_options = {}  # For the /admin/posts/new form
 
   # config.simple_form_options = {
-  #   :html => {:class => 'form-horizontal'},
-  #   :wrapper => :horizontal_form,
-  #   :wrapper_mappings => {
-  #     :boolean => :horizontal_boolean,
-  #     :check_boxes => :horizontal_radio_and_checkboxes,
-  #     :radio_buttons => :horizontal_radio_and_checkboxes
+  #   html: {class: 'form-horizontal'},
+  #   wrapper: :horizontal_form,
+  #   wrapper_mappings: {
+  #     boolean: :horizontal_boolean,
+  #     check_boxes: :horizontal_radio_and_checkboxes,
+  #     radio_buttons: :horizontal_radio_and_checkboxes
   #   }
   # }
 
+  # Display the effective roles 'choose roles' input when an admin creates a new post
+  config.use_effective_roles = true
+
+  # Submissions
+  # Allow users to submit posts (optionally for approval) to display on the website
+  config.submissions_enabled = true
+
+  # When true, a user might be signed in to submit a post. (calls devise's authenticate_user!)
+  config.submissions_require_current_user = false
+
+  # When true, an Admin must first approve any newly submitted posts before they'll be displayed
+  config.submissions_require_approval = true
+
+  # The Thank you message when they submit a post
+  config.submissions_note = "News & Event submitted! A confirmation email has been sent to the AALA office. When approved, your submission will appear on the website."
+
+  # Mailer Settings
+  # effective_posts will send the admin an email when a post is submitted
+  # For all the emails, the same :subject_prefix will be prefixed.  Leave as nil / empty string if you don't want any prefix
+  #
+  # The subject_for_post_submitted_to_admin can be one of:
+  # - nil / empty string to use the built in defaults
+  # - A string with the full subject line for this email
+  # - A Proc to create the subject line based on the email
+  # In all three of these cases, the subject_prefix will still be used.
+
+  # The Procs are the same for admin & buyer receipt, the seller Proc is different
+  # subject_for_post_submitted_to_admin: Proc.new { |post| "Post needs approval"}
+
+  config.mailer = {
+    subject_prefix: '[example]',
+    subject_for_post_submitted_to_admin: '',
+
+    layout: 'effective_posts_mailer_layout',
+
+    default_from: 'info@example.com',
+    admin_email: 'admin@example.com',
+
+    deliver_method: nil,   # :deliver (rails < 4.2), :deliver_now (rails >= 4.2) or :deliver_later
+    delayed_job_deliver: false
+  }
+
 end

data/lib/generators/templates/effective_posts_mailer_preview.rb

@@ -0,0 +1,22 @@
+# In Rails 4.1 and above, visit:
+# http://localhost:3000/rails/mailers
+# to see a preview of the following 3 emails:
+
+class EffectivePostsMailerPreview < ActionMailer::Preview
+  def post_submitted_to_admin
+    Effective::PostsMailer.post_submitted_to_admin(build_preview_post)
+  end
+
+  protected
+
+  def build_preview_post
+    post = Effective::Post.new(
+      title: 'An example post',
+      category: EffectivePosts.categories.first.presence || 'posts',
+      published_at: Time.zone.now,
+      draft: true,
+      content: 'This is a new post that has been submitted by a public user.'
+    )
+  end
+
+end

metadata

@@ -1,141 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: effective_posts
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: effective_ckeditor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: effective_datatables
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: effective_regions
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.6.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.6.9
 description: A blog implementation with WYSIWYG content editing, post scheduling,
   pagination and optional top level routes for each post category.
 email:
@@ -155,6 +155,7 @@ files:
 - app/helpers/effective_kaminari_helper.rb
 - app/helpers/effective_posts_helper.rb
 - app/helpers/effective_truncate_html_helper.rb
+- app/mailers/effective/posts_mailer.rb
 - app/models/effective/access_denied.rb
 - app/models/effective/datatables/posts.rb
 - app/models/effective/post.rb
@@ -165,10 +166,18 @@ files:
 - app/views/admin/posts/excerpts.html.haml
 - app/views/admin/posts/index.html.haml
 - app/views/admin/posts/new.html.haml
+- app/views/effective/posts/_additional_fields.html.haml
+- app/views/effective/posts/_categories.html.haml
+- app/views/effective/posts/_form.html.haml
 - app/views/effective/posts/_post.html.haml
+- app/views/effective/posts/_recent_posts.html.haml
 - app/views/effective/posts/_spacer.html.haml
+- app/views/effective/posts/edit.html.haml
 - app/views/effective/posts/index.html.haml
+- app/views/effective/posts/new.html.haml
 - app/views/effective/posts/show.html.haml
+- app/views/effective/posts/submitted.html.haml
+- app/views/effective/posts_mailer/post_submitted_to_admin.html.haml
 - app/views/effective/snippets/_read_more_divider.html.haml
 - app/views/kaminari/_first_page.html.haml
 - app/views/kaminari/_gap.html.haml
@@ -177,6 +186,7 @@ files:
 - app/views/kaminari/_page.html.haml
 - app/views/kaminari/_paginator.html.haml
 - app/views/kaminari/_prev_page.html.haml
+- app/views/layouts/effective_posts_mailer_layout.html.haml
 - config/routes.rb
 - db/migrate/01_create_effective_posts.rb.erb
 - lib/effective_posts.rb
@@ -185,6 +195,7 @@ files:
 - lib/generators/effective_posts/install_generator.rb
 - lib/generators/templates/README
 - lib/generators/templates/effective_posts.rb
+- lib/generators/templates/effective_posts_mailer_preview.rb
 - spec/effective_pages_spec.rb
 - spec/spec_helper.rb
 - spec/support/factories.rb
@@ -198,17 +209,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A blog implementation with WYSIWYG content editing, post scheduling, pagination