cms-fortress 1.0.6 → 1.0.7

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.0.7

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

@@ -26,6 +26,21 @@ class Cms::Fortress::RolesController < Admin::Cms::BaseController
     end
   end
 
+  def refresh
+    @cms_fortress_role = Cms::Fortress::Role.find(params[:id])
+    @cms_fortress_role.load_defaults
+    
+    respond_to do |format|
+      if @cms_fortress_role.save
+        format.html { redirect_to @cms_fortress_role }
+        format.json { render json: @cms_fotress_role }
+      else
+        format.html { render action: "show" }
+        format.json { render json: @cms_fortress_role.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
   # GET /cms/fortress/roles/new
   # GET /cms/fortress/roles/new.json
   def new

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

@@ -94,6 +94,6 @@ class Cms::Fortress::UsersController < Admin::Cms::BaseController
   private
 
   def user_params
-    params.require(:cms_fortress_user).permit(:email, :role_id, :password, :password_confirmation)
+    params.require(:cms_fortress_user).permit(:last_name, :first_name, :email, :role_id, :password, :password_confirmation)
   end
 end

data/app/helpers/cms/fortress/application_helper.rb

@@ -3,6 +3,16 @@ module Cms
 
     module ApplicationHelper
 
+      def topnav_item(title, path, is_current = false)
+        css_class = is_current ? "active" : ""
+        content_tag(:li, link_to(title, path), class: css_class)
+      end
+
+      def leftnav_item(title, path, options = {})
+        content_tag(:li, active_link_to(title, path, options))
+      end
+
+
       def admin_page?
         controller_name.eql?('admin') && %w{settings roles users}.include?(action_name) ||
           controller_name.eql?('sites') && %w{index}.include?(action_name) ||

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

@@ -7,13 +7,41 @@ class Cms::Fortress::Role < ActiveRecord::Base
   accepts_nested_attributes_for :role_details, allow_destroy: true
 
   def load_defaults
+    # load user custom roles
+    if File.exist?(file = File.join(Rails.root, "config", "roles.yml"))
+      load_from_file(file)
+    end
+    puts file
+
     file = File.expand_path(File.join(File.dirname(__FILE__), "../../../../", "config", "roles.yml"))
-    data = YAML.load_file(file)
+    load_from_file(file)
+  end
+
+  private
 
+  def load_from_file(file)
+    data = YAML.load_file(file)
     data.each do |k,v|
-      role_details.build(:name => k.humanize, :command => k, :can_create => false, :can_update => false, :can_delete => false, :can_view => true)
-      v.each {|m| role_details.build(:name => m.humanize, :command => "#{k}.#{m}", :can_create => true, :can_update => true, :can_delete => true, :can_view => true) }
+      role_details.build(
+        :name => k.humanize,
+        :command => k,
+        :can_create => false,
+        :can_update => false,
+        :can_delete => false,
+        :can_view => true
+      ) unless role_details.map(&:command).include?(k)
+
+      v.each do |m|
+        role_details.build(
+          :name => m.humanize,
+          :command => "#{k}.#{m}",
+          :can_create => true,
+          :can_update => true,
+          :can_delete => true,
+          :can_view => true
+        ) unless role_details.map(&:command).include?("#{k}.#{m}")
+      end
     end
-  end
 
+  end
 end

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

@@ -1,7 +1,12 @@
 class Cms::Fortress::RoleDetail < ActiveRecord::Base
-  # set_table_name :cms_fortress_role_details
   self.table_name = "cms_fortress_role_details"
-  # attr_accessible :command, :can_create, :can_delete, :name, :can_update, :can_view
+
   belongs_to :role
 
+  default_scope { order(:command) }
+
+  def can_manage?
+    can_create?
+  end
+
 end

data/app/models/cms_ability.rb

@@ -6,9 +6,9 @@ class CmsAbility
     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?
+        can :manage, role.command if role.can_manage?
 
-        if role.can_create?
+        if role.can_manage?
           if role.command.eql?("settings.roles") 
             can :manage, Cms::Fortress::Role
           elsif role.command.eql?("settings.sites")
@@ -23,36 +23,19 @@ class CmsAbility
             can :manage, Cms::Layout
           elsif role.command.eql?("designs.snippets")
             can :manage, Cms::Snippet
+          else
+            setup_role(role)
           end
         end
       end
     end
 
-    # Define abilities for the passed in user here. For example:
-    #
-    #   user ||= User.new # guest user (not logged in)
-    #   if user.admin?
-    #     can :manage, :all
-    #   else
-    #     can :read, :all
-    #   end
-    #
-    # The first argument to `can` is the action you are giving the user 
-    # permission to do.
-    # If you pass :manage it will apply to every action. Other common actions
-    # here are :read, :create, :update and :destroy.
-    #
-    # The second argument is the resource the user can perform the action on. 
-    # If you pass :all it will apply to every resource. Otherwise pass a Ruby
-    # class of the resource.
-    #
-    # The third argument is an optional hash of conditions to further filter the
-    # objects.
-    # For example, here the user can only update published articles.
-    #
-    #   can :update, Article, :published => true
-    #
-    # See the wiki for details:
-    # https://github.com/ryanb/cancan/wiki/Defining-Abilities
   end
+
+  # override this if you have custom role assignment
+  def setup_role(role)
+
+  end
+
+
 end

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

@@ -0,0 +1 @@
+

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

@@ -1,6 +1,7 @@
 .page-header
   .btn-group.pull-right
-    = link_to t('.edit'), edit_cms_fortress_role_path(@cms_fortress_role), :class => 'btn'
+    =# link_to t('.edit'), edit_cms_fortress_role_path(@cms_fortress_role), :class => 'btn'
+    = link_to t('cms.fortress.roles.load'), refresh_cms_fortress_role_path(@cms_fortress_role), :class => 'btn', :method => :post
     = link_to t('cms.fortress.roles.back'), cms_fortress_roles_path, :class => 'btn'
   %h2= "Role: #{ @cms_fortress_role.name }"
   %p= @cms_fortress_role.description

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

@@ -10,15 +10,15 @@
         %ul.nav
           - if @site && !@site.new_record?
             - if can? :view, 'contents'
-              %li{:class => content_page? ? 'active' : ''}
-                = link_to t("cms.fortress.contents"), cms_fortress_contents_path # admin_cms_site_pages_path(@site)
+              = topnav_item t("cms.fortress.contents"), cms_fortress_contents_path, content_page?
 
             - if can? :view, 'designs'
-              %li{:class => design_page? ? 'active' : ''}
-                = link_to t("cms.fortress.design"), cms_fortress_design_path #(:site_id => @site)
+              = topnav_item t("cms.fortress.design"), cms_fortress_design_path, design_page?
+
           - if can? :view, 'settings'
-            %li{:class => admin_page? ? 'active' : ''}
-              = link_to t("cms.fortress.settings"), cms_fortress_settings_path
+            = topnav_item t("cms.fortress.settings"), cms_fortress_settings_path, admin_page?
+
+          = render 'cms/fortress/admin/topnav'
         %ul.nav.nav-pill.pull-right
           - if current_cms_fortress_user
             %li

data/app/views/cms/fortress/users/_form.html.haml

@@ -5,6 +5,14 @@
       %ul
         - @cms_fortress_user.errors.full_messages.each do |msg|
           %li= msg
+  .control-group
+    = f.label :last_name, :class => 'control-label'
+    .controls
+      = f.text_field :last_name
+  .control-group
+    = f.label :first_name, :class => 'control-label'
+    .controls
+      = f.text_field :first_name
   .control-group
     = f.label :email, :class => 'control-label'
     .controls

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

@@ -4,6 +4,8 @@
 
 %table.table.table-hover.table-bordered
   %tr
+    %th Lastname
+    %th Firstname
     %th Email
     %th Role
     %th
@@ -11,6 +13,8 @@
 
   - @cms_fortress_users.each do |cms_fortress_user|
     %tr
+      %td= cms_fortress_user.last_name
+      %td= cms_fortress_user.first_name
       %td= cms_fortress_user.email
       %td= cms_fortress_user.role.name
       %td

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

@@ -4,27 +4,38 @@
 %ul.navigation
   - if admin_page?
     - if can? :view, 'settings.sites'
-      %li= active_link_to t('admin.cms.base.sites'), admin_cms_sites_path, :active => ['admin/cms/sites']
+      = leftnav_item 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
+      = leftnav_item 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
+      = leftnav_item t('cms.fortress.users.title'), cms_fortress_users_path
+
+    = render 'cms/fortress/admin/left_settings_nav'
 
   - elsif design_page?
     - if @site && !@site.new_record?
       - if can? :view, 'designs.layouts'
-        %li= active_link_to t('admin.cms.base.layouts'), admin_cms_site_layouts_path(@site)
+        = leftnav_item 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
+        = leftnav_item t('admin.cms.base.snippets'), admin_cms_site_snippets_path(@site)
+
+    = render 'cms/fortress/admin/left_designs_nav'
+
+  - elsif content_page?
     - if @site && !@site.new_record?
       - if can? :view, 'contents.pages'
-        %li= active_link_to t('admin.cms.base.pages'), admin_cms_site_pages_path(@site)
+        = leftnav_item 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)
+        = leftnav_item t('admin.cms.base.files'), admin_cms_site_files_path(@site)
+
+    = render 'cms/fortress/admin/left_contents_nav'
 
     = cms_hook :navigation
 
+  - else
+    = render 'cms/fortress/admin/left_nav'
+
+
   = render '/admin/cms/partials/navigation_inner'
 
 = render '/admin/cms/partials/navigation_after'

data/cms-fortress.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cms-fortress"
-  s.version = "1.0.6"
+  s.version = "1.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Melvin Sembrano"]
-  s.date = "2013-12-12"
+  s.date = "2013-12-15"
   s.description = "Comfortable Mexican Sofa (CMS) - User and role management extension"
   s.email = "melvinsembrano@gmail.com"
   s.extra_rdoc_files = [
@@ -47,6 +47,8 @@ Gem::Specification.new do |s|
     "app/views/.DS_Store",
     "app/views/admin/cms/pages/_form.html.haml",
     "app/views/admin/cms/partials/_body_before.html.haml",
+    "app/views/cms/fortress/admin/_leftnav.html.haml",
+    "app/views/cms/fortress/admin/_topnav.html.haml",
     "app/views/cms/fortress/admin/contents.html.haml",
     "app/views/cms/fortress/admin/design.html.haml",
     "app/views/cms/fortress/admin/roles.html.haml",

data/config/locales/en.yml

@@ -15,6 +15,7 @@ en:
         edit_title: Edit Role
         new_title: Create New Role
         back: Back
+        load: Load New Roles
 
       users:
         title: Users

data/db/migrate/01_devise_create_cms_fortress_users.rb

@@ -29,6 +29,8 @@ class DeviseCreateCmsFortressUsers < ActiveRecord::Migration
       t.string   :current_sign_in_ip
       t.string   :last_sign_in_ip
 
+      t.string :first_name, :last_name
+
       ## Confirmable
       # t.string   :confirmation_token
       # t.datetime :confirmed_at

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

@@ -8,7 +8,11 @@ class ActionDispatch::Routing::Mapper
     }
 
     scope path, module: 'cms/fortress' do
-      resources :roles, :as => 'cms_fortress_roles'
+      resources :roles, :as => 'cms_fortress_roles' do
+        member do
+          post :refresh
+        end
+      end
       resources :users, :as => 'cms_fortress_users'
 
       get 'settings' => 'admin#settings', :as => 'cms_fortress_settings'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cms-fortress
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -193,6 +193,8 @@ files:
 - app/views/.DS_Store
 - app/views/admin/cms/pages/_form.html.haml
 - app/views/admin/cms/partials/_body_before.html.haml
+- app/views/cms/fortress/admin/_leftnav.html.haml
+- app/views/cms/fortress/admin/_topnav.html.haml
 - app/views/cms/fortress/admin/contents.html.haml
 - app/views/cms/fortress/admin/design.html.haml
 - app/views/cms/fortress/admin/roles.html.haml
@@ -265,7 +267,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 124089653421059147
+      hash: -2031890954127426435
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: