lockdown 0.5.12 → 0.5.13

data/History.txt

@@ -1,3 +1,6 @@
+== 0.5.13 2008-07-10
+* Add: Support for --namespace option on generator.  Use as ./script generate lockdown --all --namespace=admin
+
 == 0.5.12 2008-07-02
 * Fix: Added production environment conditional to Dependencies.clear.
 

data/config/hoe.rb

@@ -1,19 +1,20 @@
 require 'lockdown/version'
 
 AUTHOR = 'Andrew Stone'  # can also be an array of Authors
-EMAIL = "andrew.n.stone@gmail.com"
+EMAIL = "andy@stonean.com"
 DESCRIPTION = "Authorization/Authentication system for RubyOnRails"
 GEM_NAME = 'lockdown' # what ppl will type to install your gem
 RUBYFORGE_PROJECT = 'lockdown' # The unix name for your project
 HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
 EXTRA_DEPENDENCIES = [
-  ['rubigen', '>=1.2.4']
+  ['rubigen', '>=1.3.2']
+#  ['activesupport', '>= 1.3.1']
 ]    # An array of rubygem dependencies [name, version]
 
 @config_file = "~/.rubyforge/user-config.yml"
 @config = nil
-RUBYFORGE_USERNAME = 'astone'
+RUBYFORGE_USERNAME = "astone"
 def rubyforge_username
   unless @config
     begin

data/lib/lockdown/version.rb

@@ -2,7 +2,7 @@ module Lockdown #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 5
-    TINY  = 12
+    TINY  = 13
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/rails_generators/lockdown/lockdown_generator.rb

@@ -9,8 +9,7 @@ if Rails::VERSION::MAJOR >= 2 && Rails::VERSION::MINOR >= 1
 end
 
 class LockdownGenerator < Rails::Generator::Base
-  attr_accessor :file_name
-  attr_accessor :action_name
+  attr_accessor :file_name, :action_name, :namespace, :view_path, :controller_path
 
   def initialize(runtime_args, runtime_options = {})
     super
@@ -19,195 +18,159 @@ class LockdownGenerator < Rails::Generator::Base
     else
       @action_name = "@action_name"
     end
+
+    @namespace = options[:namespace] if options[:namespace]
+
+    # so if the namespace option exists it sets the correct view path and controller path
+    @view_path = "app/views"
+    @controller_path = "app/controllers"
+    @helper_path = "app/helpers"
+
+    if @namespace
+      @view_path += "/#{@namespace}"
+      @controller_path += "/#{@namespace}"
+      @helper_path += "/#{@namespace}"
+    end
   end
 
   def manifest
     record do |m|
+      @m = m
       # Ensure appropriate folder(s) exists
-      m.directory 'app/helpers'
-      m.directory 'app/views'
-      m.directory 'app/controllers'
+      @m.directory @view_path
+      @m.directory @controller_path
+      @m.directory @helper_path
 
       if options[:all]
         options[:management] = true
         options[:login] = true
       end
 
-      add_management(m) if options[:management]
+      add_management if options[:management]
 
-      add_login(m) if options[:login]
+      add_login if options[:login]
 
-      add_models(m)
+      add_models
     end #record do |m|
   end
 
   protected
 
-  def add_management(m)
-    m.directory 'app/views/users'
-    m.directory 'app/views/user_groups'
-    m.directory 'app/views/permissions'
-
-    m.template "app/controllers/permissions_controller.rb",
-      "app/controllers/permissions_controller.rb"
-
-    m.template "app/controllers/users_controller.rb",
-      "app/controllers/users_controller.rb"
-
-    m.template "app/controllers/user_groups_controller.rb",
-      "app/controllers/user_groups_controller.rb"
+  def add_management
+    @m.directory "#{@view_path}/users"
+    @m.directory "#{@view_path}/user_groups"
+    @m.directory "#{@view_path}/permissions"
 
-    m.template "app/helpers/permissions_helper.rb",
-      "app/helpers/permissions_helper.rb"
+    write_controller("permissions")
+    write_controller("users")
+    write_controller("user_groups")
 
-    m.template "app/helpers/users_helper.rb",
-      "app/helpers/users_helper.rb"
+    copy_views("users")
 
-    m.template "app/helpers/user_groups_helper.rb",
-      "app/helpers/user_groups_helper.rb"
+    copy_views("user_groups")
 
-    copy_views(m, "users")
+    @m.template "app/views/permissions/_data.html.erb",
+      "#{@view_path}/permissions/_data.html.erb"
 
-    copy_views(m, "user_groups")
+    @m.template "app/views/permissions/index.html.erb",
+      "#{@view_path}/permissions/index.html.erb"
 
-    m.template "app/views/permissions/_data.html.erb",
-      "app/views/permissions/_data.html.erb"
+    @m.template "app/views/permissions/show.html.erb",
+      "#{@view_path}/permissions/show.html.erb"
 
-    m.template "app/views/permissions/index.html.erb",
-      "app/views/permissions/index.html.erb"
-
-    m.template "app/views/permissions/show.html.erb",
-      "app/views/permissions/show.html.erb"
-
-    m.route_resources "permissions"
-    m.route_resources "user_groups"
-    m.route_resources "users"
-
-    add_management_permissions(m)
+    add_management_routes
+    add_management_permissions
   end
 
-  def add_login(m)
-    m.directory 'app/views/sessions'
+  def add_login
+    @m.directory "app/controllers/sessions"
+    @m.directory "app/views/sessions"
 
-    m.file "app/controllers/sessions_controller.rb",
+    @m.template "app/controllers/sessions_controller.rb",
       "app/controllers/sessions_controller.rb"
 
-    m.file "app/views/sessions/new.html.erb",
+    @m.template "app/views/sessions/new.html.erb",
       "app/views/sessions/new.html.erb"
     
-    m.route_resources "sessions"
-
-    add_login_permissions(m)
-    add_login_routes(m)
+    add_login_routes
+    add_login_permissions
   end
 
-  def add_models(m)
-    m.directory 'app/models'
-
-    m.file "app/models/permission.rb",
-      "app/models/permission.rb"
-
-    m.file "app/models/user.rb",
-      "app/models/user.rb"
+  def add_models
+    @m.directory 'app/models'
 
-    m.file "app/models/user_group.rb",
-      "app/models/user_group.rb"
+    write_model("permission")
+    write_model("user")
+    write_model("user_group")
+    write_model("profile")
 
-    m.file "app/models/profile.rb",
-      "app/models/profile.rb"
-
-    add_migrations(m) unless options[:no_migrations]
-  end
-
-  def add_migrations(m)
-    begin
-      m.migration_template "db/migrate/create_profiles.rb", "db/migrate", 
-        :migration_file_name => "create_profiles"
-    rescue 
-      puts "Profiles migration exists"
-    end
-
-    begin
-      m.migration_template "db/migrate/create_users.rb", "db/migrate", 
-        :migration_file_name => "create_users"
-    rescue
-      puts "Users migration exists"
+    unless options[:no_migrations]
+      write_migration("create_profiles")
+      write_migration("create_users")
+      write_migration("create_user_groups")
+      write_migration("create_permissions")
+      write_migration("create_admin_user")
     end
+  end
 
-    begin
-      m.migration_template "db/migrate/create_user_groups.rb", "db/migrate", 
-        :migration_file_name => "create_user_groups"
-    rescue 
-      puts "User Groups migration exists"
-    end
+  def copy_views(vw)
+    @m.template "app/views/#{vw}/_data.html.erb", "#{@view_path}/#{vw}/_data.html.erb"
+    @m.template "app/views/#{vw}/_form.html.erb", "#{@view_path}/#{vw}/_form.html.erb"
+    @m.template "app/views/#{vw}/index.html.erb", "#{@view_path}/#{vw}/index.html.erb"
+    @m.template "app/views/#{vw}/show.html.erb", "#{@view_path}/#{vw}/show.html.erb"
+    @m.template "app/views/#{vw}/edit.html.erb", "#{@view_path}/#{vw}/edit.html.erb"
+    @m.template "app/views/#{vw}/new.html.erb", "#{@view_path}/#{vw}/new.html.erb"
+  end
 
-    begin
-      m.migration_template "db/migrate/create_permissions.rb", "db/migrate", 
-        :migration_file_name => "create_permissions"
-    rescue
-      puts "Permissions migration exists"
-    end
+  def add_login_permissions
+    add_permissions "set_permission :sessions_management, all_methods(:sessions)"
     
-    begin
-      m.migration_template "db/migrate/create_admin_user.rb", 
-        "db/migrate", 
-        :migration_file_name => "create_admin_user"
-    rescue
-      puts "Admin User Group... migration exists"
-    end
-  end # add_migrations
-
-  def copy_views(m, vw)
-    m.template "app/views/#{vw}/_data.html.erb", "app/views/#{vw}/_data.html.erb"
-    m.template "app/views/#{vw}/_form.html.erb", "app/views/#{vw}/_form.html.erb"
-    m.template "app/views/#{vw}/index.html.erb", "app/views/#{vw}/index.html.erb"
-    m.template "app/views/#{vw}/show.html.erb", "app/views/#{vw}/show.html.erb"
-    m.template "app/views/#{vw}/edit.html.erb", "app/views/#{vw}/edit.html.erb"
-    m.template "app/views/#{vw}/new.html.erb", "app/views/#{vw}/new.html.erb"
+    add_predefined_user_group "set_public_access :sessions_management"
   end
 
-  def add_login_permissions(m)
-    add_permissions m, "set_permission :sessions_management, all_methods(:sessions)"
-    
-    add_predefined_user_group m, "set_public_access :sessions_management"
+  def add_management_routes
+    if @namespace.blank?
+      permissions = %Q(\tmap.resources :permissions)
+      users = %Q(\tmap.resources :users)
+      user_groups = %Q(\tmap.resources :user_groups)
+      routes = [permissions, user_groups, users].join("\n\n")
+    else
+      routes = %Q(\tmap.namespace :#{@namespace} do |#{@namespace}|\n\t\t#{@namespace}.resources :permissions\n\t\t#{@namespace}.resources :users\n\t\t#{@namespace}.resources :user_groups\n\tend)
+    end
+
+    write_routes_file(routes)
   end
 
-  def add_management_permissions(m)
+  def add_management_permissions
     perms = []
-    perms << "set_permission :users_management, all_methods(:users)"
-    perms << "set_permission :user_groups_management, all_methods(:user_groups)"
-    perms << "set_permission :permissions_management, all_methods(:permissions)"
-    perms << "set_permission :my_account, only_methods(:users, :edit, :update, :show)"
+    perms << "set_permission :users_management, all_methods(:#{@namespace.blank? ? "users" : "#{@namespace}__users"})"
+    perms << "set_permission :user_groups_management, all_methods(:#{@namespace.blank? ? "user_groups" : "#{@namespace}__user_groups"})"
+    perms << "set_permission :permissions_management, all_methods(:#{@namespace.blank? ? "permissions" : "#{@namespace}__permissions"})"
+    perms << "set_permission :my_account, only_methods(:#{@namespace.blank? ? "users" : "#{@namespace}__users"}, :edit, :update, :show)"
 
-    add_permissions m, perms.join("\n  ")
+    add_permissions perms.join("\n  ")
     
-    add_predefined_user_group m, "set_protected_access :my_account"
+    add_predefined_user_group "set_protected_access :my_account"
   end
 
-  def add_permissions(m, str)
+  def add_permissions(str)
     sentinel = '# Define your permissions here:'
-    m.gsub_file 'lib/lockdown/init.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
-      "#{match}\n  #{str}"
-    end
+    write_init_file(sentinel, str)
   end
 
-  def add_predefined_user_group(m, str)
+  def add_predefined_user_group(str)
     sentinel = '# Define the built-in user groups here:'
-    m.gsub_file 'lib/lockdown/init.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
-      "#{match}\n  #{str}"
-    end
+    write_init_file(sentinel, str)
   end
 
-  def add_login_routes(m)
-    home = %Q(map.home '', :controller => 'sessions', :action => 'new')
-    login = %Q(map.login '/login', :controller => 'sessions', :action => 'new')
-    logout =%Q(map.logout '/logout', :controller => 'sessions', :action => 'destroy')
-			
-    sentinel = 'ActionController::Routing::Routes.draw do |map|'
-                
-    m.gsub_file 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
-      "#{match}\n  #{home}\n\n  #{login}\n\n  #{logout}\n"
-    end
+  def add_login_routes
+    sessions = %Q(\tmap.resources :sessions)
+    home     = %Q(\tmap.home '', :controller => 'sessions', :action => 'new')
+    login    = %Q(\tmap.login '/login', :controller => 'sessions', :action => 'new')
+    logout   = %Q(\tmap.logout '/logout', :controller => 'sessions', :action => 'destroy')
+    routes   = [sessions, home, login, logout].join("\n\n")
+
+    write_routes_file(routes)
   end
 
   def banner
@@ -224,6 +187,8 @@ EOS
     opt.separator 'Options:'
     opt.on("--all",
       "Install all Lockdown templates") { |v| options[:all] = v }
+    opt.on("--namespace namespace",
+      "Install lockdown templates with a namespace") { |v| options[:namespace] = v }
     opt.on("--models",
       "Install only models and migrations (skip migrations by --no_migrations).") { |v| options[:models] = v }
     opt.on("--management",
@@ -234,4 +199,37 @@ EOS
       "Skip migrations installation") { |v| options[:no_migrations] = v }
   end
 
+  def write_migration(str)
+    @m.migration_template "db/migrate/#{str}.rb", "db/migrate", 
+      :migration_file_name => str
+  end
+
+  def write_model(str)
+    @m.file "app/models/#{str}.rb", "app/models/#{str}.rb"
+  end
+
+  def write_controller(str)
+    @m.template "app/controllers/#{str}_controller.rb",
+      "#{@controller_path}/#{str}_controller.rb"
+    write_helper(str)
+  end
+
+  def write_helper(str)
+    @m.template "app/helpers/#{str}_helper.rb",
+      "#{@helper_path}/#{str}_helper.rb"
+  end
+
+  def write_routes_file(routes)
+    sentinel = 'ActionController::Routing::Routes.draw do |map|'
+                
+    @m.gsub_file 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
+      "#{match}\n #{routes}\n"
+    end
+  end
+
+  def write_init_file(sentinel, str)
+    @m.gsub_file 'lib/lockdown/init.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
+      "#{match}\n  #{str}"
+    end
+  end
 end

data/rails_generators/lockdown/templates/app/controllers/permissions_controller.rb

@@ -1,4 +1,4 @@
-class PermissionsController < ApplicationController
+class <%= "#{namespace.camelcase}::" unless namespace.blank? %>PermissionsController < ApplicationController
   # GET /permissions
   # GET /permissions.xml
   def index

data/rails_generators/lockdown/templates/app/controllers/sessions_controller.rb

@@ -1,5 +1,6 @@
-# This controller handles the login/logout function of the site.  
 class SessionsController < ApplicationController
+
+# This controller handles the login/logout function of the site.
   def new
     #Stub required for Lockdown to grant access
   end
@@ -28,7 +29,7 @@ class SessionsController < ApplicationController
   
   def failed_login(message = 'Authentication failed.')
     flash[:error] = message
-    redirect_back_or_default login_url
+    redirect_back_or_default login_path
   end
 	 
   def successful_login

data/rails_generators/lockdown/templates/app/controllers/user_groups_controller.rb

@@ -1,4 +1,4 @@
-class UserGroupsController < ApplicationController
+class <%= "#{namespace.camelcase}::" unless namespace.blank? %>UserGroupsController < ApplicationController
 	before_filter :find_user_group, :only => [:show, :edit, :update, :destroy]
 	after_filter :update_permissions, :only => [:create, :update]
 
@@ -48,7 +48,11 @@ class UserGroupsController < ApplicationController
     respond_to do |format|
       if @user_group.save
         flash[:notice] = 'UserGroup was successfully created.'
-        format.html { redirect_to(@user_group) }
+        <% if namespace %>
+          format.html { redirect_to(<%= namespace %>_user_group_path(@user_group)) }
+        <% else %>
+          format.html { redirect_to(user_group_path(@user_group)) }
+        <% end %>
         format.xml  { render :xml => @user_group, :status => :created, :location => @user_group }
       else
 				@all_permissions = Lockdown::System.permissions_assignable_for_user(current_user)
@@ -64,7 +68,11 @@ class UserGroupsController < ApplicationController
     respond_to do |format|
       if @user_group.update_attributes(params[:user_group])
         flash[:notice] = 'UserGroup was successfully updated.'
-        format.html { redirect_to(@user_group) }
+        <% if namespace %>
+          format.html { redirect_to(<%= namespace %>_user_group_path(@user_group)) }
+        <% else %>
+          format.html { redirect_to(user_group_path(@user_group)) }
+        <% end %>
         format.xml  { head :ok }
       else
 				@all_permissions = Lockdown::System.permissions_assignable_for_user(current_user)
@@ -80,7 +88,7 @@ class UserGroupsController < ApplicationController
     @user_group.destroy
 
     respond_to do |format|
-      format.html { redirect_to(user_groups_url) }
+      format.html { redirect_to(<%= namespace.blank? ? 'user_groups_path' : "#{namespace}_user_groups_path" %>) }
       format.xml  { head :ok }
     end
   end

data/rails_generators/lockdown/templates/app/controllers/users_controller.rb

@@ -1,4 +1,4 @@
-class UsersController < ApplicationController
+class <%= "#{namespace.camelcase}::" unless namespace.blank? %>UsersController < ApplicationController
 	before_filter :find_user, :only => [:show, :edit, :update, :destroy]
 	after_filter :update_user_groups, :only => [:create, :update]
   # GET /users
@@ -44,7 +44,7 @@ class UsersController < ApplicationController
 
 		if @user.save
 			flash[:notice] = "Thanks for signing up!"
-			redirect_to(users_path)
+			redirect_to(<%= namespace.blank? ? 'user_path(@user)' : "#{namespace}_user_path(@user)" %>)
 		else
 			@user_groups_for_user = Lockdown::System.user_groups_assignable_for_user(current_user)
 			flash[:error] = "Please correct the following issues"
@@ -60,7 +60,7 @@ class UsersController < ApplicationController
     respond_to do |format|
       if @user.save
         flash[:notice] = 'User was successfully updated.'
-        format.html { redirect_to(@user) }
+          format.html { redirect_to(<%= namespace.blank?  ? 'user_path(@user)' : "#{namespace}_user_path(@user)"%>) }
         format.xml  { head :ok }
       else
         @user_groups_for_user = Lockdown::System.user_groups_assignable_for_user(current_user)
@@ -76,7 +76,7 @@ class UsersController < ApplicationController
     @user.destroy
 
     respond_to do |format|
-      format.html { redirect_to(users_url) }
+      format.html { redirect_to(<%= namespace.blank? ? 'users_path' : "#{namespace}_users_path" %>) }
       format.xml  { head :ok }
     end
   end

data/rails_generators/lockdown/templates/app/helpers/permissions_helper.rb

@@ -1,4 +1,4 @@
-module PermissionsHelper
+module <%= "#{namespace.camelcase}::" unless namespace.blank? %>PermissionsHelper
   def permission_name_value
     h @permission.name 
   end
@@ -8,6 +8,6 @@ module PermissionsHelper
   end
 
   def permission_users_value
-    @permission.all_users.collect{|u| link_to_or_show(u.full_name, u)}.join("<br/>")
+    @permission.all_users.collect{|u| link_to_or_show(u.full_name, <%= namespace.blank? ? 'u' : "#{namespace}_user_path(u)" %>)}.join("<br/>")
   end
 end

data/rails_generators/lockdown/templates/app/helpers/user_groups_helper.rb

@@ -1,4 +1,4 @@
-module UserGroupsHelper
+module <%= "#{namespace.camelcase}::" unless namespace.blank? %>UserGroupsHelper
   def user_group_name_value
     if <%= action_name %> == "show"
        h @user_group.name 
@@ -30,6 +30,6 @@ module UserGroupsHelper
   end
 
   def user_group_users_value
-    @user_group.all_users.collect{|u| link_to_or_show(u.full_name, u)}.join("<br/>")
+    @user_group.all_users.collect{|u| link_to_or_show(u.full_name, <%= namespace.blank? ? 'u' : "#{namespace}_user_path(u)" %>)}.join("<br/>")
   end
 end

data/rails_generators/lockdown/templates/app/helpers/users_helper.rb

@@ -1,4 +1,4 @@
-module UsersHelper
+module <%= "#{namespace.camelcase}::" unless namespace.blank? %>UsersHelper
   def user_first_name_value
     if <%= action_name %> == "show"
       h @user.first_name 

data/rails_generators/lockdown/templates/app/views/permissions/index.html.erb

@@ -8,7 +8,7 @@
 <%% for permission in @permissions %>
   <tr>
     <td><%%=h permission.name %></td>
-    <td><%%= link_to 'Show', permission %></td>
+    <td><%%= link_to 'Show', <%= namespace.blank? ? 'permission_path(permission)' : "#{namespace}_permission_path(permission)" %> %></td>
   </tr>
 <%% end %>
 </table>

data/rails_generators/lockdown/templates/app/views/permissions/show.html.erb

@@ -1,3 +1,3 @@
 <%%= render :partial => "data"  %>
 
-<%%= link_to 'Back', permissions_path %>
+<%%= link_to 'Back', <%= namespace.blank? ? 'permissions_path' : "#{namespace}_permissions_path" %> %>

data/rails_generators/lockdown/templates/app/views/sessions/new.html.erb

@@ -1,12 +1,12 @@
-<%= flash[:notice] if flash[:notice] %>
-<%= flash[:error] if flash[:error] %>
+<%%= flash[:notice] if flash[:notice] %>
+<%%= flash[:error] if flash[:error] %>
 
-<% form_tag sessions_path do -%>
+<%% form_tag sessions_path  do -%>
 	<p><label for="login">Login</label><br/>
-	<%= text_field_tag 'login' %></p>
+	<%%= text_field_tag 'login' %></p>
 
 	<p><label for="password">Password</label><br/>
-	<%= password_field_tag 'password' %></p>
+	<%%= password_field_tag 'password' %></p>
 
-	<p><%= submit_tag 'Log in' %></p>
-<% end -%>
+	<p><%%= submit_tag 'Log in' %></p>
+<%% end -%>

data/rails_generators/lockdown/templates/app/views/user_groups/_form.html.erb

@@ -5,7 +5,7 @@
 
 <%%= error_messages_for :user_group %>
 
-<%% form_for(@user_group) do |f| %>
+<%% form_for(<%= namespace.blank? ? '@user_group' : "[:#{namespace}, @user_group]"  %>) do |f| %>
   <%%= render :partial => "data" %>
   <p> <%%= f.submit submit_label %> </p>
 <%% end %>

data/rails_generators/lockdown/templates/app/views/user_groups/edit.html.erb

@@ -1,6 +1,6 @@
 <h1>Editing Usergroup</h1>
 
-<%%= render :partial => "form" %>
+<%%= render :partial => "form" %
 
-<%%= link_to 'Show', @user_group %> |
-<%%= link_to 'Back', user_groups_path %>
+<%%= link_to 'Show', <%= namespace.blank? ? '@user_group' : "#{namespace}_user_group_path(@user_group)" %> %> |
+<%%= link_to 'Back', <%= namespace.blank? ? 'user_groups_path' : "#{namespace}_user_groups_path" %> %>

data/rails_generators/lockdown/templates/app/views/user_groups/index.html.erb

@@ -8,13 +8,13 @@
 <%% for user_group in @user_groups %>
   <tr>
     <td><%%=h user_group.name %></td>
-    <td><%%= link_to 'Show', user_group %></td>
-    <td><%%= link_to('Edit', edit_user_group_path(user_group)) unless Lockdown::System.has_user_group?(user_group) %></td>
-    <td><%%= link_to('Destroy', user_group, :confirm => 'Are you sure?', :method => :delete) unless Lockdown::System.has_user_group?(user_group) %></td>
+    <td><%%= link_to 'Show', <%= namespace.blank? ? "user_group_path(user_group)" : "#{namespace}_user_group_path(user_group)" %> %></td>
+    <td><%%= link_to('Edit', <%= namespace.blank? ? "edit_user_group_path(user_group)" : "edit_#{namespace}_user_group_path(user_group)" %>) unless Lockdown::System.has_user_group?(user_group) %></td>
+    <td><%%= link_to('Destroy',<%= namespace.blank? ? "user_group_path(user_group)" : "#{namespace}_user_group_path(user_group)" %>, :confirm => 'Are you sure?', :method => :delete) unless Lockdown::System.has_user_group?(user_group) %></td>
   </tr>
 <%% end %>
 </table>
 
 <br />
 
-<%%= link_to 'New User Group', new_user_group_path %>
+<%%= link_to 'New User Group', <%= namespace.blank? ? "new_user_group_path" : "new_#{namespace}_user_group_path" %> %>

data/rails_generators/lockdown/templates/app/views/user_groups/new.html.erb

@@ -2,4 +2,4 @@
 
 <%%= render :partial => "form" %>
 
-<%%= link_to 'Back', user_groups_path %>
+<%%= link_to 'Back', <%= namespace.blank? ? 'user_groups_path' : "#{namespace}_user_groups_path" %> %>

data/rails_generators/lockdown/templates/app/views/user_groups/show.html.erb

@@ -1,6 +1,6 @@
 <%%= render :partial => "data" %>
 
 <%% unless Lockdown::System.has_user_group?(@user_group) %>
-  <%%= link_to 'Edit', edit_user_group_path(@user_group) %> |
+  <%%= link_to 'Edit', <%= namespace.blank? ? 'edit_user_group_path(@user_group)' : "edit_#{namespace}_user_group_path(@user_group)" %> %> |
 <%% end %>
-<%%= link_to 'Back', user_groups_path %>
+<%%= link_to 'Back', <%= namespace.blank? ? 'user_groups_path' : "#{namespace}_user_groups_path" %> %>

data/rails_generators/lockdown/templates/app/views/users/_form.html.erb

@@ -6,7 +6,7 @@
 <%%= error_messages_for :profile %>
 <%%= error_messages_for :user %>
 
-<%% form_for(@user) do |f| %>
+<%% form_for(<%= namespace.blank? ? "@user" : "[:#{namespace}, @user]" %>) do |f| %>
   <%%= render :partial => "data" %>
   <p> <%%= f.submit submit_label %> </p>
-<%% end %>
+<%% end %>

data/rails_generators/lockdown/templates/app/views/users/edit.html.erb

@@ -2,5 +2,5 @@
 
 <%%= render :partial => "form" %>
 
-<%%= link_to 'Show', @user %> |
-<%%= link_to 'Back', users_path %>
+<%%= link_to 'Show', <%= namespace.blank? ? "user_path(@user)" : "#{namespace}_user_path(@user)" %> %> |
+<%%= link_to 'Back', <%= namespace.blank? ? "users_path" : "#{namespace}_users_path" %> %>

data/rails_generators/lockdown/templates/app/views/users/index.html.erb

@@ -10,13 +10,13 @@
   <tr>
     <td><%%=h user.login %></td>
     <td><%%=h user.full_name %></td>
-    <td><%%= link_to 'Show', user %></td>
-    <td><%%= link_to 'Edit', edit_user_path(user) %></td>
-    <td><%%= link_to 'Destroy', user, :confirm => 'Are you sure?', :method => :delete %></td>
+    <td><%%= link_to 'Show', <%= namespace.blank? ? "user_path(user)" : "#{namespace}_user_path(user)" %> %></td>
+    <td><%%= link_to 'Edit', <%= namespace.blank? ? "edit_user_path(user)" : "edit_#{namespace}_user_path(user)" %> %></td>
+    <td><%%= link_to 'Destroy', <%= namespace.blank? ? "user_path(user)" : "#{namespace}_user_path(user)" %>, :confirm => 'Are you sure?', :method => :delete %></td>
   </tr>
 <%% end %>
 </table>
 
 <br />
 
-<%%= link_to 'New User', new_user_path %>
+<%%= link_to 'New User', <%= namespace.blank? ? "new_user_path" : "new_#{namespace}_user_path" %> %>

data/rails_generators/lockdown/templates/app/views/users/new.html.erb

@@ -2,4 +2,4 @@
 
 <%%= render :partial => "form" %>
 
-<%%= link_to 'Back', users_path %>
+<%%= link_to 'Back', <%= namespace.blank? ? "users_path" : "#{namespace}_users_path" %> %>

data/rails_generators/lockdown/templates/app/views/users/show.html.erb

@@ -1,4 +1,4 @@
 <%%= render :partial => "data" %>
 
-<%%= link_to 'Edit', edit_user_path(@user) %> |
-<%%= link_to 'Back', users_path %>
+<%%= link_to 'Edit', <%= namespace.blank? ? "edit_user_path(@user)" : "edit_#{namespace}_user_path(@user)" %> %> |
+<%%= link_to 'Back', <%= namespace.blank? ? "users_path" : "#{namespace}_users_path" %> %>

data/tasks/deployment.rake

@@ -31,4 +31,4 @@ namespace :manifest do
   task :refresh do
     `rake check_manifest | patch -p0 > Manifest.txt`
   end
-end
+end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Lockdown</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/lockdown"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/lockdown" class="numbers">0.5.12</a>
+      <a href="http://rubyforge.org/projects/lockdown" class="numbers">0.5.13</a>
     </div>
     <h2>What</h2>
 
@@ -59,7 +59,7 @@
 	<p>Thanks for your interest in Lockdown,<br/>
 -andy</p>
     <p class="coda">
-      24th June 2008<br/>
+      10th July 2008<br/>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lockdown
 version: !ruby/object:Gem::Version 
-  version: 0.5.12
+  version: 0.5.13
 platform: ruby
 authors: 
 - Andrew Stone
@@ -9,21 +9,32 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-02 00:00:00 -04:00
+date: 2008-07-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubigen
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.4
+        version: 1.3.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
     version: 
 description: Authorization/Authentication system for RubyOnRails
 email: 
-- andrew.n.stone@gmail.com
+- andy@stonean.com
 executables: 
 - lockdown
 extensions: []
@@ -139,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: lockdown
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Authorization/Authentication system for RubyOnRails