Added Markdown

Gemfile

@@ -4,6 +4,7 @@ gem 'rails', '3.0.3'
 gem 'sqlite3-ruby', '1.3.2', :require => 'sqlite3', :group => :development
 gem 'gravatar_image_tag', '1.0.0.pre2'
 gem 'will_paginate', '3.0.pre2'
+gem 'maruku'
 
 group :development do
   gem 'rspec-rails', '2.3.0'

Gemfile.lock

@@ -46,6 +46,8 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    maruku (0.6.0)
+      syntax (>= 1.0.0)
     mime-types (1.16)
     nokogiri (1.4.4.1-x86-mingw32)
     polyglot (0.3.1)
@@ -82,6 +84,7 @@ GEM
       railties (~> 3.0)
       rspec (~> 2.3.0)
     sqlite3-ruby (1.3.2-x86-mingw32)
+    syntax (1.0.0)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
@@ -100,6 +103,7 @@ DEPENDENCIES
   factory_girl_rails (= 1.0)
   faker (= 0.3.1)
   gravatar_image_tag (= 1.0.0.pre2)
+  maruku
   rails (= 3.0.3)
   rspec (= 2.3.0)
   rspec-rails (= 2.3.0)

app/controllers/blogs_controller.rb

@@ -1,2 +1,9 @@
 class BlogsController < ApplicationController
+
+	def destroy
+		redirect_to root_path unless signed_in?
+		@blog = Blog.find(params[:id])
+		@blog.destroy
+		redirect_to blogs_path, :flash => { :success => "Blog deleted!" }
+	end
 end

app/controllers/microposts_controller.rb

@@ -5,7 +5,8 @@ class MicropostsController < ApplicationController
   def create
     success_message = "Micropost created!"
     @micropost = current_user.microposts.build(params[:micropost])
-
+    puts params[:micropost]
+
     if Blog.is_blog_post? params[:micropost][:content]
       current_user.blogs.create_with_post params[:micropost][:content]
       success_message = "Blog created!"

app/controllers/users_controller.rb

@@ -37,7 +37,8 @@ def create
     @user = User.new(params[:user])
     if @user.save
       sign_in @user
-      redirect_to @user, :flash => { :success => "Welcome to the Sample App!" }
+	  @user.follow_all
+      redirect_to @user, :flash => { :success => "Welcome to the Sample App!" }	  
     else
       @title = "Sign up"
       render 'new'

app/helpers/application_helper.rb

@@ -2,7 +2,7 @@ module ApplicationHelper
 
   # Return a title on a per-page basis.
   def title
-    base_title = "Ruby on Rails Tutorial Sample App"
+    base_title = "Geronimo!"
     if @title.nil?
       base_title
     else

app/models/blog.rb

@@ -11,10 +11,17 @@
 #  updated_at :datetime
 #
 
+require 'maruku'
+
 class Blog < ActiveRecord::Base
 
   belongs_to :user
 
+  def to_html
+	doc = Maruku.new(blogtext)
+	doc.to_html
+  end  
+
   class << self 
 	def latest_for_frontpage
 		self.where(:frontpage => true).last
@@ -32,14 +39,8 @@ def new_from_post(post)
 	  end
 	end
 
-	def get_blog_text(post)
-	  post_array = post.split()
-	  if(is_front_page? post)
-		post_array.shift(2)
-	  else
-		post_array.shift(1)
-	  end
-	  post_array.join(' ')
+	def get_blog_text(post)	
+		post.gsub(/blog\sfrontpage\s|blog\s/, '')
 	end
 
 	def is_blog_post?(post)

app/models/show.rb

@@ -12,6 +12,12 @@
 
 class Show < ActiveRecord::Base
 
+
+  def to_html
+	doc = Maruku.new(showtext)
+	doc.to_html
+  end
+
   class << self 
 
     def next_show()
@@ -74,9 +80,7 @@ def get_date(post)
     end
 
     def get_show_text(post)
-      post_array = post.split()
-        post_array.shift(1)
-      post_array.join(' ')	      
+		post.gsub(/^show\s/,'')
     end
   end
-end
+end

app/models/user.rb

@@ -65,6 +65,15 @@ def follow!(followed)
   def unfollow!(followed)
     relationships.find_by_followed_id(followed).destroy
   end
+
+  def follow_all
+	User.all.each { |u|
+		if u != self
+			u.follow! (self)
+			self.follow! (u)
+		end
+	}
+  end
 
   class << self
     def authenticate(email, submitted_password)

app/views/blogs/_blog.html.erb

@@ -1,6 +1,6 @@
 <div class="blogContainer round">
 	<article>
-		<%= blog.blogtext %>
+		<%= raw blog.to_html %>
 	</article>
 
 	<span>

app/views/layouts/_header.html.erb

@@ -1,5 +1,5 @@
 <header>
-  <%= link_to logo, root_path %>
+  <%= link_to "Geronimo!", root_path, :class => "BandName" %>
   <nav class="round">
     <ul>
       <li><%= link_to "Home", home_path %></li>

app/views/layouts/_stylesheets.html.erb

@@ -4,4 +4,5 @@
 <%= stylesheet_link_tag 'blueprint/screen', :media => 'screen' %>
 <%= stylesheet_link_tag 'blueprint/print',  :media => 'print' %>
 <!--[if lt IE 8]><%= stylesheet_link_tag 'blueprint/ie' %><![endif]-->
-<%= stylesheet_link_tag 'custom', :media => 'screen' %>
+<%= stylesheet_link_tag 'custom', :media => 'screen' %>
+<%= stylesheet_link_tag 'geronimo', :media => 'screen' %>

app/views/microposts/_micropost.html.erb

@@ -8,9 +8,6 @@
   <% user = micropost.user rescue User.find(micropost.user_id) %>
   <% if current_user?(user) %>
     <td>
-      <%= link_to "delete", micropost, :method => :delete,
-                                       :confirm => "You sure?",
-                                       :title => micropost.content %>
     </td>
   <% end %>
 </tr>

app/views/shared/_feed_item.html.erb

@@ -13,9 +13,6 @@
   </td>
   <% if current_user?(feed_item.user) %>
     <td>
-      <%= link_to "delete", feed_item, :method => :delete,
-                                       :confirm => "You sure?",
-                                       :title => feed_item.content %>
     </td>
   <% end %>
 </tr>

app/views/shared/_stats.html.erb

@@ -1,21 +1,4 @@
 <% @user ||= current_user %>
 <div class="stats">
-  <table summary="User stats">
-    <tr>
-      <td>
-        <a href="<%= following_user_path(@user) %>">
-          <span id="following" class="stat">
-            <%= @user.following.count %> following
-          </span>
-        </a>
-      </td>
-      <td>
-        <a href="<%= followers_user_path(@user) %>">
-          <span id="followers" class="stat">
-            <%= pluralize(@user.followers.count, "follower") %>
-          </span>
-        </a>
-      </td>
-    </tr>
-  </table>
+	<!-- Removing stats.  Different feeds are not necessary currently. -->
 </div>

app/views/shows/_show.html.erb

@@ -1,6 +1,6 @@
 		<div>
 
-				<span class="show">*&nbsp;<%= show.showtext %></span>
+				<span class="show">*&nbsp;<%= raw show.to_html %></span>
 
 
 			<% if signed_in? %>

public/stylesheets/geronimo.css

@@ -195,6 +195,11 @@ a:hover {
 	margin: 5px;
 }
 
+.show p{
+
+	display: inline;
+}
+
 
 nav {
   padding: 0 0.7em;
@@ -243,4 +248,15 @@ nav ul li a:hover {
 	margin: 10px;
 	background-color: orange;
 	width: 760px;
+}
+
+.blogContainer p
+{
+	display: inline;
+}
+
+.blogContainer h1, h2, h3, h4, h5, h6
+{
+	margin-top: 4px;
+	margin-bottom: 4px;
 }