radmin 0.2.0 → 0.3.1

data/.rvmrc

@@ -0,0 +1 @@
+rvm use 1.9.2-p290@radmin --create

data/app/controllers/radmin/dashboards_controller.rb

@@ -0,0 +1,2 @@
+class Radmin::DashboardsController < RadminController
+end

data/app/controllers/radmin/passwords_controller.rb

@@ -0,0 +1,4 @@
+class Radmin::PasswordsController < Devise::PasswordsController
+  helper :radmin
+  layout "radmin"
+end

data/app/controllers/{admin → radmin}/sessions_controller.rb

@@ -1,6 +1,6 @@
-class Admin::SessionsController < Devise::SessionsController
-  helper :admin
-  layout "admin"
+class Radmin::SessionsController < Devise::SessionsController
+  helper :radmin
+  layout "radmin"
 
   protected
   def after_sign_in_path_for(resource_or_scope)

data/app/controllers/{admin → radmin}/settings_controller.rb

@@ -1,15 +1,6 @@
-class Admin::SettingsController < AdminController
-  before_filter :find_setting, :only => [:edit,:update,:destroy]
-  filter_access_to [:index,:new,:create,:edit,:update,:destroy]
+class Radmin::SettingsController < RadminController
+  load_and_authorize_resource :class => "Radmin::Setting"
 	
-  def index
-    @settings = Radmin::Setting.all
-  end
-
-  def new
-    @setting = Radmin::Setting.new
-  end
-  
   def create
     Radmin::Setting["#{params[:setting]['key']}"] = params[:setting]['value']
     flash[:notice] = Radmin::I18n.t(:setting_sucessfully_created, :default => "Setting sucessfully created.")
@@ -32,9 +23,4 @@ class Admin::SettingsController < AdminController
     flash[:notice] = Radmin::I18n.t(:setting_sucessfully_deleted, :default => "Setting sucessfully deleted.")
     redirect_to admin_settings_url
   end
-
-  protected
-    def find_setting
-      @setting = Radmin::Setting.find(params[:id])
-    end
 end

data/app/controllers/{admin → radmin}/users_controller.rb

@@ -1,18 +1,11 @@
-class Admin::UsersController < AdminController
-  before_filter :load_user, :only => [:edit,:update,:destroy]
-  filter_access_to [:index,:new,:create]
-  filter_access_to [:edit,:update,:destroy], :attribute_check => true, :load_method => lambda { |c| @user = Radmin::User.find(params[:id]) }
+class Radmin::UsersController < RadminController
+  load_and_authorize_resource :class => "Radmin::User"
 	
-  def index    
-    @users = Radmin::User.all(:include => [:roles])
-  end
-  
-  def new
-    @user = Radmin::User.new
+  def index
+    @users = @users.includes(:roles)
   end
   
   def create
-    @user = Radmin::User.new(params[:user])
     if @user.save
       redirect_to(admin_users_url, :notice => Radmin::I18n.t(:account_created, :default => "Account created."))
     else
@@ -35,9 +28,4 @@ class Admin::UsersController < AdminController
     @user.destroy
     redirect_to(admin_users_url, :notice => Radmin::I18n.t(:account_deleted, :default => "Account deleted."))
   end
-  
-  protected
-    def load_user
-    	@user = Radmin::User.find(params[:id])
-    end
 end

data/app/controllers/radmin_controller.rb

@@ -0,0 +1,13 @@
+class RadminController < ApplicationController
+  helper :radmin
+  before_filter :authenticate_admin!
+  layout "radmin"
+
+  rescue_from CanCan::AccessDenied do |exception|
+    redirect_to admin_dashboard_url, :alert => exception.message
+  end
+
+  def current_ability
+    @current_ability ||= Radmin::Authorization.new(current_admin)
+  end
+end

data/app/helpers/{admin_helper.rb → radmin_helper.rb}

@@ -1,4 +1,4 @@
-module AdminHelper
+module RadminHelper
   def current_url?(options)
     url = case options
     when Hash
@@ -42,4 +42,8 @@ module AdminHelper
   def show_title?
     @show_title
   end
+
+  def has_role?(role)
+    current_admin.role_symbols.include?(role.to_sym)
+  end
 end

data/app/views/layouts/{admin.html.haml → radmin.html.haml}

@@ -24,7 +24,7 @@
             %span.nodisp
         #usernav
           = Radmin::I18n.t(:logged_in_as, :default => "Logged in as")
-          = link_to current_admin.email, edit_admin_account_path
+          = link_to current_admin.email, edit_admin_user_path(current_admin)
           (#{link_to Radmin::I18n.t(:logout, :default => "Logout"), destroy_admin_session_path})
       - else
         .spacer40

data/app/views/radmin/dashboards/_dashboard.html.haml

@@ -0,0 +1,2 @@
+%p.intro
+  Edit me! (app/views/radmin/dashboards/_dashboard.html.haml)

data/app/views/radmin/dashboards/show.html.haml

@@ -0,0 +1,2 @@
+- title Radmin::I18n.t(:dashboard,:default => "Dashboard")
+= render :partial => 'dashboard'

data/app/views/{admin → radmin}/passwords/edit.html.haml

@@ -3,9 +3,7 @@
   = f.hidden_field :reset_password_token
   = f.label :password, "New password"
   = f.password_field :password
-  = f.error_message_on :password
   = f.label :password_confirmation, "Confirm new password"
   = f.password_field :password_confirmation
-  = f.error_message_on :password_confirmation
   .buttons
     = f.submit Radmin::I18n.t(:change_password, :default => "Change Password")

data/app/views/{admin → radmin}/passwords/new.html.haml

@@ -2,7 +2,6 @@
 = form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f|
   = f.label :email
   = f.text_field :email
-  = f.error_message_on :email
   .buttons
     = f.submit Radmin::I18n.t(:send_instructions, :default => "Send Instructions")
     = link_to t(:login, :default => "Login"), new_session_path(resource_name)

data/app/views/{admin → radmin}/settings/index.html.haml

@@ -1,6 +1,6 @@
 - title Radmin::I18n.t(:settings,:default => "Application Settings")
 %span.toolbar
-  = link_to(Radmin::I18n.t(:new_setting,:default => "New"), new_admin_setting_path) if permitted_to? :create
+  = link_to(Radmin::I18n.t(:new_setting,:default => "New"), new_admin_setting_path) if can? :create, Radmin::Setting
 %p.intro= Radmin::I18n.t(:settings_list_intro,:default => "Application Settings")
 %table
   %thead
@@ -13,6 +13,7 @@
         %td= link_to setting.key, edit_admin_setting_path(setting)
         %td= setting.value
         %td.last
-          = link_to(Radmin::I18n.t(:edit,:default => "Edit"), edit_admin_setting_path(setting), :class => "edit") if permitted_to? :update
-          |
-          \#{link_to(Radmin::I18n.t(:delete,:default => "Delete"), admin_setting_path(setting), :confirm => Radmin::I18n.t(:are_you_sure,:default => "Are you sure?"), :method => :delete, :class => "delete") if permitted_to? :destroy}
+          = link_to(Radmin::I18n.t(:edit,:default => "Edit"), edit_admin_setting_path(setting), :class => "edit") if can? :update, Radmin::Setting
+          - if can? :destroy, Radmin::Setting
+            |
+            \#{link_to(Radmin::I18n.t(:delete,:default => "Delete"), admin_setting_path(setting), :confirm => Radmin::I18n.t(:are_you_sure,:default => "Are you sure?"), :method => :delete, :class => "delete")}

data/app/views/{admin → radmin}/users/_form.html.haml

@@ -15,7 +15,4 @@
 %p.buttons
   = form.submit Radmin::I18n.t(:save,:default=>"Save")
   = Radmin::I18n.t(:or,:default=>"or")
-  - if permitted_to? :index
-    = link_to Radmin::I18n.t(:cancel,:default=>"Cancel"), admin_users_path
-  - else
-    = link_to Radmin::I18n.t(:cancel,:default=>"Cancel"), admin_overview_path
+  = link_to Radmin::I18n.t(:cancel,:default=>"Cancel"), admin_users_path

data/app/views/{admin → radmin}/users/index.html.haml

@@ -1,6 +1,6 @@
 - title Radmin::I18n.t(:users,:default => "Users")
 %span.toolbar
-  = link_to Radmin::I18n.t(:new_user,:default => "New"), new_admin_user_path if permitted_to? :create
+  = link_to Radmin::I18n.t(:new_user,:default => "New"), new_admin_user_path if can? :create, Radmin::User
 %p.intro= Radmin::I18n.t(:users_list_intro,:default => "Users with access to admin panel.")
 %table
   %thead
@@ -13,6 +13,7 @@
         %td= link_to h(user.email), edit_admin_user_path(user)
         %td= user.roles.collect {|r| Radmin::I18n.t(r.name.underscore.to_sym,:default=>h(r.name.capitalize))}.join(",")
         %td.last
-          = link_to Radmin::I18n.t(:edit,:default => "Edit"), edit_admin_user_path(user), :class => "edit" if permitted_to? :update
-          |
-          \#{link_to Radmin::I18n.t(:delete,:default => "Delete"), admin_user_path(user), :confirm => Radmin::I18n.t(:are_you_sure,:default => "Are you sure?"), :method => :delete, :class => "delete" if permitted_to? :destroy}
+          = link_to Radmin::I18n.t(:edit,:default => "Edit"), edit_admin_user_path(user), :class => "edit" if can? :update, Radmin::User, :id => user.id
+          - if can? :destroy, Radmin::User, :id => user.id
+            |
+            \#{link_to Radmin::I18n.t(:delete,:default => "Delete"), admin_user_path(user), :confirm => Radmin::I18n.t(:are_you_sure,:default => "Are you sure?"), :method => :delete, :class => "delete"}

data/config/authorization.rb

@@ -0,0 +1,10 @@
+role :guest do
+  can :read,   Radmin::User, :id => user.id
+  can :update, Radmin::User, :id => user.id
+  can :read, Radmin::Setting
+end
+
+role :admin do
+  can :manage, Radmin::User
+  can :manage, Radmin::Setting
+end

data/config/routes.rb

@@ -1,9 +1,9 @@
 Rails.application.routes.draw do
-  devise_for :admins, :class_name => 'Radmin::User', :path => 'admin', :path_names => { :sign_in => 'login', :sign_out => 'logout' }, :controllers => { :sessions => 'admin/sessions', :passwords => 'admin/passwords' }
+  devise_for :admins, :class_name => 'Radmin::User', :path => 'admin', :path_names => { :sign_in => 'login', :sign_out => 'logout' }, :controllers => { :sessions => 'radmin/sessions', :passwords => 'radmin/passwords' }
 
-  match '/admin', :to => redirect('/admin/account/edit'), :as => :admin
-  namespace :admin do
-    resource  :account, :only => [:edit,:update]
+  match '/admin', :to => redirect('/admin/dashboard'), :as => :admin
+  namespace :admin, :module => 'radmin' do
+    resource :dashboard, :only => [:show]
     resources :settings, :except => [:show]
     resources :users, :except => [:show]
   end

data/lib/generators/radmin/install_generator.rb

@@ -22,10 +22,6 @@ module Radmin
       def copy_assets
         directory 'assets', 'public', :recursive => true
       end
-      
-      def copy_authorization_file
-        template "authorization_rules.rb", "config/authorization_rules.rb"
-      end
     end
   end
 end

data/lib/radmin.rb

@@ -1,5 +1,8 @@
 require 'radmin/engine'
-
 require 'radmin/version'
-require 'radmin/admin_ui'
-require 'radmin/i18n'
+
+module Radmin
+  autoload :AdminUI, 'radmin/admin_ui'
+  autoload :Authorization, 'radmin/authorization'
+  autoload :I18n, 'radmin/i18n'
+end

data/lib/radmin/admin_ui.rb

@@ -75,23 +75,20 @@ module Radmin
       end
 
       def visible?(user)
-        visible_by_controller?(user)
+        params = Rails.application.routes.recognize_path(url, :method => :get)
+        if params && params[:controller]
+          resource = params[:controller].demodulize.sub("Controller", "").underscore.split('/').last.singularize
+          Radmin::Authorization.authorized?(user, params[:action], "Radmin::#{resource.capitalize}".constantize) rescue true
+          #ctx = params[:controller].sub('/','_').to_sym
+          #Authorization::Engine.instance.permit?(params[:action], :context => ctx, :user => user)
+        else
+          false
+        end
       end
 
       def relative_url
         File.join('/', url)
       end
-
-      private
-        def visible_by_controller?(user)
-          params = Rails.application.routes.recognize_path(url, :method => :get)
-          if params && params[:controller]
-            ctx = params[:controller].sub('/','_').to_sym
-            Authorization::Engine.instance.permit?(params[:action], :context => ctx, :user => user)
-          else
-            false
-          end
-        end
     end
 
     class << self
@@ -126,8 +123,11 @@ module Radmin
 
     protected
       def load_default_nav
+        general = nav_tab("General")
+        general << nav_item("Dashboard", "/admin/dashboard")
+        nav << general
+
         settings = nav_tab("Settings")
-        settings << nav_item("Account", "/admin/account/edit")
         settings << nav_item("Users", "/admin/users")
         settings << nav_item("Application", "/admin/settings")
         nav << settings

data/lib/radmin/authorization.rb

@@ -0,0 +1,47 @@
+module Radmin
+  class Authorization
+    class DSLMethods
+      def role(role_name, &block)
+        #::Authorization.define_method method_name, &block
+        #role_name = role_name.to_sym
+        Radmin::Authorization.roles[role_name] ||= []
+        Radmin::Authorization.roles[role_name] << block
+      end
+    end
+
+    include CanCan::Ability
+    attr_accessor :user
+    cattr_accessor :roles
+    self.roles = {}
+
+    def initialize(user)
+      self.user = user
+      run_role(:guest) unless self.user.role_symbols.any?
+      self.user.role_symbols.each do |r|
+        run_role(r)
+      end
+    end
+
+    def includes(*role_names)
+      role_names.each do |role_name|
+        run_role(role_name.to_sym)
+      end
+    end
+
+    def self.authorized?(user, action, subject)
+      new(user).authorize!(action.to_sym, subject)
+      true
+    rescue CanCan::AccessDenied
+      false
+    end
+
+    def self.define_rules(file)
+      DSLMethods.new.instance_eval(File.read(file)) if File.exist?(file)
+    end
+
+    protected
+    def run_role(role_name)
+      self.class.roles[role_name].each { |block| instance_eval(&block) } if self.class.roles.include?(role_name)
+    end
+  end
+end

data/lib/radmin/engine.rb

@@ -1,8 +1,16 @@
-require 'declarative_authorization'
+require 'cancan'
 require 'devise'
 require 'haml-rails'
 
 module Radmin
-  class Engine < Rails::Engine    
+  class Engine < Rails::Engine
+    initializer "radmin.add_authorization_rules" do |app|
+      Radmin::Authorization.define_rules(dsl_file)
+    end
+
+    protected
+    def dsl_file
+      File.expand_path("config/authorization.rb", File.dirname(File.dirname(File.dirname(__FILE__))))
+    end
   end
 end

data/lib/radmin/version.rb

@@ -1,3 +1,3 @@
 module Radmin
-  VERSION = "0.2.0"
+  VERSION = "0.3.1"
 end

data/radmin.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency "declarative_authorization", "~> 0.5.2"
+  s.add_dependency "cancan", "~> 1.6.5"
   s.add_dependency "devise", "~> 1.3.4"
   s.add_dependency "haml-rails", "~> 0.3.4"
   
-  s.add_development_dependency "rails", "3.0.7"
-  s.add_development_dependency "rake", "0.8.7"
+  s.add_development_dependency "rails", "~> 3.0.7"
+  s.add_development_dependency "rake", "~> 0.8.7"
   s.add_development_dependency "capybara", "~> 0.4.0"
   s.add_development_dependency "rspec-rails", "~> 2.0.0.beta"
   s.add_development_dependency "launchy", "~> 0.4.0"

data/spec/dummy/config/locales/devise.en.yml

@@ -0,0 +1,50 @@
+# Additional translations at http://github.com/plataformatec/devise/wiki/I18n
+
+en:
+  errors:
+    messages:
+      expired: "has expired, please request a new one"
+      not_found: "not found"
+      already_confirmed: "was already confirmed, please try signing in"
+      not_locked: "was not locked"
+      not_saved:
+        one: "1 error prohibited this %{resource} from being saved:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"
+
+  devise:
+    failure:
+      already_authenticated: 'You are already signed in.'
+      unauthenticated: 'You need to sign in or sign up before continuing.'
+      unconfirmed: 'You have to confirm your account before continuing.'
+      locked: 'Your account is locked.'
+      invalid: 'Invalid email or password.'
+      invalid_token: 'Invalid authentication token.'
+      timeout: 'Your session expired, please sign in again to continue.'
+      inactive: 'Your account was not activated yet.'
+    sessions:
+      signed_in: 'Signed in successfully.'
+      signed_out: 'Signed out successfully.'
+    passwords:
+      send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
+      updated: 'Your password was changed successfully. You are now signed in.'
+    confirmations:
+      send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
+      confirmed: 'Your account was successfully confirmed. You are now signed in.'
+    registrations:
+      signed_up: 'Welcome! You have signed up successfully.'
+      inactive_signed_up: 'You have signed up successfully. However, we could not sign you in because your account is %{reason}.'
+      updated: 'You updated your account successfully.'
+      destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
+    unlocks:
+      send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
+      unlocked: 'Your account was successfully unlocked. You are now signed in.'
+    omniauth_callbacks:
+      success: 'Successfully authorized from %{kind} account.'
+      failure: 'Could not authorize you from %{kind} because "%{reason}".'
+    mailer:
+      confirmation_instructions:
+        subject: 'Confirmation instructions'
+      reset_password_instructions:
+        subject: 'Reset password instructions'
+      unlock_instructions:
+        subject: 'Unlock Instructions'

metadata

@@ -1,157 +1,155 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: radmin
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.1
   prerelease: 
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Damian Caruso
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-24 00:00:00 -03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: declarative_authorization
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2011-07-30 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: cancan
+  requirement: &17660220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.5.2
+      - !ruby/object:Gem::Version
+        version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *17660220
+- !ruby/object:Gem::Dependency
   name: devise
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &17659260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *17659260
+- !ruby/object:Gem::Dependency
   name: haml-rails
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &17658180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *17658180
+- !ruby/object:Gem::Dependency
   name: rails
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &17657440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 3.0.7
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *17657440
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &17656460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *17656460
+- !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &17655560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *17655560
+- !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &17654760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.0.0.beta
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *17654760
+- !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &17651240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *17651240
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &17650480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *17650480
 description: A drop in admin panel for existing rails applications
-email: 
+email:
 - damian.caruso@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
+- .rvmrc
 - Gemfile
 - MIT-LICENSE
 - README
 - Rakefile
-- app/controllers/admin/accounts_controller.rb
-- app/controllers/admin/passwords_controller.rb
-- app/controllers/admin/sessions_controller.rb
-- app/controllers/admin/settings_controller.rb
-- app/controllers/admin/users_controller.rb
-- app/controllers/admin_controller.rb
-- app/helpers/admin_helper.rb
+- app/controllers/radmin/dashboards_controller.rb
+- app/controllers/radmin/passwords_controller.rb
+- app/controllers/radmin/sessions_controller.rb
+- app/controllers/radmin/settings_controller.rb
+- app/controllers/radmin/users_controller.rb
+- app/controllers/radmin_controller.rb
+- app/helpers/radmin_helper.rb
 - app/models/radmin/assignment.rb
 - app/models/radmin/role.rb
 - app/models/radmin/setting.rb
 - app/models/radmin/user.rb
-- app/views/admin/accounts/edit.html.haml
-- app/views/admin/passwords/edit.html.haml
-- app/views/admin/passwords/new.html.haml
-- app/views/admin/sessions/new.html.haml
-- app/views/admin/settings/_form.html.haml
-- app/views/admin/settings/edit.html.haml
-- app/views/admin/settings/index.html.haml
-- app/views/admin/settings/new.html.haml
-- app/views/admin/users/_form.html.haml
-- app/views/admin/users/edit.html.haml
-- app/views/admin/users/index.html.haml
-- app/views/admin/users/new.html.haml
-- app/views/layouts/admin.html.haml
+- app/views/layouts/radmin.html.haml
+- app/views/radmin/dashboards/_dashboard.html.haml
+- app/views/radmin/dashboards/show.html.haml
+- app/views/radmin/passwords/edit.html.haml
+- app/views/radmin/passwords/new.html.haml
+- app/views/radmin/sessions/new.html.haml
+- app/views/radmin/settings/_form.html.haml
+- app/views/radmin/settings/edit.html.haml
+- app/views/radmin/settings/index.html.haml
+- app/views/radmin/settings/new.html.haml
+- app/views/radmin/users/_form.html.haml
+- app/views/radmin/users/edit.html.haml
+- app/views/radmin/users/index.html.haml
+- app/views/radmin/users/new.html.haml
+- config/authorization.rb
 - config/routes.rb
 - lib/generators/radmin/install_generator.rb
 - lib/generators/radmin/templates/assets/images/admin/topnav_active.gif
@@ -161,13 +159,13 @@ files:
 - lib/generators/radmin/templates/assets/javascripts/admin/jquery.rails.js
 - lib/generators/radmin/templates/assets/stylesheets/admin/reset.css
 - lib/generators/radmin/templates/assets/stylesheets/admin/style.css
-- lib/generators/radmin/templates/authorization_rules.rb
 - lib/generators/radmin/templates/migrations/01_radmin_create_users.rb
 - lib/generators/radmin/templates/migrations/02_radmin_create_roles.rb
 - lib/generators/radmin/templates/migrations/03_radmin_create_assignments.rb
 - lib/generators/radmin/templates/migrations/04_radmin_create_settings.rb
 - lib/radmin.rb
 - lib/radmin/admin_ui.rb
+- lib/radmin/authorization.rb
 - lib/radmin/engine.rb
 - lib/radmin/i18n.rb
 - lib/radmin/version.rb
@@ -179,7 +177,6 @@ files:
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
-- spec/dummy/config/authorization_rules.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
@@ -192,6 +189,7 @@ files:
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/locales/devise.en.yml
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20110524171909_radmin_create_users.rb
@@ -232,39 +230,34 @@ files:
 - spec/integration/navigation_spec.rb
 - spec/radmin_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/cdamian/radmin
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -2558046121998113996
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1266151900004332354
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -2558046121998113996
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 1266151900004332354
 requirements: []
-
 rubyforge_project: radmin
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A drop in admin panel for existing rails applications
 test_files: []
-

data/app/controllers/admin/accounts_controller.rb

@@ -1,16 +0,0 @@
-class Admin::AccountsController < AdminController
-  def edit
-    @user = current_admin
-  end
-  
-  def update
-    @user = current_admin
-    if @user.update_attributes(params[:user])
-      flash[:notice] = Radmin::I18n.t(:account_updated, :default => "Account updated.")
-      redirect_to edit_admin_account_url
-    else
-      flash.now[:alert] = Radmin::I18n.t(:account_could_not_be_updated, :default => "Account could not be updated.")
-      render :action => :edit
-    end
-  end
-end

data/app/controllers/admin/passwords_controller.rb

@@ -1,4 +0,0 @@
-class Admin::PasswordsController < Devise::PasswordsController
-  helper :admin
-  layout "admin"
-end

data/app/controllers/admin_controller.rb

@@ -1,15 +0,0 @@
-class AdminController < ApplicationController
-  helper :admin
-  before_filter :authenticate_admin!
-  layout "admin"
-
-  protected
-    def current_user
-      current_admin
-    end
-
-    def permission_denied
-      flash[:alert] = Radmin::I18n.t(:permission_denied,:default => "Sorry, you are not allowed to access that page.")
-      redirect_to admin_url
-    end
-end

data/app/views/admin/accounts/edit.html.haml

@@ -1,11 +0,0 @@
-- title Radmin::I18n.t(:edit_user,:default => "Edit Account")
-= form_for @user, :as => :user, :url => admin_account_path do |f|
-  .col
-    = f.label :email, Radmin::User.human_attribute_name("email")
-    = f.text_field :email
-    = f.label :password, Radmin::I18n.t(:new_password, :default => "New Password")
-    = f.password_field :password
-    = f.label :password_confirmation, Radmin::User.human_attribute_name("password_confirmation")
-    = f.password_field :password_confirmation
-  %p.buttons
-    = f.submit Radmin::I18n.t(:save,:default=>"Save")

data/lib/generators/radmin/templates/authorization_rules.rb

@@ -1,17 +0,0 @@
-authorization do
-  role :guest do
-    has_permission_on :admin_accounts, :to => [:show,:edit,:update]
-  end
-
-  role :admin do
-    includes :guest
-    has_permission_on :admin_users, :to => :manage
-    has_permission_on :admin_settings, :to => :manage
-  end
-end
-
-privileges do
-	privilege :manage do
-		includes :index,:new,:create,:edit,:update,:show,:destroy
-	end
-end

data/spec/dummy/config/authorization_rules.rb

@@ -1,17 +0,0 @@
-authorization do
-  role :guest do
-    has_permission_on :admin_accounts, :to => [:show,:edit,:update]
-  end
-
-  role :admin do
-    includes :guest
-    has_permission_on :admin_users, :to => :manage
-    has_permission_on :admin_settings, :to => :manage
-  end
-end
-
-privileges do
-	privilege :manage do
-		includes :index,:new,:create,:edit,:update,:show,:destroy
-	end
-end