lockdown 1.0.6 → 1.1.0

data/lib/lockdown/database.rb

@@ -48,7 +48,7 @@ module Lockdown
         # Create user groups not found in the database
         @user_groups.each do |key|
           str = Lockdown.get_string(key)
-          unless ug = ::UserGroup.find(:first, :conditions => ["name = ?", str])
+          unless ug = Lockdown::System.fetch(:user_group_model).find(:first, :conditions => ["name = ?", str])
             create_user_group(str, key)
           else
             # Remove permissions from user group not found in init.rb
@@ -61,8 +61,8 @@ module Lockdown
       end
 
       def create_user_group(name_str, key)
-        puts ">> Lockdown: UserGroup not in the db: #{name_str}, creating."
-        ug = ::UserGroup.create(:name => name_str)
+        puts ">> Lockdown: #{Lockdown::System.fetch(:user_group_model)} not in the db: #{name_str}, creating."
+        ug = Lockdown::System.fetch(:user_group_model).create(:name => name_str)
         #Inefficient, definitely, but shouldn't have any issues across orms.
         Lockdown::System.permissions_for_user_group(key).each do |perm|
           p = ::Permission.find(:first, :conditions => ["name = ?", 

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

@@ -15,7 +15,7 @@ module Lockdown
         def link_to_secured(name, options = {}, html_options = nil)
           url = url_for(options)
 
-          method = html_options ? html_options[:method] : nil
+          method = html_options ? html_options[:method] : :get
 
           if authorized?(url, method)
             return link_to_open(name, url, html_options)
@@ -26,7 +26,7 @@ module Lockdown
         def button_to_secured(name, options = {}, html_options = nil)
           url = url_for(options)
 
-          method = html_options ? html_options[:method] : nil
+          method = html_options ? html_options[:method] : :get
 
           if authorized?(url, method)
             return button_to_open(name, url, html_options)

data/lib/lockdown/helper.rb

@@ -14,6 +14,10 @@ module Lockdown
       end
     end
 
+    def user_groups_hbtm_reference
+      underscore(Lockdown::System.fetch(:user_group_model).to_s).pluralize.to_sym
+    end
+
     def get_string(value)
       if value.respond_to?(:name)
         string_name(value.name)

data/lib/lockdown/rules.rb

@@ -31,7 +31,9 @@ module Lockdown
         :successful_login_path => "/",
         :subdirectory => nil,
         :skip_db_sync_in => ["test"],
-        :link_separator => ' | '
+        :link_separator => ' | ',
+        :user_group_model => ::UserGroup,
+        :user_model => ::User
       }
     end
 
@@ -143,7 +145,8 @@ module Lockdown
     # Pass in a user object to be associated to the administrator user group 
     # The group will be created if it doesn't exist
     def make_user_administrator(usr)
-      usr.user_groups << UserGroup.
+      user_groups = usr.send(Lockdown.user_groups_hbtm_reference)
+      user_groups << Lockdown::System.fetch(:user_group_model).
         find_or_create_by_name(Lockdown.administrator_group_string)
     end
 
@@ -160,7 +163,8 @@ module Lockdown
 
       rights = standard_authorized_user_rights
         
-      usr.user_groups.each do |grp|
+      user_groups = usr.send(Lockdown.user_groups_hbtm_reference)
+      user_groups.each do |grp|
         permissions_for_user_group(grp).each do |perm|
           rights += access_rights_for_permission(perm) 
         end
@@ -185,7 +189,8 @@ module Lockdown
 
     # Pass in user object and symbol for name of user group
     def user_has_user_group?(usr, sym)
-      usr.user_groups.any? do |ug|
+      user_groups = usr.send(Lockdown.user_groups_hbtm_reference)
+      user_groups.any? do |ug|
         Lockdown.convert_reference_name(ug.name) == sym
       end
     end
@@ -197,11 +202,11 @@ module Lockdown
       return [] if usr.nil?
         
       if administrator?(usr)
-        UserGroup.find_by_sql <<-SQL
+        Lockdown::System.fetch(:user_group_model).find_by_sql <<-SQL
           select user_groups.* from user_groups order by user_groups.name
         SQL
       else
-        UserGroup.find_by_sql <<-SQL
+        Lockdown::System.fetch(:user_group_model).find_by_sql <<-SQL
             select user_groups.* from user_groups, user_groups_users
              where user_groups.id = user_groups_users.user_group_id
              and user_groups_users.user_id = #{usr.id}	 

data/lib/lockdown.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), "lockdown", "helper")
 module Lockdown
   extend Lockdown::Helper
 
-  VERSION = '1.0.6'
+  VERSION = '1.1.0'
 
   # Returns the version string for the library.
   def self.version

data/rails_generators/lockdown/templates/lib/lockdown/init.rb

@@ -5,12 +5,19 @@ Lockdown::System.configure do
   #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   # Options with defaults:
   #
-  # Set who_did_it method
+  #
+  # Set User model:
+  #      options[:user_model] = User
+  #
+  # Set UserGroup model:
+  #      options[:user_group_model] = UserGroup
+  #
+  # Set who_did_it method:
   #   This method is used in setting the created_by/updated_by fields and
   #   should be accessible to the controller
   #      options[:who_did_it] = :current_user_id
   #
-  # Set default_who_did_it
+  # Set default_who_did_it:
   #   When current_user_id returns nil, this is the value to use
   #      options[:default_who_did_it] = 1
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lockdown
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors: 
 - Andrew Stone