merbful_authentication 0.9.2 → 0.9.3

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 
 PLUGIN = "merbful_authentication"
 NAME = "merbful_authentication"
-VERSION = "0.9.2"
+VERSION = "0.9.3"
 AUTHOR = "Daniel Neighman"
 EMAIL = "has.sox@gmail.com"
 HOMEPAGE = "http://rubyforge.org/projects/merbful-auth/"

data/merb_generators/authenticated/authenticated_generator.rb

@@ -44,7 +44,7 @@ class AuthenticatedGenerator < Merb::GeneratorBase
     @include_activation = options[:include_activation]
     
     @controller_name = runtime_args.shift || 'sessions'
-    @model_controller_name = @name.pluralize
+    @model_controller_name = @name.snake_case.pluralize
     @mailer_controller_name = @name
     
     # sessions controller
@@ -58,7 +58,7 @@ class AuthenticatedGenerator < Merb::GeneratorBase
     end
     @controller_full_path = File.join(controller_class_path, controller_file_name)
     @controller_view_path = File.join("app/views", @controller_full_path)
-
+    
     # model controller
     base_name, @model_controller_class_path, @model_controller_file_path, @model_controller_class_nesting, @model_controller_class_nesting_depth = extract_modules(@model_controller_name)
     @model_controller_class_name_without_nesting, @model_controller_singular_name, @model_controller_plural_name = inflect_names(base_name)
@@ -70,6 +70,7 @@ class AuthenticatedGenerator < Merb::GeneratorBase
     end    
     @model_controller_full_path = File.join(model_controller_class_path, model_controller_file_name)
     @model_controller_view_path = File.join("app/views", @model_controller_full_path)
+    
   end
 
   def manifest
@@ -85,7 +86,7 @@ class AuthenticatedGenerator < Merb::GeneratorBase
       @choices.each do |f|
         options[f] = options[:include_activation] ? true : false
       end
-
+      
       @assigns = {
         :class_name                               => class_name,
         :class_path                               => class_path, 

data/merb_generators/authenticated/templates/lib/authenticated_system/authenticated_system_controller.rb

@@ -55,7 +55,11 @@ module AuthenticatedSystem
 
       # Redirect as appropriate when an access request fails.
       #
-      # The default action is to redirect to the login screen.
+      # The default HTML action is to redirect to the login screen.
+      #
+      # The default XML action is to render the text Couldn't authenticate you.
+      # To provide this response wrapped in XML, make sure to specify an
+      # XML layout, such as /app/views/layouts/application.xml.builder.
       #
       # Override this method in your controllers if you want to have special
       # behavior in case the <%= singular_name %> is not authorized
@@ -69,8 +73,8 @@ module AuthenticatedSystem
         when :xml
           headers["Status"]             = "Unauthorized"
           headers["WWW-Authenticate"]   = %(Basic realm="Web Password")
-          set_status(401)
-          render :text => "Couldn't authenticate you"
+          self.status = 401
+          render "Couldn't authenticate you"
         end
       end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merbful_authentication
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -9,7 +9,7 @@ autorequire: merbful_authentication
 bindir: bin
 cert_chain: []
 
-date: 2008-03-26 00:00:00 +11:00
+date: 2008-04-25 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.0.1
+rubygems_version: 1.1.0
 signing_key: 
 specification_version: 2
 summary: A Merb plugin that is essentially a port of Rick Olsons restful_authentication plugin for rails