lockdown 0.3.14 → 0.3.15

data/History.txt

@@ -1,3 +1,6 @@
+== 0.3.15 2008-05-03
+* Fixed: The controller inspection code was short-circuiting the Dependencies reload mechanism while in development mode.
+
 == 0.3.14 2008-05-02
 * Fixed:  Session keys to use symbols.  Wasn't correctly expiring the session.  
 

data/lib/lockdown/system.rb

@@ -216,16 +216,12 @@ module Lockdown
       def load_controller_classes
         @controller_classes = {}
 
-        unless const_defined?("Application")
-          load(Lockdown.project_root + "/app/controllers/application.rb")
-        end
+        maybe_load_framework_controller_parent
 
         Dir.chdir("#{Lockdown.project_root}/app/controllers") do
           Dir["**/*.rb"].sort.each do |c|
             next if c == "application.rb"
-            klass = controller_class_name_from_file(c)
-            load(c) unless qualified_const_defined?(klass)
-            @controller_classes[klass] = qualified_const_get(klass) 
+            lockdown_load(c) 
           end
         end
       end
@@ -242,6 +238,25 @@ module Lockdown
         end
       end
 
+      def maybe_load_framework_controller_parent
+        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)
+        if Lockdown.rails_app?
+          Dependencies.require_or_load(file)
+        else
+          load(file) unless qualified_const_defined?(klass)
+        end
+        @controller_classes[klass] = qualified_const_get(klass) 
+      end
+
       def qualified_const_defined?(klass)
         if klass =~ /::/
           namespace, klass = klass.split("::")

data/lib/lockdown/version.rb

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

data/rails_generators/lockdown_all/templates/app/views/sessions/new.html.erb

@@ -1,3 +1,6 @@
+<%= flash[:notice] if flash[:notice] %>
+<%= flash[:error] if flash[:error] %>
+
 <% form_tag sessions_path do -%>
 	<p><label for="login">Login</label><br/>
 	<%= text_field_tag 'login' %></p>
@@ -6,4 +9,4 @@
 	<%= password_field_tag 'password' %></p>
 
 	<p><%= submit_tag 'Log in' %></p>
-<% end -%>
+<% end -%>

metadata

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