cms-fortress 0.2.0 → 1.0.0

data/app/models/cms/page_workflow.rb

@@ -0,0 +1,27 @@
+class Cms::PageWorkflow < ActiveRecord::Base
+  self.table_name = 'cms_page_workflows'
+
+  belongs_to :page, :foreign_key => 'cms_page_id'
+
+  after_save do |record|
+    record.page.update_attribute(:is_published, record.page_published?)
+  end
+
+  def self.statuses
+    {
+      0 => :draft,
+      1 => :reviewed,
+      # 2 => :scheduled,
+      3 => :published
+    }
+  end
+
+  def self.statuses_for_select
+    self.statuses.map {|k,v| [v.to_s.titleize, k]}
+  end
+
+  def page_published?
+    status_id.eql?(3) || status_id.eql?(2) && published_date < Time.now
+  end
+
+end

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

@@ -0,0 +1,61 @@
+- content_for :right_column do
+  #form-save.box
+    %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'
+
+= render 'admin/cms/partials/page_form_before', :object => form
+
+= form.text_field :label, :data => {:slugify => @page.new_record?}
+
+- unless @site.pages.count == 0 || @site.pages.root == @page
+  = form.text_field :slug, :data => {:slug => true}
+  - unless @page.new_record?
+    = form.text_field :full_path, :id => 'full-path', :disabled => true
+
+- 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
+
+- if (options = ::Cms::Page.options_for_select(@site, @page, nil, 0, false)).present?
+  = form.select :target_page_id, [["---- #{t('.select_target_page')} ----", nil]] + options
+
+= render 'admin/cms/partials/page_form_inner', :object => form
+
+= render :partial => 'admin/cms/categories/form', :object => form
+
+= render :partial => 'form_blocks'
+
+=# form.check_box :is_published, :label => t('.is_published')
+
+= form.fields_for :page_workflow do |wf|
+  = wf.select :status_id, Cms::PageWorkflow.statuses_for_select, {}, {class: "status-control"}
+  = wf.text_field :published_date, class: "status-control", :data => {:utc_date => @page.page_workflow.published_date.utc.strftime("%d %B, %Y")}
+
+= render 'admin/cms/partials/page_form_after', :object => form
+
+.form-actions
+  = form.submit t('.preview'), :name => 'preview', :id => nil, :class => 'btn'
+  = form.submit t(@page.new_record?? '.create' : '.update'), :class => 'btn btn-primary'
+
+
+:coffeescript
+  dateControl = $("#page_page_workflow_attributes_published_date")
+  wkControl = $("#page_page_workflow_attributes_status_id")
+  parentControl = $("#page_page_workflow_attributes_published_date").parents(".control-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()
+

data/app/views/admin/cms/partials/_body_before.html.haml

@@ -0,0 +1 @@
+= render :partial => 'cms/fortress/shared/admin_topnav'

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

@@ -10,10 +10,10 @@
         %ul.nav
           - if @site && !@site.new_record?
             %li{:class => content_page? ? 'active' : ''}
-              = link_to t("cms.fortress.contents"), cms_admin_site_pages_path(@site)
+              = link_to t("cms.fortress.contents"), admin_cms_site_pages_path(@site)
             %li{:class => design_page? ? 'active' : ''}
-              = link_to t("cms.fortress.design"), cms_admin_site_layouts_path(@site)
+              = link_to t("cms.fortress.design"), admin_cms_site_layouts_path(@site)
           %li{:class => admin_page? ? 'active' : ''}
-            = link_to t("cms.fortress.settings"), cms_admin_sites_path
+            = link_to t("cms.fortress.settings"), admin_cms_sites_path
           %li
-            = link_to "Logout", destroy_cms_user_session_path, :method => 'delete'
+            = link_to "Logout", destroy_cms_fortress_user_session_path, :method => 'delete'

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

@@ -0,0 +1,11 @@
+= render :partial => 'cms/fortress/shared/navbar'
+= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => "form-signin" }) do |f|
+  %h3.form-signin-heading Sign in
+  = f.email_field :email, :autofocus => true, :placeholder => "Email address", :class => "input-block-level"
+  = f.password_field :password, :placeholder => "Password", :class => "input-block-level"
+  - if devise_mapping.rememberable?
+    %label.checkbox
+      = f.check_box :remember_me
+      Remember me
+  = f.submit "Sign in", :class => "btn btn-primary"
+  = render "devise/shared/links"

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

@@ -0,0 +1,17 @@
+%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'

data/app/views/layouts/{cms_admin → admin/cms}/_head.html.haml

@@ -10,5 +10,5 @@
   = javascript_include_tag 'comfortable_mexican_sofa/admin/application'
   
   = yield :head
-  = cms_hook :html_head
-
+  
+  = render 'admin/cms/partials/html_head'

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

@@ -0,0 +1,23 @@
+
+= render '/admin/cms/partials/navigation_before'
+
+%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
+
+  - 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)
+  - 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)
+
+    = cms_hook :navigation
+
+  = 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 = "0.2.0"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Melvin Sembrano"]
-  s.date = "2013-05-01"
+  s.date = "2013-12-10"
   s.description = "Comfortable Mexican Sofa (CMS) - User and role management extension"
   s.email = "melvinsembrano@gmail.com"
   s.extra_rdoc_files = [
@@ -18,6 +18,8 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".rbenv-gemsets",
+    ".ruby-version",
     ".rvmrc",
     "Gemfile",
     "Gemfile.lock",
@@ -54,7 +56,11 @@ Gem::Specification.new do |s|
     "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/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/design.html.haml",
     "app/views/cms/fortress/admin/roles.html.haml",
     "app/views/cms/fortress/admin/settings.html.haml",
@@ -70,32 +76,38 @@ Gem::Specification.new do |s|
     "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_users/sessions/new.html.erb",
+    "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",
     "app/views/layouts/cms/fortress/default.html.erb",
     "app/views/layouts/cms/fortress/session.html.erb",
-    "app/views/layouts/cms_admin/_body.html.haml",
-    "app/views/layouts/cms_admin/_head.html.haml",
-    "app/views/layouts/cms_admin/_left.html.haml",
     "cms-fortress.gemspec",
-    "config/initializers/devise.rb",
     "config/locales/en.yml",
     "config/roles.yml",
-    "config/routes.rb",
     "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",
     "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/page_methods.rb",
     "lib/cms/fortress/rails/engine.rb",
+    "lib/cms/fortress/routes/admin.rb",
+    "lib/cms/fortress/routing.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",
@@ -109,36 +121,39 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/melvinsembrano/cms-fortress"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.23"
   s.summary = "Comfortable Mexican Sofa (CMS) - User and role management extension"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 0"])
-      s.add_runtime_dependency(%q<comfortable_mexican_sofa>, ["= 1.8.1"])
-      s.add_runtime_dependency(%q<devise>, [">= 1.5.4"])
+      s.add_runtime_dependency(%q<rails>, [">= 4.0.0"])
+      s.add_runtime_dependency(%q<comfortable_mexican_sofa>, ["~> 1.11"])
+      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_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>, [">= 0"])
-      s.add_dependency(%q<comfortable_mexican_sofa>, ["= 1.8.1"])
-      s.add_dependency(%q<devise>, [">= 1.5.4"])
+      s.add_dependency(%q<rails>, [">= 4.0.0"])
+      s.add_dependency(%q<comfortable_mexican_sofa>, ["~> 1.11"])
+      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<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>, [">= 0"])
-    s.add_dependency(%q<comfortable_mexican_sofa>, ["= 1.8.1"])
-    s.add_dependency(%q<devise>, [">= 1.5.4"])
+    s.add_dependency(%q<rails>, [">= 4.0.0"])
+    s.add_dependency(%q<comfortable_mexican_sofa>, ["~> 1.11"])
+    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<rdoc>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

data/config/roles.yml

@@ -1,6 +1,8 @@
 contents:
   - pages
   - files
+  - page.review
+  - page.publish
 designs:
   - layouts
   - snippets

data/db/migrate/04_create_cms_page_workflows.rb

@@ -0,0 +1,11 @@
+class CreateCmsPageWorkflows < ActiveRecord::Migration
+  def change
+    create_table :cms_page_workflows do |t|
+      t.integer :cms_page_id
+      t.integer :status_id
+      t.date :published_date
+
+      t.timestamps
+    end
+  end
+end

data/lib/cms-fortress.rb

@@ -2,8 +2,11 @@ require 'comfortable_mexican_sofa'
 require 'devise'
 require 'cancan'
 
-require 'cms/fortress/application_controller_methods'
-require 'cms/fortress/rails/engine'
-require 'cms/fortress/auth'
-require 'cms/fortress/comfortable_mexican_sofa'
-require 'cms/fortress/devise'
+require_relative 'cms/fortress/application_controller_methods'
+require_relative 'cms/fortress/page_methods'
+require_relative 'cms/fortress/rails/engine'
+require_relative 'cms/fortress/auth'
+require_relative 'cms/fortress/content_renderer'
+require_relative 'cms/fortress/comfortable_mexican_sofa'
+require_relative 'cms/fortress/devise'
+require_relative 'cms/fortress/routing'

data/lib/cms/fortress/application_controller_methods.rb

@@ -2,12 +2,12 @@ module Cms
   module Fortress
     module ApplicationControllerMethods
       def after_sign_in_path_for(resource)
-        cms_admin_path
+        admin_cms_path
       end
 
       def after_sign_out_path_for(resource_or_scope)
         # request.referrer
-        cms_admin_path
+        admin_cms_path
       end
     end
   end

data/lib/cms/fortress/auth.rb

@@ -2,8 +2,8 @@ module Cms
   module Fortress
     module Auth
       def authenticate
-        unless current_cms_user
-          redirect_to new_cms_user_session_path
+        unless current_cms_fortress_user
+          redirect_to new_cms_fortress_user_session_path
         end
       end
     end

data/lib/cms/fortress/comfortable_mexican_sofa.rb

@@ -1,5 +1,6 @@
 ComfortableMexicanSofa.configure do |config|
   config.admin_auth = 'Cms::Fortress::Auth'
+  config.cms_title = 'CMS Fortress (Powered by ComfortableMexicanSofa)'
 end
 
 ComfortableMexicanSofa::ViewHooks.add(:header, 'cms/fortress/shared/admin_topnav')

data/lib/cms/fortress/content_renderer.rb

@@ -0,0 +1,30 @@
+module Cms
+  module Fortress
+    module ContentRenderer
+
+      def self.included(base)
+
+        base.class_eval do
+
+          def render_html(status = 200)
+
+            fresh_when etag: @cms_page, last_modified: @cms_page.updated_at.utc, public: true
+
+            if @cms_layout = @cms_page.layout
+
+              #TODO: put the caching config in the page
+              response.cache_control[:max_age] = 5.minutes
+
+              app_layout = (@cms_layout.app_layout.blank? || request.xhr?) ? false : @cms_layout.app_layout
+              render(:inline => @cms_page.content, :layout => app_layout, :status => status, :content_type => 'text/html') unless performed?
+            else
+              render :text => I18n.t('cms.content.layout_not_found'), :status => 404
+            end
+          end
+
+        end
+      end
+
+    end
+  end
+end

data/lib/cms/fortress/page_methods.rb

@@ -0,0 +1,17 @@
+module Cms
+  module Fortress
+    module PageMethods
+
+      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
+
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -6,6 +6,10 @@ module Cms
         app.config.to_prepare do
           Devise::SessionsController.layout "cms/fortress/session"
           ApplicationController.helper(Cms::Fortress::ApplicationHelper)
+
+          Cms::ContentController.send(:include, Cms::Fortress::ContentRenderer)
+          Cms::Page.send(:include, Cms::Fortress::PageMethods)
+
         end
         app.config.railties_order = [ :all, ComfortableMexicanSofa::Engine, Cms::Fortress::Engine ]