lockdown 0.6.3 → 0.7.0

data/lib/lockdown/frameworks/rails/view.rb

@@ -3,52 +3,48 @@ module Lockdown
     module Rails
       module View
         def self.included(base)
-          base.send :alias_method, :link_to_open,  :link_to
-          base.send :alias_method, :link_to,  :link_to_secured
+          base.class_eval do
+            alias_method :link_to_open, :link_to
+            alias_method :link_to, :link_to_secured
 
-          base.send :alias_method, :button_to_open,  :button_to
-          base.send :alias_method, :button_to,  :button_to_secured
+            alias_method :button_to_open, :button_to
+            alias_method :button_to, :button_to_secured
+          end
         end
     
         def link_to_secured(name, options = {}, html_options = nil)
-          # Don't want to go through the url_for twice
           url = url_for(options)
-          if authorized? test_path(url, html_options)
+
+          method = html_options ? html_options[:method] : nil
+
+          if authorized?(url, method)
             return link_to_open(name, url, html_options)
           end
           return ""
         end
 
-        def link_to_or_show(name, options = {}, html_options = nil)
-          lnk = link_to(name, options, html_options)
-          lnk.length == 0 ? name : lnk
-        end
-    
         def button_to_secured(name, options = {}, html_options = nil)
           url = url_for(options)
-          if authorized? test_path(url, html_options)
+
+          method = html_options ? html_options[:method] : nil
+
+          if authorized?(url, method)
             return button_to_open(name, url, html_options)
           end
           return ""
         end
 
+        def link_to_or_show(name, options = {}, html_options = nil)
+          lnk = link_to(name, options, html_options)
+          lnk.length == 0 ? name : lnk
+        end
+
         def links(*lis)
           rvalue = []
           lis.each{|link| rvalue << link if link.length > 0 }
           rvalue.join(" | ")
         end
-    
-        private
-      
-        def test_path(url, html_options)
-          if html_options.is_a?(Hash) && html_options[:method] == :delete
-            url += "/destroy"
-          elsif url.split("/").last =~ /\A\d+\z/
-            url += "/show"
-          end
-          url 
-        end
       end # View
     end # Rails
   end # Frameworks
-end # Lockdown
+end # Lockdown

data/lib/lockdown/orms/active_record.rb

@@ -12,7 +12,9 @@ module Lockdown
         end
 
         def mixin
-          Lockdown.orm_parent.send :include, Lockdown::Orms::ActiveRecord::Stamps
+          Lockdown.orm_parent.class_eval do
+            include Lockdown::Orms::ActiveRecord::Stamps
+          end
         end
       end # class block
 
@@ -63,4 +65,4 @@ module Lockdown
       end
     end
   end
-end
+end

data/lib/lockdown/orms/data_mapper.rb

@@ -12,7 +12,9 @@ module Lockdown
         end
 
         def mixin
-          orm_parent.send :include, Lockdown::Orm::DataMapper::Stamps
+          orm_parent.class_eval do
+            include Lockdown::Orm::DataMapper::Stamps
+          end
         end
       end # class block
 
@@ -65,4 +67,4 @@ module Lockdown
       end
     end
   end
-end
+end

data/lib/lockdown/rights.rb

@@ -205,4 +205,4 @@ module Lockdown
     end
       
   end
-end
+end

data/lib/lockdown/system.rb

@@ -14,9 +14,8 @@ module Lockdown
 
         instance_eval(&block)
 
-        unless Lockdown::System.fetch(:skip_db_sync_in).include?(ENV['RAILS_ENV']) 
-          Lockdown::Database.sync_with_db
-        end
+        Lockdown::Database.sync_with_db unless skip_sync?
+
       end
 
       # Return option value for key

data/rails_generators/lockdown/lockdown_generator.rb

@@ -3,7 +3,7 @@
 if Rails::VERSION::MAJOR >= 2 && Rails::VERSION::MINOR >= 1 
   if Rails::VERSION::TINY == 0
     @override_next_migration_string = true
-  elsif ActiveRecord::Base.timestamped_migrations 
+  elsif ActiveRecord::Base.timestamped_migrations
     @override_next_migration_string = true
   end
 end
@@ -35,6 +35,9 @@ class LockdownGenerator < Rails::Generator::Base
     @view_path = "app/views"
     @controller_path = "app/controllers"
     @helper_path = "app/helpers"
+    @lib_path = "lib/lockdown"
+
+    @initializer = "config/environment.rb"
 
     if @namespace
       @view_path += "/#{@namespace}"
@@ -44,12 +47,17 @@ class LockdownGenerator < Rails::Generator::Base
   end
 
   def manifest
-    record do |m|
-      @m = m
+    record do |@m|
       # Ensure appropriate folder(s) exists
       @m.directory @view_path
       @m.directory @controller_path
       @m.directory @helper_path
+      @m.directory @lib_path
+
+      unless options[:skip_rules]
+        @m.template "lib/lockdown/session.rb", "lib/lockdown/session.rb"
+        @m.file "lib/lockdown/init.rb", "lib/lockdown/init.rb"
+      end
 
       if options[:basics]
         options[:skip_management] = true
@@ -61,6 +69,8 @@ class LockdownGenerator < Rails::Generator::Base
       add_login unless options[:skip_login]
 
       add_models
+      
+      @m.file "config/initializers/lockit.rb", "config/initializers/lockit.rb"
     end #record do |m|
   end
 
@@ -79,9 +89,6 @@ class LockdownGenerator < Rails::Generator::Base
 
     copy_views("user_groups")
 
-    @m.template "app/views/permissions/_data.html.erb",
-      "#{@view_path}/permissions/_data.html.erb"
-
     @m.template "app/views/permissions/index.html.erb",
       "#{@view_path}/permissions/index.html.erb"
 
@@ -123,8 +130,6 @@ class LockdownGenerator < Rails::Generator::Base
   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"
@@ -187,7 +192,9 @@ class LockdownGenerator < Rails::Generator::Base
 Installs the lockdown framework to managing users user_groups 
 and viewing permissions. Also includes a login screen.
 
-By default the entire set of stubs are installed.  Please use the appropriate options to customize your install. 
+By default the entire set of stubs are installed.  
+
+Please use the appropriate options to customize your install. 
 
 USAGE: #{$0} #{spec.name} 
 EOS
@@ -199,11 +206,13 @@ EOS
     opt.on("--namespace=admin",
       "Install lockdown templates with a namespace, in this example 'admin'.") { |v| options[:namespace] = v }
     opt.on("--skip-management",
-      "Generate everything but management screens. (controllers, helpers and views for users, permissions and user_groups are not generated). Renders namespace option meaningless.") { |v| options[:skip_management] = v }
+      "Only lib/lockdown and app/models are generated.") { |v| options[:skip_management] = v }
     opt.on("--skip-login",
-      "Generate everything but login (sessions controller and sessions view dir).") { |v| options[:skip_login] = v }
+      "Skips generation of session controller and views.") { |v| options[:skip_login] = v }
     opt.on("--basics",
       "Install only models and migrations.  Equivalent to skip-management and skip-login.") { |v| options[:basics] = v }
+    opt.on("--skip-rules",
+        "Skip installation of lib/lockdown/init.rb lib/lockdown/session.rb") { |v| options[:skip_rules] = v }
     opt.on("--skip-migrations",
       "Skip migrations installation") { |v| options[:skip_migrations] = v }
   end
@@ -241,4 +250,5 @@ EOS
       "#{match}\n  #{str}"
     end
   end
+  
 end

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

@@ -101,15 +101,12 @@ class <%= "#{namespace.camelcase}::" unless namespace.blank? %>UsersController <
 
 	def update_user_groups
 		new_ug_ids = params.collect{|p| p[0].split("_")[1].to_i if p[0] =~ /^ug_/}.compact
-		#
 		# Removed previously associated user_groups if not checked this time.
 		#
 		@user.user_groups.dup.each do |g|
-			#Don't remove the automatically assigned user groups
-			next if Lockdown::System.has_user_group?(g)
 			@user.user_groups.delete(g) unless new_ug_ids.include?(g.id)
     end
-		# 
+	
 		# Add in the new permissions
 		#
 		new_ug_ids.each do |id|

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

@@ -1,13 +1,2 @@
 module <%= "#{namespace.camelcase}::" unless namespace.blank? %>PermissionsHelper
-  def permission_name_value
-    h @permission.name 
-  end
-
-  def permission_access_rights_value
-    Lockdown::System.access_rights_for_permission(@permission).collect{|r| r}.join("<br/>") 
-  end
-
-  def permission_users_value
-    @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,35 +1,2 @@
 module <%= "#{namespace.camelcase}::" unless namespace.blank? %>UserGroupsHelper
-  def user_group_name_value
-    if <%= action_name %> == "show"
-       h @user_group.name 
-    else
-       text_field :user_group, :name
-    end
-  end
-
-  def user_group_permissions_value
-    if <%= action_name %> == "show"
-       @user_group.permissions.collect{|p| p.name + "<br/>"}
-    else
-      rvalue = %{<ul id="all_permissions" class="checklist">}
-      @all_permissions.each_with_index do |perm,i|
-        bg = ( i % 2 == 0 ) ? "even" : "odd"
-        input_id = "perm_#{perm.id}"
-        checked = (@user_group.permission_ids.include?(perm.id) ? "checked" : "")
-        bg << "_" << checked if checked.length > 0
-        rvalue << <<-HTML
-          <li class="#{bg}" id="li_#{input_id}">
-            <label for="#{input_id}" onclick="do_highlight('#{input_id}')">
-              <input id="#{input_id}" name="#{input_id}" type="checkbox" #{checked}/>&nbsp;&nbsp;#{perm.name}
-            </label>
-          </li>
-        HTML
-       end
-       rvalue << "</ul>"
-    end
-  end
-
-  def user_group_users_value
-    @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,78 +1,2 @@
 module <%= "#{namespace.camelcase}::" unless namespace.blank? %>UsersHelper
-  def user_first_name_value
-    if <%= action_name %> == "show"
-      h @user.first_name 
-    else
-      text_field :user, :first_name
-    end
-  end
-
-  def user_last_name_value
-    if <%= action_name %> == "show"
-      h @user.last_name 
-    else
-      text_field :user, :last_name
-    end
-  end
-
-  def user_email_value
-    if <%= action_name %> == "show"
-      h @user.email 
-    else
-      text_field :user, :email 
-    end
-  end
-
-  def user_login_value
-    if <%= action_name %> == "show"
-      h @user.login 
-    else
-      text_field :user, :login
-    end
-  end
-
-  def user_password_value
-    if <%= action_name %> == "show"
-      h "Hidden for security..."
-    else
-      %{<input autocomplete="off" type="password" name="user[password]" id="user_password"/>}
-    end
-  end
-
-  def user_password_confirmation_value
-    if <%= action_name %> == "show"
-      h "Hidden for security..."
-    else
-      %{<input autocomplete="off" type="password" name="user[password_confirmation]" id="user_password_confirmation"/>}
-    end
-  end
-
-  def user_user_groups_value
-    if <%= action_name %> == "show"
-      @user.user_groups.collect{|ug| ug.name + "<br/>"}
-    else
-      rvalue = %{<ul id="all_user_groups" class="checklist">}
-      #
-      # Restrict user group list to the list of the current user.
-      # This prevents a user from creating someone with more access than
-      # him/herself.
-      #
-      @user_groups_for_user.each_with_index do |ug,i|
-        bg =  ( i % 2 == 0 ) ? "even" : "odd"
-        input_id = "ug_#{ug.id}"
-        checked = (@user.user_group_ids.include?(ug.id) ? "checked" : "")
-        bg << "_" << checked if checked.length > 0
-        rvalue << <<-HTML
-          <li class="#{bg}" id="li_#{input_id}">
-            <label for="#{input_id}" onclick="do_highlight('#{input_id}')">
-            <input id="#{input_id}" name="#{input_id}" type="checkbox" #{checked}/>&nbsp;&nbsp;#{ug.name}
-            </label>
-          </li>
-        HTML
-      end
-      rvalue << "</ul>"
-    end
-  end
-
-
 end

data/rails_generators/lockdown/templates/app/models/user.rb

@@ -1,11 +1,7 @@
 require 'digest/sha1'
 class User < ActiveRecord::Base
   has_and_belongs_to_many :user_groups
-  # depends_on functionality is from the classy-inheritance gem 
-  # that is bundled with lockdown.
-  # For more info: http://stonean.com
-  #
-  depends_on :profile, :attrs => [:first_name, :last_name, :email]
+  belongs_to :profile
   
   # Virtual attributes
   attr_accessor :password
@@ -18,7 +14,8 @@ class User < ActiveRecord::Base
   validates_length_of       :login,    :within => 3..40
   validates_uniqueness_of   :login, :case_sensitive => false
   
-	before_save :prepare_for_save
+	before_save :encrypt_password
+	before_save :save_profile
 
   attr_accessible :login, :password, :password_confirmation, 
                   :first_name, :last_name, :email
@@ -45,14 +42,39 @@ class User < ActiveRecord::Base
   end
   
   def full_name
-    self.first_name + " " + self.last_name
+    first_name + " " + last_name
+  end
+
+  # Profile information
+  def first_name
+    user_profile.first_name
   end
   
-  protected
+  def first_name=(string)
+    user_profile.first_name = string
+  end
+  
+  def last_name
+    user_profile.last_name
+  end
+  
+  def last_name=(string)
+    user_profile.last_name = string
+  end
+  
+  def email
+    user_profile.email
+  end
+  
+  def email=(string)
+    user_profile.email = string
+  end
 
-  def prepare_for_save
-    encrypt_password
+  def user_profile
+    self.profile || self.profile = Profile.new
   end
+  
+  protected
       
   def encrypt_password
     return if password.blank?
@@ -61,7 +83,11 @@ class User < ActiveRecord::Base
     end
     self.crypted_password = encrypt(password)
   end
-    
+
+  def save_profile
+    profile.save
+  end
+  
   def password_required?
     (crypted_password.blank? || !password.blank?)
   end