merbful_authentication 0.1.1 → 0.1.2

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 
 PLUGIN = "merbful_authentication"
 NAME = "merbful_authentication"
-VERSION = "0.1.1"
+VERSION = "0.1.2"
 AUTHOR = "Daniel Neighman"
 EMAIL = "has.sox@gmail.com"
 HOMEPAGE = "http://rubyforge.org/projects/merbful-auth/"
@@ -21,6 +21,7 @@ spec = Gem::Specification.new do |s|
   s.email = EMAIL
   s.homepage = HOMEPAGE
   s.add_dependency('merb', '>= 0.5.0')
+  s.add_dependency('merb_helpers', '>= 0.5.0')
   s.require_path = 'lib'
   s.autorequire = PLUGIN
   s.files = %w(LICENSE README Rakefile TODO) +

data/activerecord_generators/merbful_authentication_model/templates/model.rb

@@ -1,5 +1,5 @@
 require 'digest/sha1'
-require 'authenticated_system_model'
+dependency 'authenticated_system_model'
 class <%= class_name %> < ActiveRecord::Base
   include AuthenticatedSystem::Model
   

data/datamapper_generators/merbful_authentication_model/templates/model.rb

@@ -1,5 +1,5 @@
 require 'digest/sha1'
-require 'authenticated_system_model'
+dependency 'authenticated_system_model'
 class <%= class_name %> < DataMapper::Base
   include AuthenticatedSystem::Model
   

data/merb_generators/authenticated/templates/authenticated_system_controller.rb

@@ -129,4 +129,8 @@ module AuthenticatedSystem
         return auth_data && auth_data[0] == 'Basic' ? Base64.decode64(auth_data[1]).split(':')[0..1] : [nil, nil] 
       end
   end
+end
+
+Merb::BootLoader.after_app_loads do
+  Application.send(:include, AuthenticatedSystem::Controller)
 end

data/merb_generators/authenticated/templates/authenticated_system_model.rb

@@ -1,4 +1,4 @@
-require 'authenticated_system_orm_map'
+dependency 'authenticated_system_orm_map'
 module AuthenticatedSystem
   module Model
     
@@ -87,7 +87,7 @@ module AuthenticatedSystem
       
       # Authenticates a <%= singular_name %> by their login name and unencrypted password.  Returns the <%= singular_name %> or nil.
       def authenticate(login, password)
-        u = find_activated_authenticated_model_with_login(login) # need to get the salt
+        u = find_activated_authenticated_model_with_login(login.downcase) # need to get the salt
         u && u.authenticated?(password) ? u : nil
       end
     end

data/merb_generators/authenticated/templates/model_controller.rb

@@ -1,6 +1,6 @@
+dependencies "authenticated_system_controller", "merb_helpers"
 class <%= model_controller_class_name %> < Application
   provides :xml
-  include AuthenticatedSystem::Controller
   
   skip_before :login_required
   

data/merb_generators/authenticated/templates/new_model.html.erb

@@ -1,5 +1,5 @@
-<%%= error_messages_for @user %>
-<%% form_for @user, :action => url(:users) do %>
+<%%= error_messages_for @<%= singular_name %> %>
+<%% form_for @<%= singular_name %>, :action => url(:<%= plural_name %>) do %>
   <p>
     <%%= text_control :login, :label => "Login" %>
   </p>

data/merb_generators/authenticated/templates/session_controller.rb

@@ -1,9 +1,6 @@
-require 'lib/authenticated_system_controller'
+dependencies "authenticated_system_controller", "merb_helpers"
 class <%= controller_class_name %> < Application
 
-  # Be sure to include AuthenticationSystem in Application Controller instead
-  include AuthenticatedSystem::Controller
-  
   skip_before :login_required
   
   def new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merbful_authentication
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -9,7 +9,7 @@ autorequire: merbful_authentication
 bindir: bin
 cert_chain: []
 
-date: 2008-01-07 00:00:00 +11:00
+date: 2008-01-18 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +21,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.5.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: merb_helpers
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.5.0
+    version: 
 description: A Merb plugin that is essentially a port of Rick Olsons restful_authentication plugin for rails
 email: has.sox@gmail.com
 executables: []