scottmotte-merb_auth_slice_multisite 0.6.2 → 0.7.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
-:minor: 6
-:patch: 2
+:minor: 7
+:patch: 0

data/app/controllers/passwords.rb

@@ -0,0 +1,25 @@
+class MerbAuthSliceMultisite::Passwords <  MerbAuthSliceMultisite::Application
+ 
+  def forgot_password
+    render
+  end
+  
+  def send_password
+    @login_param = Merb::Authentication::Strategies::Multisite::Base.login_param
+    @site_id_param = Merb::Authentication::Strategies::Multisite::Base.site_id_param
+    @user = Merb::Authentication.user_class.find_with_login_param(@login_param, params[@login_param])
+    @user = Merb::Authentication.user_class.first(@login_param => params[@login_param], @site_id_param => params[@site_id_param])
+      
+    if @user
+      from = MerbAuthSliceMultisite[:send_password_from_email]
+      raise "No :send_password_from_email option set for Merb::Slices::config[:merb_auth_slice_multisite][:send_password_from_email]" unless from      
+      send_mail(MerbAuthSliceMultisite::SendPasswordMailer, :send_password, { :subject => (MerbAuthSliceMultisite[:send_password_subject] || "Your password"), :from => from, :to => @user.email }, { :user => @user })
+      # MerbAuthSliceMultisite::SendPasswordMailer.dispatch_and_deliver(:send_password, :subject => (MerbAuthSliceMultisite[:send_password_subject] || "Your password"), :from => from, :to => @user.email), :user => @user)
+      redirect "/", :message => {:notice => "Password sent".t}
+    else
+      message[:error] = "User with #{@login_param} \"%s\" not found".t(params[@login_param].freeze)
+      render :forgot_password
+    end
+  end
+ 
+end # MerbAuthSliceMultisite::Passwords

data/app/mailers/send_password_mailer.rb

@@ -0,0 +1,11 @@
+class MerbAuthSliceMultisite::SendPasswordMailer < Merb::MailController
+ 
+  controller_for_slice MerbAuthSliceMultisite, :templates_for => :mailer, :path => "views"
+ 
+  def send_password
+    @user = params[:user]
+    Merb.logger.info "Sending Password to #{@user.email}"
+    render_mail :layout => nil
+  end
+ 
+end

data/app/mailers/views/send_password_mailer/send_password.text.erb

@@ -0,0 +1,3 @@
+Your password is <%= @user.password %>
+
+	Log on at http://<%= @user.site.subdomain %>.<%= Merb::Slices::config[:merb_auth_slice_multisite][:domain] %>

data/app/views/exceptions/unauthenticated.html.erb

@@ -24,6 +24,9 @@
 	  </div> <!-- close: formRow -->
 	  <div class="formRow">
 	    <input type="submit" name="Submit" value="Log In" id="Submit">
+	  </div> <!-- close: formRow -->
+		<div class="formRow">
+	    <a href="/forgot_password">Forgot password</a>
 	  </div> <!-- close: formRow -->
 	</form>
 </div>

data/app/views/passwords/forgot_password.html.erb

@@ -0,0 +1,18 @@
+<% @login_param = Merb::Authentication::Strategies::Multisite::Base.login_param %>
+<% @site_id_param = Merb::Authentication::Strategies::Multisite::Base.site_id_param %>
+<% 
+# make @current_site value. application.rb does not get call 
+# because the authentication is protected at the rack level - which is better, 
+# but it means I have to add the following duplicate line of code as far as I know.
+@current_site = Site.first(:subdomain => request.first_subdomain)
+%>
+
+<form action="" method="post">
+	<input type="hidden" name="<%= @site_id_param.to_s %>" value="<%= @current_site.id %>" id="<%= @site_id_param.to_s %>">
+  <input type="hidden" name="_method" value="PUT" />
+  <p>
+    <label for="<%= @login_param.to_s %>"><%= @login_param.to_s.capitalize.t %></label>
+    <input type="text" class="text" name="<%= @login_param.to_s %>" id="<%= @login_param.to_s %>" />
+  </p>
+  <input type="submit" value="Reset password" />
+</form>

data/config/init.rb

@@ -27,7 +27,11 @@ use_orm :datamapper
 use_test :rspec
 use_template_engine :erb
 
-# borrowed from http://github.com/ck/merb-auth-slice-activation/
+# Setup the required configuration for the slice
+Merb::Slices::config[:merb_auth_slice_multisite][:send_password_from_email] = "no-reply@yourapp.com"
+Merb::Slices::config[:merb_auth_slice_multisite][:domain] = "example.com"
+
+
 Merb::BootLoader.before_app_loads do
   DataMapper.setup(:default, "sqlite3::memory:")
   
@@ -38,6 +42,9 @@ Merb::BootLoader.before_app_loads do
     property :id,    Serial
     property :email, String
     property :login, String
+    property :password, String
+    
+    belongs_to :site
   end
  
   class Merb::Authentication

data/lib/merb_auth_slice_multisite.rb

@@ -2,6 +2,7 @@ if defined?(Merb::Plugins)
 
   $:.unshift File.dirname(__FILE__)
 
+  dependency 'merb-mailer'
   dependency 'merb-slices', :immediate => true
   dependency 'merb-auth-core'
   dependency 'merb-auth-more'
@@ -87,9 +88,11 @@ if defined?(Merb::Plugins)
     #   to avoid potential conflicts with global named routes.
     def self.setup_router(scope)
       # example of a named route
-      scope.match("/login", :method => :get ).to(:controller => "/exceptions",  :action => "unauthenticated").name(:login)
-      scope.match("/login", :method => :put ).to(:controller => "sessions",     :action => "update"         ).name(:perform_login)
-      scope.match("/logout"                 ).to(:controller => "sessions",     :action => "destroy"        ).name(:logout)
+      scope.match("/login", :method => :get ).to(:controller => "/exceptions", :action => "unauthenticated").name(:login)
+      scope.match("/login", :method => :put ).to(:controller => "sessions", :action => "update").name(:perform_login)
+      scope.match("/logout").to(:controller => "sessions", :action => "destroy").name(:logout)
+      scope.match("/forgot_password", :method => :get).to(:controller => "passwords", :action => "forgot_password").name(:forgot_password)
+      scope.match("/forgot_password", :method => :post).to(:controller => "passwords", :action => "send_password").name(:send_password)
     end
     
   end

data/spec/mailers/send_password_mailer_spec.rb

@@ -0,0 +1,47 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+ 
+describe "SendPasswordMailer" do
+ 
+  before(:all) do
+    Merb::Router.prepare { add_slice(:merb_auth_slice_password_reset)}
+    User.auto_migrate!
+  end
+ 
+  after(:all) do
+    Merb::Router.reset!
+  end
+ 
+  describe MerbAuthSliceMultisite::SendPasswordMailer do
+ 
+    def deliver(action, mail_opts= {},opts = {})
+      MerbAuthSliceMultisite::SendPasswordMailer.dispatch_and_deliver action, mail_opts, opts
+      @last_delivered_mail = Merb::Mailer.deliveries.last
+    end
+ 
+    before(:each) do
+      Merb::Mailer.deliveries.clear
+      Site.all.destroy!
+      User.all.destroy!
+      @site = Site.create(valid_site_attributes)
+      @user = @site.users.build(:email => "homer@simpsons.com", :login => "homer", :password => "donuts" )
+      @mailer_params = { :from => "info@mysite.com", :to => @user.email, :subject => "Welcome to MySite.com" }
+    end
+    
+    it "should send mail to homer@simpsons.com for the send password email" do
+      deliver(:send_password, @mailer_params, :user => @user)
+      @last_delivered_mail.assigns(:headers).should include("to: homer@simpsons.com")
+    end
+ 
+    it "should send the mail from 'info@mysite.com' for the the send password email" do
+      deliver(:send_password, @mailer_params, :user => @user)
+      @last_delivered_mail.assigns(:headers).should include("from: info@mysite.com")
+    end
+ 
+    it "should have the link to the subdomain site" do
+      deliver(:send_password, @mailer_params, :user => @user)
+      @last_delivered_mail.text.should include("http://#{@user.site.subdomain}.#{Merb::Slices::config[:merb_auth_slice_multisite][:domain] = "example.com"}")
+    end
+ 
+  end
+ 
+end

data/spec/spec_helper.rb

@@ -40,6 +40,10 @@ module Merb
   end
 end
 
+class Merb::Mailer
+  self.delivery_method = :test_send
+end
+
 Spec::Runner.configure do |config|
   config.include(Merb::Test::ViewHelper)
   config.include(Merb::Test::RouteHelper)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scottmotte-merb_auth_slice_multisite
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors: 
 - scottmotte
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-29 00:00:00 -07:00
+date: 2009-04-30 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -37,7 +37,8 @@ files:
 - lib/merb_auth_slice_multisite/slicetasks.rb
 - lib/merb_auth_slice_multisite/spectasks.rb
 - lib/merb_auth_slice_multisite.rb
-- spec/merb_auth_slice_multisite_spec.rb
+- spec/mailers
+- spec/mailers/send_password_mailer_spec.rb
 - spec/mixins
 - spec/mixins/user_belongs_to_site_spec.rb
 - spec/models
@@ -46,9 +47,15 @@ files:
 - app/controllers
 - app/controllers/application.rb
 - app/controllers/exceptions.rb
+- app/controllers/passwords.rb
 - app/controllers/sessions.rb
 - app/helpers
 - app/helpers/application_helper.rb
+- app/mailers
+- app/mailers/send_password_mailer.rb
+- app/mailers/views
+- app/mailers/views/send_password_mailer
+- app/mailers/views/send_password_mailer/send_password.text.erb
 - app/models
 - app/models/site.rb
 - app/views
@@ -56,6 +63,8 @@ files:
 - app/views/exceptions/unauthenticated.html.erb
 - app/views/layout
 - app/views/layout/merb_auth_slice_multisite.html.erb
+- app/views/passwords
+- app/views/passwords/forgot_password.html.erb
 - config/database.yml
 - config/dependencies.rb
 - config/init.rb

data/spec/merb_auth_slice_multisite_spec.rb

@@ -1,20 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe "MerbAuthSliceMultisite (module)" do
-  
-  # Implement your MerbAuthSliceMultisite specs here
-  
-  # To spec MerbAuthSliceMultisite you need to hook it up to the router like this:
-  
-  # before :all do
-  #   Merb::Router.prepare { add_slice(:MerbAuthSliceMultisite) } if standalone?
-  # end
-  # 
-  # after :all do
-  #   Merb::Router.reset! if standalone?
-  # end
-  #
-  #
-  # it "should have proper specs"
-  
-end