cms-fortress 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c5f4c7b4d6f02f6dd8fa2989e5aded60c09d4b6
-  data.tar.gz: 6bec6b1fcdd207cc46731691cab8fd479c7abcea
+  metadata.gz: 3dcc3b976c1e83c56a15ac187a00cc34eabd6d00
+  data.tar.gz: 769030e4388d0733a4041d1d26b8eb7529752a3f
 SHA512:
-  metadata.gz: 7a097385abbf62c706491e7faf8db34b91130b845d55a3948b7ef39483a9bba2cd6d3993eac7a5528f9188f0e334af7abc0cf3fa92204462bc848dac811305bc
-  data.tar.gz: cd6e48d2f3167886c1b744af90ca59757161f299fb99100a69e110de100c00f0e05d83baacb8b7245ece77cb6b0e60269e658f8f96da0dc429ebaacd36009add
+  metadata.gz: bcc9faa7bd1203baa3736678e33e144f41e59a91578e837729c653a9f1bca6d2767128fd18855a6f222398b218aa559e9a1cb96e8aeccaa2251e5e8e34a6ae23
+  data.tar.gz: c835238762bf86ec188ffec4cc0aa0dcc3414277c48afe836c4522dd2bdbd98e98725fc8d514ad2a0d880e46b46c8621c9289bbc6ee9f25b0844b64f5e76c679

data/README.rdoc

@@ -26,16 +26,63 @@ Then from the Rails project's root run:
 After that run your app and navigate to http://localhost:3000/cms-admin to start creating your pages, and also don't forget to delete your public/index.html file.
 
     login using the following info below:
-    
+
     username: admin@cmsfortress.com
     password: 1234qwer
 
-===TODO: Customization documents and sample
+===Adding custom role details
+
+You can create a custom role ability via a three-step process.
+
+1: Edit <tt>config/roles.yml</tt> and add the new role under the category you wish.
+
+    contents:
+      - pages
+      - files
+      - page.review
+      - page.publish
+    designs:
+      - layouts
+      - snippets
+    settings:
+      - sites
+      - roles
+      - users
+      - *my_role_detail*
+
+2: Configure cms-fortress to add a new resource. Add this in an initializer:
+
+    Cms::Fortress.configure do |config|
+      config.settings_resources << {
+        :name => 'my_role_detail',
+        :title => 'i18n.label.title', # this is passed to the t() function - can be plain text
+        :path => 'admin_my_role_details_path'
+      }
+      # the other two lists are "content_resources" and "design_resources"
+    end
+
+The path is eval'd at runtime, so you can use Rails helper methods such as
++current_user+ or <tt>@site</tt> in it. If the result is nil, the link will not show up
+in the left nav bar.
+
+3: Restart the server. Go into each Role you have defined and click
+"Load New Roles". Voila!
+
+=== Other configuration
+
+You can turn off page workflow or page caching via configuration:
+
+    Cms::Fortress.configure do |config|
+      config.enable_page_workflow = false
+      config.enable_page_caching = false
+    end
+
+===TODO: More customization documents and sample
 
 For more Comfortable Mexican Sofa awesomeness visit the wiki page here https://github.com/comfy/comfortable-mexican-sofa/wiki
 
 == Contributing to cms-fortress
- 
+
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
 * Fork the project.

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

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

@@ -2,22 +2,6 @@ module Cms
   module Fortress
     class AdminController < Admin::Cms::BaseController
 
-      def designs
-
-      end
-
-      def settings
-
-      end
-
-      def contents
-
-      end
-
-      def index
-
-      end
-
       def roles
         @roles = Role.all
       end

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

@@ -14,22 +14,22 @@ module Cms
 
 
       def admin_page?
-        controller_name.eql?('admin') && %w{settings roles users}.include?(action_name) ||
-          controller_name.eql?('sites') && %w{index}.include?(action_name) ||
-          controller_name.eql?('roles') ||
-          controller_name.eql?('users')
+        controller_name.eql?('admin') && %w{roles users}.include?(action_name) ||
+          Cms::Fortress.configuration.settings_resources.
+            map { |resource| resource[:name] }.
+            include?(controller_name)
       end
 
       def design_page?
-        controller_name.eql?('admin') && %{design}.include?(action_name) ||
-          controller_name.eql?('layouts') ||
-          controller_name.eql?('snippets')
+        Cms::Fortress.configuration.design_resources.
+            map { |resource| resource[:name] }.
+            include?(controller_name)
       end
 
       def content_page?
-        controller_name.eql?('admin') && %{contents}.include?(action_name) ||
-        controller_name.eql?('pages') ||
-          controller_name.eql?('files')
+        Cms::Fortress.configuration.content_resources.
+            map { |resource| resource[:name] }.
+            include?(controller_name)
       end
 
     end

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

@@ -21,23 +21,15 @@ class Cms::Fortress::Role < ActiveRecord::Base
   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
-      ) unless role_details.map(&:command).include?(k)
-
       v.each do |m|
+        description = m.split('.').map(&:humanize).join(' - ')
         role_details.build(
-          :name => m.humanize,
-          :command => "#{k}.#{m}",
+          :name       => description,
+          :command    => "#{k}.#{m}",
           :can_create => true,
           :can_update => true,
           :can_delete => true,
-          :can_view => true
+          :can_view   => true
         ) unless role_details.map(&:command).include?("#{k}.#{m}")
       end
     end

data/app/models/cms_ability.rb

@@ -1,15 +1,15 @@
 # Create a generator for an override file for this class
 # sample below:
 # class Ability < CmsAbility
-# 
-#   def setup_role(role)
-#     if role.command.eql?('contents.blog')
+#
+#   def setup_role(role_detail, user)
+#     if role_detail.command.eql?('contents.blog')
 #       can :manage, Blog
 #     else
-#       warn "#{ role.command } is not yet handled."
+#       warn "#{ role_detail.command } is not yet handled."
 #     end
 #   end
-# 
+#
 # end
 class CmsAbility
   include CanCan::Ability
@@ -17,27 +17,28 @@ class CmsAbility
   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_manage?
+      user.role.role_details.each do |role_detail|
+        can :view, role_detail.command if role_detail.can_view?
+        can :manage, role_detail.command if role_detail.can_manage?
 
-        if role.can_manage?
-          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
-          else
-            setup_role(role) if defined?(setup_role)
+        if role_detail.can_manage?
+          case role_detail.command
+            when 'settings.roles'
+              can :manage, Cms::Fortress::Role
+            when 'settings.sites'
+              can :manage, Cms::Site
+            when 'settings.users'
+              can :manage, Cms::Fortress::User
+            when 'contents.pages'
+              can :manage, Cms::Page
+            when 'contents.files'
+              can :manage, Cms::File
+            when 'designs.layouts'
+              can :manage, Cms::Layout
+            when 'designs.snippets'
+              can :manage, Cms::Snippet
+            else
+              setup_role(role_detail, user) if defined?(setup_role)
           end
         end
       end

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

@@ -2,10 +2,10 @@
 
 - content_for :right_column do
   #form-save.box
-    
-    /%label.checkbox.inline
-    /  %input{:type => 'checkbox'}
-    /  = ::Cms::Page.human_attribute_name(:is_published)
+    - unless Cms::Fortress.configuration.enable_page_workflow
+      %label.checkbox.inline
+        %input{:type => 'checkbox'}
+        = ::Cms::Page.human_attribute_name(:is_published)
     %button.btn.btn-small.btn-primary.pull-right
   = render :partial => 'admin/cms/files/index'
 
@@ -20,7 +20,7 @@
 
 - if (options = ::Cms::Layout.options_for_select(@site)).present?
   = form.select :layout_id, options, {}, 'data-url' => form_blocks_admin_cms_site_page_path(@site, @page.id.to_i)
-  
+
 - if (options = ::Cms::Page.options_for_select(@site, @page)).present?
   = form.select :parent_id, options
 
@@ -33,7 +33,8 @@
 
 = render :partial => 'form_blocks'
 
-=# form.check_box :is_published, :label => t('.is_published')
+- unless Cms::Fortress.configuration.enable_page_workflow
+  = form.check_box :is_published, :label => t('.is_published')
 = render :partial => 'cms/fortress/shared/page_extend', :locals => {form: form}
 
 = render 'admin/cms/partials/page_form_after', :object => form

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

@@ -11,12 +11,12 @@
 
   %table.table
     %tr
-      %th 
+      %th
       %th Show
       %th Manage
     = f.fields_for :role_details do |role|
       %tr
-        %td= role.object.command
+        %td= role.object.name
         %td= role.check_box :can_view
         %td= role.check_box :can_create
 

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

@@ -9,14 +9,18 @@
       .nav-collapse.collapse
         %ul.nav
           - if @site && !@site.new_record?
-            - if can? :view, 'contents'
-              = topnav_item t("cms.fortress.contents"), cms_fortress_contents_path, content_page?
+            - if Cms::Fortress.configuration.content_resources.any? {|resource| can? :view, "contents.#{resource[:name]}" }
+              = topnav_item t("cms.fortress.contents"), |
+                @site && !@site.new_record? ? admin_cms_site_pages_path(@site) : admin_cms_sites_pages_path, |
+                content_page?
 
-            - if can? :view, 'designs'
-              = topnav_item t("cms.fortress.design"), cms_fortress_design_path, design_page?
+            - if Cms::Fortress.configuration.design_resources.any? {|resource| can? :view, "designs.#{resource[:name]}" }
+              = topnav_item t("cms.fortress.design"), |
+                @site && !@site.new_record? ? admin_cms_site_layouts_path(@site) : admin_cms_sites_pages_path, |
+                design_page?
 
-          - if can? :view, 'settings'
-            = topnav_item t("cms.fortress.settings"), cms_fortress_settings_path, admin_page?
+            - if Cms::Fortress.configuration.settings_resources.any? {|resource| can? :view, "settings.#{resource[:name]}" }
+              = topnav_item t("cms.fortress.settings"), admin_cms_sites_path, admin_page?
 
           = render 'cms/fortress/admin/topnav'
         %ul.nav.nav-pill.pull-right

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

@@ -1,5 +1,7 @@
-= form.fields_for :page_workflow do |wf|
-  = wf.select :status_id, Cms::PageWorkflow.statuses_for_select(can?(:manage, 'contents.page.publish'), can?(:manage, 'contents.page.review')), {}, {class: "status-control"}
-  = wf.text_field :published_date, label: 'Published', class: "status-control", :data => {:utc_date => (@page.page_workflow.published_date.nil? ? Time.now : @page.page_workflow.published_date).strftime("%d %B, %Y") }
+- if Cms::Fortress.configuration.enable_page_workflow
+  = form.fields_for :page_workflow do |wf|
+    = wf.select :status_id, Cms::PageWorkflow.statuses_for_select(can?(:manage, 'contents.page.publish'), can?(:manage, 'contents.page.review')), {}, {class: "status-control"}
+    = wf.text_field :published_date, label: 'Published', class: "status-control", :data => {:utc_date => (@page.page_workflow.published_date.nil? ? Time.now : @page.page_workflow.published_date).strftime("%d %B, %Y") }
 
-= form.select :cached_timeout, Cms::PageWorkflow.cached_timeout_for_select, {label: 'Cached Timeout'}, {class: 'status-control'}
+- if Cms::Fortress.configuration.enable_page_caching
+  = form.select :cached_timeout, Cms::PageWorkflow.cached_timeout_for_select, {label: 'Cached Timeout'}, {class: 'status-control'}

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

@@ -3,30 +3,29 @@
 
 %ul.navigation
   - if admin_page?
-    - if can? :view, 'settings.sites'
-      = leftnav_item t('admin.cms.base.sites'), admin_cms_sites_path, :active => ['admin/cms/sites']
-    - if can? :view, 'settings.roles'
-      = leftnav_item t('cms.fortress.roles.title'), cms_fortress_roles_path
-    - if can? :view, 'settings.users'
-      = leftnav_item t('cms.fortress.users.title'), cms_fortress_users_path
+    - Cms::Fortress.configuration.settings_resources.each do |resource|
+      - if can? :view, "settings.#{resource[:name]}"
+        - path = begin; eval(resource[:path]); rescue; end
+        - if path
+          = leftnav_item t(resource[:title]), path
 
     = render 'cms/fortress/admin/left_settings_nav'
 
   - elsif design_page?
-    - if @site && !@site.new_record?
-      - if can? :view, 'designs.layouts'
-        = leftnav_item t('admin.cms.base.layouts'), admin_cms_site_layouts_path(@site)
-      - if can? :view, 'designs.snippets'
-        = leftnav_item t('admin.cms.base.snippets'), admin_cms_site_snippets_path(@site)
+    - Cms::Fortress.configuration.design_resources.each do |resource|
+      - if can? :view, "designs.#{resource[:name]}"
+        - path = begin; eval(resource[:path]);rescue;end
+        - if path
+          = leftnav_item t(resource[:title]), path
 
     = render 'cms/fortress/admin/left_designs_nav'
 
   - elsif content_page?
-    - if @site && !@site.new_record?
-      - if can? :view, 'contents.pages'
-        = leftnav_item t('admin.cms.base.pages'), admin_cms_site_pages_path(@site)
-      - if can? :view, 'contents.files'
-        = leftnav_item t('admin.cms.base.files'), admin_cms_site_files_path(@site)
+    - Cms::Fortress.configuration.content_resources.each do |resource|
+      - if can? :view, "contents.#{resource[:name]}"
+        - path = begin; eval(resource[:path]);rescue;end
+        - if path
+          = leftnav_item t(resource[:title]), path
 
     = render 'cms/fortress/admin/left_contents_nav'
 

data/cms-fortress.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cms-fortress"
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Melvin Sembrano"]
-  s.date = "2014-02-04"
+  s.date = "2014-02-16"
   s.description = "Comfortable Mexican Sofa (CMS) - User and role management extension"
   s.email = "melvinsembrano@gmail.com"
   s.extra_rdoc_files = [
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
     ".document",
     ".rbenv-gemsets",
     ".ruby-version",
-    ".rvmrc",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",

data/lib/cms-fortress.rb

@@ -13,3 +13,56 @@ require_relative 'cms/fortress/comfortable_mexican_sofa'
 require_relative 'cms/fortress/devise'
 require_relative 'cms/fortress/routing'
 require_relative '../app/models/cms_ability'
+
+module Cms
+  module Fortress
+    class Configuration
+
+      attr_accessor :content_resources
+      attr_accessor :design_resources
+      attr_accessor :settings_resources
+      attr_accessor :enable_page_workflow
+      attr_accessor :enable_page_caching
+
+      def initialize
+        self.class.send(:include, Rails.application.routes.url_helpers)
+        @enable_page_workflow = true
+        @enable_page_caching = true
+        @content_resources = [
+          {:name => 'pages', :title => 'admin.cms.base.pages',
+           :path => 'admin_cms_site_pages_path(@site) if @site && !@site.new_record?'},
+          {:name => 'files', :title => 'admin.cms.base.files',
+          :path => 'admin_cms_site_files_path(@site) if @site && !@site.new_record?'}
+        ]
+        @design_resources = [
+          {:name => 'layouts', :title => 'admin.cms.base.layouts',
+           :path => 'admin_cms_site_layouts_path(@site) if @site && !@site.new_record?'
+          },
+          {:name => 'snippets', :title => 'admin.cms.base.snippets',
+          :path => 'admin_cms_site_snippets_path(@site) if @site && !@site.new_record?'}
+        ]
+        @settings_resources = [
+          {:name => 'sites', :title => 'admin.cms.base.sites',
+          :path => 'admin_cms_sites_path'},
+          {:name => 'roles', :title => 'cms.fortress.roles.title',
+          :path => 'cms_fortress_roles_path'},
+          {:name => 'users', :title => 'cms.fortress.users.title',
+          :path => 'cms_fortress_users_path'}
+        ]
+      end
+
+    end
+
+    class << self
+      def configure
+        yield configuration
+      end
+
+      def configuration
+        @configuration ||= Configuration.new
+      end
+
+    end
+
+  end
+end

data/lib/cms/fortress/application_controller_methods.rb

@@ -27,7 +27,28 @@ module Cms
         base.class_eval do
 
           rescue_from CanCan::AccessDenied do |ex|
-            redirect_to cms_fortress_unauthorised_path #, :alert => ex.message
+            # if cannot view page check if can on files
+            if controller_name.eql?('pages')
+              if can? :view, Cms::File
+                redirect_to admin_cms_site_files_path
+              else
+              redirect_to cms_fortress_unauthorised_path
+              end
+            elsif controller_name.eql?('layouts')
+              if can? :view, Cms::Snippet
+                redirect_to admin_cms_site_snippets_path
+              else
+              redirect_to cms_fortress_unauthorised_path
+              end
+            elsif controller_name.eql?('sites')
+              if can? :view, Cms::Fortress::Role
+                redirect_to cms_fortress_roles_path
+              else
+              redirect_to cms_fortress_unauthorised_path
+              end
+            else
+              redirect_to cms_fortress_unauthorised_path #, :alert => ex.message
+            end
           end
 
         end

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

@@ -20,9 +20,6 @@ class ActionDispatch::Routing::Mapper
       end
       resources :users, :as => 'cms_fortress_users'
 
-      get 'settings' => 'admin#settings', :as => 'cms_fortress_settings'
-      get 'design' => 'admin#design', :as => 'cms_fortress_design'
-      get 'contents' => 'admin#contents', :as => 'cms_fortress_contents'
       get 'settings/users' => 'admin#users', :as => 'cms_fortress_user_settings'
       get 'unauthorised' => 'admin#unauthorised', :as => 'cms_fortress_unauthorised'
 

data/lib/generators/cms/fortress/fortress_generator.rb

@@ -14,6 +14,16 @@ class Cms::FortressGenerator < Rails::Generators::Base
   def generate_migrations
     rake("cms_fortress_engine:install:migrations")
   end
+
+  def copy_files
+    log 'Copying files...'
+    files = [
+      'config/roles.yml'
+    ]
+    files.each do |file|
+      copy_file file, file
+    end
+  end
 =begin
   def generate_assets
     directory 'app/assets/javascripts/cms/fortress',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cms-fortress
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Melvin Sembrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -147,7 +147,6 @@ files:
 - .document
 - .rbenv-gemsets
 - .ruby-version
-- .rvmrc
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt

data/.rvmrc

@@ -1 +0,0 @@
-rvm use --create 1.9.3@cms-fortress