Merge branch 'user_mailer' of https://github.com/hcarreras/hackety-hack.com into hcarreras-user_mailer

PragTob · PragTob · commit b2430979bc4a · 2013-10-11T22:35:09.000+02:00
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -95,7 +95,7 @@ GEM
     erubis (2.7.0)
     execjs (1.3.0)
       multi_json (~> 1.0)
-    fabrication (1.2.0)
+    fabrication (2.8.1)
     faker (1.0.1)
       i18n (~> 0.4)
     ffi (1.0.11)
diff --git a/app/controllers/mailer_controller.rb b/app/controllers/mailer_controller.rb
@@ -1,18 +1,21 @@
 class MailerController < ApplicationController
   def new
-    @user = User.find_by_username(params[:user])
+    @users = Array(params[:user])
+    @emails = User.where(:username => @users).all.map(&:email);
   	@message = Message.new
   end
 
   def create
   	@message = Message.new(params[:message])
 
   	if @message.valid?
-  		MessageMailer.new_message(@message).deliver
+      @message.email.each do |email|
+  		  MessageMailer.new_message(@message, email).deliver
+      end
   		redirect_to users_index_path, :notice => "Email sent correctly"
   	else
   		notice = "There was an error"
-  		reder :new
+  		render :new
   	end
   end
 end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -4,10 +4,8 @@ class UsersController < InheritedController
   require 'will_paginate/array'
 
   def index
-    @users = User.all.paginate(:page => params[:page], :per_page => 1)
-    respond_to do |format|
-      format.html
-    end  
+    redirect_to root_path unless can? :manage, @users
+    @users = User.all.paginate(:page => params[:page], :per_page => 10)
   end
 
   def follow
diff --git a/app/mailers/message_mailer.rb b/app/mailers/message_mailer.rb
@@ -1,8 +1,9 @@
 class MessageMailer < ActionMailer::Base
   default from: "steve@hackety.com"
 
-  def new_message message 
+  def new_message message, email
   	@message = message
-  	mail(:to => @message.email, :subject => @message.subject)
+  	@email = email
+  	mail(:to => @email, :subject => @message.subject)
   end
 end
diff --git a/app/models/message.rb b/app/models/message.rb
@@ -1,6 +1,6 @@
 class Message
 	include MongoMapper::Document
-	key :email, String	
+	key :email, Array	
 	key :subject, String
 	key :body, String
 	validates_presence_of :email, :body
diff --git a/app/views/mailer/_form.html.haml b/app/views/mailer/_form.html.haml
@@ -3,6 +3,9 @@
 	.inputs
 		=f.input :subject, :hint => "Write the subject here!"
 		=f.input :body, :as => :text
-		=f.input :email, :as => :hidden, :input_html => { :value => @user.email }
+
+		-@emails.each do |email|
+			=f.input "email[#{email}]", :as => :text, :as => :hidden, :input_html => { :value => ""}		
+
 	.actions
 		=f.button :submit , 'Send Email', :class => "primary btn"
diff --git a/app/views/mailer/new.html.haml b/app/views/mailer/new.html.haml
@@ -2,6 +2,6 @@
 = render "form"
 
 This email will send to: 
-=@user.username 
-with email: 
-=@user.email 
+-@emails.each do |email|
+	= email
+	= "  "
diff --git a/app/views/shared/menu/_user.html.haml b/app/views/shared/menu/_user.html.haml
@@ -1,5 +1,7 @@
 = semantic_menu :class => "nav secondary-nav" do |root|
   - if current_user
+    - if current_user.moderator
+      - root.add "Send an Email", users_index_path
     - root.add current_user.username, user_path(current_user)
     - root.add "Log Out", logout_path
   - else
diff --git a/app/views/users/index.html.haml b/app/views/users/index.html.haml
@@ -1,8 +1,10 @@
+=link_to "Create a diffusion", mailer_path(:user => User.all)
 %ul
 	- @users.each do |user|
 		%li
 			.info
 				.title= user.username
 			.categories
 				.btn.success= link_to "Email him", mailer_path(:user => user)
+
 = will_paginate @users
diff --git a/spec/controllers/mailer_controller_spec.rb b/spec/controllers/mailer_controller_spec.rb
@@ -1,10 +1,44 @@
 require 'spec_helper'
 
 describe MailerController do
-  describe "GET 'new'" do
+  let(:user) { Fabricate(:user) }
+  let(:users) { Fabricate.sequence(:user, 5)}
+
+  describe "GET 'new' for a single user email" do
     it "returns http success" do
-      get 'new'
+      get 'new', user: Array(user)
       response.should be_success
     end
   end
+
+  describe "GET 'new' for a diffusion" do
+    it "returns http success" do
+      get 'new', user: Array(users)
+      response.should be_success
+    end
+  end
+
+  describe "POST 'create' for a single user email" do
+    it "returns http success" do
+      @message = Fabricate.build(:message)
+      post 'create', message: @message
+      response.should be_success
+      #We expect after send a message that the deliveries raise one
+      expect { MessageMailer.new_message(@message, @message.email).deliver }.to change { ActionMailer::Base.deliveries.size }.by(1)
+    end
+  end
+
+  describe "POST 'create' for a diffusion" do
+    it "returns http success" do
+      @diffusion = Fabricate.build(:diffusion)
+      post 'create', message: @diffusion
+      response.should be_success
+
+      @before_send = ActionMailer::Base.deliveries.size
+      @diffusion.email.each do |email|
+        MessageMailer.new_message(@diffusion, email).deliver
+      end
+      ActionMailer::Base.deliveries.size.should eq @before_send + @diffusion.email.size
+    end
+  end
 end
diff --git a/spec/fabricators/message_fabricator.rb b/spec/fabricators/message_fabricator.rb
@@ -1,5 +1,11 @@
 Fabricator(:message) do
-	email:"proof@example.com"
+	email(count: 1) {"proof@example.com" }
 	subject:"Hackety-hack email"
 	body:"This is an email from hackety-hack.com"
-end
+end
+
+Fabricator(:diffusion, from: :message) do
+	email(count: 5) { |i| "proof#{i}@example.com" }
+	subject:"Hackety-hack email"	
+	body:"This is an email from hackety-hack.com"
+end
diff --git a/spec/mailers/message_mailer_spec.rb b/spec/mailers/message_mailer_spec.rb
@@ -1,9 +1,21 @@
 require "spec_helper"
 
 describe MessageMailer do
-	let(:message) { MessageMailer.new_message(Fabricate(:message))}
+  let(:message) { MessageMailer.new_message(Fabricate(:message), Array("proof@example.com"))}
 
   it "is from Steve" do
     message.from.should eq(["steve@hackety.com"])
   end
+
+  it "Correct subject" do
+  	message.subject.should eq("Hackety-hack email")
+  end
+
+  it "Correct receiver email" do
+  	message.to.should eq(["proof@example.com"])
+  end
+
+  it "Correct body" do
+  	message.body.encoded.should match("This is an email from hackety-hack.com")
+  end
 end
