merb-auth-slice-password 0.9.9 → 0.9.10

data/README.textile

@@ -1,23 +1,22 @@
 MerbAuthSlicePassword ==================
 
 A slice for the Merb framework that uses the merb-auth-core authentication
-framework.  This provides basic form based login as well as basic auth login.
-To see how to customize the authentication process, see merb-auth-core.
+framework.  This slice provides a basic login and logout function.  By default
+it also include the form based password logins and basic authentication.
 
-To use this slice you should supply a User type model that logs in via an
-identifier and password.  i.e. "email" and "password", or "login" & "password"
+To see how to customize it see the merb-auth-core
 
-Additionally your model should implement a class level method,
-authenticate(login, password)  This should return the user object, or if not
-found should return false or nil
+To use this slice setup some strategies and make sure you have everything required there.
+Usually a "User" model of some kind. 
 
-For example
+To overwrite the login form, you should just create a view file in 
+app/views/exceptions/unauthenticated.html.erb in the host app.
 
-User.authenticate("fred", "sekrit") #=> The user object for the "fred" login
-or nil / false if not found
-
-You can use the salted_user mixin from merb-auth-more for use with this slice.
+By default the slice will load the password_form and the basic_auth strategies.  
+To prevent the slice from loading strategeis use:
+MerbAutheSliceDefault[:no_default_strategies] = true
 
+<pre>
 ------------------------------------------------------------------------------
 
 |-- LICENSE
@@ -59,7 +58,7 @@ You can use the salted_user mixin from merb-auth-more for use with this slice.
             `-- main.rb
 
 
-
+</pre>
 1. Rake tasks to package/install the gem - edit this to modify the manifest.
 2. The slice application: controllers, models, helpers, views.
 3. The default layout, as specified in Merb::Slices::config[:mauth_password_slice][:layout]
@@ -177,4 +176,4 @@ and other runtime code from within the host application.
 
 To create your own Slice run this (somewhere outside of your merb app):
 
-$ merb-gen slice <your-lowercase-slice-name>
+$ merb-gen slice <your-lowercase-slice-name>

data/Rakefile

@@ -5,11 +5,12 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "merb-auth-slice-password"
-AUTHOR = "Your Name"
-EMAIL = "Your Email"
+AUTHOR = "Daniel Neighman"
+EMAIL = "has.sox@gmail.com"
 HOMEPAGE = "http://merbivore.com/"
-SUMMARY = "Merb Slice that provides ..."
-GEM_VERSION = Merb::VERSION
+SUMMARY = "Merb Slice that provides UI for password strategy of merb-auth."
+PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
+GEM_VERSION = Merb::VERSION + PKG_BUILD
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = 'merb'
@@ -23,9 +24,9 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('merb-slices', '>= 0.9.9')
-  s.add_dependency('merb-auth-core', "= #{Merb::VERSION}")
-  s.add_dependency('merb-auth-more', "= #{Merb::VERSION}")
+  s.add_dependency('merb-slices', ">= #{Merb::VERSION}")
+  s.add_dependency('merb-auth-core', ">= #{Merb::VERSION}")
+  s.add_dependency('merb-auth-more', ">= #{Merb::VERSION}")
   s.require_path = 'lib'
   s.files = %w(LICENSE README.textile Rakefile TODO) + Dir.glob("{lib,spec,app,public,stubs}/**/*")
 end
@@ -49,4 +50,4 @@ end
 require 'spec/rake/spectask'
 require 'merb-core/test/tasks/spectasks'
 desc 'Default: run spec examples'
-task :default => 'spec'
+task :default => 'spec'

data/app/controllers/exceptions.rb

@@ -1,18 +1,7 @@
-class Application < Merb::Controller; end
-
-class Exceptions < Application
-  include Merb::Slices::Support # Required to provide slice_url
-  
-  # # This stuff allows us to provide a default view
-  the_view_path = File.expand_path(File.dirname(__FILE__) / ".." / "views")
-  self._template_roots ||= []
-  self._template_roots << [the_view_path, :_template_location]
-  self._template_roots << [Merb.dir_for(:view), :_template_location]
-    
+# the mixin to provide the exceptions controller action for Unauthenticated
+module MerbAuthSlicePassword::ExceptionsMixin
   def unauthenticated
     provides :xml, :js, :json, :yaml
-    
-    session.abandon!
 
     case content_type
     when :html
@@ -21,6 +10,24 @@ class Exceptions < Application
       basic_authentication.request!
       ""
     end
-  end
+  end # unauthenticated
+end
+
+Merb::Authentication.customize_default do
+  
+  Exceptions.class_eval do
+    include Merb::Slices::Support # Required to provide slice_url
+  
+    # # This stuff allows us to provide a default view
+    the_view_path = File.expand_path(File.dirname(__FILE__) / ".." / "views")
+    self._template_roots ||= []
+    self._template_roots << [the_view_path, :_template_location]
+    self._template_roots << [Merb.dir_for(:view), :_template_location]
+    
+    include MerbAuthSlicePassword::ExceptionsMixin
+    
+    show_action :unauthenticated
+
+  end# Exceptions.class_eval
   
-end
+end # Customize default

data/app/controllers/sessions.rb

@@ -3,8 +3,8 @@ class MerbAuthSlicePassword::Sessions < MerbAuthSlicePassword::Application
   before :_grab_return_to                       # Need to hang onto the redirection during the session.abandon!
   after  :_store_return_to_in_session           # Need to hang onto the redirection during the session.abandon!
   
-  before(nil, :only => [:update, :destroy]) { session.abandon! }
-  before :ensure_authenticated
+  before :_abandon_session,     :only => [:update, :destroy]
+  before :ensure_authenticated, :only => [:update]
 
   # redirect from an after filter for max flexibility
   # We can then put it into a slice and ppl can easily 
@@ -24,12 +24,14 @@ class MerbAuthSlicePassword::Sessions < MerbAuthSlicePassword::Application
   private   
   # @overwritable
   def redirect_after_login
-    redirect_back_or "/", :message => "Authenticated Successfully", :ignore => [url(:login), url(:logout)]
+    message[:notice] = "Authenticated Successfully"
+    redirect_back_or "/", :message => message, :ignore => [slice_url(:login), slice_url(:logout)]
   end
   
   # @overwritable
   def redirect_after_logout
-    redirect "/", :message => "Logged Out"
+    message[:notice] = "Logged Out"
+    redirect "/", :message => message
   end  
   
   # @private
@@ -41,4 +43,9 @@ class MerbAuthSlicePassword::Sessions < MerbAuthSlicePassword::Application
   def _store_return_to_in_session
     session.authentication.return_to_url = session.authentication.return_to_url
   end
+  
+  # @private
+  def _abandon_session
+    session.abandon!
+  end
 end

data/lib/merb-auth-slice-password.rb

@@ -25,7 +25,7 @@ if defined?(Merb::Plugins)
     
     # Slice metadata
     self.description = "MerbAuthSlicePassword is a merb slice that provides basic password based logins"
-    self.version = "0.9.9"
+    self.version = "0.9.10"
     self.author = "Daniel Neighman"
     
     # Stub classes loaded hook - runs before LoadClasses BootLoader

data/stubs/app/controllers/sessions.rb

@@ -0,0 +1,19 @@
+class MerbAuthSlicePassword::Sessions < MerbAuthSlicePassword::Application
+
+  after :redirect_after_login,  :only => :update, :if => lambda{ !(300..399).include?(status) }
+  after :redirect_after_logout, :only => :destroy
+
+  private   
+  # @overwritable
+  def redirect_after_login
+    message[:notice] = "Authenticated Successfully"
+    redirect_back_or "/", :message => message, :ignore => [slice_url(:login), slice_url(:logout)]
+  end
+  
+  # @overwritable
+  def redirect_after_logout
+    message[:notice] = "Logged Out"
+    redirect "/", :message => message
+  end
+  
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: merb-auth-slice-password
 version: !ruby/object:Gem::Version 
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors: 
-- Your Name
+- Daniel Neighman
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-10-13 00:00:00 -07:00
+date: 2008-10-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.9
+        version: 0.9.10
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb-auth-core
@@ -28,9 +28,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.9
+        version: 0.9.10
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb-auth-more
@@ -38,12 +38,12 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.9
+        version: 0.9.10
     version: 
-description: Merb Slice that provides ...
-email: Your Email
+description: Merb Slice that provides UI for password strategy of merb-auth.
+email: has.sox@gmail.com
 executables: []
 
 extensions: []
@@ -81,8 +81,7 @@ files:
 - public/stylesheets/master.css
 - stubs/app
 - stubs/app/controllers
-- stubs/app/controllers/application.rb
-- stubs/app/controllers/main.rb
+- stubs/app/controllers/sessions.rb
 has_rdoc: true
 homepage: http://merbivore.com/
 post_install_message: 
@@ -105,9 +104,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: merb
-rubygems_version: 1.2.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
-summary: Merb Slice that provides ...
+summary: Merb Slice that provides UI for password strategy of merb-auth.
 test_files: []
 

data/stubs/app/controllers/application.rb

@@ -1,2 +0,0 @@
-class MerbAuthSlicePassword::Application < Merb::Controller
-end

data/stubs/app/controllers/main.rb

@@ -1,2 +0,0 @@
-class MerbAuthSlicePassword::Main < MerbAuthSlicePassword::Application
-end