lockdown 0.5.21 → 0.5.22

data/History.txt

@@ -1,3 +1,6 @@
+== 0.5.22 2008-09-14
+* Update: Add test for future deprecation: Dependencies to be ActiveSupport::Dependencies 
+
 == 0.5.21 2008-09-12
 * Updated lockdown to abide by config.active_record.timestamped_migrations introduced in Rails 2.1.1 
 * Fixed: schlick fixed an issue with the user_groups edit.html.erb.  thanks Michael!

data/lib/lockdown/system.rb

@@ -258,8 +258,10 @@ module Lockdown
           end
         end
 
-        if Lockdown.rails_app?
-          unless ENV['RAILS_ENV'] == 'production'
+        if Lockdown.rails_app? && ENV['RAILS_ENV'] != 'production'
+          if ActiveSupport.const_defined?("Dependencies")
+            ActiveSupport::Dependencies.clear
+          else
             Dependencies.clear
           end
         end
@@ -279,7 +281,11 @@ module Lockdown
 
       def maybe_load_framework_controller_parent
         if Lockdown.rails_app?
-          Dependencies.require_or_load("application.rb")
+          if ActiveSupport.const_defined?("Dependencies")
+            ActiveSupport::Dependencies.require_or_load("application.rb")
+          else
+            Dependencies.require_or_load("application.rb")
+          end
         else
           load("application.rb") unless const_defined?("Application")
         end
@@ -288,7 +294,11 @@ module Lockdown
       def lockdown_load(file)
         klass = lockdown_class_name_from_file(file)
         if Lockdown.rails_app?
-          Dependencies.require_or_load(file)
+          if ActiveSupport.const_defined?("Dependencies")
+            ActiveSupport::Dependencies.require_or_load(file)
+          else
+            Dependencies.require_or_load(file)
+          end
         else
           load(file) unless qualified_const_defined?(klass)
         end

data/lib/lockdown/version.rb

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

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.21</a>
+      <a href="http://rubyforge.org/projects/lockdown" class="numbers">0.5.22</a>
     </div>
     <h2>What</h2>
 <p>Lockdown is a authentication/authorization system for RubyOnRails (ver 2.x). While Merb functionality is in place, it is not complete.  There will be a release solely focused on getting the Merb functionality up to par with Rails.</p>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lockdown
 version: !ruby/object:Gem::Version 
-  version: 0.5.21
+  version: 0.5.22
 platform: ruby
 authors: 
 - Andrew Stone
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-12 00:00:00 -04:00
+date: 2008-09-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency