effective_pages 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddac8c5966ed3e1d03290f2faca0b85932cc36a3
-  data.tar.gz: 5342d8e6be2b9269a0c419ef1c4ab5420f08d4ca
+  metadata.gz: 5e0857bc336aef11ee45b65b154b193c4678cd1b
+  data.tar.gz: 56fc281dce56d5538ff770985bea2ac49e62a5d7
 SHA512:
-  metadata.gz: b029523505a15f7a50a3865aac1d40ec63fa334d4f7affb01aaeeff1e21e1afa3a85428bb0b5cecf475daaa65a84239ed23bac450bb01a54b42479a43f4e02ae
-  data.tar.gz: 582121876ff42513540c06689f48489b7df190858bac4c32d72179ca7a2a8e51c200b426a860218482ce36ed9387de4299e328acb469b202dd28e0b768125223
+  metadata.gz: 328465e88b51fc487005c9513c2e226c190a5e603509da2b40a5536647f8e4b6bb21b3eb2bbc36c621c48a40cbc205cb67bc582bdc69ce82dd7b75da41bedb06
+  data.tar.gz: 9da42b2ff1d138482de523a5cc4c8f655d46df5946e78fc9e07ce648dc0c1778ca6c76469995603f1745ef28005332444c5039a56d076a31c5ec9d6531caa88b

data/README.md

@@ -10,6 +10,8 @@ Use this gem to create a fully-functional CMS that provides full or restricted e
 
 Built ontop of effective_regions.
 
+Rails 3.2.x and 4.x
+
 
 ## Getting Started
 

data/app/controllers/effective/pages_controller.rb

@@ -2,18 +2,14 @@ module Effective
   class PagesController < ApplicationController
     def show
       @pages = (Rails::VERSION::MAJOR > 3 ? Effective::Page.all : Effective::Page.scoped)
+      @pages = @pages.published if params[:edit].to_s != 'true'
 
-      if defined?(EffectiveRoles) && (current_user.respond_to?(:roles) rescue false)
-        @pages = @pages.for_role(current_user.roles)
-      end
+      @page = @pages.find(params[:id])
 
-      if params[:edit].to_s != 'true'
-        @pages = @pages.published
+      if defined?(EffectiveRoles)
+        raise Effective::AccessDenied unless @page.roles_permit?(current_user)
       end
 
-      @page = @pages.find(params[:id])
-      raise ActiveRecord::RecordNotFound unless @page
-
       EffectivePages.authorized?(self, :show, @page)
 
       @page_title = @page.title

data/app/models/effective/menu_item.rb

@@ -8,6 +8,8 @@ module Effective
     self.table_name = EffectivePages.menu_items_table_name.to_s
     attr_protected() if Rails::VERSION::MAJOR == 3
 
+    acts_as_role_restricted if defined?(EffectiveRoles)
+
     structure do
       title           :string, :validates => [:presence]
 
@@ -40,8 +42,8 @@ module Effective
     # This will work with effective_roles one day...
     def visible_for?(user)
       can_view_page = (
-        if menuable.kind_of?(Effective::Page) && defined?(EffectiveRoles) && menuable.is_role_restricted?
-          (user.roles_match_with?(menuable) rescue false)
+        if menuable.kind_of?(Effective::Page) && defined?(EffectiveRoles)
+          menuable.roles_permit?(user)
         else
           true
         end
@@ -54,8 +56,8 @@ module Effective
           user.blank?
         elsif roles_mask == 0 # Am I logged in?
           user.present?
-        elsif roles_mask > 0 && defined?(EffectiveRoles)
-          user.present? && (user.roles_match_with?(roles_mask) rescue false)
+        elsif defined?(EffectiveRoles)
+          roles_permit?(user)
         else
           false
         end

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = "0.9.0"
+  VERSION = '0.9.1'.freeze
 end

data/lib/generators/templates/effective_pages.rb

@@ -20,7 +20,7 @@ EffectivePages.setup do |config|
   config.excluded_layouts = [:admin]
 
   # Use CanCan: can?(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_pages
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails