cms-fortress 1.2.2 → 1.3.0.rc1

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

@@ -6,7 +6,7 @@
         %span.icon-bar
         %span.icon-bar
         %span.icon-bar
-      %a.navbar-brand(href="#")= t('cms.fortress.title')
+      = link_to settings.title, settings.title_link, class: 'navbar-brand'
 
     .collapse.navbar-collapse#main-nav
       %ul.nav.navbar-nav

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

@@ -1,7 +1,5 @@
-- if Cms::Fortress.configuration.enable_page_workflow
-  = form.fields_for :page_workflow, control_col: "col-sm-4" 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: t('cms.fortress.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 && can?(:manage, 'contents.page.schedule') && !@page.new_record?
+  = form.text_field :published_date, label: (@page.published? ? t('cms.fortress.published_date') : t('cms.fortress.schedule_date')), control_col: "col-sm-3", class: "status-control", :data => {:utc_date => (@page.published_date.nil? ? Time.now : @page.published_date).strftime("%d %B, %Y") }
 
 - if Cms::Fortress.configuration.enable_page_caching
-  = form.select :cached_timeout, Cms::PageWorkflow.cached_timeout_for_select, {label: t('cms.fortress.cached_timeout'), control_col: "col-sm-4"}, {class: 'status-control'}
+  = form.select :cached_timeout, cached_timeout_for_select, {label: t('cms.fortress.cache_timeout'), control_col: "col-sm-3"}, {class: 'status-control'}

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

@@ -1,16 +1,4 @@
 :coffeescript
-  dateControl = $("#page_page_workflow_attributes_published_date")
-  wkControl = $("#page_page_workflow_attributes_status_id")
-  parentControl = $("#page_page_workflow_attributes_published_date").parents(".form-group:first")
-
-  dateControl.val(dateControl.data("utcDate")).datepicker(dateFormat: "d MM, yy")
-
-  if wkControl.val() in ["0","1"]
-    parentControl.hide()
-
-  wkControl.change ->
-    if $(this).val() in ["0","1"]
-      parentControl.hide()
-    else
-      parentControl.show()
+  dateControl = $("#page_published_date")
+  dateControl.datepicker(dateFormat: "d MM, yy")
 

data/app/views/cms/fortress/themes/wide/_body.html.haml

@@ -1,9 +1,9 @@
 - unless @site.nil? || @site.new_record?
-  .container.current-site-info
+  .container-fluid.current-site-info
     %span.label.label-primary
       = @site.label
 
-.container.wide-body
+.container-fluid.wide-body
   - if controller_name.eql?('revisions')
     .row
       .col-sm-9
@@ -27,9 +27,10 @@
 
   $(".wide-body .page-header a:contains(Create New Page)").html("<i class='glyphicon glyphicon-file' /> New Page").attr("title", "Create New Page").tooltip(placement: 'left')
 
-  # New Page
-  index_path = "#{ back_path }"
-  $(".wide-body .page-header h2:contains(New), .wide-body .page-header h2:contains(Editing)").parent()
-    .prepend('<a class="btn btn-default pull-right" href="' + index_path + '" title="" data-original-title="Create New Page"><i class="glyphicon glyphicon-chevron-left"></i> Back</a> ')
-  
-  $(".wide-body .page-header .btn").removeClass("pull-right").wrapAll("<div class='btn-group pull-right'></div>")
+- unless @no_back_button
+  :coffeescript
+    index_path = "#{ back_path }"
+    $(".wide-body .page-header h2:contains(New), .wide-body .page-header h2:contains(Editing)").parent()
+      .prepend('<a class="btn btn-default pull-right" href="' + index_path + '" title="" data-original-title="Create New Page"><i class="glyphicon glyphicon-chevron-left"></i> Back</a> ')
+
+    $(".wide-body .page-header .btn").removeClass("pull-right").wrapAll("<div class='btn-group pull-right'></div>")

data/app/views/cms/fortress/themes/wide/_menu.html.haml

@@ -1,37 +1,70 @@
-- if @site && !@site.new_record?
-  - if Cms::Fortress.configuration.content_resources.any? {|resource| can? :view, "contents.#{resource[:name]}" }
-    %li.dropdown(class="#{ "active" if content_page? }")
-      %a.dropdown-toggle(data-toggle='dropdown' href='#')
-        = t("cms.fortress.contents")
-        %b.caret
-      %ul.dropdown-menu
-
-        - Cms::Fortress.configuration.content_resources.each do |resource|
-          - if can? :view, "contents.#{resource[:name]}"
-            - path = begin; eval(resource[:path]);rescue;end
-            - if path
-              = topnav_item t(resource[:title]), path, current_page?(path)
-
-  - if Cms::Fortress.configuration.design_resources.any? {|resource| can? :view, "designs.#{resource[:name]}" }
-    %li.dropdown(class="#{ "active" if design_page? }")
-      %a.dropdown-toggle(data-toggle='dropdown' href='#')
-        = t("cms.fortress.design")
-        %b.caret
-      %ul.dropdown-menu
-        - Cms::Fortress.configuration.design_resources.each do |resource|
-          - if can? :view, "designs.#{resource[:name]}"
-            - path = begin; eval(resource[:path]);rescue;end
-            - if path
-              = topnav_item t(resource[:title]), path, current_page?(path)
-
-  - if Cms::Fortress.configuration.settings_resources.any? {|resource| can? :view, "settings.#{resource[:name]}" }
-    %li.dropdown(class="#{ "active" if admin_page? }")
-      %a.dropdown-toggle(data-toggle='dropdown' href='#')
-        = t("cms.fortress.settings")
-        %b.caret
-      %ul.dropdown-menu
-        - Cms::Fortress.configuration.settings_resources.each do |resource|
-          - if can? :view, "settings.#{resource[:name]}"
-            - path = begin; eval(resource[:path]); rescue; end
-            - if path
-              = topnav_item t(resource[:title]), path, current_page?(path)
+%nav.navbar.navbar-default(role="navigation")
+  .container-fluid
+    .navbar-header
+      %button.navbar-toggle(type="button" data-toggle="collapse" data-target="#main-nav")
+        %span.sr-only= t('cms.fortress.toggle_navigation')
+        %span.icon-bar
+        %span.icon-bar
+        %span.icon-bar
+      = link_to settings.title, settings.title_link, class: 'navbar-brand'
+
+    .collapse.navbar-collapse#main-nav
+      %ul.nav.navbar-nav
+
+        - if @site && !@site.new_record?
+          %li= topnav_item "Dashboard", dashboard_site_path, current_page?(dashboard_site_path)
+
+          - if Cms::Fortress.configuration.content_resources.any? {|resource| can? :view, "contents.#{resource[:name]}" }
+            %li.dropdown(class="#{ "active" if content_page? }")
+              %a.dropdown-toggle(data-toggle='dropdown' href='#')
+                = t("cms.fortress.contents")
+                %b.caret
+              %ul.dropdown-menu
+
+                - Cms::Fortress.configuration.content_resources.each do |resource|
+                  - if resource[:super_user]
+                    - if current_cms_fortress_user.type.eql?(:super_user)
+                      = topnav_resource_item("contents", resource)
+                  - else
+                    = topnav_resource_item("contents", resource)
+
+          - if Cms::Fortress.configuration.design_resources.any? {|resource| can? :view, "designs.#{resource[:name]}" }
+            %li.dropdown(class="#{ "active" if design_page? }")
+              %a.dropdown-toggle(data-toggle='dropdown' href='#')
+                = t("cms.fortress.design")
+                %b.caret
+              %ul.dropdown-menu
+                - Cms::Fortress.configuration.design_resources.each do |resource|
+                  - if resource[:super_user]
+                    - if current_cms_fortress_user.type.eql?(:super_user)
+                      = topnav_resource_item("designs", resource)
+                  - else
+                    = topnav_resource_item("designs", resource)
+
+          - if Cms::Fortress.configuration.settings_resources.any? {|resource| can? :view, "settings.#{resource[:name]}" }
+            %li.dropdown(class="#{ "active" if admin_page? }")
+              %a.dropdown-toggle(data-toggle='dropdown' href='#')
+                = t("cms.fortress.settings")
+                %b.caret
+              %ul.dropdown-menu
+                - Cms::Fortress.configuration.settings_resources.each do |resource|
+                  - if resource[:super_user]
+                    - if current_cms_fortress_user.type.eql?(:super_user)
+                      = topnav_resource_item("settings", resource)
+                  - else
+                    = topnav_resource_item("settings", resource)
+
+
+
+        = render 'cms/fortress/admin/topnav'
+
+      - if current_cms_fortress_user
+        .btn-group.pull-right(style="margin-top: 8px;")
+          %button.btn.btn-default.dropdown-toggle(type="button" data-toggle="dropdown")
+            = current_cms_fortress_user.display_name
+            %span.caret
+          %ul.dropdown-menu(role="menu")
+            %li
+              = link_to t('cms.fortress.logout'), destroy_cms_fortress_user_session_path, :method => 'delete'
+
+

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

@@ -1,7 +1,12 @@
 = form.text_field :last_name
 = form.text_field :first_name
 = form.text_field :email
-= form.select :role_id, Cms::Fortress::Role.all.collect {|role| [role.name, role.id]}
+
+- unless @super_user
+  = form.select :role_id, @site.roles.collect {|role| [role.name, role.id]}
+- if @cms_fortress_user.new_record?
+  = form.hidden_field :type_id
+
 = form.password_field :password
 = form.password_field :password_confirmation
 

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

@@ -1,6 +1,5 @@
 .page-header
-  .btn-group.pull-right
-    = link_to t('cms.fortress.cancel'), cms_fortress_users_path, class: 'btn btn-default btn-sm'
+  = link_to t('cms.fortress.cancel'), cms_fortress_users_path, class: 'btn btn-default btn-sm pull-right'
 
   %h3= t('cms.fortress.users.new_title')
 

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

@@ -1,15 +1,22 @@
 .page-header
-  .btn-group.pull-right
-    = link_to t('cms.fortress.users.new_link'), new_cms_fortress_user_path, :class => 'btn btn-primary btn-sm'
+  - unless @super_user
+    = link_to t('cms.fortress.users.new_link'), new_cms_fortress_user_path, :class => 'btn btn-primary btn-sm pull-right'
+  - else
+    = link_to t('cms.fortress.users.new_super_link'), super_new_cms_fortress_users_path, :class => 'btn btn-primary btn-sm pull-right'
 
-  %h3= t('cms.fortress.users.title')
+  %h3
+    - unless @super_user
+      = t('cms.fortress.users.title')
+    - else
+      = t('cms.fortress.admin.super_user.title')
 
 %table.table.table-hover.table-bordered
   %tr
     %th= t('cms.fortress.users.last_name')
     %th= t('cms.fortress.users.first_name')
     %th= t('cms.fortress.users.email')
-    %th= t('cms.fortress.users.role')
+    - unless @super_user
+      %th= t('cms.fortress.users.role')
     %th
 
   - @cms_fortress_users.each do |cms_fortress_user|
@@ -17,7 +24,9 @@
       %td= cms_fortress_user.last_name
       %td= cms_fortress_user.first_name
       %td= cms_fortress_user.email
-      %td= cms_fortress_user.role.name
+      - unless @super_user
+        - if cms_fortress_user.role
+          %td= cms_fortress_user.role.name
       %td
         .btn-group.pull-right
           = link_to t('cms.fortress.edit'), edit_cms_fortress_user_path(cms_fortress_user), :class => 'btn btn-sm btn-default'

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

@@ -1,6 +1,5 @@
 .page-header
-  .btn-group.pull-right
-    = link_to t('cms.fortress.cancel'), cms_fortress_users_path, class: 'btn btn-default btn-sm'
+  = link_to t('cms.fortress.cancel'), cms_fortress_users_path, class: 'btn btn-default btn-sm, pull-right'
 
   %h3= t('cms.fortress.users.new_title')
 

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

@@ -1,5 +1,3 @@
-- @page.page_workflow ||= Cms::PageWorkflow.new
-
 - content_for :right_column do
   #form-save.box
     %label.checkbox-inline
@@ -10,6 +8,14 @@
 
 = render 'comfy/admin/cms/partials/page_form_before', :object => form
 
+- if Cms::Fortress.configuration.enable_page_workflow && !@page.new_record?
+  .container-fluid
+    .btn-group
+      %span.btn.btn-success= @page.aasm_state.titleize
+      - page_actions(@page).each do |page_action|
+        = form.button t('.'+page_action.to_s), :class => 'btn btn-default', :value => page_action, :name => 'transition'
+  %hr
+
 = form.text_field :label, :data => {:slugify => @page.new_record?}
 
 - unless @site.pages.count == 0 || @site.pages.root == @page
@@ -39,7 +45,7 @@
 = render 'comfy/admin/cms/partials/page_form_after', :object => form
 
 = form.form_group :class => 'form-actions' do
-  = form.submit t('.preview'), :name => 'preview', :id => nil, :class => 'btn btn-default'
-  = form.submit t(@page.new_record?? '.create' : '.update'), :class => 'btn btn-primary'
+  = form.button t('.preview'), :name => 'preview', :id => nil, :class => 'btn btn-default'
+  = form.button t(@page.new_record?? '.create' : '.update'), :class => 'btn btn-primary', :value => 'save', :name => 'commit'
 
 = render :partial => 'cms/fortress/shared/page_extend_js'

data/app/views/comfy/admin/cms/pages/edit.html.haml

@@ -0,0 +1,25 @@
+.page-header
+
+  = link_to t('.revision', :count => @page.revisions.count), comfy_admin_cms_site_page_revisions_path(@site, @page), :class => 'btn btn-default pull-right'
+
+  /%h2.pull-right
+  /  -if @page.drafted?
+  /    %span.label.label-info
+  /      Draft
+  /  -if @page.reviewed?
+  /    %span.label.label-primary
+  /      Reviewed
+  /  -if @page.scheduled?
+  /    %span.label.label-warning
+  /      Scheduled
+  /  -if @page.published?
+  /    %span.label.label-success
+  /      Published
+  %h2= t('.title')
+
+
+- content_for :right_column do
+  = render 'comfy/admin/cms/sites/mirrors', :object => @page
+
+= comfy_form_for @page, :as => :page, :url => {:action => :update}, :html => {:multipart => true} do |form|
+  = render form

data/app/views/layouts/comfy/admin/cms/_head.html.haml

@@ -1,6 +1,6 @@
 %head
   %meta{'http-equiv' => "Content-type", :content => "text/html; charset=utf-8"}
-  %title= ComfortableMexicanSofa.config.cms_title
+  %title= settings.title
   = csrf_meta_tag
 
   = stylesheet_link_tag 'comfortable_mexican_sofa/application'

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

@@ -3,28 +3,31 @@
 %ul.navigation
   - if admin_page?
     - 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
+      - if resource[:super_user]
+        - if current_cms_fortress_user.type.eql?(:super_user)
+          = topnav_resource_item("settings", resource)
+      - else
+        = topnav_resource_item("settings", resource)
 
     = render 'cms/fortress/admin/left_settings_nav'
 
   - elsif design_page?
     - 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
+      - if resource[:super_user]
+        - if current_cms_fortress_user.type.eql?(:super_user)
+          = topnav_resource_item("designs", resource)
+      - else
+        = topnav_resource_item("designs", resource)
 
     = render 'cms/fortress/admin/left_designs_nav'
 
   - elsif content_page?
     - 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
+      - if resource[:super_user]
+        - if current_cms_fortress_user.type.eql?(:super_user)
+          = topnav_resource_item("contents", resource)
+      - else
+        = topnav_resource_item("contents", resource)
 
     = render 'cms/fortress/admin/left_contents_nav'
     = cms_hook :navigation

data/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/cms-fortress.gemspec

@@ -1,178 +1,39 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "cms-fortress"
-  s.version = "1.2.2"
+  s.name      = "cms-fortress"
+  s.version   = "1.3.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Melvin Sembrano"]
-  s.date = "2014-06-01"
-  s.description = "Comfortable Mexican Sofa (CMS) - User and role management extension"
-  s.email = "melvinsembrano@gmail.com"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "app/assets/javascripts/cms/fortress/cms_fortress.js",
-    "app/assets/javascripts/cms/fortress/media.js.coffee",
-    "app/assets/javascripts/cms/fortress/themes/wide.js.coffee.erb",
-    "app/assets/javascripts/html5shiv.js",
-    "app/assets/stylesheets/cms/fortress/admin_overrides.css",
-    "app/assets/stylesheets/cms/fortress/session.css",
-    "app/assets/stylesheets/cms/fortress/themes/wide.css.scss",
-    "app/controllers/cms/fortress/admin_controller.rb",
-    "app/controllers/cms/fortress/roles_controller.rb",
-    "app/controllers/cms/fortress/users/sessions_controller.rb",
-    "app/controllers/cms/fortress/users_controller.rb",
-    "app/helpers/cms/fortress/application_helper.rb",
-    "app/helpers/cms/fortress/roles_helper.rb",
-    "app/helpers/cms/fortress/sprocket_helper.rb",
-    "app/models/cms/fortress.rb",
-    "app/models/cms/fortress/role.rb",
-    "app/models/cms/fortress/role_detail.rb",
-    "app/models/cms/fortress/user.rb",
-    "app/models/cms/page_workflow.rb",
-    "app/models/cms_ability.rb",
-    "app/models/error/missing_role_configuration_file.rb",
-    "app/views/cms/fortress/admin/_left_contents_nav.html.haml",
-    "app/views/cms/fortress/admin/_left_designs_nav.html.haml",
-    "app/views/cms/fortress/admin/_left_nav.html.haml",
-    "app/views/cms/fortress/admin/_left_settings_nav.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",
-    "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",
-    "app/views/cms/fortress/roles/index.html.haml",
-    "app/views/cms/fortress/roles/new.html.haml",
-    "app/views/cms/fortress/roles/show.html.haml",
-    "app/views/cms/fortress/shared/_media_items.html.haml",
-    "app/views/cms/fortress/shared/_mediaboxes.html.haml",
-    "app/views/cms/fortress/shared/_menu.html.haml",
-    "app/views/cms/fortress/shared/_navbar.html.haml",
-    "app/views/cms/fortress/shared/_page_extend.html.haml",
-    "app/views/cms/fortress/shared/_page_extend_js.html.haml",
-    "app/views/cms/fortress/themes/wide/_body.html.haml",
-    "app/views/cms/fortress/themes/wide/_menu.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/comfy/admin/cms/pages/_form.html.haml",
-    "app/views/comfy/admin/cms/partials/_body_before.html.haml",
-    "app/views/layouts/cms/fortress/session.html.haml",
-    "app/views/layouts/comfy/admin/cms/_body.html.haml",
-    "app/views/layouts/comfy/admin/cms/_footer.html.haml",
-    "app/views/layouts/comfy/admin/cms/_head.html.haml",
-    "app/views/layouts/comfy/admin/cms/_left.html.haml",
-    "cms-fortress.gemspec",
-    "config/initializers/cms_fortress.rb",
-    "config/locales/de.yml",
-    "config/locales/en.yml",
-    "config/roles.yml",
-    "db/migrate/01_devise_create_cms_fortress_users.rb",
-    "db/migrate/02_create_cms_fortress_role_details.rb",
-    "db/migrate/03_create_cms_fortress_roles.rb",
-    "db/migrate/04_create_cms_page_workflows.rb",
-    "db/migrate/05_add_caching_info_to_pages.rb",
-    "docs/screens/compact-layout-01.png",
-    "docs/screens/compact-layout-02.png",
-    "docs/screens/files-integration-01.png",
-    "docs/screens/files-integration-02.png",
-    "docs/screens/files-integration-03.png",
-    "docs/screens/files-integration-04.png",
-    "lib/cms-fortress.rb",
-    "lib/cms/fortress/application_controller_methods.rb",
-    "lib/cms/fortress/auth.rb",
-    "lib/cms/fortress/comfortable_mexican_sofa.rb",
-    "lib/cms/fortress/content_renderer.rb",
-    "lib/cms/fortress/devise.rb",
-    "lib/cms/fortress/file_methods.rb",
-    "lib/cms/fortress/page_methods.rb",
-    "lib/cms/fortress/rails/engine.rb",
-    "lib/cms/fortress/routes/admin.rb",
-    "lib/cms/fortress/routing.rb",
-    "lib/comfortable_mexican_sofa/fixture/page.rb",
-    "lib/generators/cms/fortress/USAGE",
-    "lib/generators/cms/fortress/fortress_generator.rb",
-    "lib/generators/cms/fortress/templates/README",
-    "lib/generators/comfy/cms/cms_generator.rb",
-    "test/fixtures/cms/fortress/role_details.yml",
-    "test/fixtures/cms/fortress/roles.yml",
-    "test/fixtures/cms/page_workflows.yml",
-    "test/functional/cms/fortress/roles_controller_test.rb",
-    "test/functional/cms/fortress/users_controller_test.rb",
-    "test/helper.rb",
-    "test/test_cms-fortress.rb",
-    "test/unit/cms/fortress/role_detail_test.rb",
-    "test/unit/cms/fortress/role_test.rb",
-    "test/unit/cms/fortress/role_user_test.rb",
-    "test/unit/helpers/cms/fortress/roles_helper_test.rb",
-    "test/unit/helpers/cms/fortress/users_helper_test.rb"
-  ]
-  s.homepage = "http://github.com/melvinsembrano/cms-fortress"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23.2"
-  s.summary = "Comfortable Mexican Sofa (CMS) - User and role management extension"
+  s.authors           = ["Melvin Sembrano"]
+  s.date              = "2014-06-01"
+  s.description       = "Comfortable Mexican Sofa (CMS) - User and role management extension"
+  s.email             = "melvinsembrano@gmail.com"
+  s.extra_rdoc_files  = [ "LICENSE.txt", "README.rdoc" ]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.homepage          = "http://github.com/melvinsembrano/cms-fortress"
+  s.licenses          = "MIT"
+  s.summary           = "Comfortable Mexican Sofa (CMS) - User and role management extension"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 4.0.0"])
-      s.add_runtime_dependency(%q<comfortable_mexican_sofa>, ["~> 1.12.0"])
-      s.add_runtime_dependency(%q<devise>, ["~> 3.2"])
-      s.add_runtime_dependency(%q<cancan>, [">= 1.6.9"])
-      s.add_runtime_dependency(%q<delayed_job>, ["~> 4"])
-      s.add_runtime_dependency(%q<tinymce-rails>, ["~> 4.0.0"])
-      s.add_runtime_dependency(%q<tinymce-rails-langs>, ["~> 4.0"])
-      s.add_development_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-    else
-      s.add_dependency(%q<rails>, [">= 4.0.0"])
-      s.add_dependency(%q<comfortable_mexican_sofa>, ["~> 1.12.0"])
-      s.add_dependency(%q<devise>, ["~> 3.2"])
-      s.add_dependency(%q<cancan>, [">= 1.6.9"])
-      s.add_dependency(%q<delayed_job>, ["~> 4"])
-      s.add_dependency(%q<tinymce-rails>, ["~> 4.0.0"])
-      s.add_dependency(%q<tinymce-rails-langs>, ["~> 4.0"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rails>, [">= 4.0.0"])
-    s.add_dependency(%q<comfortable_mexican_sofa>, ["~> 1.12.0"])
-    s.add_dependency(%q<devise>, ["~> 3.2"])
-    s.add_dependency(%q<cancan>, [">= 1.6.9"])
-    s.add_dependency(%q<delayed_job>, ["~> 4"])
-    s.add_dependency(%q<tinymce-rails>, ["~> 4.0.0"])
-    s.add_dependency(%q<tinymce-rails-langs>, ["~> 4.0"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-  end
-end
+  s.files             = `git ls-files`.split($/)
+  s.executables       = []
+  s.test_files        = s.files.grep(%r{^(test|spec|features)/})
+  s.require_paths     = ["lib"]
+
+  s.add_dependency 'rails',                     '>= 4.0.0'
+  s.add_dependency 'comfortable_mexican_sofa',  '~> 1.12.0'
+  s.add_dependency 'devise',                    '~> 3.2'
+  s.add_dependency 'cancan',                    '>= 1.6.9'
+  s.add_dependency 'delayed_job',               '~> 4'
+  s.add_dependency 'tinymce-rails',             '~> 4.0.0'
+  s.add_dependency 'tinymce-rails-langs',       '~> 4.0'
+  s.add_dependency 'aasm',                      '~> 3.2'
 
+  s.add_development_dependency 'rdoc'
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'minitest',      '~> 4.7.3'
+  s.add_development_dependency 'minitest-rails'
+  s.add_development_dependency 'minitest-spec-rails'
+  s.add_development_dependency 'minitest-reporters'
+  s.add_development_dependency 'sqlite3'
+end