Merge branch 'master' into swap-alt-with-redux

* master:
  fixed rubocop error, leaving js errors for next PR
  Several slight enhancements, most importantly sanitization

client/assets/javascripts/components/Comment.jsx

@@ -10,7 +10,7 @@ const Comment = React.createClass({
   },
 
   render() {
-    const rawMarkup = marked(this.props.text);
+    const rawMarkup = marked(this.props.text, { gfm: true, sanitize: true });
     return (
       <div className="comment">
         <h2 className="comment-author">

client/assets/javascripts/components/CommentBox.jsx

@@ -23,6 +23,7 @@ const CommentBox = React.createClass({
     return (
       <div className='commentBox container'>
         <h1>Comments { this.props.ajaxCounter > 0 ? `SENDING AJAX REQUEST! Ajax Counter is ${this.props.ajaxCounter}` : '' }</h1>
+        <p>Text take Github Flavored Markdown. Comments older than 24 hours are deleted.</p>
         <CommentForm ajaxSending={this.props.ajaxCounter > 0} actions={actions}/>
         <CommentList comments={data.get('comments')}/>
       </div>

lib/tasks/daily.rake

@@ -0,0 +1,8 @@
+task daily: :environment do
+  t = 1.day.ago
+  older_comments = Comment.where("created_at < ?", t)
+  newer_comments = Comment.where("created_at >= ?", t)
+  Rails.logger.info "Deleting #{older_comments.count} comments older than #{t}"
+  Rails.logger.info "Keeping #{newer_comments.count} comments newer than #{t}"
+  older_comments.delete_all
+end

spec/features/comments_spec.rb

@@ -12,6 +12,14 @@
     expect(page).to have_css(".commentList .comment", text: "Tommy")
     expect(page).to have_css(".commentList .comment", text: "Surf's up dude!")
 
+    click_link "Horizontal Form"
+    fill_in "Your Name", with: "Jason"
+    fill_in "Say something...", with: "<iframe src=\"http://www.w3schools.com\"></iframe>"
+    click_button "Post"
+    expect(page).to have_css(".commentList .comment", text: "Jason")
+    expect(page).not_to have_css("iframe")
+    expect(page).to have_css(".commentList .comment", text: "<iframe src=\"http://www.w3schools.com\"")
+
     click_link "Stacked Form"
     fill_in "Your Name", with: "Spicoli"
     fill_in hint_text, with: "Cowabunga dude!"

spec/rails_helper.rb

@@ -48,7 +48,6 @@
     DatabaseCleaner.clean
   end
 
-
   Capybara.javascript_driver = :poltergeist
 
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures