cms-fortress 1.0.3 → 1.0.4

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/app/controllers/cms/fortress/admin_controller.rb

@@ -2,6 +2,18 @@ module Cms
   module Fortress
     class AdminController < Admin::Cms::BaseController
 
+      def designs
+
+      end
+
+      def settings
+
+      end
+
+      def contents
+
+      end
+
       def index
 
       end

data/app/controllers/cms/fortress/roles_controller.rb

@@ -1,4 +1,8 @@
 class Cms::Fortress::RolesController < Admin::Cms::BaseController
+  before_filter do
+    authorize! :manage, Cms::Fortress::Role
+  end
+
 
   # GET /cms/fortress/roles
   # GET /cms/fortress/roles.json
@@ -87,6 +91,6 @@ class Cms::Fortress::RolesController < Admin::Cms::BaseController
   private
 
   def role_params
-    params.require(:cms_fortress_role).permit(:name, :description)
+    params.require(:cms_fortress_role).permit! #(:name, :description, :role_details_attributes)
   end
 end

data/app/controllers/cms/fortress/users_controller.rb

@@ -1,4 +1,8 @@
 class Cms::Fortress::UsersController < Admin::Cms::BaseController
+  before_filter do
+    authorize! :manage, Cms::Fortress::User
+  end
+
   # GET /cms/fortress/users
   # GET /cms/fortress/users.json
   def index
@@ -40,7 +44,7 @@ class Cms::Fortress::UsersController < Admin::Cms::BaseController
   # POST /cms/fortress/users
   # POST /cms/fortress/users.json
   def create
-    @cms_fortress_user = Cms::Fortress::User.new(params[:cms_fortress_user])
+    @cms_fortress_user = Cms::Fortress::User.new(user_params)
 
     respond_to do |format|
       if @cms_fortress_user.save
@@ -58,14 +62,14 @@ class Cms::Fortress::UsersController < Admin::Cms::BaseController
   def update
     @cms_fortress_user = Cms::Fortress::User.find(params[:id])
 
-    user_params = params[:cms_fortress_user]
-    if user_params[:password].blank?
-      user_params.delete(:password)
-      user_params.delete(:password_confirmation) if user_params[:password_confirmation].blank?
+    user = user_params
+    if user[:password].blank?
+      user.delete(:password)
+      user.delete(:password_confirmation) if user[:password_confirmation].blank?
     end
 
     respond_to do |format|
-      if @cms_fortress_user.update_attributes(user_params)
+      if @cms_fortress_user.update_attributes(user)
         format.html { redirect_to cms_fortress_users_path, notice: 'User was successfully updated.' }
         format.json { head :no_content }
       else
@@ -86,4 +90,10 @@ class Cms::Fortress::UsersController < Admin::Cms::BaseController
       format.json { head :no_content }
     end
   end
+
+  private
+
+  def user_params
+    params.require(:cms_fortress_user).permit(:email, :role_id, :password, :password_confirmation)
+  end
 end

data/app/models/cms/fortress/role.rb

@@ -4,6 +4,7 @@ class Cms::Fortress::Role < ActiveRecord::Base
   # attr_accessible :description, :name
   has_many :users
   has_many :role_details
+  accepts_nested_attributes_for :role_details, allow_destroy: true
 
   def load_defaults
     file = File.expand_path(File.join(File.dirname(__FILE__), "../../../../", "config", "roles.yml"))

data/app/models/cms_ability.rb

@@ -2,6 +2,32 @@ class CmsAbility
   include CanCan::Ability
 
   def initialize(user)
+
+    if user && user.role && user.role.role_details
+      user.role.role_details.each do |role|
+        can :view, role.command if role.can_view?
+        can :manage, role.command if role.can_create?
+
+        if role.can_create?
+          if role.command.eql?("settings.roles") 
+            can :manage, Cms::Fortress::Role
+          elsif role.command.eql?("settings.sites")
+            can :manage, Cms::Site
+          elsif role.command.eql?("settings.users")
+            can :manage, Cms::Fortress::User
+          elsif role.command.eql?("contents.pages")
+            can :manage, Cms::Page
+          elsif role.command.eql?("contents.files")
+            can :manage, Cms::File
+          elsif role.command.eql?("designs.layouts")
+            can :manage, Cms::Layout
+          elsif role.command.eql?("designs.snippets")
+            can :manage, Cms::Snippet
+          end
+        end
+      end
+    end
+
     # Define abilities for the passed in user here. For example:
     #
     #   user ||= User.new # guest user (not logged in)

data/app/views/cms/fortress/admin/unauthorised.html.haml

@@ -0,0 +1,2 @@
+.alert.alert-danger
+  %h3 You are not authorized to access this functionality

data/app/views/cms/fortress/roles/index.html.haml

@@ -14,7 +14,7 @@
       %td= cms_fortress_role.description
       %td
         .btn-group.pull-right
-          = link_to 'Show', cms_fortress_role, :class => 'btn btn-small btn-primary'
+          = link_to 'Show Access Rights', cms_fortress_role, :class => 'btn btn-small btn-info'
           = link_to 'Edit', edit_cms_fortress_role_path(cms_fortress_role), :class => 'btn btn-small btn-primary'
           = link_to 'Destroy', cms_fortress_role, :method => :delete, :data => { :confirm => 'Are you sure?' }, :class => 'btn btn-small btn-danger'
 

data/app/views/cms/fortress/roles/show.html.haml

@@ -5,8 +5,20 @@
   %h2= "Role: #{ @cms_fortress_role.name }"
   %p= @cms_fortress_role.description
 
-%table.table
-  - @cms_fortress_role.role_details.each do |d|
+
+= form_for @cms_fortress_role, :html => {:class => ''} do |f|
+
+  %table.table
     %tr
-      %td= d.command
-      %td= d.can_create
+      %th 
+      %th Show
+      %th Manage
+    = f.fields_for :role_details do |role|
+      %tr
+        %td= role.object.command
+        %td= role.check_box :can_view
+        %td= role.check_box :can_create
+
+  .form-actions
+    = f.submit 'Save', :class => 'btn btn-primary'
+

data/app/views/cms/fortress/shared/_admin_topnav.html.haml

@@ -9,11 +9,21 @@
       .nav-collapse.collapse
         %ul.nav
           - if @site && !@site.new_record?
-            %li{:class => content_page? ? 'active' : ''}
-              = link_to t("cms.fortress.contents"), admin_cms_site_pages_path(@site)
-            %li{:class => design_page? ? 'active' : ''}
-              = link_to t("cms.fortress.design"), admin_cms_site_layouts_path(@site)
-          %li{:class => admin_page? ? 'active' : ''}
-            = link_to t("cms.fortress.settings"), admin_cms_sites_path
-          %li
-            = link_to "Logout", destroy_cms_fortress_user_session_path, :method => 'delete'
+            - if can? :view, 'contents'
+              %li{:class => content_page? ? 'active' : ''}
+                = link_to t("cms.fortress.contents"), admin_cms_site_pages_path(@site)
+
+            - if can? :view, 'designs'
+              %li{:class => design_page? ? 'active' : ''}
+                = link_to t("cms.fortress.design"), admin_cms_site_layouts_path(@site)
+          - if can? :view, 'settings'
+            %li{:class => admin_page? ? 'active' : ''}
+              = link_to t("cms.fortress.settings"), admin_cms_sites_path
+        %ul.nav.nav-pill.pull-right
+          - if current_cms_fortress_user
+            %li
+              = link_to ":: #{ current_cms_fortress_user.email }", "#"
+            %li
+              = link_to "Logout", destroy_cms_fortress_user_session_path, :method => 'delete'
+
+

data/app/views/cms/fortress/shared/_navbar.html.haml

@@ -0,0 +1,10 @@
+.navbar.navbar-inverse.navbar-fixed-top
+  .navbar-inner
+    .container
+      %button.btn.btn-navbar{"data-target" => ".nav-collapse", "data-toggle" => "collapse", :type => "button"}
+        %span.icon-bar
+        %span.icon-bar
+        %span.icon-bar
+      %a.brand{:href => "#"} CMS Fortress
+      .nav-collapse.collapse
+      / /.nav-collapse

data/app/views/layouts/admin/cms/_left.html.haml

@@ -3,18 +3,25 @@
 
 %ul.navigation
   - if admin_page?
-    %li= active_link_to t('admin.cms.base.sites'), admin_cms_sites_path, :active => ['admin/cms/sites']
-    %li= active_link_to t('cms.fortress.roles.title'), cms_fortress_roles_path
-    %li= active_link_to t('cms.fortress.users.title'), cms_fortress_users_path
+    - if can? :view, 'settings.sites'
+      %li= active_link_to t('admin.cms.base.sites'), admin_cms_sites_path, :active => ['admin/cms/sites']
+    - if can? :view, 'settings.roles'
+      %li= active_link_to t('cms.fortress.roles.title'), cms_fortress_roles_path
+    - if can? :view, 'settings.users'
+      %li= active_link_to t('cms.fortress.users.title'), cms_fortress_users_path
 
   - elsif design_page?
     - if @site && !@site.new_record?
-      %li= active_link_to t('admin.cms.base.layouts'), admin_cms_site_layouts_path(@site)
-      %li= active_link_to t('admin.cms.base.snippets'), admin_cms_site_snippets_path(@site)
+      - if can? :view, 'designs.layouts'
+        %li= active_link_to t('admin.cms.base.layouts'), admin_cms_site_layouts_path(@site)
+      - if can? :view, 'designs.snippets'
+        %li= active_link_to t('admin.cms.base.snippets'), admin_cms_site_snippets_path(@site)
   - else
     - if @site && !@site.new_record?
-      %li= active_link_to t('admin.cms.base.pages'), admin_cms_site_pages_path(@site)
-      %li= active_link_to t('admin.cms.base.files'), admin_cms_site_files_path(@site)
+      - if can? :view, 'contents.pages'
+        %li= active_link_to t('admin.cms.base.pages'), admin_cms_site_pages_path(@site)
+      - if can? :view, 'contents.files'
+        %li= active_link_to t('admin.cms.base.files'), admin_cms_site_files_path(@site)
 
     = cms_hook :navigation
 

data/cms-fortress.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cms-fortress"
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Melvin Sembrano"]
-  s.date = "2013-12-10"
+  s.date = "2013-12-11"
   s.description = "Comfortable Mexican Sofa (CMS) - User and role management extension"
   s.email = "melvinsembrano@gmail.com"
   s.extra_rdoc_files = [
@@ -50,6 +50,7 @@ Gem::Specification.new do |s|
     "app/views/cms/fortress/admin/design.html.haml",
     "app/views/cms/fortress/admin/roles.html.haml",
     "app/views/cms/fortress/admin/settings.html.haml",
+    "app/views/cms/fortress/admin/unauthorised.html.haml",
     "app/views/cms/fortress/admin/users.html.haml",
     "app/views/cms/fortress/roles/_form.html.haml",
     "app/views/cms/fortress/roles/edit.html.haml",
@@ -57,14 +58,13 @@ Gem::Specification.new do |s|
     "app/views/cms/fortress/roles/new.html.haml",
     "app/views/cms/fortress/roles/show.html.haml",
     "app/views/cms/fortress/shared/_admin_topnav.html.haml",
-    "app/views/cms/fortress/shared/_navbar.html.erb",
+    "app/views/cms/fortress/shared/_navbar.html.haml",
     "app/views/cms/fortress/users/_form.html.haml",
     "app/views/cms/fortress/users/edit.html.haml",
     "app/views/cms/fortress/users/index.html.haml",
     "app/views/cms/fortress/users/new.html.haml",
     "app/views/cms/fortress/users/sessions/.DS_Store",
     "app/views/cms/fortress/users/sessions/new.html.haml",
-    "app/views/layouts/admin/_body.html.haml",
     "app/views/layouts/admin/cms/.DS_Store",
     "app/views/layouts/admin/cms/_head.html.haml",
     "app/views/layouts/admin/cms/_left.html.haml",

data/lib/cms-fortress.rb

@@ -10,3 +10,4 @@ require_relative 'cms/fortress/content_renderer'
 require_relative 'cms/fortress/comfortable_mexican_sofa'
 require_relative 'cms/fortress/devise'
 require_relative 'cms/fortress/routing'
+require_relative '../app/models/cms_ability'

data/lib/cms/fortress/application_controller_methods.rb

@@ -1,3 +1,4 @@
+
 module Cms
   module Fortress
     module ApplicationControllerMethods
@@ -9,6 +10,21 @@ module Cms
         # request.referrer
         admin_cms_path
       end
+
+      def current_ability
+         @current_ability ||= CmsAbility.new(current_cms_fortress_user)
+      end
+
+      def self.included(base)
+        base.class_eval do
+
+          rescue_from CanCan::AccessDenied do |ex|
+            redirect_to cms_fortress_unauthorised_path #, :alert => ex.message
+          end
+
+        end
+      end
+
     end
   end
 end

data/lib/cms/fortress/rails/engine.rb

@@ -10,6 +10,33 @@ module Cms
           Cms::ContentController.send(:include, Cms::Fortress::ContentRenderer)
           Cms::Page.send(:include, Cms::Fortress::PageMethods)
 
+          # Insert Roles
+          Admin::Cms::SitesController.class_eval do
+            before_filter do
+              authorize! :manage, Cms::Site
+            end
+          end
+          Admin::Cms::LayoutsController.class_eval do
+            before_filter do
+              authorize! :manage, Cms::Layout
+            end
+          end
+          Admin::Cms::SnippetsController.class_eval do
+            before_filter do
+              authorize! :manage, Cms::Snippet
+            end
+          end
+          Admin::Cms::PagesController.class_eval do
+            before_filter do
+              authorize! :manage, Cms::Page
+            end
+          end
+          Admin::Cms::FilesController.class_eval do
+            before_filter do
+              authorize! :manage, Cms::File
+            end
+          end
+
         end
         app.config.railties_order = [ :all, ComfortableMexicanSofa::Engine, Cms::Fortress::Engine ]
 

data/lib/cms/fortress/routes/admin.rb

@@ -14,6 +14,7 @@ class ActionDispatch::Routing::Mapper
       get 'settings' => 'admin#settings', :as => 'cms_fortress_settings'
       get 'design' => 'admin#design', :as => 'cms_fortress_design'
       get 'settings/users' => 'admin#users', :as => 'cms_fortress_user_settings'
+      get 'unauthorised' => 'admin#unauthorised', :as => 'cms_fortress_unauthorised'
 
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cms-fortress
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -196,6 +196,7 @@ files:
 - app/views/cms/fortress/admin/design.html.haml
 - app/views/cms/fortress/admin/roles.html.haml
 - app/views/cms/fortress/admin/settings.html.haml
+- app/views/cms/fortress/admin/unauthorised.html.haml
 - app/views/cms/fortress/admin/users.html.haml
 - app/views/cms/fortress/roles/_form.html.haml
 - app/views/cms/fortress/roles/edit.html.haml
@@ -203,14 +204,13 @@ files:
 - app/views/cms/fortress/roles/new.html.haml
 - app/views/cms/fortress/roles/show.html.haml
 - app/views/cms/fortress/shared/_admin_topnav.html.haml
-- app/views/cms/fortress/shared/_navbar.html.erb
+- app/views/cms/fortress/shared/_navbar.html.haml
 - app/views/cms/fortress/users/_form.html.haml
 - app/views/cms/fortress/users/edit.html.haml
 - app/views/cms/fortress/users/index.html.haml
 - app/views/cms/fortress/users/new.html.haml
 - app/views/cms/fortress/users/sessions/.DS_Store
 - app/views/cms/fortress/users/sessions/new.html.haml
-- app/views/layouts/admin/_body.html.haml
 - app/views/layouts/admin/cms/.DS_Store
 - app/views/layouts/admin/cms/_head.html.haml
 - app/views/layouts/admin/cms/_left.html.haml
@@ -264,7 +264,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1555868352439146595
+      hash: 3584437866439993559
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/views/cms/fortress/shared/_navbar.html.erb

@@ -1,14 +0,0 @@
-<div class="navbar navbar-inverse navbar-fixed-top">
-  <div class="navbar-inner">
-    <div class="container">
-      <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="brand" href="#">CMS Fortress</a>
-      <div class="nav-collapse collapse">
-      </div><!--/.nav-collapse -->
-    </div>
-  </div>
-</div>

data/app/views/layouts/admin/_body.html.haml

@@ -1,17 +0,0 @@
-%body#comfy{:class => "c-#{params[:controller].slugify} a-#{params[:action].slugify}"}
-
-  = render 'admin/cms/partials/body_before'
-
-  .body-wrapper
-    .left-column
-      .left-column-content
-        = render :partial => 'layouts/admin/cms/left'
-    .right-column
-      .right-column-content
-        = render :partial => 'layouts/admin/cms/right'
-    .center-column
-      = render :partial => 'layouts/admin/cms/center'
-      
-      = render :partial => 'layouts/admin/cms/footer'
-  
-  = render :partial => 'layouts/admin/cms/footer_js'