creature_feature 0.0.1 → 0.1.0

data/app/controllers/admin/roles_controller.rb

@@ -1,11 +1,11 @@
 module Admin
   class RolesController < ApplicationController
     def index
-      @roles = Role.all
+      @roles = Role.visible
     end
 
     def show
-      @role = Role.find(params[:id])
+      get_and_verify_role
     end
 
     def new
@@ -14,7 +14,7 @@ module Admin
     end
 
     def edit
-      @role = Role.find(params[:id])
+      get_and_verify_role
       @features = Feature.all
     end
 
@@ -49,13 +49,14 @@ module Admin
     end
 
     def update
+      return unless get_and_verify_role
+
       if params[:role]
         fp_params = params[:role].delete(:feature_permissions) || []
       else
         fp_params = []
       end
 
-      @role = Role.find(params[:id])
       @features = Feature.all
 
       success = false
@@ -79,12 +80,22 @@ module Admin
     end
 
     def destroy
-      @role = Role.find(params[:id])
+      return unless get_and_verify_role
       @role.destroy
 
       notice = 'Role was successfully deleted.'
 
       redirect_to(admin_roles_url, :notice => notice)
     end
+
+    private
+
+    def get_and_verify_role
+      @role = Role.visible.find(params[:id]) rescue nil
+
+      redirect_to(admin_roles_url, :alert => 'Invalid Role') and return false if @role.nil?
+
+      return true
+    end
   end
 end

data/app/models/role.rb

@@ -4,6 +4,8 @@ class Role < ActiveRecord::Base
   has_many :feature_permissions, :dependent => :destroy
   has_many :features, :through => :feature_permissions
 
+  scope :visible, where(:hidden => false)
+
   def read_only_features
     list = []
 

data/db/migrate/20111116151332_create_roles.rb

@@ -1,7 +1,8 @@
 class CreateRoles < ActiveRecord::Migration
   def change
     create_table :roles do |t|
-      t.string :name, :null => false
+      t.string  :name,   :null => false
+      t.boolean :hidden, :default => false
     end
 
     add_index :roles, :name, :unique => true

data/lib/creature_feature/version.rb

@@ -1,3 +1,3 @@
 module CreatureFeature
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: creature_feature
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-18 00:00:00.000000000 -05:00
-default_executable: 
+date: 2011-12-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &20407840 !ruby/object:Gem::Requirement
+  requirement: &14151420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *20407840
+  version_requirements: *14151420
 - !ruby/object:Gem::Dependency
   name: haml-rails
-  requirement: &20406760 !ruby/object:Gem::Requirement
+  requirement: &14150280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20406760
+  version_requirements: *14150280
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &20405660 !ruby/object:Gem::Requirement
+  requirement: &14148380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20405660
+  version_requirements: *14148380
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &20405040 !ruby/object:Gem::Requirement
+  requirement: &14147680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20405040
+  version_requirements: *14147680
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &20403860 !ruby/object:Gem::Requirement
+  requirement: &14146860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20403860
+  version_requirements: *14146860
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &20366200 !ruby/object:Gem::Requirement
+  requirement: &14145860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20366200
+  version_requirements: *14145860
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &20364160 !ruby/object:Gem::Requirement
+  requirement: &14143000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20364160
+  version_requirements: *14143000
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &20334040 !ruby/object:Gem::Requirement
+  requirement: &14142220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20334040
+  version_requirements: *14142220
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &20333260 !ruby/object:Gem::Requirement
+  requirement: &14141100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20333260
+  version_requirements: *14141100
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &20331440 !ruby/object:Gem::Requirement
+  requirement: &14140460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20331440
+  version_requirements: *14140460
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &20329440 !ruby/object:Gem::Requirement
+  requirement: &14139560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20329440
+  version_requirements: *14139560
 description: Rails 3.1 engine which adds the ability to build roles from features
   you create.
 email:
@@ -141,30 +140,30 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/models/role.rb
-- app/models/feature.rb
-- app/models/feature_permission.rb
-- app/helpers/admin/roles_helper.rb
-- app/helpers/admin/features_helper.rb
 - app/views/admin/features/index.html.haml
+- app/views/admin/roles/show.html.haml
 - app/views/admin/roles/new.html.haml
 - app/views/admin/roles/_form.html.haml
 - app/views/admin/roles/edit.html.haml
-- app/views/admin/roles/show.html.haml
 - app/views/admin/roles/index.html.haml
-- app/controllers/admin/roles_controller.rb
+- app/helpers/admin/features_helper.rb
+- app/helpers/admin/roles_helper.rb
 - app/controllers/admin/features_controller.rb
-- app/assets/stylesheets/admin/roles.css
+- app/controllers/admin/roles_controller.rb
 - app/assets/stylesheets/admin/features.css
+- app/assets/stylesheets/admin/roles.css
 - app/assets/javascripts/admin/roles.js
 - app/assets/javascripts/admin/features.js
-- config/routes.rb
+- app/models/feature.rb
+- app/models/feature_permission.rb
+- app/models/role.rb
 - config/cucumber.yml
+- config/routes.rb
+- db/migrate/20111116174017_create_feature_permissions.rb
 - db/migrate/20111116151332_create_roles.rb
 - db/migrate/20111115210509_create_features.rb
-- db/migrate/20111116174017_create_feature_permissions.rb
-- lib/tasks/cucumber.rake
 - lib/tasks/guard.rake
+- lib/tasks/cucumber.rake
 - lib/tasks/creature_feature_tasks.rake
 - lib/creature_feature.rb
 - lib/creature_feature/version.rb
@@ -172,7 +171,6 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
-has_rdoc: true
 homepage: ''
 licenses: []
 post_install_message: 
@@ -187,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4057842884699446607
+      hash: 3954090576861834810
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -196,10 +194,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4057842884699446607
+      hash: 3954090576861834810
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Role/Feature engine for Rails 3.1.