cms-fortress 1.2.2 → 1.3.0.rc1

data/test/models/comfy/cms/settings_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+
+class Cms::Fortress::SettingsTest < ActiveSupport::TestCase
+
+  test "it_should_raise_MissingConfigFile_exception" do
+    assert_raises (Cms::Fortress::Error::MissingSettingsFile) {
+      Cms::Fortress::Settings.new(:bla)
+    }
+  end
+
+  test "test_it_should_return_the_config_file" do
+    settings = Cms::Fortress::Settings.new(:global_settings)
+    assert_equal(settings.title, 'CMS Fortress')
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,25 @@
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'
+require 'rails/all'
+require 'cms-fortress'
+require 'minitest/pride'
+require 'minitest/reporters'
+
+# test without creating a test database.
+ActiveRecord::Base.establish_connection(
+  :adapter => 'sqlite3',
+  :database => ':memory:'
+)
+
+MiniTest::Reporters.use! [Minitest::Reporters::SpecReporter.new]
+
+load File.dirname(__FILE__) + '/../db/schema.rb'
+
+class ActiveSupport::TestCase
+  fixtures :all
+end
+
+class ActionController::TestCase
+  include Devise::TestHelpers
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cms-fortress
 version: !ruby/object:Gem::Version
-  version: 1.2.2
-  prerelease: 
+  version: 1.3.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Melvin Sembrano
@@ -123,6 +123,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: aasm
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +172,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -172,7 +188,71 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.7.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.7.3
+- !ruby/object:Gem::Dependency
+  name: minitest-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-spec-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -196,6 +276,7 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .document
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -216,19 +297,21 @@ files:
 - app/helpers/cms/fortress/application_helper.rb
 - app/helpers/cms/fortress/roles_helper.rb
 - app/helpers/cms/fortress/sprocket_helper.rb
+- app/helpers/comfy/admin/cms/pages_helper.rb
 - app/models/cms/fortress.rb
+- app/models/cms/fortress/error.rb
 - app/models/cms/fortress/role.rb
 - app/models/cms/fortress/role_detail.rb
+- app/models/cms/fortress/settings.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/dashboard.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
@@ -239,6 +322,7 @@ files:
 - 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/_dashboard_widget.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
@@ -254,28 +338,49 @@ files:
 - 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/pages/edit.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
+- bin/bundle
+- bin/rails
+- bin/rake
 - cms-fortress.gemspec
+- config.ru
+- config/application.rb
+- config/boot.rb
+- config/cms/fortress/global_settings.yml
+- config/cms_routes.rb
+- config/database.yml
+- config/environment.rb
+- config/environments/development.rb
+- config/environments/test.rb
 - config/initializers/cms_fortress.rb
+- config/initializers/devise.rb
+- config/initializers/secret_token.rb
 - config/locales/de.yml
+- config/locales/devise.en.yml
 - config/locales/en.yml
 - config/roles.yml
+- config/secrets.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
+- db/migrate/06_add_type_to_users.rb
+- db/migrate/07_integrate_workflow_into_cms_pages.rb
+- db/schema.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/assets/.keep
 - lib/cms-fortress.rb
 - lib/cms/fortress/application_controller_methods.rb
 - lib/cms/fortress/auth.rb
@@ -284,26 +389,39 @@ files:
 - lib/cms/fortress/devise.rb
 - lib/cms/fortress/file_methods.rb
 - lib/cms/fortress/page_methods.rb
+- lib/cms/fortress/pages_controller_methods.rb
 - lib/cms/fortress/rails/engine.rb
 - lib/cms/fortress/routes/admin.rb
 - lib/cms/fortress/routing.rb
+- lib/cms/fortress/site_methods.rb
+- lib/cms/fortress/sites_controller_methods.rb
 - lib/comfortable_mexican_sofa/fixture/page.rb
+- lib/generators/cms/comfy/comfy_generator.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
+- lib/generators/cms/fortress/upgrade/USAGE
+- lib/generators/cms/fortress/upgrade/upgrade_generator.rb
+- lib/tasks/.keep
+- test/controllers/cms/fortress/roles_controller_test.rb
+- test/controllers/cms/fortress/users_controller_test.rb
+- test/controllers/comfy/admin/cms/pages_controller_test.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
+- test/fixtures/cms/fortress/users.yml
+- test/fixtures/comfy/cms/blocks.yml
+- test/fixtures/comfy/cms/categories.yml
+- test/fixtures/comfy/cms/categorizations.yml
+- test/fixtures/comfy/cms/files.yml
+- test/fixtures/comfy/cms/layouts.yml
+- test/fixtures/comfy/cms/pages.yml
+- test/fixtures/comfy/cms/revisions.yml
+- test/fixtures/comfy/cms/sites.yml
+- test/fixtures/comfy/cms/snippets.yml
+- test/integration/cms/fortress/users_controller_test.rb
+- test/models/comfy/cms/page_test.rb
+- test/models/comfy/cms/settings_test.rb
+- test/test_helper.rb
 homepage: http://github.com/melvinsembrano/cms-fortress
 licenses:
 - MIT
@@ -317,19 +435,35 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2597146753711526027
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: Comfortable Mexican Sofa (CMS) - User and role management extension
-test_files: []
+test_files:
+- test/controllers/cms/fortress/roles_controller_test.rb
+- test/controllers/cms/fortress/users_controller_test.rb
+- test/controllers/comfy/admin/cms/pages_controller_test.rb
+- test/fixtures/cms/fortress/role_details.yml
+- test/fixtures/cms/fortress/roles.yml
+- test/fixtures/cms/fortress/users.yml
+- test/fixtures/comfy/cms/blocks.yml
+- test/fixtures/comfy/cms/categories.yml
+- test/fixtures/comfy/cms/categorizations.yml
+- test/fixtures/comfy/cms/files.yml
+- test/fixtures/comfy/cms/layouts.yml
+- test/fixtures/comfy/cms/pages.yml
+- test/fixtures/comfy/cms/revisions.yml
+- test/fixtures/comfy/cms/sites.yml
+- test/fixtures/comfy/cms/snippets.yml
+- test/integration/cms/fortress/users_controller_test.rb
+- test/models/comfy/cms/page_test.rb
+- test/models/comfy/cms/settings_test.rb
+- test/test_helper.rb

data/app/models/cms/page_workflow.rb

@@ -1,44 +0,0 @@
-class Cms::PageWorkflow < ActiveRecord::Base
-  self.table_name = 'cms_page_workflows'
-
-  belongs_to :page, :class_name => 'Comfy::Cms::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(can_publish, can_review)
-    ret = [["Draft", 0]]
-    ret << ["Reviewed", 1] if can_review
-    ret << ["Published", 3] if can_publish
-    # self.statuses.map {|k,v| [v.to_s.titleize, k]}
-    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
-
-end

data/app/models/error/missing_role_configuration_file.rb

@@ -1,12 +0,0 @@
-module Error
-  # log error to the Rails log
-  def self.log_error(name, message)
-    Rails.logger.fatal("[ERROR:] in #{name} with message: #{message}\n\n")
-  end
-
-  class MissingRoleConfigurationFile < StandardError
-    def initialize
-      Error.log_error(self, "missing the roles.yml file in config/roles.yml")
-    end
-  end
-end

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

@@ -1,60 +0,0 @@
-require 'rails/generators/active_record'
-
-module Comfy
-  module Generators
-    class CmsGenerator < Rails::Generators::Base
-
-      include Rails::Generators::Migration
-      include Thor::Actions
-
-      spec = Gem::Specification.find_by_name("comfortable_mexican_sofa")
-      source_root spec.gem_dir # File.expand_path('../../../../..', __FILE__)
-
-      def generate_migration
-        destination   = File.expand_path('db/migrate/01_create_cms.rb', self.destination_root)
-        migration_dir = File.dirname(destination)
-        destination   = self.class.migration_exists?(migration_dir, 'create_cms')
-
-        if destination
-          puts "\e[0m\e[31mFound existing cms_create.rb migration. Remove it if you want to regenerate.\e[0m"
-        else
-          migration_template 'db/migrate/01_create_cms.rb', 'db/migrate/create_cms.rb'
-        end
-      end
-
-      def generate_initialization
-        copy_file 'config/initializers/comfortable_mexican_sofa.rb',
-          'config/initializers/comfortable_mexican_sofa.rb'
-      end
-      
-      def generate_routing
-        route_string  = "  cms_fortress_routes :path => '/cms-admin'\n"
-        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 generate_cms_seeds
-        directory 'db/cms_fixtures', 'db/cms_fixtures'
-      end
-      
-      def generate_assets
-        directory 'app/assets/javascripts/comfortable_mexican_sofa/admin',
-          'app/assets/javascripts/comfortable_mexican_sofa/admin'
-        directory 'app/assets/stylesheets/comfortable_mexican_sofa/admin',
-          'app/assets/stylesheets/comfortable_mexican_sofa/admin'
-      end
-
-=begin
-      def show_readme
-        readme 'lib/generators/comfy/cms/README'
-      end
-=end
-      def self.next_migration_number(dirname)
-        ActiveRecord::Generators::Base.next_migration_number(dirname)
-      end
-      
-    end
-  end
-end