lockdown 0.5.1 → 0.5.2

data/History.txt

@@ -1,3 +1,6 @@
+== 0.5.2 2008-05-26
+* Fixed: make call to Dependencies.clear after inspecting controllers.  Using Dependencies.require_or_load is not sufficient it seems.
+
 == 0.5.1 2008-05-25
 * Fixed: bug with namespaced access having identical standard access.  e.g. /users and /admin/users 
 

data/lib/lockdown/helper.rb

@@ -14,13 +14,13 @@ module Lockdown
       end
     end
 
-		def string_name(str_sym)
-			str_sym.is_a?(Symbol) ? convert_reference_name(str_sym) : str_sym
-		end
-
-		def symbol_name(str_sym)
-			str_sym.is_a?(String) ? convert_reference_name(str_sym) : str_sym
-		end
+    def lockdown_string(value)
+      if value.respond_to?(:name)
+        string_name(value.name)
+      else
+        string_name(value)
+      end
+    end
 
     def lockdown_symbol(value)
       if value.respond_to?(:name)
@@ -41,16 +41,24 @@ module Lockdown
       Array.new(len){||chars[rand(chars.size)]}.join
     end
 
-		def administrator_group_string
-			string_name(:administrators)
+    def administrator_group_string
+      string_name(:administrators)
     end
 
-		def administrator_group_symbol
-			:administrators
+    def administrator_group_symbol
+      :administrators
     end
     
     private
 
+    def string_name(str_sym)
+      str_sym.is_a?(Symbol) ? convert_reference_name(str_sym) : str_sym
+    end
+
+    def symbol_name(str_sym)
+      str_sym.is_a?(String) ? convert_reference_name(str_sym) : str_sym
+    end
+
     def titleize(str)
       humanize(underscore(str)).gsub(/\b([a-z])/) { $1.capitalize }
     end
@@ -67,11 +75,11 @@ module Lockdown
     end
 
     if Lockdown.rails_app?
-      def kontroller_class_name(str)
+      def controller_class_name(str)
         "#{str}Controller"
       end
     else
-      def kontroller_class_name(str)
+      def controller_class_name(str)
         str
       end
     end

data/lib/lockdown/system.rb

@@ -15,13 +15,15 @@ module Lockdown
 
       # Future functionality:
       # :private_access will restrict access to model data to their creators.
-      # attr_accessor :private_access #:nodoc:
+      # attr_accessor :private_access 
 
       attr_accessor :controller_classes #:nodoc:
 
       def configure(&block)
         set_defaults
+
         instance_eval(&block)
+
         if options[:use_db_models] && options[:sync_init_rb_with_db]
           sync_with_db
         end
@@ -71,7 +73,7 @@ module Lockdown
         elsif ug.responds_to?(:name)
           # This user group was defined in the database
           ug.permissions.each do |perm|
-            perm_sym = symbol_name(perm.name)
+            perm_sym = lockdown_symbol(perm.name)
             unless permission_exists?(perm_sym)
               raise SecurityError, "Permission associated to User Group is invalid: #{perm_sym}"
             end
@@ -132,7 +134,7 @@ module Lockdown
       # Delete a user group record from the database
       #
       def delete_user_group(str_sym)
-        ug = UserGroup.find(:first, :conditions => ["name = ?",string_name(str_sym)])
+        ug = UserGroup.find(:first, :conditions => ["name = ?",lockdown_string(str_sym)])
         ug.destroy unless ug.nil?
       end
 
@@ -181,7 +183,7 @@ module Lockdown
       def permissions_assignable_for_user(usr)
         return [] if usr.nil?
         if administrator?(usr)
-          @permissions.keys.collect{|k| Permission.find_by_name(string_name(k)) }.compact
+          @permissions.keys.collect{|k| Permission.find_by_name(lockdown_string(k)) }.compact
         else
           groups = user_groups_assignable_for_user(usr)
           groups.collect{|g| g.permissions}.flatten.compact
@@ -205,14 +207,14 @@ module Lockdown
       end
       
       def fetch_controller_class(str)
-        @controller_classes[controller_class_name(str)]
+        @controller_classes[lockdown_class_name(str)]
       end
       
       protected 
 
       def set_defaults
         load_controller_classes
-        
+
         @permissions = {}
         @user_groups = {}
         
@@ -246,7 +248,7 @@ module Lockdown
 
       def load_controller_classes
         @controller_classes = {}
-
+         
         maybe_load_framework_controller_parent
 
         Dir.chdir("#{Lockdown.project_root}/app/controllers") do
@@ -255,17 +257,21 @@ module Lockdown
             lockdown_load(c) 
           end
         end
+
+        if Lockdown.rails_app?
+          Dependencies.clear
+        end
       end
 
-      def controller_class_name_from_file(str)
+      def lockdown_class_name_from_file(str)
         str.split(".")[0].split("/").collect{|s| camelize(s) }.join("::")
       end
 
-      def controller_class_name(str)
+      def lockdown_class_name(str)
         if str.include?("__")
-          kontroller_class_name(str.split("__").collect{|p| camelize(p)}.join("::"))
+          controller_class_name(str.split("__").collect{|p| camelize(p)}.join("::"))
         else
-          kontroller_class_name(camelize(str))
+          controller_class_name(camelize(str))
         end
       end
 
@@ -273,13 +279,12 @@ module Lockdown
         if Lockdown.rails_app?
           Dependencies.require_or_load("application.rb")
         else
-          #just default to Merb for now as the only alternative
           load("application.rb") unless const_defined?("Application")
         end
       end
       
       def lockdown_load(file)
-        klass = controller_class_name_from_file(file)
+        klass = lockdown_class_name_from_file(file)
         if Lockdown.rails_app?
           Dependencies.require_or_load(file)
         else
@@ -316,7 +321,7 @@ module Lockdown
         # Create permissions not found in the database
         get_permissions.each do |key|
           next if permission_assigned_automatically?(key)
-          str = string_name(key)
+          str = lockdown_string(key)
           p = Permission.find(:first, :conditions => ["name = ?", str])
           unless p
             puts ">> Lockdown: Permission not found in db: #{str}, creating."
@@ -330,7 +335,7 @@ module Lockdown
         db_perms = Permission.find(:all).dup
         perm_keys = get_permissions
         db_perms.each do |dbp|
-          unless perm_keys.include?(symbol_name(dbp.name))
+          unless perm_keys.include?(lockdown_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}")
             dbp.destroy
@@ -339,14 +344,14 @@ module Lockdown
 
         # Create user groups not found in the database
         get_user_groups.each do |key|
-          str = string_name(key)
+          str = lockdown_string(key)
           ug = UserGroup.find(:first, :conditions => ["name = ?", str])
           unless ug
             puts ">> Lockdown: UserGroup not in the db: #{str}, creating."
             ug = UserGroup.create(:name => str)
             #Inefficient, definitely, but shouldn't have any issues across orms.
             permissions_for_user_group(key) do |perm|
-              p = Permission.find(:first, :conditions => ["name = ?", string_name(perm)])
+              p = Permission.find(:first, :conditions => ["name = ?", lockdown_string(perm)])
               Lockdown.database_execute <<-SQL 
                 insert into permissions_user_groups(permission_id, user_group_id)
                 values(#{p.id}, #{ug.id})

data/lib/lockdown/version.rb

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

data/website/generator.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.5.1</a>
+      <a href="http://rubyforge.org/projects/lockdown" class="numbers">0.5.2</a>
     </div>
     <h2>What</h2>
 

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.5.1</a>
+      <a href="http://rubyforge.org/projects/lockdown" class="numbers">0.5.2</a>
     </div>
     <h2>What</h2>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lockdown
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Andrew Stone
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-25 00:00:00 -04:00
+date: 2008-05-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency