lockdown 1.1.3 → 1.1.5

data/lib/lockdown/database.rb

@@ -38,7 +38,13 @@ module Lockdown
         db_perms.each do |dbp|
           unless @permissions.include?(Lockdown.get_symbol(dbp.name))
             puts ">> Lockdown: Permission no longer in init.rb: #{dbp.name}, deleting."
-            Lockdown.database_execute("delete from permissions_user_groups where permission_id = #{dbp.id}")
+          ug_table = Lockdown.user_groups_hbtm_reference.to_s
+          if "permissions" < ug_table
+            join_table = "permissions_#{ug_table}"
+          else
+            join_table = "#{ug_table}_permissions"
+          end
+            Lockdown.database_execute("delete from #{join_table} where permission_id = #{dbp.id}")
             dbp.destroy
           end
         end
@@ -68,7 +74,13 @@ module Lockdown
           p = ::Permission.find(:first, :conditions => ["name = ?", 
                                 Lockdown.get_string(perm)])
 
-          Lockdown.database_execute "insert into permissions_user_groups(permission_id, user_group_id) values(#{p.id}, #{ug.id})"
+          ug_table = Lockdown.user_groups_hbtm_reference.to_s
+          if "permissions" < ug_table
+            join_table = "permissions_#{ug_table}"
+          else
+            join_table = "#{ug_table}_permissions"
+          end
+          Lockdown.database_execute "insert into #{join_table}(permission_id, #{Lockdown.user_group_id_reference}) values(#{p.id}, #{ug.id})"
         end
       end
 

data/lib/lockdown.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lockdown
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
+  version: 1.1.5
 platform: ruby
 authors: 
 - Andrew Stone
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-04 00:00:00 -04:00
+date: 2009-08-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency