effective_posts 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eca3438b280dc68df0a2068bc09754ebdf9d11f5
-  data.tar.gz: e84fcb3c11970fe9f60f3917c4bbcf97cd39ce5f
+  metadata.gz: 67d4f4c53d2b315bab9f9d64444fe9d7293a028c
+  data.tar.gz: c410bbe65c851e8cf3623aeb41391812deae99c3
 SHA512:
-  metadata.gz: 8e8f78680d751d43fd2cc15b7daff3150075601522d6f330fc3b2ce18132a560c3704e915d5e176540aa38008f4eed95e9344298db47715255e62dbd66b1a21d
-  data.tar.gz: f572bc531f7f88a3a093b97d3f543db5bb8b00c7db8f35eeaa9ed0b0cbbcf700c9499cb87af8b96d69dd1a6e0f8bfc073a7e0c8a332b17edd4ac3578da14c4d3
+  metadata.gz: 51c85c563406546e794d6c057fae118e8dd44ca4459f7b87ed8957e4e24cfef127942026606d650eafca829211c6ea4bb85cf338b3f92c3b6940484aa75e6a70
+  data.tar.gz: 12f20e77a16e05dda25596faf128d7c56b0af6de63ecb62471239c5c6f775aa2d7170da1f4678f2685eb634bb3efd35215e8e4766e32bef9191204e443912f7e

data/app/controllers/effective/posts_controller.rb

@@ -7,13 +7,10 @@ module Effective
     def index
       @posts = (Rails::VERSION::MAJOR > 3 ? Effective::Post.all : Effective::Post.scoped)
 
-      if defined?(EffectiveRoles) && (current_user.respond_to?(:roles) rescue false)
-        @posts = @posts.for_role(current_user.roles)
-      end
-
-      @posts = @posts.includes(:regions)
+      @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)
 
       @posts = @posts.order("#{EffectivePosts.posts_table_name}.published_at DESC")
       @posts = @posts.page(params[:page]).per(EffectivePosts.per_page)
@@ -26,13 +23,10 @@ module Effective
     def show
       @posts = (Rails::VERSION::MAJOR > 3 ? Effective::Post.all : Effective::Post.scoped)
 
-      if defined?(EffectiveRoles) && (current_user.respond_to?(:roles) rescue false)
-        @posts = @posts.for_role(current_user.roles)
-      end
-
-      @posts = @posts.includes(:regions)
+      @posts = @posts.for_role(current_user.try(:roles)) if defined?(EffectiveRoles)
       @posts = @posts.with_category(params[:category]) if params[:category]
       @posts = @posts.published if params[:edit].to_s != 'true'
+      @posts = @posts.includes(:regions)
 
       @post = @posts.find(params[:id])
 

data/lib/effective_posts/version.rb

@@ -1,3 +1,3 @@
 module EffectivePosts
-  VERSION = "0.2.0"
+  VERSION = '0.2.1'.freeze
 end

data/lib/generators/templates/effective_posts.rb

@@ -25,7 +25,7 @@ EffectivePosts.setup do |config|
   config.post_meta_author = true
 
   # Use CanCan: authorize!(action, resource)
-  # Use effective_roles:  resource.roles_match_with?(current_user)
+  # Use effective_roles:  resource.roles_permit?(current_user)
   config.authorization_method = Proc.new { |controller, action, resource| true }
 
   # Layout Settings

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_posts
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails