proclaim 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f01a5d261bff3eb7daf30ba4bde79f074c20e58
-  data.tar.gz: 1519808eae64115a710a98131470e6b4fa61cd5f
+  metadata.gz: 95376276542d333bb59c9ae6c18791bed276b629
+  data.tar.gz: 3d7f91736e0aabd04624da823c4973b072be0270
 SHA512:
-  metadata.gz: ef0e2bdf09f08125eaf80c8f7fd91c7831b8081b4414ba28b472463d8f29db4fb196772d01f10185261c3eb57b9a0d8bc3d9797591134ca803f707a499866f2b
-  data.tar.gz: ce8688fb5521fa7777645fb4fabdaa7ae7a75e95860974cd2c769f9eb91b6e19b0cf75518a527b3167a58f4df6a6643fa74e10fd625e703f3618d8231cf47e86
+  metadata.gz: 92414f0b8e9f7b4a2059a06868e2e68fd39d5e9dd4e2a8702da1232f07ab2705ec217cf45c8a36aed960b4569671c7abdcab85b157bf1789e0e780bbbb59b1df
+  data.tar.gz: d6fa347afc769970dd4eb03bacd3d677e6665897db1a5e391e0679db2acae90716f869ef2307ae3828c15fc545faeb9f032a478fb0b57bc64f1fd42a2f7ee590

data/CHANGELOG

@@ -1,3 +1,9 @@
+v 0.2.4
+  - Added simple format to comments, to preserve line breaks
+
+v 0.2.3
+  - Fixed inability to set "from" field in emails sent from Proclaim
+
 v 0.2.2
   - Fixed post titles showing HTML entities
   - Fixed posts index to show published time instead of updated time

data/README.md

@@ -25,10 +25,11 @@ scheme is given below.
 
 ### Get Proclaim
 
-Proclaim 0.1 works with Rails 4.2 and on. Add it to your Gemfile with:
+Proclaim 0.2 works with Rails 4.2 and on, with Ruby 1.9.3 and on. Add it to your
+Gemfile with:
 
 ```ruby
-gem 'proclaim', "~> 0.2.2"
+gem 'proclaim', "~> 0.2.4"
 ```
 
 Run `bundle install` to install it.
@@ -105,6 +106,7 @@ Proclaim.current_author_method = :current_user
 Proclaim.authentication_method = :authenticate_user!
 Proclaim.excerpt_length = 500
 Proclaim.editor_toolbar_buttons = ['bold', 'italic', 'underline', 'anchor', 'header1', 'header2', 'quote']
+Proclaim.mailer_sender = nil
 ```
 
 - **Proclaim.author_class**
@@ -139,6 +141,12 @@ Proclaim.editor_toolbar_buttons = ['bold', 'italic', 'underline', 'anchor', 'hea
   The buttons to be displayed on the Medium Editor toolbar. For a full list of
   options, see the README for [that project][1].
 
+- **Proclaim.mailer_sender**
+
+  The email address to use in the "from" field of all emails from Proclaim. If
+  not specified (the default), the mailer's default params will be used, which
+  means it should be set in your environment.
+
 Astute readers may note that the defaults corresponds to defaults from Devise (on
 the User class). If that's not your setup, all of these options can be changed
 in the initializer installed by `rails generate proclaim:install`.

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.4

data/app/mailers/proclaim/subscription_mailer.rb

@@ -1,6 +1,6 @@
 module Proclaim
 	class SubscriptionMailer < ActionMailer::Base
-		default from: "from@example.com"
+		default from: Proclaim.mailer_sender || default_params[:from] || "from@example.com"
 
 		def welcome_email(subscription)
 			@subscription = subscription

data/app/views/proclaim/comments/_comment.html.erb

@@ -1,6 +1,6 @@
 <div id = "comment_<%= comment.id %>" class = "comment">
 	<div class = "comment_body">
-		<%= comment.body %>
+		<%= simple_format h comment.body %>
 	</div>
 	<p class = "comment_author">By <%= comment.author %></p>
 

data/app/views/proclaim/comments/_form.html.erb

@@ -25,7 +25,7 @@
 	<%= f.label :author %><br />
 	<%= f.text_field :author %><br />
 	<%= f.label :body %><br />
-	<%= f.text_area :body %><br />
+	<%= f.text_area :body, rows: 7, cols: 50 %><br />
 
 
 

data/lib/generators/proclaim/templates/initialize_proclaim.rb

@@ -22,4 +22,7 @@ Proclaim.setup do |config|
 
 	# Buttons to display on post editor toolbar
 	#config.editor_toolbar_buttons = ['bold', 'italic', 'underline', 'anchor', 'header1', 'header2', 'quote']
+
+	# Email address to use in the "from" field of all emails
+	#config.mailer_sender = '"My Blog" <blog@example.com>'
 end

data/lib/proclaim.rb

@@ -19,6 +19,9 @@ module Proclaim
 	mattr_accessor :editor_toolbar_buttons
 	@@editor_toolbar_buttons = ['bold', 'italic', 'underline', 'anchor', 'header1', 'header2', 'quote']
 
+	mattr_accessor :mailer_sender
+	@@mailer_sender = nil
+
 	def self.setup
 		yield self
 	end

data/lib/proclaim/version.rb

@@ -1,3 +1,3 @@
 module Proclaim
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proclaim
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Kyle Fazzari