lockdown 0.1.4 → 0.2.0

data/History.txt

@@ -1,3 +1,6 @@
+== 0.2.0 2008-04-25
+* First full implementation of generate script "lockdown_all".  Warranted a bump up of the minor version.
+
 == 0.1.4 2008-04-25
 * Uncommented line in config/hoe.rb to hopefully resolved rubigen dependency issue.
 

data/Manifest.txt

@@ -30,6 +30,7 @@ rails_generators/lockdown_all/templates/app/helpers/permissions_helper.rb
 rails_generators/lockdown_all/templates/app/helpers/user_groups_helper.rb
 rails_generators/lockdown_all/templates/app/helpers/users_helper.rb
 rails_generators/lockdown_all/templates/app/models/permission.rb
+rails_generators/lockdown_all/templates/app/models/profile.rb
 rails_generators/lockdown_all/templates/app/models/user.rb
 rails_generators/lockdown_all/templates/app/models/user_group.rb
 rails_generators/lockdown_all/templates/app/views/permissions/_data.html.erb
@@ -49,8 +50,9 @@ rails_generators/lockdown_all/templates/app/views/users/edit.html.erb
 rails_generators/lockdown_all/templates/app/views/users/index.html.erb
 rails_generators/lockdown_all/templates/app/views/users/new.html.erb
 rails_generators/lockdown_all/templates/app/views/users/show.html.erb
+rails_generators/lockdown_all/templates/db/migrate/create_base_user_groups.rb
 rails_generators/lockdown_all/templates/db/migrate/create_permissions.rb
-rails_generators/lockdown_all/templates/db/migrate/create_profile.rb
+rails_generators/lockdown_all/templates/db/migrate/create_profiles.rb
 rails_generators/lockdown_all/templates/db/migrate/create_user_groups.rb
 rails_generators/lockdown_all/templates/db/migrate/create_users.rb
 script/console

data/app_generators/lockdown/templates/access.rb

@@ -95,8 +95,10 @@ module Lockdown
       #
       # All newly created users are assigned to this User Group by default
       #
+      # Sample registered user permission:
+      # [:my_account]
       def registered_users
-        #[:my_account]
+        []
       end
 
       #

data/app_generators/lockdown/templates/session.rb

@@ -52,7 +52,7 @@ module Lockdown
     end
 
     def current_user
-      return User.find(current_user_id, :include => [:profile, :user_groups])
+      return current_user_id > 0 ? User.find(current_user_id, :include => [:profile, :user_groups]) : nil
     end
   
   end # Session module

data/bin/lockdown

@@ -5,7 +5,12 @@ require "rubigen"
 require "rubigen/scripts/generate"
 require 'optparse'
 
-#require File.join(File.dirname(__FILE__), "..", "lib", "lockdown_generator")
+if %w(-v --version).include? ARGV.first
+  require 'lockdown/version'
+  puts "#{File.basename($0)} #{Lockdown::VERSION::STRING}"
+  exit(0)
+end
+
 
 #
 #  Created on 2008-4-21.

data/lib/lockdown/controller.rb

@@ -190,7 +190,7 @@ module Lockdown
           respond_to do |accepts|
             accepts.html do
               store_location
-              send_to login_path
+              send_to "/"
             end
             accepts.xml do
               headers["Status"] = "Unauthorized"

data/lib/lockdown/version.rb

@@ -1,8 +1,8 @@
 module Lockdown #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 1
-    TINY  = 4
+    MINOR = 2
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/rails_generators/lockdown_all/lockdown_all_generator.rb

@@ -1,16 +1,5 @@
-require "rubigen"
-
-class LockdownAllGenerator < RubiGen::Base
-  
-  default_options :author => nil
-  
-  attr_reader :name
-  
-  def initialize(runtime_args, runtime_options = {})
-    super
-    usage if args.empty?
-    @name = args.shift
-  end
+class LockdownAllGenerator < Rails::Generator::Base
+  attr_accessor :file_name
 
   def manifest
     record do |m|
@@ -28,11 +17,28 @@ class LockdownAllGenerator < RubiGen::Base
       m.file "app/controllers/permissions_controller.rb",  "app/controllers/permissions_controller.rb"
       m.file "app/controllers/users_controller.rb",        "app/controllers/users_controller.rb"
       m.file "app/controllers/user_groups_controller.rb",  "app/controllers/user_groups_controller.rb"
+      m.file "app/controllers/sessions_controller.rb",  "app/controllers/sessions_controller.rb"
 
       #Models
       m.file "app/models/permission.rb",  "app/models/permission.rb"
       m.file "app/models/user.rb",        "app/models/user.rb"
       m.file "app/models/user_group.rb",  "app/models/user_group.rb"
+      m.file "app/models/profile.rb",  "app/models/profile.rb"
+
+
+
+      #Migrations
+      m.migration_template "db/migrate/create_profiles.rb", "db/migrate", :migration_file_name => "create_profiles"
+      m.migration_template "db/migrate/create_users.rb", "db/migrate", :migration_file_name => "create_users"
+      m.migration_template "db/migrate/create_user_groups.rb", "db/migrate", :migration_file_name => "create_user_groups"
+      m.migration_template "db/migrate/create_permissions.rb", "db/migrate", :migration_file_name => "create_permissions"
+      m.migration_template "db/migrate/create_base_user_groups.rb", "db/migrate", :migration_file_name => "create_base_user_groups"
+
+      #Route file (i like having them on individual lines)
+      m.route_resources "permissions"
+      m.route_resources "user_groups"
+      m.route_resources "users"
+      m.route_resources "sessions"
 
       #Helpers
       m.file "app/helpers/permissions_helper.rb",  "app/helpers/permissions_helper.rb"
@@ -45,7 +51,9 @@ class LockdownAllGenerator < RubiGen::Base
 
       copy_views(m, "user_groups")
 
-      copy_views(m, "permissions")
+      m.file "app/views/permissions/_data.html.erb", "app/views/permissions/_data.html.erb"
+      m.file "app/views/permissions/index.html.erb", "app/views/permissions/index.html.erb"
+      m.file "app/views/permissions/show.html.erb", "app/views/permissions/show.html.erb"
 
       m.file "app/views/sessions/new.html.erb", "app/views/sessions/new.html.erb"
     end
@@ -54,9 +62,10 @@ class LockdownAllGenerator < RubiGen::Base
   protected
     def banner
       <<-EOS
-Creates a ...
+Installs the lockdown framework to managing users user_groups and viewing permissions. 
+Also includes a login screen.
 
-USAGE: #{$0} #{spec.name} name
+USAGE: #{$0} #{spec.name} 
 EOS
     end
 

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

@@ -5,8 +5,6 @@ class UsersController < ApplicationController
   # GET /users.xml
   def index
     @users = User.all
-    logger.info "===============> access rights: #{session[:access_rights].join("\n")}" unless session[:access_rights] == :all
-    logger.info "===============> is: #{current_user_is_admin?}"
     respond_to do |format|
       format.html # index.html.erb
       format.xml  { render :xml => @users }

data/rails_generators/lockdown_all/templates/app/models/profile.rb

@@ -0,0 +1,10 @@
+class Profile < ActiveRecord::Base
+  SYSTEM = 1
+  
+  validates_presence_of :email, :first_name, :last_name
+  
+  validates_length_of :email, :within => 5..100
+  validates_format_of :email, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
+  
+  validates_uniqueness_of :email, :case_sensitive => false
+end

data/rails_generators/lockdown_all/templates/app/models/user_group.rb

@@ -95,6 +95,8 @@ class UserGroup < ActiveRecord::Base
     # to errors by mistakingly removing them.
 		#
 		def find_assignable_for_user(usr)
+      return [] if usr.nil?
+
 			if usr.administrator?
 				find :all, 
 							:conditions => "name != 'Public Access' and name != 'Registered Users'", 
@@ -121,6 +123,8 @@ class UserGroup < ActiveRecord::Base
     # 
 		#
 		def find_content_assignable_for_user(usr)
+      return [] if usr.nil?
+
 			if usr.administrator?
 				find :all
 			else

data/rails_generators/lockdown_all/templates/db/migrate/create_base_user_groups.rb

@@ -0,0 +1,11 @@
+class CreateBaseUserGroups < ActiveRecord::Migration
+  def self.up
+	  UserGroup.create_record :administrators
+	  UserGroup.create_record :public_access
+	  UserGroup.create_record :registered_users
+  end
+	 
+  def self.down
+    #Nothing to see here...
+	end
+end

data/rails_generators/lockdown_all/templates/db/migrate/create_permissions.rb

@@ -5,11 +5,15 @@ class CreatePermissions < ActiveRecord::Migration
 
       t.timestamps
     end
-		create_join_table :permissions, :user_groups
+
+		create_table :permissions_user_groups, :id => false do |t|
+      t.integer :permission_id
+      t.integer :user_group_id
+    end
   end
 
   def self.down
-		drop_join_table :permissions, :user_groups
+		drop_table :permissions_user_groups
     drop_table :permissions
   end
 end

data/rails_generators/lockdown_all/templates/db/migrate/{create_profile.rb → create_profiles.rb}

@@ -9,11 +9,9 @@ class CreateProfiles < ActiveRecord::Migration
 
       t.timestamps
     end
-    define_foreign_key_column :profiles, :updated_by, :profiles
   end
 
   def self.down
-    remove_foreign_key_column :profiles, :updated_by
     drop_table :profiles
   end
 end

data/rails_generators/lockdown_all/templates/db/migrate/create_user_groups.rb

@@ -5,11 +5,15 @@ class CreateUserGroups < ActiveRecord::Migration
 
       t.timestamps
     end
-		create_join_table :user_groups, :users
+
+    create_table :user_groups_users, :id => false do |t|
+      t.integer :user_group_id
+      t.integer :user_id
+    end
   end
 
   def self.down
-		drop_join_table :user_groups, :users
+		drop_table :user_groups_users
     drop_table :user_groups
   end
 end

data/rails_generators/lockdown_all/templates/db/migrate/create_users.rb

@@ -4,17 +4,14 @@ class CreateUsers < ActiveRecord::Migration
       t.string :login
       t.string :crypted_password
       t.string :salt
+      t.integer :profile_id
       t.integer :updated_by
 
       t.timestamps
     end
-    add_foreign_key :users, :profiles
-    define_foreign_key_column :users, :updated_by, :profiles
   end
 
   def self.down
-    remove_foreign_key :users, :profiles
-    remove_foreign_key_column :users, :updated_by
     drop_table :users
   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.1.4</a>
+      <a href="http://rubyforge.org/projects/lockdown" class="numbers">0.2.0</a>
     </div>
     <h1>&#x2192; &#8216;lockdown&#8217;</h1>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lockdown
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors: 
 - Andrew Stone
@@ -68,6 +68,7 @@ files:
 - rails_generators/lockdown_all/templates/app/helpers/user_groups_helper.rb
 - rails_generators/lockdown_all/templates/app/helpers/users_helper.rb
 - rails_generators/lockdown_all/templates/app/models/permission.rb
+- rails_generators/lockdown_all/templates/app/models/profile.rb
 - rails_generators/lockdown_all/templates/app/models/user.rb
 - rails_generators/lockdown_all/templates/app/models/user_group.rb
 - rails_generators/lockdown_all/templates/app/views/permissions/_data.html.erb
@@ -87,8 +88,9 @@ files:
 - rails_generators/lockdown_all/templates/app/views/users/index.html.erb
 - rails_generators/lockdown_all/templates/app/views/users/new.html.erb
 - rails_generators/lockdown_all/templates/app/views/users/show.html.erb
+- rails_generators/lockdown_all/templates/db/migrate/create_base_user_groups.rb
 - rails_generators/lockdown_all/templates/db/migrate/create_permissions.rb
-- rails_generators/lockdown_all/templates/db/migrate/create_profile.rb
+- rails_generators/lockdown_all/templates/db/migrate/create_profiles.rb
 - rails_generators/lockdown_all/templates/db/migrate/create_user_groups.rb
 - rails_generators/lockdown_all/templates/db/migrate/create_users.rb
 - script/console