Adding changes from rails sample app

.gitignore

@@ -2,11 +2,9 @@
 db/*.sqlite3*
 log/*.log
 *.log
-tmp/**/*
-tmp/*
-doc/api
-doc/app
+/tmp/
+doc/
 *.swp
 *~
 .DS_Store
-config/s3.yml
+config/s3.yml

Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.3'
 gem 'sqlite3-ruby', '1.3.2', :require => 'sqlite3', :group => :development
+gem 'rails', '3.0.4'
 gem 'gravatar_image_tag', '1.0.0.pre2'
 gem 'will_paginate', '3.0.pre2'
 gem 'maruku'
@@ -10,13 +10,13 @@ gem "paperclip", "~> 2.3"
 gem 'aws-s3'
 
 group :development do
-  gem 'rspec-rails', '2.3.0'
+  gem 'rspec-rails', '2.5.0'
   gem 'annotate-models', '1.0.4'
   gem 'faker', '0.3.1'
 end
 
 group :test do
-  gem 'rspec', '2.3.0'
+  gem 'rspec', '2.5.0'
   gem 'webrat', '0.7.1'
   gem 'factory_girl_rails', '1.0'
 end

app/helpers/microposts_helper.rb

@@ -0,0 +1,15 @@
+module MicropostsHelper
+
+  def wrap(content)
+    sanitize(raw(content.split.map{ |s| wrap_long_string(s) }.join(' ')))
+  end
+
+  private
+
+    def wrap_long_string(text, max_width = 30)
+      zero_width_space = "​"
+      regex = /.{1,#{max_width}}/
+      (text.length < max_width) ? text : 
+                                  text.scan(regex).join(zero_width_space)
+    end
+end

app/views/shared/_feed_item.html.erb

@@ -6,7 +6,7 @@
     <span class="user">
       <%= link_to feed_item.user.name, feed_item.user %>
     </span>
-    <span class="content"><%= feed_item.content %></span>
+    <span class="content"><%= wrap(feed_item.content) %></span>
     <span class="timestamp">
       Posted <%= time_ago_in_words(feed_item.created_at) %> ago.
     </span>