effective_posts 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cbae7b7138b3a8c12923d42784c42ba660abfb1
-  data.tar.gz: d3235a3688cd1d3dc9f1d7af60fb142f00a58c78
+  metadata.gz: be81ac9b127e592c28c261f3853fa5eae6947c14
+  data.tar.gz: 3200a7c2d3b17e51a289a2880473d948a8315a35
 SHA512:
-  metadata.gz: f63838c6ffa90c6eaa6efb925c8cbd39a9b2bc9155605bebd8be62c44e8d29a5f0439bc9e89c8d25142bb143ce3ee537c17246a0f711bd33b56cfe7d12d35e10
-  data.tar.gz: aa39d8b2d97656f24e387abc3f7de7108a5607ea7378f5b1e61b7bb3f014cc70157c63a678b6b8e9a4a26074a1a906a94d467b114355377d39050b50660677d7
+  metadata.gz: 8baf180a6ca1485eefc7d68749c5298688af411018665f3a02b3681637787bf44919fd6ddedc0c68a0139aa7d7b3ba09bb2222325dc948aded7ce043026ac653
+  data.tar.gz: 330c929ee5a515492eae9d7624c786906c847c4648db0b68f2b24d8f047748c92f3028549b67182dda14d31329693c81d622cca213ad260528690a72d1784ee8

data/app/assets/javascripts/effective_pages/additional_fields.js.coffee

@@ -0,0 +1,8 @@
+# Show/hide the Event fields on admin/posts form
+
+$(document).on 'change', "select[name='effective_post[category]']", (event) ->
+  obj = $(event.currentTarget)
+
+  obj.closest('form').find("[class^='effective-post-category-']").hide()
+  obj.closest('form').find(".effective-post-category-#{obj.val()}").show()
+

data/app/assets/javascripts/effective_posts.js

@@ -0,0 +1 @@
+//= require effective_pages/additional_fields

data/app/controllers/effective/posts_controller.rb

@@ -11,6 +11,15 @@ module Effective
       @posts ||= Effective::Post.posts(user: current_user, category: params[:category])
       @posts = @posts.page(params[:page]).per(EffectivePosts.per_page)
 
+      if params[:category] == 'events'
+        @posts = @posts.reorder(:start_at).where('start_at > ?', Time.zone.now)
+      end
+
+      if params[:search].present?
+        search = params[:search].permit(EffectivePosts.permitted_params).delete_if { |k, v| v.blank? }
+        @posts = @posts.where(search) if search.present?
+      end
+
       EffectivePosts.authorized?(self, :index, Effective::Post)
 
       @page_title = (params[:page_title] || params[:category] || params[:defaults].try(:[], :category) || 'Posts').titleize

data/app/helpers/effective_posts_helper.rb

@@ -6,7 +6,7 @@ module EffectivePostsHelper
     opts ||= {}
 
     if EffectivePosts.use_category_routes
-      "/#{category}" + effective_posts.post_path(post, opts)
+      effective_posts.post_path(post, opts).sub('/posts', "/#{category}")
     else
       effective_posts.post_path(post, opts.merge(category: category))
     end
@@ -37,7 +37,7 @@ module EffectivePostsHelper
     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
+      truncate_html(content, Effective::Snippets::ReadMoreDivider::TOKEN, '') + read_more
     elsif length.present?
       truncate_html(content, length, omission) + read_more
     else
@@ -47,7 +47,7 @@ module EffectivePostsHelper
 
   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)
+      link_to((options.delete(:label) || 'Read more'), effective_post_path(post), (options.delete(:class) || {class: 'btn btn-primary'}).reverse_merge(options))
     end
   end
   alias_method :readmore_link, :read_more_link
@@ -58,8 +58,8 @@ module EffectivePostsHelper
     categories = EffectivePosts.categories
   end
 
-  def render_post_categories
-    render(partial: '/effective/posts/categories', locals: { categories: post_categories })
+  def render_post_categories(reverse: false)
+    render(partial: '/effective/posts/categories', locals: { categories: (reverse ? post_categories.reverse : post_categories) })
   end
 
   def link_to_post_category(category, options = {})
@@ -71,16 +71,29 @@ module EffectivePostsHelper
 
   ### 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)
+  def recent_posts(user: current_user, category: 'posts', limit: EffectivePosts.per_page)
+    @recent_posts ||= {}
+    @recent_posts[category] ||= Effective::Post.posts(user: user, category: category).limit(limit)
   end
 
-  def render_recent_posts(user: current_user, category: nil, limit: EffectivePosts.per_page)
+  def render_recent_posts(user: current_user, category: 'posts', limit: EffectivePosts.per_page)
     posts = recent_posts(user: user, category: category, limit: limit)
-
     render partial: '/effective/posts/recent_posts', locals: { posts: posts }
   end
 
+  ### Upcoming Events
+
+  def upcoming_events(user: current_user, category: 'events', limit: EffectivePosts.per_page)
+    @upcoming_events ||= {}
+    @upcoming_events[category] ||= Effective::Post.posts(user: user, category: category).limit(limit)
+      .reorder(:start_at).where('start_at > ?', Time.zone.now)
+  end
+
+  def render_upcoming_events(user: current_user, category: 'events', limit: EffectivePosts.per_page)
+    posts = upcoming_events(user: user, category: category, limit: limit)
+    render partial: '/effective/posts/upcoming_events', 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)

data/app/models/effective/post.rb

@@ -1,26 +1,36 @@
 module Effective
   class Post < ActiveRecord::Base
     acts_as_role_restricted if defined?(EffectiveRoles)
+    acts_as_asset_box :image if defined?(EffectiveAssets)
     acts_as_regionable
 
     self.table_name = EffectivePosts.posts_table_name.to_s
 
     belongs_to :user
 
-    # structure do
-    #   title             :string, :validates => [:presence, :length => {:maximum => 255}]
-    #   category          :string, :validates => [:presence]
-    #   published_at      :datetime, :validates => [:presence]
-    #   draft             :boolean, :default => false
-    #   tags              :text
-    #   roles_mask        :integer, :default => 0
-    #   timestamps
-    # end
+    # Attributes
+    # title             :string
+    # category          :string
+    # draft             :boolean
+    # published_at      :datetime
+    # tags              :text
+    # roles_mask        :integer
+
+    # Event Fields
+    # start_at          :datetime
+    # end_at            :datetime
+    # location          :string
+    # website_name      :website_name
+    # website_href      :website_href
+
+    # timestamps
 
     validates :title, presence: true, length: { maximum: 255 }
     validates :category, presence: true
     validates :published_at, presence: true
 
+    validates :start_at, presence: true, if: -> { category == 'events'}
+
     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) }
@@ -29,6 +39,10 @@ module Effective
       scope = (Rails::VERSION::MAJOR > 3 ? all : scoped)
       scope = scope.includes(:regions).order(published_at: :desc)
 
+      if defined?(EffectiveAssets)
+        scope = scope.includes(attachments: :asset)
+      end
+
       if user.present? && user.respond_to?(:roles) && defined?(EffectiveRoles)
         scope = scope.for_role(user.roles)
       end
@@ -52,6 +66,10 @@ module Effective
       draft == false
     end
 
+    def event?
+      category == 'events'
+    end
+
     def body
       region(:body).content
     end

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

@@ -3,13 +3,10 @@
 - @posts.find_each do |post|
   .row
     .col-sm-12
-      %h2.post-title
-        %a{:href => effective_post_path(post)}
-          = simple_effective_region post, :title do
-            = post.title
+      %h2.post-title= link_to post, effective_post_path(post)
   .row
     .col-sm-6
-      %pre= effective_region(post, :body, :editable => false)
+      %pre= effective_region(post, :body, editable: false)
 
     .col-sm-6
       %pre= post_excerpt(post)

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

@@ -1,2 +1,19 @@
--# intentionally left blank
--# = form.input :start_at
+-# Adding additional .effective-posts-category-#{category} will correctly show/hide on Posts#new forms
+
+- # Event specific fields
+.effective-post-category-events.well{style: ('display: none' unless f.object.category == 'events')}
+  %h4 Event Information
+  = form.input :start_at, as: (:effective_date_time_picker if defined?(EffectiveFormInputs)),
+    required: true,
+    hint: 'Display a start time for this event.'
+
+  = form.input :end_at, as: (:effective_date_time_picker if defined?(EffectiveFormInputs)),
+    hint: 'Display an end time of this event.'
+
+  = form.input :location, hint: 'Display a location where this event is taking place.'
+
+  = form.input :website_name, label: 'External website',
+    placeholder: 'Buy Tickets', hint: 'The label of an external website.'
+
+  = form.input :website_href, label: 'External website address',
+    placeholder: 'http://', hint: 'The address of an external website (start with http:// or https://).'

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

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

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

@@ -1,4 +1,4 @@
-= simple_form_for(post, (EffectivePosts.simple_form_options || {}).merge(:url => (post.persisted? ? effective_posts.post_path(post.id) : effective_posts.posts_path))) do |f|
+= 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
@@ -14,11 +14,11 @@
   = 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.'
+    hint: 'When should this be displayed on the website.'
 
   = f.input :body,
     as: (defined?(EffectiveFormInputs) ? :effective_ckeditor_text_area : :text),
-    hint: 'The body of your post.',
+    hint: 'The body of your post. You can add content here, or with the full screen editor on the next page.',
     toolbar: 'simple',
     required: true
 

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

@@ -1,9 +1,29 @@
 .effective-post
-  %h2.post-title
-    %a{:href => effective_post_path(post)}
-      = simple_effective_region post, :title do
-        = post.title
+  %h2.post-title= link_to post, effective_post_path(post)
 
   %p.post-meta= post_meta(post)
 
+  - if post.category == 'events'
+    %table.table.post-events
+      %tbody
+        - if post.start_at.present?
+          %tr
+            %th Starts
+            %td= post.start_at
+
+        - if post.end_at.present?
+          %tr
+            %th Ends
+            %td= post.start_at
+
+        - if post.location.present?
+          %tr
+            %th Location
+            %td= post.location
+
+        - if post.website_href.present? && post.website_name.present?
+          %tr
+            %th Website
+            %td= link_to post.website_name, post.website_href
+
   .post-content.post-excerpt= post_excerpt(post)

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

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

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

@@ -1,11 +1,31 @@
 .effective-post
-  %h2.post-title
-    %a{href: effective_post_path(@post)}
-      = simple_effective_region @post, :title do
-        = @post.title
+  %h2.post-title= link_to @post, effective_post_path(@post)
 
   %p.post-meta= post_meta(@post)
 
+  - if post.category == 'events'
+    %table.table.post-events
+      %tbody
+        - if post.start_at.present?
+          %tr
+            %th Starts
+            %td= post.start_at
+
+        - if post.end_at.present?
+          %tr
+            %th Ends
+            %td= post.start_at
+
+        - if post.location.present?
+          %tr
+            %th Location
+            %td= post.location
+
+        - if post.website_href.present? && post.website_name.present?
+          %tr
+            %th Website
+            %td= link_to post.website_name, post.website_href
+
   .post-body.post-content
     = effective_region @post, :body do
       %p Default content

data/config/effective_posts.rb

@@ -3,15 +3,15 @@ EffectivePosts.setup do |config|
 
   # Every post must belong to one or more category.
   # Don't use the category :posts
-  config.categories = [:blog, :news]
+  config.categories = [:news, :events]
 
   # Create top level routes for each category
   # Should each of the above categories have a top level route created for it
   # For example:
-  #   Visiting /blog will display all posts created with the :blog category
-  #   Visiting /news will display all posts created with the :news category
+  #   Visiting /news will display all posts created with the 'news' category
+  #   Visiting /events will display all posts created with the 'events' category
   #
-  # Regardless of this setting, posts will always be available via /posts?category=blog
+  # Regardless of this setting, posts will always be available via /posts?category=events
   config.use_category_routes = true
 
   # Number of posts displayed per page (Kaminari)
@@ -48,9 +48,12 @@ EffectivePosts.setup do |config|
   # Configure the Layout per controller, or all at once
   config.layout = {
     posts: 'application',
-    admin: 'application'
+    admin: 'admin'
   }
 
+  # Add additional permitted params
+  # config.permitted_params += [:additional_field]
+
   # SimpleForm Options
   # This Hash of options will be passed into any client facing simple_form_for() calls
   config.simple_form_options = {}
@@ -80,7 +83,7 @@ EffectivePosts.setup do |config|
   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."
+  config.submissions_note = "News & Event submitted! A confirmation email has been sent to the website owner. When approved, your submission will appear on the website."
 
   # Mailer Settings
   # effective_posts will send the admin an email when a post is submitted

data/db/migrate/01_create_effective_posts.rb.erb

@@ -7,12 +7,20 @@ class CreateEffectivePosts < ActiveRecord::Migration
       t.string :category
 
       t.boolean :draft, :default => false
+      t.datetime :published_at
 
       t.text :tags
 
       t.integer :roles_mask, :default => 0
 
-      t.datetime :published_at
+      # Events fields
+      t.datetime :start_at
+      t.datetime :end_at
+      t.string :location
+      t.string :website_name
+      t.string :website_href
+
+      t.text :extra
 
       t.datetime :updated_at
       t.datetime :created_at

data/lib/effective_posts.rb

@@ -44,7 +44,11 @@ module EffectivePosts
   end
 
   def self.permitted_params
-    @@permitted_params ||= [:title, :draft, :category, :published_at, :body, roles: []]
+    @@permitted_params ||= [
+      :title, :draft, :category, :published_at, :body, :tags, :extra,
+      :start_at, :end_at, :location, :website_name, :website_href,
+      (EffectiveAssets.permitted_params if defined?(EffectiveAssets)), roles: []
+    ].compact
   end
 
 end

data/lib/effective_posts/version.rb

@@ -1,3 +1,3 @@
 module EffectivePosts
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.5.1'.freeze
 end

data/lib/generators/templates/effective_posts_mailer_preview.rb

@@ -15,7 +15,7 @@ class EffectivePostsMailerPreview < ActionMailer::Preview
       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.'
+      body: 'This is a new post that has been submitted by a public user.'
     )
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_posts
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -148,6 +148,7 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/effective/snippets/read_more_divider.js.coffee
+- app/assets/javascripts/effective_pages/additional_fields.js.coffee
 - app/assets/javascripts/effective_posts.js
 - app/assets/stylesheets/effective_posts.scss
 - app/controllers/admin/posts_controller.rb
@@ -172,6 +173,7 @@ files:
 - 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/_upcoming_events.html.haml
 - app/views/effective/posts/edit.html.haml
 - app/views/effective/posts/index.html.haml
 - app/views/effective/posts/new.html.haml