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

PragTob · PragTob · commit b7b263ff8448 · 2013-08-22T11:45:26.000+02:00
diff --git a/Gemfile b/Gemfile
@@ -15,6 +15,8 @@ gem 'jquery-rails'
 gem 'mongo_mapper'
 gem 'bson_ext'
 
+gem "letter_opener", group: :development
+
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -122,6 +122,8 @@ GEM
     kgio (2.7.2)
     launchy (2.0.5)
       addressable (~> 2.2.6)
+    letter_opener (1.0.0)
+      launchy (>= 2.0.4)
     mail (2.3.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -261,6 +263,7 @@ DEPENDENCIES
   jquery-rails
   json
   launchy
+  letter_opener
   mm-devise (~> 2.0)
   mocha
   mongo_mapper
diff --git a/app/controllers/mailer_controller.rb b/app/controllers/mailer_controller.rb
@@ -0,0 +1,18 @@
+class MailerController < ApplicationController
+  def new
+    @user = User.find_by_username(params[:user])
+  	@message = Message.new
+  end
+
+  def create
+  	@message = Message.new(params[:message])
+
+  	if @message.valid?
+  		MessageMailer.new_message(@message).deliver
+  		redirect_to users_index_path, :notice => "Email sent correctly"
+  	else
+  		notice = "There was an error"
+  		reder :new
+  	end
+  end
+end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -1,6 +1,14 @@
 class UsersController < InheritedController
   load_and_authorize_resource
   skip_authorize_resource :only => [:following, :followers] #anyone can perform these read-only actions
+  require 'will_paginate/array'
+
+  def index
+    @users = User.all.paginate(:page => params[:page], :per_page => 1)
+    respond_to do |format|
+      format.html
+    end  
+  end
 
   def follow
     followee = User.first(:id => params[:user][:followee])
diff --git a/app/mailers/message_mailer.rb b/app/mailers/message_mailer.rb
@@ -0,0 +1,8 @@
+class MessageMailer < ActionMailer::Base
+  default from: "steve@hackety.com"
+
+  def new_message message 
+  	@message = message
+  	mail(:to => @message.email, :subject => @message.subject)
+  end
+end
diff --git a/app/models/message.rb b/app/models/message.rb
@@ -0,0 +1,7 @@
+class Message
+	include MongoMapper::Document
+	key :email, String	
+	key :subject, String
+	key :body, String
+	validates_presence_of :email, :body
+end
diff --git a/app/views/mailer/_form.html.haml b/app/views/mailer/_form.html.haml
@@ -0,0 +1,8 @@
+=simple_form_for(@message, :url => mailer_path) do |f| 
+	=f.error_notification
+	.inputs
+		=f.input :subject, :hint => "Write the subject here!"
+		=f.input :body, :as => :text
+		=f.input :email, :as => :hidden, :input_html => { :value => @user.email }
+	.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
@@ -0,0 +1,7 @@
+%h1 Send an Email!
+= render "form"
+
+This email will send to: 
+=@user.username 
+with email: 
+=@user.email 
diff --git a/app/views/message_mailer/new_message.html.haml b/app/views/message_mailer/new_message.html.haml
@@ -0,0 +1 @@
+=@message.body
diff --git a/app/views/users/index.html.haml b/app/views/users/index.html.haml
@@ -0,0 +1,8 @@
+%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/config/environments/development.rb b/config/environments/development.rb
@@ -26,4 +26,5 @@
   config.assets.compress = false
 
   config.action_mailer.default_url_options = { :host => 'localhost:3000' }
+  config.action_mailer.delivery_method = :letter_opener
 end
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,5 +1,10 @@
 HacketyHackCom::Application.routes.draw do
 
+  get "users/index"
+
+  match 'mailer' => 'mailer#new', :as => 'mailer', :via => :get
+  match 'mailer' => 'mailer#create', :as => 'mailer', :via => :post
+
   resources :lessons, :only => [:index, :show]
 
   resources :questions do
diff --git a/spec/controllers/mailer_controller_spec.rb b/spec/controllers/mailer_controller_spec.rb
@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe MailerController do
+  describe "GET 'new'" do
+    it "returns http success" do
+      get 'new'
+      response.should be_success
+    end
+  end
+end
diff --git a/spec/fabricators/message_fabricator.rb b/spec/fabricators/message_fabricator.rb
@@ -0,0 +1,5 @@
+Fabricator(:message) do
+	email:"proof@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
@@ -0,0 +1,9 @@
+require "spec_helper"
+
+describe MessageMailer do
+	let(:message) { MessageMailer.new_message(Fabricate(:message))}
+
+  it "is from Steve" do
+    message.from.should eq(["steve@hackety.com"])
+  end
+end
diff --git a/spec/views/mailer/index.html.haml_spec.rb b/spec/views/mailer/index.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "mailer/index.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/mailer/new.html.haml_spec.rb b/spec/views/mailer/new.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "mailer/new.html.haml" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
