lockdown 1.1.6 → 1.2.0

data/lib/lockdown/database.rb

@@ -54,7 +54,7 @@ module Lockdown
         # Create user groups not found in the database
         @user_groups.each do |key|
           str = Lockdown.get_string(key)
-          unless ug = Lockdown::System.fetch(:user_group_model).find(:first, :conditions => ["name = ?", str])
+          unless ug = Lockdown.user_group_class.find(:first, :conditions => ["name = ?", str])
             create_user_group(str, key)
           else
             # Remove permissions from user group not found in init.rb
@@ -68,7 +68,7 @@ module Lockdown
 
       def create_user_group(name_str, key)
         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)
+        ug = Lockdown.user_group_class.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/helper.rb

@@ -14,20 +14,28 @@ module Lockdown
       end
     end
 
+    def user_group_class
+      eval(Lockdown::System.fetch(:user_group_model))
+    end
+
     def user_groups_hbtm_reference
-      underscore(Lockdown::System.fetch(:user_group_model).to_s).pluralize.to_sym
+      underscore(Lockdown::System.fetch(:user_group_model)).pluralize.to_sym
     end
 
     def user_group_id_reference
-      underscore(Lockdown::System.fetch(:user_group_model).to_s) + "_id"
+      underscore(Lockdown::System.fetch(:user_group_model)) + "_id"
+    end
+
+    def user_class
+      eval(Lockdown::System.fetch(:user_model))
     end
 
     def users_hbtm_reference
-      underscore(Lockdown::System.fetch(:user_model).to_s).pluralize.to_sym
+      underscore(Lockdown::System.fetch(:user_model)).pluralize.to_sym
     end
 
     def user_id_reference
-      underscore(Lockdown::System.fetch(:user_model).to_s) + "_id"
+      underscore(Lockdown::System.fetch(:user_model)) + "_id"
     end
 
     def get_string(value)

data/lib/lockdown/rules.rb

@@ -35,12 +35,12 @@ module Lockdown
       }
 
       begin
-        @options[:user_group_model] = ::UserGroup
+        @options[:user_group_model] = "UserGroup"
       rescue NameError 
       end
 
       begin
-        @options[:user_model] = ::User 
+        @options[:user_model] = "User" 
       rescue NameError 
       end
       
@@ -155,7 +155,7 @@ module Lockdown
     # The group will be created if it doesn't exist
     def make_user_administrator(usr)
       user_groups = usr.send(Lockdown.user_groups_hbtm_reference)
-      user_groups << Lockdown::System.fetch(:user_group_model).
+      user_groups << Lockdown.user_group_class.
         find_or_create_by_name(Lockdown.administrator_group_string)
     end
 
@@ -211,7 +211,7 @@ module Lockdown
       return [] if usr.nil?
       ug_table = Lockdown.user_groups_hbtm_reference.to_s
       if administrator?(usr)
-        Lockdown::System.fetch(:user_group_model).find_by_sql <<-SQL
+        Lockdown.user_group_class.find_by_sql <<-SQL
           select #{ug_table}.* from #{ug_table} order by #{ug_table}.name
         SQL
       else
@@ -221,7 +221,7 @@ module Lockdown
         else
           join_table = "#{ug_table}_#{usr_table}"
         end
-        Lockdown::System.fetch(:user_group_model).find_by_sql <<-SQL
+        Lockdown.user_group_class.find_by_sql <<-SQL
             select #{ug_table}.* from #{ug_table}, #{join_table}
              where #{ug_table}.id = #{join_table}.#{Lockdown.user_group_id_reference}
              and #{join_table}.#{Lockdown.user_id_reference} = #{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.1.6'
+  VERSION = '1.2.0'
 
   # Returns the version string for the library.
   def self.version

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

@@ -7,10 +7,12 @@ Lockdown::System.configure do
   #
   #
   # Set User model:
-  #      options[:user_model] = User
+  #      # make sure you use the string "User", not the constant
+  #      options[:user_model] = "User"
   #
   # Set UserGroup model:
-  #      options[:user_group_model] = UserGroup
+  #      # make sure you use the string "UserGroup", not the constant
+  #      options[:user_group_model] = "UserGroup"
   #
   # Set who_did_it method:
   #   This method is used in setting the created_by/updated_by fields and

metadata

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