cms-fortress 1.2.2 → 1.3.0.rc1

data/lib/cms/fortress/pages_controller_methods.rb

@@ -0,0 +1,17 @@
+module Cms
+  module Fortress
+    module PagesControllerMethods
+
+      def transit_to_state
+        @page.send(params.fetch(:transition)) if params[:transition].present?
+      end
+
+      def self.included(base)
+        base.class_eval do
+          before_action :transit_to_state, only: [:create, :update]
+        end
+      end
+
+    end
+  end
+end

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

@@ -10,15 +10,24 @@ module Cms
           Sprockets::Context.send :include, Cms::Fortress::SprocketHelper
 
           Comfy::Cms::ContentController.send(:include, Cms::Fortress::ContentRenderer)
+          Comfy::Admin::Cms::PagesController.send(:include, Cms::Fortress::PagesControllerMethods)
           Comfy::Cms::Page.send(:include, Cms::Fortress::PageMethods)
           Comfy::Cms::File.send(:include, Cms::Fortress::FileMethods)
+          Comfy::Cms::Site.send(:include, Cms::Fortress::SiteMethods)
 
-          # Insert Roles
-          Comfy::Admin::Cms::SitesController.class_eval do
+
+          Comfy::Admin::Cms::BaseController.class_eval do
             before_action do
-              authorize! :manage, Comfy::Cms::Site
+              if current_cms_fortress_user && current_cms_fortress_user.type.eql?(:site_user)
+                @site = current_cms_fortress_user.site
+                session[:site_id] = @site.id if @site
+              end
             end
           end
+
+          # Insert Roles
+          Comfy::Admin::Cms::SitesController.send :include, Cms::Fortress::SiteControllerMethods
+
           Comfy::Admin::Cms::LayoutsController.class_eval do
             before_action do
               authorize! :manage, Comfy::Cms::Layout

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

@@ -18,7 +18,13 @@ class ActionDispatch::Routing::Mapper
           post :refresh
         end
       end
-      resources :users, :as => 'cms_fortress_users'
+
+      resources :users, :except => :show, :as => 'cms_fortress_users' do
+        collection do
+          get :super
+          get "super/new", action: "new_super"
+        end
+      end
 
       get 'settings/users' => 'admin#users', as: 'cms_fortress_user_settings'
       get 'unauthorised' => 'admin#unauthorised', as: 'cms_fortress_unauthorised'
@@ -27,6 +33,8 @@ class ActionDispatch::Routing::Mapper
       get 'sites/:site_id/files/videos' => 'admin#videos', as: 'cms_fortress_files_videos'
       get 'sites/:site_id/files/others' => 'admin#other_files', as: 'cms_fortress_files_others'
 
+      # Site Resource routes
+      get 'site/dashboard' => 'admin#dashboard', as: 'dashboard_site'
     end
 
   end

data/lib/cms/fortress/site_methods.rb

@@ -0,0 +1,29 @@
+require 'active_support/concern'
+
+module Cms
+  module Fortress
+    module SiteMethods
+      extend ActiveSupport::Concern
+
+      included do
+        after_create :generate_defaults
+
+        has_many :users, class_name: "Cms::Fortress::User", foreign_key: :site_id
+        has_many :roles, class_name: "Cms::Fortress::Role", foreign_key: :site_id
+        has_many :role_details, class_name: "Cms::Fortress::RoleDetail", foreign_key: :site_id
+      end
+
+      # generate default roles specific for the site
+      def generate_defaults
+        #TODO: implement I18n below
+        role = Cms::Fortress::Role.create!(:site_id => id, :name => "#{label} Administrator", :description => "#{ label } administrator users")
+        role.load_defaults
+        role.save
+      end
+
+      module ClassMethods
+
+      end
+    end
+  end
+end

data/lib/cms/fortress/sites_controller_methods.rb

@@ -0,0 +1,22 @@
+require 'active_support/concern'
+module Cms
+  module Fortress
+    module SiteControllerMethods
+      extend ActiveSupport::Concern
+
+      included do
+        before_action do
+          authorize! :manage, Comfy::Cms::Site
+        end
+        before_action only: [:new, :create] do
+          raise CanCan::AccessDenied.new("You are not allowed to create a site.") unless current_cms_fortress_user.type.eql?(:super_user)
+        end
+      end
+
+      module ClassMethods
+
+      end
+
+    end
+  end
+end

data/lib/generators/cms/comfy/comfy_generator.rb

@@ -0,0 +1,18 @@
+require 'rails/generators'
+require 'generators/comfy/cms/cms_generator'
+
+class Cms::ComfyGenerator < Comfy::Generators::CmsGenerator
+  spec = Gem::Specification.find_by_name("comfortable_mexican_sofa")
+  source_root spec.gem_dir # File.expand_path('../../../../..', __FILE__)
+
+  def generate_routing
+    route_string  = "  comfy_route :cms_admin, :path => '/cms-admin'\n\n"
+    route_string << "  # Make sure this routeset is defined last\n"
+    route_string << "  comfy_route :cms, :path => '/', :sitemap => false\n"
+    route route_string[2..-1]
+  end
+
+  def show_readme
+
+  end
+end

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

@@ -1,29 +1,53 @@
+require 'generators/cms/comfy/comfy_generator'
+require 'fileutils'
 
 class Cms::FortressGenerator < Rails::Generators::Base
+  include Thor::Actions
+
   # source_root File.expand_path('../templates', __FILE__)
   source_root File.expand_path('../../../../..', __FILE__)
+  class_option :comfy, type: :boolean, default: true, description: "Generate Comfy"
+  class_option :routes, type: :boolean, default: true, description: "Generate routes"
+  class_option :migration, type: :boolean, default: true, description: "Generate migration"
+  class_option :devise, type: :boolean, default: true, description: "Generate devise"
+  class_option :development , default: false, desc: "Copy files that are necessary for development and testing of cms-fortress.", aliases: "-d"
 
   def install_devise
-    generate("devise:install")
+    generate("devise:install") if options.devise? && !options.development?
   end
 
   def install_comfortable_mexican_sofa
-    generate("comfy:cms")
+    Cms::ComfyGenerator.start if options.comfy? && !options.development?
   end
 
   def generate_migrations
-    rake("cms_fortress_engine:install:migrations")
+    rake("cms_fortress_engine:install:migrations") if options.migration?
   end
 
   def generate_initialization
-    copy_file 'config/initializers/cms_fortress.rb',
-      'config/initializers/cms_fortress.rb'
+    copy_file 'config/initializers/cms_fortress.rb', 'config/initializers/cms_fortress.rb'
+  end
+
+  def copy_development_files
+    if options[:development] == "development"
+      copy_file Gem::Specification.find_by_name('comfortable_mexican_sofa').gem_dir+'/db/migrate/01_create_cms.rb',
+        'db/migrate/00_create_cms.rb'
+    end
+  end
+
+  def generate_routing
+    if options.routes?
+      route_string = ""
+      route_string << "  cms_fortress_routes :path => '/cms-admin'\n"
+      route route_string[2..-1]
+    end
   end
 
   def copy_files
     log 'Copying files...'
     files = [
-      'config/roles.yml'
+      'config/roles.yml',
+      'config/cms/fortress/global_settings.yml'
     ]
     files.each do |file|
       copy_file file, file

data/lib/generators/cms/fortress/upgrade/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Explain the generator
+
+Example:
+    rails generate upgrade Thing
+
+    This will create:
+        what/will/it/create

data/lib/generators/cms/fortress/upgrade/upgrade_generator.rb

@@ -0,0 +1,24 @@
+class Cms::Fortress::UpgradeGenerator < Rails::Generators::Base
+  source_root File.expand_path('../../../../../..', __FILE__)
+
+  def generate_migrations
+    rake("cms_fortress_engine:install:migrations")
+  end
+
+  def copy_files
+    log 'Copying files...'
+    files = [
+      'config/cms/fortress/global_settings.yml'
+    ]
+    files.each do |file|
+      copy_file file, file
+    end
+  end
+
+  def done
+    puts "\r\n\r\n!!! IMPORTANT NOTE: Review your existing users since they set to super users as default. Review and assign site roles accordingly."
+    puts "Upgrade complete..."
+    puts "\r\n\r\n"
+  end
+
+end

data/test/{functional → controllers}/cms/fortress/roles_controller_test.rb

@@ -1,11 +1,16 @@
+# http://api.rubyonrails.org/classes/ActionController/TestCase.html
 require 'test_helper'
 
+
 class Cms::Fortress::RolesControllerTest < ActionController::TestCase
-  setup do
+  def setup
+    @comfy_cms_site = comfy_cms_sites(:default)
+    @cms_fortress_user = cms_fortress_users(:one)
     @cms_fortress_role = cms_fortress_roles(:one)
+    sign_in Cms::Fortress::User, @cms_fortress_user
   end
 
-  test "should get index" do
+  def test_should_get_index
     get :index
     assert_response :success
     assert_not_nil assigns(:cms_fortress_roles)
@@ -18,7 +23,7 @@ class Cms::Fortress::RolesControllerTest < ActionController::TestCase
 
   test "should create cms_fortress_role" do
     assert_difference('Cms::Fortress::Role.count') do
-      post :create, cms_fortress_role: { description: @cms_fortress_role.description, title: @cms_fortress_role.title }
+      post :create, cms_fortress_role: { description: @cms_fortress_role.description, name: @cms_fortress_role.name }
     end
 
     assert_redirected_to cms_fortress_role_path(assigns(:cms_fortress_role))
@@ -35,7 +40,7 @@ class Cms::Fortress::RolesControllerTest < ActionController::TestCase
   end
 
   test "should update cms_fortress_role" do
-    put :update, id: @cms_fortress_role, cms_fortress_role: { description: @cms_fortress_role.description, title: @cms_fortress_role.title }
+    put :update, id: @cms_fortress_role, cms_fortress_role: { description: @cms_fortress_role.description, name: @cms_fortress_role.name }
     assert_redirected_to cms_fortress_role_path(assigns(:cms_fortress_role))
   end
 

data/test/{functional → controllers}/cms/fortress/users_controller_test.rb

@@ -1,13 +1,16 @@
+# http://api.rubyonrails.org/classes/ActionController/TestCase.html
 require 'test_helper'
 
 class Cms::Fortress::UsersControllerTest < ActionController::TestCase
-  setup do
+  def setup
+    @comfy_cms_site = comfy_cms_sites(:default)
     @cms_fortress_user = cms_fortress_users(:one)
+    @cms_fortress_role_details = cms_fortress_role_details(:one)
+    sign_in Cms::Fortress::User, @cms_fortress_user
   end
 
-  test "should get index" do
+  def test_it_should_get_index
     get :index
-    assert_response :success
     assert_not_nil assigns(:cms_fortress_users)
   end
 
@@ -18,15 +21,10 @@ class Cms::Fortress::UsersControllerTest < ActionController::TestCase
 
   test "should create cms_fortress_user" do
     assert_difference('Cms::Fortress::User.count') do
-      post :create, cms_fortress_user: { email: @cms_fortress_user.email, password: @cms_fortress_user.password, password_confirmation: @cms_fortress_user.password_confirmation }
+      post :create, cms_fortress_user: { email: 'foo@bar.com', password: 'foobar123', password_confirmation: 'foobar123' }
     end
 
-    assert_redirected_to cms_fortress_user_path(assigns(:cms_fortress_user))
-  end
-
-  test "should show cms_fortress_user" do
-    get :show, id: @cms_fortress_user
-    assert_response :success
+    assert_redirected_to cms_fortress_users_path
   end
 
   test "should get edit" do
@@ -36,7 +34,8 @@ class Cms::Fortress::UsersControllerTest < ActionController::TestCase
 
   test "should update cms_fortress_user" do
     put :update, id: @cms_fortress_user, cms_fortress_user: { email: @cms_fortress_user.email, password: @cms_fortress_user.password, password_confirmation: @cms_fortress_user.password_confirmation }
-    assert_redirected_to cms_fortress_user_path(assigns(:cms_fortress_user))
+    #assert_redirected_to cms_fortress_user_path(assigns(:cms_fortress_user))
+    assert_redirected_to cms_fortress_users_path()
   end
 
   test "should destroy cms_fortress_user" do

data/test/controllers/comfy/admin/cms/pages_controller_test.rb

@@ -0,0 +1,115 @@
+require 'test_helper'
+
+class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
+  def setup
+    @comfy_cms_site = comfy_cms_sites(:default)
+    @cms_fortress_user = cms_fortress_users(:one)
+    @cms_fortress_role = cms_fortress_roles(:one)
+    sign_in Cms::Fortress::User, @cms_fortress_user
+  end
+
+  test "new page should be drafted" do
+    assert_difference 'Comfy::Cms::Page.count' do
+      assert_difference 'Comfy::Cms::Block.count', 2 do
+        post :create, :site_id => @comfy_cms_site, :page => {
+            :label          => 'Test Page',
+            :slug           => 'test-page',
+            :parent_id      => comfy_cms_pages(:default).id,
+            :layout_id      => comfy_cms_layouts(:default).id,
+            :blocks_attributes => [
+                { :identifier => 'default_page_text',
+                  :content    => 'content content' },
+                { :identifier => 'default_field_text',
+                  :content    => 'title content' }
+            ]
+        }, :transition => 'draft'
+        page = Comfy::Cms::Page.last
+        assert_equal @comfy_cms_site, page.site
+        assert page.drafted?
+        assert_redirected_to edit_comfy_admin_cms_site_page_url(id: page, site_id: page.site)
+        assert_equal 'Page created', flash[:success]
+      end
+    end
+  end
+
+  test "new page should be published" do
+    assert_difference 'Comfy::Cms::Page.count' do
+      assert_difference 'Comfy::Cms::Block.count', 2 do
+        post :create, :site_id => @comfy_cms_site, :page => {
+            :label          => 'Test Page',
+            :slug           => 'test-page',
+            :parent_id      => comfy_cms_pages(:default).id,
+            :layout_id      => comfy_cms_layouts(:default).id,
+            :blocks_attributes => [
+                { :identifier => 'default_page_text',
+                  :content    => 'content content' },
+                { :identifier => 'default_field_text',
+                  :content    => 'title content' }
+            ]
+        }, :transition => 'publish'
+        page = Comfy::Cms::Page.last
+        assert_equal @comfy_cms_site, page.site
+        assert page.published?
+        assert_redirected_to edit_comfy_admin_cms_site_page_url(id: page, site_id: page.site)
+        assert_equal 'Page created', flash[:success]
+      end
+    end
+  end
+
+  test "drafted page should become reviewed" do
+    page = comfy_cms_pages(:drafted)
+    assert_no_difference 'Comfy::Cms::Block.count' do
+      put :update, :site_id => page.site, :id => page, :transition => 'review'
+      assert_response :redirect
+      assert_redirected_to :action => :edit, :id => page
+      assert_equal 'Page updated', flash[:success]
+      assert assigns(:page).reviewed?
+    end
+  end
+
+  test "drafted page should become published" do
+    page = comfy_cms_pages(:drafted)
+    assert_no_difference 'Comfy::Cms::Block.count' do
+      put :update, :site_id => page.site, :id => page, :transition => 'publish'
+      assert_response :redirect
+      assert_redirected_to :action => :edit, :id => page
+      assert_equal 'Page updated', flash[:success]
+      assert assigns(:page).published?
+    end
+  end
+
+  test "reviewed page should become published" do
+    page = comfy_cms_pages(:reviewed)
+    assert_no_difference 'Comfy::Cms::Block.count' do
+      put :update, :site_id => page.site, :id => page, :transition => 'publish'
+      assert_response :redirect
+      assert_redirected_to :action => :edit, :id => page
+      assert_equal 'Page updated', flash[:success]
+      assert assigns(:page).published?
+    end
+  end
+
+  test "published page should become drafted" do
+    page = comfy_cms_pages(:published)
+    assert_no_difference 'Comfy::Cms::Block.count' do
+      put :update, :site_id => page.site, :id => page, :transition => 'reset'
+      assert_response :redirect
+      assert_redirected_to :action => :edit, :id => page
+      assert_equal 'Page updated', flash[:success]
+      assert assigns(:page).drafted?
+    end
+  end
+
+  test "saving a page should'nt change status of a page" do
+    page = comfy_cms_pages(:drafted)
+    label = 'Arrr'
+    put :update, :site_id => page.site, :id => page, :commit => 'save', :page => {
+        :label          => label,
+    }
+    assert_response :redirect
+    assert_redirected_to :action => :edit, :id => page
+    assert_equal 'Page updated', flash[:success]
+    assert assigns(:page).drafted?
+    assert_equal assigns(:page).label, label
+  end
+end