cms-fortress 1.2.2 → 1.3.0.rc1

data/.gitignore

@@ -0,0 +1,66 @@
+# rcov generated
+coverage
+coverage.data
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore:
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+.DS_Store
+
+.rbenv-gemsets
+.ruby-version
+
+# For TextMate
+#*.tmproj
+#tmtags
+
+# For emacs:
+#*~
+#\#*
+#.\#*
+
+# For vim:
+#*.swp
+
+# For redcar:
+#.redcar
+
+# For rubinius:
+#*.rbc
+
+#For Rubymine
+.idea
+
+# Rails stuff
+.rvmrc
+db/test.sqlite3
+log/
+/tmp/cache
+/.idea/
+
+00_create_cms.rb
+
+/db/development.sqlite3

data/Gemfile

@@ -1,18 +1,3 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-  gem 'rails', '>=4.0.0'
-  gem 'comfortable_mexican_sofa', '~>1.12.0'
-  gem 'devise', '~>3.2'
-  gem 'cancan', '>=1.6.9'
-  gem 'delayed_job', '~>4'
-  gem 'tinymce-rails', '~>4.0.0'
-  gem 'tinymce-rails-langs', '~>4.0'
+source "https://rubygems.org"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "rdoc"
-  gem "bundler"
-  gem "jeweler"
-  gem "simplecov"
-end
+gemspec

data/Gemfile.lock

@@ -1,47 +1,59 @@
+PATH
+  remote: .
+  specs:
+    cms-fortress (1.2.2)
+      aasm (~> 3.2)
+      cancan (>= 1.6.9)
+      comfortable_mexican_sofa (~> 1.12.0)
+      delayed_job (~> 4)
+      devise (~> 3.2)
+      rails (>= 4.0.0)
+      tinymce-rails (~> 4.0.0)
+      tinymce-rails-langs (~> 4.0)
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.1)
-      actionpack (= 4.1.1)
-      actionview (= 4.1.1)
+    aasm (3.2.0)
+    actionmailer (4.0.5)
+      actionpack (= 4.0.5)
       mail (~> 2.5.4)
-    actionpack (4.1.1)
-      actionview (= 4.1.1)
-      activesupport (= 4.1.1)
+    actionpack (4.0.5)
+      activesupport (= 4.0.5)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.1)
-      activesupport (= 4.1.1)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
     active_link_to (1.0.2)
       actionpack
-    activemodel (4.1.1)
-      activesupport (= 4.1.1)
-      builder (~> 3.1)
-    activerecord (4.1.1)
-      activemodel (= 4.1.1)
-      activesupport (= 4.1.1)
-      arel (~> 5.0.0)
-    activesupport (4.1.1)
+    activemodel (4.0.5)
+      activesupport (= 4.0.5)
+      builder (~> 3.1.0)
+    activerecord (4.0.5)
+      activemodel (= 4.0.5)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.5)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.5)
       i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
       thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    addressable (2.3.6)
-    arel (5.0.1.20140414130214)
+      tzinfo (~> 0.3.37)
+    ansi (1.4.3)
+    arel (4.0.2)
     bcrypt (3.1.7)
     bootstrap-sass (3.1.1.1)
       sass (~> 3.2)
     bootstrap_form (2.1.1)
-    builder (3.2.2)
+    builder (3.1.4)
     cancan (1.6.10)
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cocaine (0.5.4)
       climate_control (>= 0.0.3, < 1.0)
-    codemirror-rails (4.1)
+    codemirror-rails (4.2)
       railties (>= 3.0, < 5)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
@@ -68,8 +80,6 @@ GEM
       tinymce-rails (>= 4.0.0)
     delayed_job (4.0.1)
       activesupport (>= 3.0, < 4.2)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
     devise (3.2.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -78,18 +88,7 @@ GEM
       warden (~> 1.2.3)
     docile (1.1.3)
     erubis (2.7.0)
-    execjs (2.1.0)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    git (1.2.6)
-    github_api (0.11.3)
-      addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 1.2)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.0)
-      oauth2
+    execjs (2.2.0)
     haml (4.0.5)
       tilt
     haml-rails (0.5.3)
@@ -97,27 +96,16 @@ GEM
       activesupport (>= 4.0.1)
       haml (>= 3.1, < 5.0)
       railties (>= 4.0.1)
-    hashie (2.1.1)
-    highline (1.6.21)
+    hashie (3.0.0)
     hike (1.2.3)
     i18n (0.6.9)
-    jeweler (2.0.1)
-      builder
-      bundler (>= 1.0)
-      git (>= 1.2.5)
-      github_api
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
-      rake
-      rdoc
     jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
     json (1.8.1)
-    jwt (1.0.0)
-    kaminari (0.15.1)
+    kaminari (0.16.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kramdown (1.3.3)
@@ -125,45 +113,49 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    mini_portile (0.6.0)
-    minitest (5.3.4)
+    minitest (4.7.3)
+    minitest-rails (1.0.1)
+      minitest (~> 4.7)
+      minitest-test (~> 1.0)
+      railties (>= 3.0, < 4.1)
+    minitest-reporters (0.14.24)
+      ansi
+      builder
+      minitest (>= 2.12, < 5.0)
+      powerbar
+    minitest-spec-rails (4.7.7)
+      minitest (~> 4.7)
+      rails (>= 3.0, < 4.1)
+    minitest-test (1.1.0)
+      minitest (~> 4.0)
     multi_json (1.10.1)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    nokogiri (1.6.2.1)
-      mini_portile (= 0.6.0)
-    oauth2 (0.9.4)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
     orm_adapter (0.5.0)
     paperclip (4.1.1)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
-    polyglot (0.3.4)
+    polyglot (0.3.5)
+    powerbar (1.0.11)
+      ansi (~> 1.4.0)
+      hashie (>= 1.1.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.1.1)
-      actionmailer (= 4.1.1)
-      actionpack (= 4.1.1)
-      actionview (= 4.1.1)
-      activemodel (= 4.1.1)
-      activerecord (= 4.1.1)
-      activesupport (= 4.1.1)
+    rails (4.0.5)
+      actionmailer (= 4.0.5)
+      actionpack (= 4.0.5)
+      activerecord (= 4.0.5)
+      activesupport (= 4.0.5)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.1)
-      sprockets-rails (~> 2.0)
+      railties (= 4.0.5)
+      sprockets-rails (~> 2.0.0)
     rails-i18n (4.0.2)
       i18n (~> 0.6)
       rails (>= 4.0)
-    railties (4.1.1)
-      actionpack (= 4.1.1)
-      activesupport (= 4.1.1)
+    railties (4.0.5)
+      actionpack (= 4.0.5)
+      activesupport (= 4.0.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
@@ -185,22 +177,22 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.3)
+    sprockets-rails (2.0.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
+    sqlite3 (1.3.9)
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
-    tinymce-rails (4.0.26)
+    tinymce-rails (4.0.28.1)
       railties (>= 3.1.1)
     tinymce-rails-langs (4.20140129)
       tinymce-rails (~> 4.0)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (1.2.0)
-      thread_safe (~> 0.1)
+    tzinfo (0.3.39)
     warden (1.2.3)
       rack (>= 1.0)
 
@@ -209,13 +201,11 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
-  cancan (>= 1.6.9)
-  comfortable_mexican_sofa (~> 1.12.0)
-  delayed_job (~> 4)
-  devise (~> 3.2)
-  jeweler
-  rails (>= 4.0.0)
+  cms-fortress!
+  minitest (~> 4.7.3)
+  minitest-rails
+  minitest-reporters
+  minitest-spec-rails
   rdoc
   simplecov
-  tinymce-rails (~> 4.0.0)
-  tinymce-rails-langs (~> 4.0)
+  sqlite3

data/README.rdoc

@@ -104,6 +104,17 @@ http://raw.github.com/melvinsembrano/cms-fortress/master/docs/screens/files-inte
 
 For more Comfortable Mexican Sofa awesomeness visit the wiki page here https://github.com/comfy/comfortable-mexican-sofa/wiki
 
+== Development & Testing
+
+To run the tests you have to install the development files and run the migrations
+
+    rails generate cms:fortress --development
+    rake db:migrate
+
+Afterwards you can run the tests by calling
+
+    rake test
+
 == Contributing to cms-fortress
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/Rakefile

@@ -1,51 +1,21 @@
 # encoding: utf-8
-
-require 'rubygems'
 require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "cms-fortress"
-  gem.homepage = "http://github.com/melvinsembrano/cms-fortress"
-  gem.license = "MIT"
-  gem.summary = %Q{Comfortable Mexican Sofa (CMS) - User and role management extension}
-  gem.description = %Q{Comfortable Mexican Sofa (CMS) - User and role management extension}
-  gem.email = "melvinsembrano@gmail.com"
-  gem.authors = ["Melvin Sembrano"]
-  # dependencies defined in Gemfile
-  gem.files.include 'lib/**/*.rb'
-end
-Jeweler::RubygemsDotOrgTasks.new
+Bundler.setup
 
 require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
+require 'rdoc/task'
 
-=begin
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.test_files = FileList['test/**/*_test.rb']
+  t.verbose = false
 end
-=end
+
+require_relative 'config/application'
+Cms::Fortress::Application.load_tasks
 
 task :default => :test
 
-require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

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

@@ -1,4 +1,9 @@
 class Cms::Fortress::AdminController < Comfy::Admin::Cms::BaseController
+
+  def dashboard
+
+  end
+
   def roles
     @roles = Role.all
   end

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

@@ -2,23 +2,18 @@ class Cms::Fortress::RolesController < Comfy::Admin::Cms::BaseController
   before_filter do
     authorize! :manage, Cms::Fortress::Role
   end
+  before_action :set_role, only: [:show, :edit, :update, :destroy, :refresh]
 
   # GET /cms/fortress/roles
   # GET /cms/fortress/roles.json
   def index
-    @cms_fortress_roles = Cms::Fortress::Role.all
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @cms_fortress_roles }
-    end
+    @cms_fortress_roles = @site.roles
   end
 
   # GET /cms/fortress/roles/1
   # GET /cms/fortress/roles/1.json
   def show
-    @cms_fortress_role = Cms::Fortress::Role.find(params[:id])
-
+    @no_back_button = true
     respond_to do |format|
       format.html # show.html.erb
       format.json { render json: @cms_fortress_role }
@@ -26,7 +21,7 @@ class Cms::Fortress::RolesController < Comfy::Admin::Cms::BaseController
   end
 
   def refresh
-    @cms_fortress_role = Cms::Fortress::Role.find(params[:id])
+    # @cms_fortress_role = Cms::Fortress::Role.find(params[:id])
     @cms_fortress_role.load_defaults
 
     respond_to do |format|
@@ -43,26 +38,20 @@ class Cms::Fortress::RolesController < Comfy::Admin::Cms::BaseController
   # GET /cms/fortress/roles/new
   # GET /cms/fortress/roles/new.json
   def new
-    @cms_fortress_role = Cms::Fortress::Role.new
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.json { render json: @cms_fortress_role }
-    end
+    @cms_fortress_role = @site.roles.build
   end
 
   # GET /cms/fortress/roles/1/edit
   def edit
-    @cms_fortress_role = Cms::Fortress::Role.find(params[:id])
   end
 
   # POST /cms/fortress/roles
   # POST /cms/fortress/roles.json
   def create
-    @cms_fortress_role = Cms::Fortress::Role.new(role_params)
+    @cms_fortress_role = @site.roles.build(role_params)
     begin
       @cms_fortress_role.load_defaults
-    rescue Error::MissingRoleConfigurationFile
+    rescue Cms::Fortress::Error::MissingRoleConfigurationFile
       flash[:error] = @cms_fortress_role.errors.messages[:base].first
       render action: "new" and return
     end
@@ -82,8 +71,6 @@ class Cms::Fortress::RolesController < Comfy::Admin::Cms::BaseController
   # PUT /cms/fortress/roles/1
   # PUT /cms/fortress/roles/1.json
   def update
-    @cms_fortress_role = Cms::Fortress::Role.find(params[:id])
-
     respond_to do |format|
       if @cms_fortress_role.update_attributes(role_params)
         flash[:success] = "Role was successfully updated."
@@ -99,7 +86,6 @@ class Cms::Fortress::RolesController < Comfy::Admin::Cms::BaseController
   # DELETE /cms/fortress/roles/1
   # DELETE /cms/fortress/roles/1.json
   def destroy
-    @cms_fortress_role = Cms::Fortress::Role.find(params[:id])
     @cms_fortress_role.destroy
 
     respond_to do |format|
@@ -110,6 +96,10 @@ class Cms::Fortress::RolesController < Comfy::Admin::Cms::BaseController
 
   private
 
+  def set_role
+    @cms_fortress_role = @site.roles.where(id: params[:id]).first
+  end
+
   def role_params
     params.require(:cms_fortress_role).permit! #(:name, :description, :role_details_attributes)
   end