beef-admin_area 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/app/controllers/admin/users_controller.rb

@@ -1,6 +1,6 @@
 class Admin::UsersController < Admin::BaseController
   authorise :roles => :admin
-  sortable_attributes :name, :email, :role 
+  sortable_attributes :name, :email, :role
 
   # GET /users
   # GET /users.xml
@@ -27,13 +27,15 @@ class Admin::UsersController < Admin::BaseController
 
   # POST /users
   # POST /users.xml
-  def create    
-    @user = User.new(params[:user])
-    # Because mass assignment is protected
-    @user.role = params[:user][:role]
+  def create
+    @user = User.new(params[:user]) do |user|
+      # No need for email confirmation
+      user.email_confirmed = true
+      # Because mass assignment is protected
+      user.role = params[:user][:role]
+    end
     respond_to do |format|
       if @user.save
-        @user.confirm_email!
         flash[:notice] = 'User was successfully created.'
         format.html { redirect_to(admin_users_url) }
         format.xml  { render :xml => @user, :status => :created, :location => @user }
@@ -46,7 +48,7 @@ class Admin::UsersController < Admin::BaseController
 
   # PUT /users/1
   # PUT /users/1.xml
-  def update  
+  def update
     @user = User.find(params[:id])
     # Because mass assignment is protected
     @user.role = params[:user][:role]
@@ -68,11 +70,11 @@ class Admin::UsersController < Admin::BaseController
     @user = User.find(params[:id])
     @user.destroy
     flash[:notice] = 'User was successfully deleted.'
-    
+
     respond_to do |format|
       format.html { redirect_to(admin_users_url) }
       format.xml  { head :ok }
     end
   end
-  
-end       
+
+end

data/beef-admin_area.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beef-admin_area}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2010-02-25}
+  s.date = %q{2010-03-03}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -198,11 +198,11 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/beef/admin}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Rails engine that provides a standard admin area with user managament}
   s.test_files = [
-    "test/test_helper.rb",
-     "test/admin_area_test.rb"
+    "test/admin_area_test.rb",
+     "test/test_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/config/routes.rb

@@ -1,4 +1,5 @@
 ActionController::Routing::Routes.draw do |map|
+  Clearance::Routes.draw(map)
   map.admin 'admin', :controller => 'admin/base'
   map.namespace(:admin) do |admin|
     admin.resource :settings

data/generators/admin_area_files/admin_area_files_generator.rb

@@ -10,7 +10,6 @@ class AdminAreaFilesGenerator < Rails::Generator::Base
   ROLES = [:team_member, :admin]
   include Beef::AdminArea::Roles
 
-  attr_accessible :name
   validates_presence_of :name
 
 private

data/lib/admin_area.rb

@@ -9,11 +9,11 @@ module Beef
         controller.class_eval do
           helper_method :authorised?
           helper_method :not_authorised?
-        
+
           hide_action :authorised?, :authorise, :not_authorised?
         end
       end
-    
+
       module ClassMethods
         def authorise(options)
           raise ArgumentError, 'Roles must be suplied' if options[:roles].nil?
@@ -27,34 +27,35 @@ module Beef
         def authorise(*roles)
           deny_access("You do not have the required access privileges to access page") unless current_user.authorised?(*roles)
         end
-      
+
         def authorised?(*roles, &block)
           return unless current_user.authorised?(*roles)
           if block_given?
             yield
           else
             return true
-          end 
+          end
         end
-      
+
         def not_authorised?(*roles, &block)
           return if current_user.authorised?(*roles)
           if block_given?
             yield
           else
             return true
-          end 
+          end
         end
       end
 
     end
-  
+
     module Roles
 
       def self.included(base)
         base.send(:include, InstanceMethods)
 
         base.class_eval do
+          attr_protected :role
           User::ROLES.each do |r|
             self.class_eval <<-RUBY
               def #{r}?

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: beef-admin_area
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Steve England
@@ -9,39 +14,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-25 00:00:00 +00:00
+date: 2010-03-03 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: clearance
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 6
         version: 0.6.6
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-sortable_table
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: will_paginate
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 8
         version: 2.3.8
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: 
 email: steve@wearebeef.co.uk
 executables: []
@@ -243,21 +258,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Rails engine that provides a standard admin area with user managament
 test_files: 
-- test/test_helper.rb
 - test/admin_area_test.rb
+- test/test_helper.rb