cms-fortress 0.2.0 → 1.0.0

data/.rbenv-gemsets

@@ -0,0 +1 @@
+cms-fortress

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3-p448

data/Gemfile

@@ -1,9 +1,10 @@
 source "http://rubygems.org"
 # Add dependencies required to use your gem here.
-  gem 'rails'
-  gem 'comfortable_mexican_sofa', '1.8.1'
-  gem 'devise', '>= 1.5.4'
+  gem 'rails', '>=4.0.0'
+  gem 'comfortable_mexican_sofa', '~>1.11'
+  gem 'devise', '~>3.2'
   gem 'cancan', '>=1.6.9'
+  gem 'delayed_job', '~>4'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,150 +1,190 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
+    actionmailer (4.0.2)
+      actionpack (= 4.0.2)
+      mail (~> 2.5.4)
+    actionpack (4.0.2)
+      activesupport (= 4.0.2)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    active_link_to (1.0.0)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    bcrypt-ruby (3.0.1)
-    builder (3.0.4)
-    cancan (1.6.9)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    active_link_to (1.0.1)
+      actionpack
+    activemodel (4.0.2)
+      activesupport (= 4.0.2)
+      builder (~> 3.1.0)
+    activerecord (4.0.2)
+      activemodel (= 4.0.2)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.2)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.2)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    addressable (2.3.5)
+    arel (4.0.1)
+    atomic (1.1.14)
+    bcrypt-ruby (3.1.2)
+    builder (3.1.4)
+    cancan (1.6.10)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.1)
+    cocaine (0.5.3)
       climate_control (>= 0.0.3, < 1.0)
-    coffee-rails (3.2.2)
+    codemirror-rails (3.16)
+      railties (>= 3.0, < 5)
+    coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
-      railties (~> 3.2.0)
+      railties (>= 4.0.0, < 5.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.2)
-    comfortable_mexican_sofa (1.8.1)
+    coffee-script-source (1.6.3)
+    comfortable_mexican_sofa (1.11.0)
       active_link_to (>= 1.0.0)
+      codemirror-rails (>= 3.0.0)
       coffee-rails (>= 3.1.0)
       formatted_form (>= 2.1.0)
       haml-rails (>= 0.3.0)
-      jquery-rails (>= 2.2.0)
+      jquery-rails (>= 3.0.0)
+      jquery-ui-rails (>= 4.0.0)
+      kaminari (>= 0.14.0)
+      kramdown (>= 1.0.0)
       paperclip (>= 3.4.0)
-      rails (>= 3.1.0)
-      redcarpet (>= 2.2.0)
+      rails (~> 4.0)
       sass-rails (>= 3.1.0)
-    devise (2.2.3)
+    delayed_job (4.0.0)
+      activesupport (>= 3.0, < 4.1)
+    devise (3.2.2)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (~> 3.1)
-      warden (~> 1.2.1)
+      railties (>= 3.2.6, < 5)
+      thread_safe (~> 0.1)
+      warden (~> 1.2.3)
+    docile (1.1.1)
     erubis (2.7.0)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    formatted_form (2.1.1)
-      rails (>= 3.1.0)
-    git (1.2.5)
-    haml (4.0.2)
+    execjs (2.0.2)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    formatted_form (2.1.2)
+      rails (>= 3.1)
+    git (1.2.6)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    haml (4.0.4)
       tilt
-    haml-rails (0.4)
-      actionpack (>= 3.1, < 4.1)
-      activesupport (>= 3.1, < 4.1)
-      haml (>= 3.1, < 4.1)
-      railties (>= 3.1, < 4.1)
-    hike (1.2.2)
-    i18n (0.6.1)
-    jeweler (1.8.4)
+    haml-rails (0.5.1)
+      actionpack (~> 4.0.0)
+      activesupport (~> 4.0.0)
+      haml (>= 3.1, < 5.0)
+      railties (~> 4.0.0)
+    hashie (2.0.5)
+    highline (1.6.20)
+    hike (1.2.3)
+    httpauth (0.2.0)
+    i18n (0.6.9)
+    jeweler (1.8.8)
+      builder
       bundler (~> 1.0)
       git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       rake
       rdoc
-    journey (1.0.4)
-    jquery-rails (2.2.1)
+    jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.7.7)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
+    jquery-ui-rails (4.1.0)
+      railties (>= 3.1.0)
+    json (1.8.1)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    kaminari (0.15.0)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+    kramdown (1.2.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.23)
-    multi_json (1.7.2)
-    orm_adapter (0.4.0)
-    paperclip (3.4.1)
+    mime-types (1.25.1)
+    minitest (4.7.5)
+    multi_json (1.8.2)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    nokogiri (1.5.10)
+    oauth2 (0.9.2)
+      faraday (~> 0.8)
+      httpauth (~> 0.2)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    orm_adapter (0.5.0)
+    paperclip (3.5.2)
       activemodel (>= 3.0.0)
-      activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
-      cocaine (~> 0.5.0)
+      cocaine (~> 0.5.3)
       mime-types
     polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.2)
+      actionmailer (= 4.0.2)
+      actionpack (= 4.0.2)
+      activerecord (= 4.0.2)
+      activesupport (= 4.0.2)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.2)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.2)
+      actionpack (= 4.0.2)
+      activesupport (= 4.0.2)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
-    rdoc (3.12.2)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.0)
+    rdoc (4.0.1)
       json (~> 1.4)
-    redcarpet (2.2.2)
-    sass (3.2.8)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
+    sass (3.2.12)
+    sass-rails (4.0.1)
+      railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
-      tilt (~> 1.3)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    sprockets (2.2.2)
+      sprockets-rails (~> 2.0.0)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
     thor (0.18.1)
-    tilt (1.3.7)
-    treetop (1.4.12)
+    thread_safe (0.1.3)
+      atomic
+    tilt (1.4.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-    warden (1.2.1)
+    tzinfo (0.3.38)
+    warden (1.2.3)
       rack (>= 1.0)
 
 PLATFORMS
@@ -153,9 +193,10 @@ PLATFORMS
 DEPENDENCIES
   bundler
   cancan (>= 1.6.9)
-  comfortable_mexican_sofa (= 1.8.1)
-  devise (>= 1.5.4)
+  comfortable_mexican_sofa (~> 1.11)
+  delayed_job (~> 4)
+  devise (~> 3.2)
   jeweler
-  rails
+  rails (>= 4.0.0)
   rdoc
   simplecov

data/README.rdoc

@@ -6,8 +6,7 @@ An extension for the awesome Comfortable Mexican Sofa (https://github.com/comfy/
 * Added Devise for User and Session Management
 * todo..
 
-Installation
-------------
+== Installation
 
 Add gem defintion to your Gemfile:
 
@@ -19,7 +18,9 @@ Then from the Rails project's root run:
     rails generate cms:fortress
     rake db:migrate
 
+After that run your app and navigate to http://localhost:3000/cms-admin to start creating your pages, and also don't forget to delete your public/index.html file.
 
+For more Comfortable Mexican Sofa awesomeness visit the wiki page here https://github.com/comfy/comfortable-mexican-sofa/wiki
 
 == Contributing to cms-fortress
  

data/VERSION

@@ -1 +1 @@
-0.2.0
+1.0.0

data/app/assets/stylesheets/cms/fortress/admin_overrides.css

@@ -9,3 +9,8 @@ body#comfy .body-wrapper {
 .footer-container {
   margin-top: 1em;
 }
+
+body#comfy form.formatted.form-horizontal .control-group .controls select.status-control,
+body#comfy form.formatted.form-horizontal .control-group .controls input[type='text'].status-control {
+  width: 30%;
+}

data/app/controllers/cms/fortress/admin_controller.rb

@@ -1,6 +1,6 @@
 module Cms
   module Fortress
-    class AdminController < CmsAdmin::BaseController
+    class AdminController < Admin::Cms::BaseController
 
       def index
 

data/app/controllers/cms/fortress/roles_controller.rb

@@ -1,4 +1,4 @@
-class Cms::Fortress::RolesController < CmsAdmin::BaseController
+class Cms::Fortress::RolesController < Admin::Cms::BaseController
 
   # GET /cms/fortress/roles
   # GET /cms/fortress/roles.json
@@ -41,10 +41,12 @@ class Cms::Fortress::RolesController < CmsAdmin::BaseController
   # POST /cms/fortress/roles
   # POST /cms/fortress/roles.json
   def create
-    @cms_fortress_role = Cms::Fortress::Role.new(params[:cms_fortress_role])
+    @cms_fortress_role = Cms::Fortress::Role.new(role_params)
+    @cms_fortress_role.load_defaults
 
     respond_to do |format|
       if @cms_fortress_role.save
+
         format.html { redirect_to @cms_fortress_role, notice: 'Role was successfully created.' }
         format.json { render json: @cms_fortress_role, status: :created, location: @cms_fortress_role }
       else
@@ -60,7 +62,7 @@ class Cms::Fortress::RolesController < CmsAdmin::BaseController
     @cms_fortress_role = Cms::Fortress::Role.find(params[:id])
 
     respond_to do |format|
-      if @cms_fortress_role.update_attributes(params[:cms_fortress_role])
+      if @cms_fortress_role.update_attributes(role_params)
         format.html { redirect_to cms_fortress_roles_path, notice: 'Role was successfully updated.' }
         format.json { head :no_content }
       else
@@ -81,4 +83,10 @@ class Cms::Fortress::RolesController < CmsAdmin::BaseController
       format.json { head :no_content }
     end
   end
+
+  private
+
+  def role_params
+    params.require(:cms_fortress_role).permit(:name, :description)
+  end
 end

data/app/controllers/cms/fortress/users_controller.rb

@@ -1,4 +1,4 @@
-class Cms::Fortress::UsersController < CmsAdmin::BaseController
+class Cms::Fortress::UsersController < Admin::Cms::BaseController
   # GET /cms/fortress/users
   # GET /cms/fortress/users.json
   def index

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

@@ -1,6 +1,7 @@
 class Cms::Fortress::Role < ActiveRecord::Base
-  set_table_name :cms_fortress_roles
-  attr_accessible :description, :name
+  # set_table_name :cms_fortress_roles
+  self.table_name = "cms_fortress_roles"
+  # attr_accessible :description, :name
   has_many :users
   has_many :role_details
 

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

@@ -1,6 +1,7 @@
 class Cms::Fortress::RoleDetail < ActiveRecord::Base
-  set_table_name :cms_fortress_role_details
-  attr_accessible :command, :can_create, :can_delete, :name, :can_update, :can_view
+  # set_table_name :cms_fortress_role_details
+  self.table_name = "cms_fortress_role_details"
+  # attr_accessible :command, :can_create, :can_delete, :name, :can_update, :can_view
   belongs_to :role
 
 end

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

@@ -1,5 +1,7 @@
 class Cms::Fortress::User < ActiveRecord::Base
-  set_table_name :cms_fortress_users
+  # set_table_name :cms_fortress_users
+  self.table_name = "cms_fortress_users"
+
   # Include default devise modules. Others available are:
   # :token_authenticatable, :confirmable,
   # :lockable, :timeoutable and :omniauthable
@@ -7,7 +9,8 @@ class Cms::Fortress::User < ActiveRecord::Base
          :recoverable, :rememberable, :trackable, :validatable
 
   # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me, :role_id
+  # TODO: remove this deprecation
+  # attr_accessible :email, :password, :password_confirmation, :remember_me, :role_id
   # attr_accessible :title, :body
   belongs_to :role