cms-fortress 1.0.7 → 1.0.8

data/VERSION

@@ -1 +1 @@
-1.0.7
+1.0.8

data/app/controllers/cms/fortress/users/sessions_controller.rb

@@ -0,0 +1,4 @@
+class Cms::Fortress::Users::SessionsController < Devise::SessionsController
+  layout 'cms/fortress/session'
+
+end

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

@@ -11,7 +11,6 @@ class Cms::Fortress::Role < ActiveRecord::Base
     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"))
     load_from_file(file)

data/app/models/cms/page_workflow.rb

@@ -24,6 +24,19 @@ class Cms::PageWorkflow < ActiveRecord::Base
     ret
   end
 
+  def self.cached_timeout_for_select
+    {
+      "Uncached" => 0,
+      "15 minutes" => 15.minutes,
+      "30 minutes" => 30.minutes,
+      "1 hour" => 1.hour,
+      "3 hours" => 3.hours,
+      "24 hours" => 1.day,
+      "15 days" => 15.days,
+      "30 days" => 30.days
+    }.map {|k,v| [k, v.to_i] }
+  end
+
   def page_published?
     (status_id.eql?(3) || status_id.eql?(2)) && published_date <= Date.today
   end

data/app/models/cms_ability.rb

@@ -1,3 +1,16 @@
+# 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')
+#       can :manage, Blog
+#     else
+#       warn "#{ role.command } is not yet handled."
+#     end
+#   end
+# 
+# end
 class CmsAbility
   include CanCan::Ability
 
@@ -24,7 +37,7 @@ class CmsAbility
           elsif role.command.eql?("designs.snippets")
             can :manage, Cms::Snippet
           else
-            setup_role(role)
+            setup_role(role) if defined?(setup_role)
           end
         end
       end
@@ -32,10 +45,4 @@ class CmsAbility
 
   end
 
-  # override this if you have custom role assignment
-  def setup_role(role)
-
-  end
-
-
 end

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

@@ -34,9 +34,7 @@
 = 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(can?(:manage, 'contents.page.publish'), can?(:manage, 'contents.page.review')), {}, {class: "status-control"}
-  = wf.text_field :published_date, class: "status-control", :data => {:utc_date => (@page.page_workflow.published_date.nil? ? Time.now : @page.page_workflow.published_date).strftime("%d %B, %Y") }
+= render :partial => 'cms/fortress/shared/page_extend', :locals => {form: form}
 
 = render 'admin/cms/partials/page_form_after', :object => form
 
@@ -45,19 +43,4 @@
   = 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()
-
+= render :partial => 'cms/fortress/shared/page_extend_js'

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

@@ -0,0 +1,5 @@
+= 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'}

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

@@ -0,0 +1,16 @@
+: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/cms-fortress.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cms-fortress"
-  s.version = "1.0.7"
+  s.version = "1.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Melvin Sembrano"]
-  s.date = "2013-12-15"
+  s.date = "2013-12-18"
   s.description = "Comfortable Mexican Sofa (CMS) - User and role management extension"
   s.email = "melvinsembrano@gmail.com"
   s.extra_rdoc_files = [
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     "app/assets/stylesheets/cms/fortress/session.css",
     "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",
@@ -44,7 +45,6 @@ Gem::Specification.new do |s|
     "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/_leftnav.html.haml",
@@ -62,6 +62,8 @@ Gem::Specification.new do |s|
     "app/views/cms/fortress/roles/show.html.haml",
     "app/views/cms/fortress/shared/_admin_topnav.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/users/_form.html.haml",
     "app/views/cms/fortress/users/edit.html.haml",
     "app/views/cms/fortress/users/index.html.haml",
@@ -80,6 +82,7 @@ Gem::Specification.new do |s|
     "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",
     "lib/cms-fortress.rb",
     "lib/cms/fortress/application_controller_methods.rb",
     "lib/cms/fortress/auth.rb",

data/db/migrate/05_add_caching_info_to_pages.rb

@@ -0,0 +1,5 @@
+class AddCachingInfoToPages < ActiveRecord::Migration
+  def change
+    add_column :cms_pages, :cached_timeout, :integer, :default => 0
+  end
+end

data/lib/cms/fortress/application_controller_methods.rb

@@ -11,8 +11,16 @@ module Cms
         admin_cms_path
       end
 
+      def ability_class
+        if defined?(Ability)  #File.exist?(File.join(Rails.root, "app", "models", "ability.rb"))
+          Ability
+        else
+          CmsAbility
+        end
+      end
+
       def current_ability
-         @current_ability ||= CmsAbility.new(current_cms_fortress_user)
+         @current_ability ||= ability_class.new(current_cms_fortress_user)
       end
 
       def self.included(base)

data/lib/cms/fortress/content_renderer.rb

@@ -7,14 +7,11 @@ module Cms
         base.class_eval do
 
           def render_html(status = 200)
-
             fresh_when etag: @cms_page, last_modified: @cms_page.updated_at.utc, public: true
+            response.cache_control[:max_age] = @cms_page.cached_timeout.seconds
 
             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

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

@@ -4,7 +4,7 @@ module Cms
 
       initializer 'cms-fortress.setup' do |app|
         app.config.to_prepare do
-          Devise::SessionsController.layout "cms/fortress/session"
+          # Devise::SessionsController.layout "cms/fortress/session"
           ApplicationController.helper(Cms::Fortress::ApplicationHelper)
 
           Cms::ContentController.send(:include, Cms::Fortress::ContentRenderer)
@@ -12,27 +12,27 @@ module Cms
 
           # Insert Roles
           Admin::Cms::SitesController.class_eval do
-            before_filter do
+            before_action do
               authorize! :manage, Cms::Site
             end
           end
           Admin::Cms::LayoutsController.class_eval do
-            before_filter do
+            before_action do
               authorize! :manage, Cms::Layout
             end
           end
           Admin::Cms::SnippetsController.class_eval do
-            before_filter do
+            before_action do
               authorize! :manage, Cms::Snippet
             end
           end
           Admin::Cms::PagesController.class_eval do
-            before_filter do
+            before_action do
               authorize! :manage, Cms::Page
             end
           end
           Admin::Cms::FilesController.class_eval do
-            before_filter do
+            before_action do
               authorize! :manage, Cms::File
             end
           end

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

@@ -3,9 +3,14 @@ class ActionDispatch::Routing::Mapper
   def cms_fortress_routes(options = {})
     path = options[:path] || "cms-admin"
 
-    devise_for "cms/fortress/users", :path => path, :path_names => {
-      :sign_in => 'login', :sign_out => 'logout'
-    }
+    devise_for "cms/fortress/users",
+      :path => path,
+      :path_names => {
+        :sign_in => 'login', :sign_out => 'logout'
+      },
+      :controllers => {
+        :sessions => 'cms/fortress/users/sessions'
+      }
 
     scope path, module: 'cms/fortress' do
       resources :roles, :as => 'cms_fortress_roles' do

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

@@ -14,7 +14,7 @@ class Cms::FortressGenerator < Rails::Generators::Base
   def generate_migrations
     rake("cms_fortress_engine:install:migrations")
   end
-
+=begin
   def generate_assets
     directory 'app/assets/javascripts/cms/fortress',
       'app/assets/javascripts/cms/fortress'
@@ -22,7 +22,7 @@ class Cms::FortressGenerator < Rails::Generators::Base
     directory 'app/assets/stylesheets/cms/fortress',
       'app/assets/stylesheets/cms/fortress'
   end
-
+=end
   def show_readme
     readme 'lib/generators/cms/fortress/templates/README'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cms-fortress
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-15 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -181,6 +181,7 @@ files:
 - app/assets/stylesheets/cms/fortress/session.css
 - 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
@@ -190,7 +191,6 @@ files:
 - 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/_leftnav.html.haml
@@ -208,6 +208,8 @@ files:
 - app/views/cms/fortress/roles/show.html.haml
 - app/views/cms/fortress/shared/_admin_topnav.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/users/_form.html.haml
 - app/views/cms/fortress/users/edit.html.haml
 - app/views/cms/fortress/users/index.html.haml
@@ -226,6 +228,7 @@ files:
 - 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
 - lib/cms-fortress.rb
 - lib/cms/fortress/application_controller_methods.rb
 - lib/cms/fortress/auth.rb
@@ -267,7 +270,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2031890954127426435
+      hash: 1036308534323409436
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: