effective_posts 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be81ac9b127e592c28c261f3853fa5eae6947c14
-  data.tar.gz: 3200a7c2d3b17e51a289a2880473d948a8315a35
+  metadata.gz: 0adec48b907d17f506e2176b161e53daf59a86d5
+  data.tar.gz: 5a2c2158ae1cdcc9f6fd1a7391fa3675c28a6531
 SHA512:
-  metadata.gz: 8baf180a6ca1485eefc7d68749c5298688af411018665f3a02b3681637787bf44919fd6ddedc0c68a0139aa7d7b3ba09bb2222325dc948aded7ce043026ac653
-  data.tar.gz: 330c929ee5a515492eae9d7624c786906c847c4648db0b68f2b24d8f047748c92f3028549b67182dda14d31329693c81d622cca213ad260528690a72d1784ee8
+  metadata.gz: 64f861165de83fe29bae345c5e114fdb870bf5c842830ae8b63845e715fa3f7a26b05210b1aea63e4f0cc36fada2f1196707dea8cd59133c6460cd1104e88414
+  data.tar.gz: 89633a7b7e1d03069005ab164d8815024446cdd16e83696e3911d752ba00472a66836f8ab15c39385a63e960050ab669247278849263b180440194950cf03b37

data/app/controllers/admin/posts_controller.rb

@@ -1,12 +1,17 @@
 module Admin
   class PostsController < ApplicationController
-    before_filter :authenticate_user! if respond_to?(:authenticate_user!)   # This is devise, ensure we're logged in.
+    before_action(:authenticate_user!) # Devise
 
     layout (EffectivePosts.layout.kind_of?(Hash) ? EffectivePosts.layout[:admin] : EffectivePosts.layout)
 
     def index
       @page_title = 'Posts'
-      @datatable = Effective::Datatables::Posts.new()
+
+      if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
+        @datatable = Effective::Datatables::Posts.new()
+      else
+        @datatable = EffectivePostsDatatable.new(self)
+      end
 
       authorize_effective_posts!
     end

data/app/datatables/effective_posts_datatable.rb

@@ -0,0 +1,31 @@
+unless Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
+  class EffectivePostsDatatable < Effective::Datatable
+    datatable do
+      order :published_at, :desc
+
+      col :published_at
+      col :id, visible: false
+
+      col :title
+      col :category, search: { collection: EffectivePosts.categories }
+
+      if EffectivePosts.submissions_enabled
+        col :approved, sql_column: 'NOT(draft)', as: :boolean do |post|
+          post.draft? ? 'No' : 'Yes'
+        end
+
+        col :draft, visible: false
+      else
+        col :draft
+      end
+
+      col :created_at, label: 'Submitted at', visible: false
+
+      actions_col partial: '/admin/posts/actions', partial_as: :post
+    end
+
+    collection do
+      Effective::Post.all
+    end
+  end
+end

data/app/helpers/effective_posts_helper.rb

@@ -21,7 +21,7 @@ module EffectivePostsHelper
       'Published',
       "on #{post.published_at.strftime('%B %d, %Y at %l:%M %p')}",
       ("to #{link_to_post_category(post.category)}" if Array(EffectivePosts.categories).length > 1),
-      ("by #{post.user.to_s.presence || 'Unknown'}" if EffectivePosts.post_meta_author)
+      ("by #{post.user.to_s.presence || 'Unknown'}" if EffectivePosts.post_meta_author && post.user.present?)
     ].compact.join(' ').html_safe
   end
 

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

@@ -1,4 +1,4 @@
-if defined?(EffectiveDatatables)
+if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
   module Effective
     module Datatables
       class Posts < Effective::Datatable

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

@@ -3,28 +3,28 @@
 
   %p.post-meta= post_meta(@post)
 
-  - if post.category == 'events'
+  - if @post.category == 'events'
     %table.table.post-events
       %tbody
-        - if post.start_at.present?
+        - if @post.start_at.present?
           %tr
             %th Starts
-            %td= post.start_at
+            %td= @post.start_at
 
-        - if post.end_at.present?
+        - if @post.end_at.present?
           %tr
             %th Ends
-            %td= post.start_at
+            %td= @post.start_at
 
-        - if post.location.present?
+        - if @post.location.present?
           %tr
             %th Location
-            %td= post.location
+            %td= @post.location
 
-        - if post.website_href.present? && post.website_name.present?
+        - if @post.website_href.present? && @post.website_name.present?
           %tr
             %th Website
-            %td= link_to post.website_name, post.website_href
+            %td= link_to @post.website_name, @post.website_href
 
   .post-body.post-content
     = effective_region @post, :body do

data/config/effective_posts.rb

@@ -41,8 +41,10 @@ EffectivePosts.setup do |config|
   #
   # Or disable the check completely:
   # config.authorization_method = false
-  config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) && resource.roles_permit?(current_user) } # CanCanCan
-  # Use effective_roles:  resource.roles_permit?(current_user)
+  config.authorization_method = Proc.new do |controller, action, resource|
+    authorize!(action, resource)
+    resource.respond_to?(:roles_permit?) ? resource.roles_permit?(current_user) : true
+  end
 
   # Layout Settings
   # Configure the Layout per controller, or all at once

data/lib/effective_posts/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_posts
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -153,6 +153,7 @@ files:
 - app/assets/stylesheets/effective_posts.scss
 - app/controllers/admin/posts_controller.rb
 - app/controllers/effective/posts_controller.rb
+- app/datatables/effective_posts_datatable.rb
 - app/helpers/effective_kaminari_helper.rb
 - app/helpers/effective_posts_helper.rb
 - app/helpers/effective_truncate_html_helper.rb