cms-fortress 1.2.2 → 1.3.0.rc1

data/config/locales/devise.en.yml

@@ -0,0 +1,59 @@
+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+
+en:
+  devise:
+    confirmations:
+      confirmed: "Your account was successfully confirmed."
+      send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes."
+    failure:
+      already_authenticated: "You are already signed in."
+      inactive: "Your account is not activated yet."
+      invalid: "Invalid email or password."
+      locked: "Your account is locked."
+      last_attempt: "You have one more attempt before your account will be locked."
+      not_found_in_database: "Invalid email or password."
+      timeout: "Your session expired. Please sign in again to continue."
+      unauthenticated: "You need to sign in or sign up before continuing."
+      unconfirmed: "You have to confirm your account before continuing."
+    mailer:
+      confirmation_instructions:
+        subject: "Confirmation instructions"
+      reset_password_instructions:
+        subject: "Reset password instructions"
+      unlock_instructions:
+        subject: "Unlock Instructions"
+    omniauth_callbacks:
+      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+      success: "Successfully authenticated from %{kind} account."
+    passwords:
+      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+      updated: "Your password was changed successfully. You are now signed in."
+      updated_not_active: "Your password was changed successfully."
+    registrations:
+      destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
+      signed_up: "Welcome! You have signed up successfully."
+      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please open the link to activate your account."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
+      updated: "You updated your account successfully."
+    sessions:
+      signed_in: "Signed in successfully."
+      signed_out: "Signed out successfully."
+    unlocks:
+      send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
+      send_paranoid_instructions: "If your account exists, you will receive an email with instructions about how to unlock it in a few minutes."
+      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+  errors:
+    messages:
+      already_confirmed: "was already confirmed, please try signing in"
+      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
+      expired: "has expired, please request a new one"
+      not_found: "not found"
+      not_locked: "was not locked"
+      not_saved:
+        one: "1 error prohibited this %{resource} from being saved:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"

data/config/locales/en.yml

@@ -15,13 +15,28 @@ en:
       are_you_sure: Are you sure?
       cancel: Cancel
       published: Published
-      cached_timeout: Cached Timeout
+      published_date: Published At
+      schedule_date: Scheduled Publication
+      cache_timeout: Cached Timeout
       toggle_navigation: Toggle Navigation
       image_selector: Image Selector
       insert_item: Click the thumbnail to insert item to the selected editor.
       settings: Settings
 
       admin:
+
+        dashboard:
+          title: Dashboard
+          draft_widget: Draft Pages
+          reviewed_widget: Reviewed Pages
+          updated_pages: Recently Updated Pages
+
+        sites:
+          menu_header: "Site/ %{site_name}"
+        super_user:
+          title: Super Users
+          menu_header: Super Users Only
+
         users: Users
         not_authorized: You are not authorized to access this functionality
         settings_dashboard: Settings Dashboard
@@ -64,6 +79,7 @@ en:
       users:
         title: Users
         new_link: New User
+        new_super_link: New Super User
         edit_title: Edit User
         new_title: Create New User
         last_name: Lastname
@@ -77,6 +93,17 @@ en:
             password: Password
             remember_me: Remember me
 
+  comfy:
+    admin:
+      cms:
+        pages:
+          form:
+            review: Approve
+            schedule: Publish Date
+            publish: Publish Now
+            draft: save as draft
+            reset: Reset to Draft
+
   activerecord:
     attributes:
       cms/fortress/user:
@@ -86,3 +113,12 @@ en:
         role_id: Role
         password: Password
         password_confirmation: Password Confirmation
+      cms/fortress/role:
+        name: Name
+        description: Description
+      cms/fortress/role_detail:
+        contents: Contents
+      comfy/cms/page:
+        full_path: Path
+        parent_id: Parent page
+        slug: Slug

data/config/roles.yml

@@ -3,6 +3,7 @@ contents:
   - files
   - page.review
   - page.publish
+  - page.draft
 designs:
   - layouts
   - snippets

data/config/secrets.yml

@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure the secrets in this file are kept private
+# if you're sharing your code publicly.
+
+test:
+  secret_key_base: a8fb39f9880722d803b8c64f445123d50e9d408a8a5b9f70072849ff8bafd51b6d615f549b3a5d08a55f66f52384e2aa6fca0d3c24ea19a2340b3c6daa1d590b

data/db/migrate/06_add_type_to_users.rb

@@ -0,0 +1,11 @@
+class AddTypeToUsers < ActiveRecord::Migration
+  def change
+    add_column :cms_fortress_users, :type_id, :integer
+    add_column :cms_fortress_users, :site_id, :integer
+    add_column :cms_fortress_roles, :site_id, :integer
+    add_column :cms_fortress_role_details, :site_id, :integer
+    add_column :cms_page_workflows, :site_id, :integer
+
+    Cms::Fortress::User.update_all(type_id: 1)
+  end
+end

data/db/migrate/07_integrate_workflow_into_cms_pages.rb

@@ -0,0 +1,37 @@
+class IntegrateWorkflowIntoCmsPages < ActiveRecord::Migration
+  class Cms::PageWorkflow < ActiveRecord::Base
+    self.table_name = 'cms_page_workflows'
+    belongs_to :page, :class_name => 'Comfy::Cms::Page', :foreign_key => 'cms_page_id'
+  end
+
+  def change
+
+    add_column :comfy_cms_pages, :aasm_state, :string, default: 'new'
+    add_column :comfy_cms_pages, :published_date, :date
+
+    Comfy::Cms::Page.reset_column_information
+
+    Cms::PageWorkflow.all.each do |workflow|
+      page = Comfy::Cms::Page.where(id: workflow.cms_page_id).first
+      if page
+        page.aasm_state = case workflow.status_id.to_i
+          when 0
+            'drafted'
+          when 1
+            'reviewed'
+          when 2
+            'scheduled'
+          when 3
+            'published'
+          else
+            'drafted'
+          end
+        page.published_date = workflow.published_date
+        page.save!
+      end
+    end
+
+    # TODO: Just to make it safe workflow table will be removed on the 5th patch release
+    # drop_table :cms_page_workflows
+  end
+end

data/db/schema.rb

@@ -0,0 +1,182 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 7) do
+
+  create_table "cms_fortress_role_details", force: true do |t|
+    t.string   "name"
+    t.string   "command"
+    t.boolean  "can_create"
+    t.boolean  "can_update"
+    t.boolean  "can_delete"
+    t.boolean  "can_view"
+    t.integer  "role_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "site_id"
+  end
+
+  create_table "cms_fortress_roles", force: true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "site_id"
+  end
+
+  create_table "cms_fortress_users", force: true do |t|
+    t.string   "email",                  default: "", null: false
+    t.string   "encrypted_password",     default: "", null: false
+    t.integer  "role_id"
+    t.string   "reset_password_token"
+    t.datetime "reset_password_sent_at"
+    t.datetime "remember_created_at"
+    t.integer  "sign_in_count",          default: 0
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
+    t.string   "first_name"
+    t.string   "last_name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "type_id"
+    t.integer  "site_id"
+  end
+
+  add_index "cms_fortress_users", ["email"], name: "index_cms_fortress_users_on_email", unique: true
+  add_index "cms_fortress_users", ["reset_password_token"], name: "index_cms_fortress_users_on_reset_password_token", unique: true
+
+  create_table "comfy_cms_blocks", force: true do |t|
+    t.string   "identifier",                      null: false
+    t.text     "content",        limit: 16777215
+    t.integer  "blockable_id"
+    t.string   "blockable_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "comfy_cms_blocks", ["blockable_id", "blockable_type"], name: "index_comfy_cms_blocks_on_blockable_id_and_blockable_type"
+  add_index "comfy_cms_blocks", ["identifier"], name: "index_comfy_cms_blocks_on_identifier"
+
+  create_table "comfy_cms_categories", force: true do |t|
+    t.integer "site_id",          null: false
+    t.string  "label",            null: false
+    t.string  "categorized_type", null: false
+  end
+
+  add_index "comfy_cms_categories", ["site_id", "categorized_type", "label"], name: "index_cms_categories_on_site_id_and_cat_type_and_label", unique: true
+
+  create_table "comfy_cms_categorizations", force: true do |t|
+    t.integer "category_id",      null: false
+    t.string  "categorized_type", null: false
+    t.integer "categorized_id",   null: false
+  end
+
+  add_index "comfy_cms_categorizations", ["category_id", "categorized_type", "categorized_id"], name: "index_cms_categorizations_on_cat_id_and_catd_type_and_catd_id", unique: true
+
+  create_table "comfy_cms_files", force: true do |t|
+    t.integer  "site_id",                                    null: false
+    t.integer  "block_id"
+    t.string   "label",                                      null: false
+    t.string   "file_file_name",                             null: false
+    t.string   "file_content_type",                          null: false
+    t.integer  "file_file_size",                             null: false
+    t.string   "description",       limit: 2048
+    t.integer  "position",                       default: 0, null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "comfy_cms_files", ["site_id", "block_id"], name: "index_comfy_cms_files_on_site_id_and_block_id"
+  add_index "comfy_cms_files", ["site_id", "file_file_name"], name: "index_comfy_cms_files_on_site_id_and_file_file_name"
+  add_index "comfy_cms_files", ["site_id", "label"], name: "index_comfy_cms_files_on_site_id_and_label"
+  add_index "comfy_cms_files", ["site_id", "position"], name: "index_comfy_cms_files_on_site_id_and_position"
+
+  create_table "comfy_cms_layouts", force: true do |t|
+    t.integer  "site_id",                                     null: false
+    t.integer  "parent_id"
+    t.string   "app_layout"
+    t.string   "label",                                       null: false
+    t.string   "identifier",                                  null: false
+    t.text     "content",    limit: 16777215
+    t.text     "css",        limit: 16777215
+    t.text     "js",         limit: 16777215
+    t.integer  "position",                    default: 0,     null: false
+    t.boolean  "is_shared",                   default: false, null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "comfy_cms_layouts", ["parent_id", "position"], name: "index_comfy_cms_layouts_on_parent_id_and_position"
+  add_index "comfy_cms_layouts", ["site_id", "identifier"], name: "index_comfy_cms_layouts_on_site_id_and_identifier", unique: true
+
+  create_table "comfy_cms_pages", force: true do |t|
+    t.integer  "site_id",                                             null: false
+    t.integer  "layout_id"
+    t.integer  "parent_id"
+    t.integer  "target_page_id"
+    t.string   "label",                                               null: false
+    t.string   "slug"
+    t.string   "full_path",                                           null: false
+    t.text     "content_cache",  limit: 16777215
+    t.integer  "position",                        default: 0,         null: false
+    t.integer  "children_count",                  default: 0,         null: false
+    t.boolean  "is_published",                    default: true,      null: false
+    t.boolean  "is_shared",                       default: false,     null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "cached_timeout",                  default: 0
+    t.string   "aasm_state",                      default: "new"
+    t.date     "published_date"
+  end
+
+  add_index "comfy_cms_pages", ["parent_id", "position"], name: "index_comfy_cms_pages_on_parent_id_and_position"
+  add_index "comfy_cms_pages", ["site_id", "full_path"], name: "index_comfy_cms_pages_on_site_id_and_full_path"
+
+  create_table "comfy_cms_revisions", force: true do |t|
+    t.string   "record_type",                  null: false
+    t.integer  "record_id",                    null: false
+    t.text     "data",        limit: 16777215
+    t.datetime "created_at"
+  end
+
+  add_index "comfy_cms_revisions", ["record_type", "record_id", "created_at"], name: "index_cms_revisions_on_rtype_and_rid_and_created_at"
+
+  create_table "comfy_cms_sites", force: true do |t|
+    t.string  "label",                       null: false
+    t.string  "identifier",                  null: false
+    t.string  "hostname",                    null: false
+    t.string  "path"
+    t.string  "locale",      default: "en",  null: false
+    t.boolean "is_mirrored", default: false, null: false
+  end
+
+  add_index "comfy_cms_sites", ["hostname"], name: "index_comfy_cms_sites_on_hostname"
+  add_index "comfy_cms_sites", ["is_mirrored"], name: "index_comfy_cms_sites_on_is_mirrored"
+
+  create_table "comfy_cms_snippets", force: true do |t|
+    t.integer  "site_id",                                     null: false
+    t.string   "label",                                       null: false
+    t.string   "identifier",                                  null: false
+    t.text     "content",    limit: 16777215
+    t.integer  "position",                    default: 0,     null: false
+    t.boolean  "is_shared",                   default: false, null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "comfy_cms_snippets", ["site_id", "identifier"], name: "index_comfy_cms_snippets_on_site_id_and_identifier", unique: true
+  add_index "comfy_cms_snippets", ["site_id", "position"], name: "index_comfy_cms_snippets_on_site_id_and_position"
+
+end

data/lib/cms-fortress.rb

@@ -1,13 +1,17 @@
 require 'comfortable_mexican_sofa'
 require 'devise'
 require 'cancan'
+require 'aasm'
 require 'tinymce-rails'
 
 require_relative 'comfortable_mexican_sofa/fixture/page'
 
 require_relative 'cms/fortress/application_controller_methods'
+require_relative 'cms/fortress/sites_controller_methods'
+require_relative 'cms/fortress/pages_controller_methods'
 require_relative 'cms/fortress/page_methods'
 require_relative 'cms/fortress/file_methods'
+require_relative 'cms/fortress/site_methods'
 require_relative 'cms/fortress/rails/engine'
 require_relative 'cms/fortress/auth'
 require_relative 'cms/fortress/content_renderer'
@@ -46,8 +50,13 @@ module Cms
           :path => 'comfy_admin_cms_site_snippets_path(@site) if @site && !@site.new_record?'}
         ]
         @settings_resources = [
+          {name: 'dropdown-header', title: "cms.fortress.admin.super_user.menu_header", super_user: true},
           {:name => 'sites', :title => 'comfy.admin.cms.base.sites',
-          :path => 'comfy_admin_cms_sites_path'},
+          :path => 'comfy_admin_cms_sites_path', :super_user => true},
+          {:name => 'super_users', :title => 'cms.fortress.admin.super_user.title',
+          :path => 'super_cms_fortress_users_path', :super_user => true},
+          {name: 'divider', super_user: true},
+          {name: 'dropdown-header', title: "cms.fortress.admin.sites.menu_header"},
           {:name => 'roles', :title => 'cms.fortress.roles.title',
           :path => 'cms_fortress_roles_path'},
           {:name => 'users', :title => 'cms.fortress.users.title',

data/lib/cms/fortress/application_controller_methods.rb

@@ -4,7 +4,9 @@ module Cms
 
       def after_sign_in_path_for(resource)
         if resource.class.eql?(Cms::Fortress::User)
-          comfy_admin_cms_path
+          session[:site_id] = resource.site_id
+          #comfy_admin_cms_path
+          dashboard_site_path
         else
           begin
             stored_location_for(resource) || send("after_sign_in_path_for_#{ resource.class.name.underscore }", resource)
@@ -17,7 +19,8 @@ module Cms
       def after_sign_out_path_for(resource_or_scope)
         # request.referrer
         if resource_or_scope.eql?(:cms_fortress_user)
-          comfy_admin_cms_path
+          # comfy_admin_cms_path
+          dashboard_site_path
         else
           begin
             stored_location_for(resource_or_scope) || send("after_sign_out_path_for_#{ resource_or_scope.to_s }", resource_or_scope)

data/lib/cms/fortress/page_methods.rb

@@ -5,8 +5,58 @@ module Cms
       def self.included(base)
 
         base.class_eval do
-          has_one :page_workflow, :class_name => "Cms::PageWorkflow", :foreign_key => 'cms_page_id'
-          accepts_nested_attributes_for :page_workflow
+          before_create { self.draft if self.new? }
+
+          include AASM
+
+          aasm do
+            state :new, initial: true
+            state :drafted
+            state :reviewed
+            state :scheduled
+            state :published, before_enter: :check_publish_date
+
+            event :draft do
+              after :publish_page?
+              transitions from: :new, to: :drafted
+            end
+
+            event :review do
+              after :publish_page?
+              transitions from: [:new, :drafted], to: :reviewed
+            end
+
+            event :schedule do
+              after :publish_page?
+              transitions from: [:new, :drafted, :reviewed], to: :scheduled, guard: :published_date?
+            end
+
+            event :publish do
+              after :publish_page?
+              transitions from: [:new, :drafted, :reviewed, :scheduled], to: :published
+            end
+
+            event :reset do
+              after :publish_page?
+              transitions from: [:reviewed, :scheduled, :published], to: :drafted
+            end
+          end
+
+          def check_publish_date
+            self.published_date = Time.now unless self.published_date
+          end
+
+          def publish_page?
+            ret = false
+            if self.published?
+              ret = true
+            else
+              if self.scheduled? && self.published_date.present? && self.published_date <= Date.today
+                ret = true
+              end
+            end
+            self.is_published = ret
+          end
 
         end