effective_pages 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a79dbb57c52dbba7a942dc5ab61f99dea6c2a425
-  data.tar.gz: 2ff4f3480deba1e9393b951263f49cbd400cdfd6
+  metadata.gz: 0aef3abe04536ada75d9414bc51eccb62465ce35
+  data.tar.gz: bea3191fc4af0367e9e85d29612c2d724abe4505
 SHA512:
-  metadata.gz: 5a9d35738f11252819d50d853d94b310295e54baea224b899d061e8d248a181b8cbe5c213343990b38f5e0505ac82d0725d9f0f9120af59397e3ec412a0678a3
-  data.tar.gz: 19e5d44b424479ade5d01d74fdfd60ee93b0ea9423cc96d31bf13a310130d24e941511ec20cf79676be38f24bd586f8f3a1a5e70bc477564fd73032717087a0d
+  metadata.gz: db5bb110ec6c88ad6476042479f425afb20ad64c80d7f75d0a323a086fdc620080dc7b572401bfeb53c7672d2958545e6cd464dc5eadeb9601da29a9e46f166d
+  data.tar.gz: a7c417401d64a59fdafd7ecd8b41e99f643b816d25043e84b456ef7d174a0beb533789e3d4d737fcce3e37f5ddba09ce0654c4c045383eb227b716f1e2c9d151

data/app/controllers/admin/menus_controller.rb

@@ -2,6 +2,8 @@ module Admin
   class MenusController < ApplicationController
     before_filter :authenticate_user!   # This is devise, ensure we're logged in.
 
+    helper EffectiveMenusAdminHelper
+
     layout (EffectivePages.layout.kind_of?(Hash) ? EffectivePages.layout[:admin] : EffectivePages.layout)
 
     def index

data/app/controllers/effective/pages_controller.rb

@@ -5,10 +5,7 @@ module Effective
       @pages = @pages.published if params[:edit].to_s != 'true'
 
       @page = @pages.find(params[:id])
-
-      if defined?(EffectiveRoles)
-        raise Effective::AccessDenied unless @page.roles_permit?(current_user)
-      end
+      raise Effective::AccessDenied unless @page.roles_permit?(current_user)
 
       EffectivePages.authorized?(self, :show, @page)
 

data/app/helpers/effective_menus_admin_helper.rb

@@ -0,0 +1,8 @@
+module EffectiveMenusAdminHelper
+
+  def visible_badge(menu_item, stack, comparator)
+    visible = comparator.call(menu_item) && stack.all? { |parent_menu_item| parent_menu_item.lft == 1 || comparator.call(parent_menu_item) }
+    content_tag(:span, (visible ? 'YES'.freeze : 'NO'.freeze), :class => "label label-#{(visible ? 'primary' : 'warning')}")
+  end
+
+end

data/app/models/effective/menu_item.rb

@@ -8,7 +8,7 @@ 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)
+    acts_as_role_restricted
 
     structure do
       title           :string, :validates => [:presence]
@@ -42,7 +42,7 @@ 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)
+        if menuable.kind_of?(Effective::Page)
           menuable.roles_permit?(user)
         else
           true
@@ -56,10 +56,8 @@ module Effective
           user.blank?
         elsif roles_mask == 0 # Am I logged in?
           user.present?
-        elsif defined?(EffectiveRoles)
-          roles_permit?(user)
         else
-          false
+          roles_permit?(user)
         end
       )
 

data/app/models/effective/page.rb

@@ -1,8 +1,8 @@
 module Effective
   class Page < ActiveRecord::Base
     acts_as_sluggable
-    acts_as_role_restricted if defined?(EffectiveRoles)
-    acts_as_regionable if defined?(EffectiveRegions)
+    acts_as_role_restricted
+    acts_as_regionable
 
     has_many :menu_items, :as => :menuable, :dependent => :destroy
 

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

@@ -1,6 +1,31 @@
 = simple_form_for(menu, (EffectivePages.simple_form_options || {}).merge(:url => (menu.persisted? ? effective_pages.admin_menu_path(menu) : effective_pages.admin_menus_path))) do |f|
   = f.input :title, :hint => "Give this menu a title"
 
+  %h3 Menu Item Visibility
+
+  %table.table
+    %thead
+      %th Menu Item
+      %th.text-center Public
+      %th.text-center Signed In
+      - EffectiveRoles.roles.each do |role|
+        %th.text-center= ":#{role}"
+
+    %tbody
+      - stack = [menu.menu_items.first]
+      - menu.menu_items.each_with_index do |menu_item, index|
+        - next if index == 0
+        - stack.pop while menu_item.rgt > stack.last.rgt if stack.size > 1
+        %tr
+          %td
+            = ("  " * (stack.size-1)).html_safe
+            = (menu_item.divider? ? ':divider' : menu_item.title)
+          %td.text-center= visible_badge(menu_item, stack, Proc.new { |item| item.roles_mask == nil || item.roles_mask == -1 })
+          %td.text-center= visible_badge(menu_item, stack, Proc.new { |item| item.roles_mask == nil || item.roles_mask == 0 })
+          - EffectiveRoles.roles.each do |role|
+            %td.text-center= visible_badge(menu_item, stack, Proc.new { |item| item.visible_for?(role) })
+        - stack.push(menu_item)
+
   .form-group
     .col-xs-12
       .form-group

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

@@ -18,7 +18,7 @@
   - else
     = f.input :layout, :as => :select, :collection => EffectivePages.layouts, :include_blank => false
 
-  - if defined?(EffectiveRoles) and f.object.respond_to?(:roles)
+  - if f.object.respond_to?(:roles)
     = f.input :roles, :collection => EffectiveRoles.roles_collection(f.object), :as => :check_boxes, :hint => '* leave blank for a regular public page that anyone can view'
 
   .form-group

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '0.9.2'.freeze
+  VERSION = '0.9.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: effective_roles
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 description: Content pages, bootstrap3 menu builder and page-specific header tag helpers
   for your Rails app.
 email:
@@ -139,6 +153,7 @@ files:
 - app/controllers/admin/menus_controller.rb
 - app/controllers/admin/pages_controller.rb
 - app/controllers/effective/pages_controller.rb
+- app/helpers/effective_menus_admin_helper.rb
 - app/helpers/effective_menus_helper.rb
 - app/helpers/effective_pages_helper.rb
 - app/models/effective/access_denied.rb