From 36290c82ed6033507d1f557ad01be763affe46c1 Mon Sep 17 00:00:00 2001
From: Skud <skud@infotrope.net>
Date: Mon, 29 Apr 2013 18:09:55 +1000
Subject: [PATCH 01/35] Added a reply link to the notifications/show page

- sets subject "Re: whatever" for PMs
- also removed "sender=N" from PM link (wtf! -- it wasn't doing anything
    but it looked bad.)
---
 app/controllers/notifications_controller.rb   | 16 ++++++++++++-
 app/views/members/show.html.haml              |  2 +-
 app/views/notifications/_form.html.haml       |  2 +-
 app/views/notifications/index.html.haml       |  2 +-
 app/views/notifications/show.html.haml        |  3 ++-
 .../notifications_controller_spec.rb          | 24 ++++++++++++++++++-
 .../views/notifications/new.html.haml_spec.rb | 17 ++++++++++++-
 .../notifications/show.html.haml_spec.rb      |  5 ++++
 8 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index 7b49c326f..5fa2415df 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -15,6 +15,19 @@ class NotificationsController < ApplicationController
     @notification.read = true
     @notification.save
 
+    # by default, reply link sends a PM in return
+    @reply_link = new_notification_path(
+      :recipient_id => @notification.sender.id,
+      :subject => @notification.subject =~ /^Re: / ?
+        @notification.subject :
+        "Re: " + @notification.subject
+    )
+
+    if @notification.post
+      # comment on the post in question
+      @reply_link = new_comment_path(:post_id => @notification.post.id)
+    end
+
     respond_to do |format|
       format.html # show.html.erb
     end
@@ -25,6 +38,7 @@ class NotificationsController < ApplicationController
   def new
     @notification = Notification.new
     @recipient = Member.find_by_id(params[:recipient_id])
+    @subject   = params[:subject] || ""
 
     respond_to do |format|
       format.html # new.html.erb
@@ -49,7 +63,7 @@ class NotificationsController < ApplicationController
 
     respond_to do |format|
       if @notification.save
-        format.html { redirect_to @recipient, notice: 'Message was successfully sent.' }
+        format.html { redirect_to notifications_path, notice: 'Message was successfully sent.' }
       else
         format.html { render action: "new" }
       end
diff --git a/app/views/members/show.html.haml b/app/views/members/show.html.haml
index 39a7893af..bd150618b 100644
--- a/app/views/members/show.html.haml
+++ b/app/views/members/show.html.haml
@@ -9,7 +9,7 @@
     -if can? :create, Notification and current_member != @member
       %p
         %br/
-        =link_to 'Send Message', new_notification_path(:sender_id => current_member.id, :recipient_id => @member.id), :class => 'btn btn-primary'
+        =link_to 'Send Message', new_notification_path(:recipient_id => @member.id), :class => 'btn btn-primary'
 
     %p
       %strong Member since:
diff --git a/app/views/notifications/_form.html.haml b/app/views/notifications/_form.html.haml
index a0b9f6d55..babb75fd0 100644
--- a/app/views/notifications/_form.html.haml
+++ b/app/views/notifications/_form.html.haml
@@ -13,7 +13,7 @@
     To:
     = link_to @recipient, @recipient
   = label_tag :notification, "Subject:"
-  = f.text_field :subject, :class => 'input-block-level'
+  = f.text_field :subject, :value => @subject, :class => 'input-block-level'
   = label_tag :body, "Type your message here:"
   = f.text_area :body, :rows => 12, :class => 'input-block-level'
   %span.help-block
diff --git a/app/views/notifications/index.html.haml b/app/views/notifications/index.html.haml
index 08c00121b..ace28ca92 100644
--- a/app/views/notifications/index.html.haml
+++ b/app/views/notifications/index.html.haml
@@ -1,4 +1,4 @@
-- content_for :title, "Notifications"
+- content_for :title, "Inbox"
 
 - if @notifications.length > 0
   %table.table.table-striped
diff --git a/app/views/notifications/show.html.haml b/app/views/notifications/show.html.haml
index cbd66aeaf..3d4280640 100644
--- a/app/views/notifications/show.html.haml
+++ b/app/views/notifications/show.html.haml
@@ -15,4 +15,5 @@
     #{ strip_tags(@notification.body) }
 
 %p
-  =link_to 'Delete', @notification, method: :delete, data: { confirm: 'Are you sure?' }, :class => 'btn btn-mini'
+  =link_to 'Delete', @notification, method: :delete, data: { confirm: 'Are you sure?' }, :class => 'btn'
+  =link_to 'Reply', @reply_link, :class => 'btn btn-primary'
diff --git a/spec/controllers/notifications_controller_spec.rb b/spec/controllers/notifications_controller_spec.rb
index 155273f07..c6ca70b7e 100644
--- a/spec/controllers/notifications_controller_spec.rb
+++ b/spec/controllers/notifications_controller_spec.rb
@@ -42,6 +42,28 @@ describe NotificationsController do
       assigns(:notification).should eq(notification)
     end
 
+    it "assigns the reply link for a PM" do
+      notification = FactoryGirl.create(:notification, :recipient_id => subject.current_member.id, :post_id => nil)
+      subject = "Re: " + notification.subject
+
+      get :show, {:id => notification.to_param}
+      assigns(:reply_link).should_not be_nil
+      assigns(:reply_link).should eq new_notification_path(
+        :recipient_id => notification.sender_id,
+        :subject => subject
+      )
+    end
+
+    it "assigns the reply link for a post comment" do
+      notification = FactoryGirl.create(:notification, :recipient_id => subject.current_member.id)
+
+      get :show, {:id => notification.to_param}
+      assigns(:reply_link).should_not be_nil
+      assigns(:reply_link).should eq new_comment_path(
+        :post_id => notification.post.id
+      )
+    end
+
     it "marks notifications as read" do
       notification = FactoryGirl.create(:notification, :recipient_id => subject.current_member.id)
       get :show, {:id => notification.to_param}
@@ -96,7 +118,7 @@ describe NotificationsController do
       it "redirects to the recipient's profile" do
         @recipient = FactoryGirl.create(:member)
         post :create, { :notification => { :recipient_id => @recipient.id } }
-        response.should redirect_to(@recipient)
+        response.should redirect_to(notifications_path)
       end
     end
 
diff --git a/spec/views/notifications/new.html.haml_spec.rb b/spec/views/notifications/new.html.haml_spec.rb
index 441905ef0..d96358da8 100644
--- a/spec/views/notifications/new.html.haml_spec.rb
+++ b/spec/views/notifications/new.html.haml_spec.rb
@@ -5,7 +5,6 @@ describe "notifications/new" do
     @recipient = FactoryGirl.create(:member)
     @sender = FactoryGirl.create(:member)
     assign(:notification, FactoryGirl.create(:notification, :recipient_id => @recipient.id, :sender_id => @sender.id))
-# assign(:forum, Forum.new)
     sign_in @sender
     controller.stub(:current_user) { @sender}
   end
@@ -23,6 +22,22 @@ describe "notifications/new" do
     rendered.should contain @recipient.login_name
   end
 
+  it "puts the recipient in a hidden field" do
+    render
+    assert_select "input#notification_recipient_id[type=hidden]", :name => "notification[recipient_id]"
+  end
+
+  it "fills in the subject if provided" do
+    assign(:subject, 'Foo')
+    render
+    assert_select "input#notification_subject", :value => "Foo"
+  end
+
+  it "leaves the subject empty if not provided" do
+    render
+    assert_select "input#notification_subject", :value => ""
+  end
+
   it "Tells you to write your message here" do
     render
     rendered.should contain "Type your message here"
diff --git a/spec/views/notifications/show.html.haml_spec.rb b/spec/views/notifications/show.html.haml_spec.rb
index 26251395b..8b9f2159c 100644
--- a/spec/views/notifications/show.html.haml_spec.rb
+++ b/spec/views/notifications/show.html.haml_spec.rb
@@ -5,6 +5,7 @@ describe "notifications/show" do
     @member = FactoryGirl.create(:member)
     @notification = FactoryGirl.create(:notification, :recipient => @member)
     assign(:notification, @notification)
+    assign(:reply_link, new_notification_path)
     controller.stub(:current_user) { @member }
     render
   end
@@ -18,4 +19,8 @@ describe "notifications/show" do
     assert_select "a", "Delete"
   end
 
+  it "includes a reply button" do
+    assert_select "a", "Reply"
+  end
+
 end

From 844f2c845e963c9dca7804e2fa2a7eb181a59c65 Mon Sep 17 00:00:00 2001
From: Skud <skud@infotrope.net>
Date: Mon, 29 Apr 2013 18:26:22 +1000
Subject: [PATCH 02/35] removed unused random crop code

---
 app/helpers/application_helper.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 11d1c7f13..a2f487023 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,7 +1,3 @@
 module ApplicationHelper
 
-  def random_crop
-    Crop.random
-  end
-
 end

From 11f979313a7e3d2b30d55012a7fa133b0c70576a Mon Sep 17 00:00:00 2001
From: Skud <skud@infotrope.net>
Date: Mon, 29 Apr 2013 18:55:13 +1000
Subject: [PATCH 03/35] Added reply link to notification email.

Note: this breaks DRY but we couldn't figure out how to put it in a
helper and make it useable by both the controller and the mailer.
Suggestions/help much appreciated!
---
 app/mailers/notifier.rb                      | 14 ++++++++++++++
 app/views/notifier/notify.html.haml          |  2 ++
 spec/views/notifier/notify.html.haml_spec.rb |  6 ++++++
 3 files changed, 22 insertions(+)

diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
index 50612c353..28814bb07 100644
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -3,6 +3,20 @@ class Notifier < ActionMailer::Base
 
   def notify(notification)
     @notification = notification
+
+    # by default, reply link sends a PM in return
+    @reply_link = new_notification_url(
+      :recipient_id => @notification.sender.id,
+      :subject => @notification.subject =~ /^Re: / ?
+        @notification.subject :
+        "Re: " + @notification.subject
+    )
+
+    if @notification.post
+      # comment on the post in question
+      @reply_link = new_comment_url(:post_id => @notification.post.id)
+    end
+
     mail(:to => @notification.recipient.email,
          :subject => @notification.subject)
   end
diff --git a/app/views/notifier/notify.html.haml b/app/views/notifier/notify.html.haml
index cbbb82bcd..7ccf9bea6 100644
--- a/app/views/notifier/notify.html.haml
+++ b/app/views/notifier/notify.html.haml
@@ -14,6 +14,8 @@
     #{strip_tags @notification.body}
 
 %p
+  = link_to "Reply to this message", @reply_link
+  %br/
   = link_to "View this message in your inbox", notification_url(@notification)
   %br/
   = link_to "Turn off these notifications", edit_member_registration_url
diff --git a/spec/views/notifier/notify.html.haml_spec.rb b/spec/views/notifier/notify.html.haml_spec.rb
index 3f70895c1..687e702cc 100644
--- a/spec/views/notifier/notify.html.haml_spec.rb
+++ b/spec/views/notifier/notify.html.haml_spec.rb
@@ -4,6 +4,8 @@ describe 'notifier/notify.html.haml', :type => "view" do
 
   before(:each) do
     @notification = FactoryGirl.create(:notification)
+    @reply_link = "http://example.com"
+    assign(:reply_link, @reply_link)
     render
   end
 
@@ -16,6 +18,10 @@ describe 'notifier/notify.html.haml', :type => "view" do
     rendered.should contain @notification.post.subject
   end
 
+  it 'should include a reply link' do
+    assert_select "a[href=#{@reply_link}]", :text => /Reply/
+  end
+
   it 'should contain a link to your inbox' do
     assert_select "a[href*=notifications]"
   end

From e0782c23460bc157c5d9ae6be35354aea52b856e Mon Sep 17 00:00:00 2001
From: Skud <skud@infotrope.net>
Date: Tue, 30 Apr 2013 21:56:02 +1000
Subject: [PATCH 04/35] fixed failing notifications tests

(our non-DRY code, which we just pasted into the mailer, was breaking
this in a roundabout way. this is a quick and not very nice fix. The
whole problem is resolved by @pozorvlak's recent "no subject" fix for
notifications, anyway.)
---
 spec/controllers/notifications_controller_spec.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/spec/controllers/notifications_controller_spec.rb b/spec/controllers/notifications_controller_spec.rb
index c6ca70b7e..635ccb38b 100644
--- a/spec/controllers/notifications_controller_spec.rb
+++ b/spec/controllers/notifications_controller_spec.rb
@@ -7,7 +7,8 @@ describe NotificationsController do
   def valid_attributes
     {
       "recipient_id" => subject.current_member.id,
-      "sender_id" => FactoryGirl.create(:member).id
+      "sender_id" => FactoryGirl.create(:member).id,
+      "subject" => 'test'
     }
   end
 
@@ -19,7 +20,8 @@ describe NotificationsController do
   def valid_attributes_for_sender
     {
       "sender_id" => subject.current_member.id,
-      "recipient_id" => FactoryGirl.create(:member).id
+      "recipient_id" => FactoryGirl.create(:member).id,
+      "subject" => 'test'
     }
   end
 
@@ -117,7 +119,7 @@ describe NotificationsController do
 
       it "redirects to the recipient's profile" do
         @recipient = FactoryGirl.create(:member)
-        post :create, { :notification => { :recipient_id => @recipient.id } }
+        post :create, { :notification => { :recipient_id => @recipient.id, :subject => 'foo' } }
         response.should redirect_to(notifications_path)
       end
     end

From c46ba2f16ba0389866cc3e683bafdd29ca653417 Mon Sep 17 00:00:00 2001
From: Miles Gould <miles@assyrian.org.uk>
Date: Wed, 1 May 2013 16:27:29 +0100
Subject: [PATCH 05/35] Delete unused helpers.

---
 app/helpers/application_helper.rb      |  3 ---
 app/helpers/comments_helper.rb         |  2 --
 app/helpers/crops_helper.rb            |  2 --
 app/helpers/forums_helper.rb           |  2 --
 app/helpers/gardens_helper.rb          |  2 --
 app/helpers/home_helper.rb             |  2 --
 app/helpers/members_helper.rb          |  9 ---------
 app/helpers/notifications_helper.rb    |  2 --
 app/helpers/plantings_helper.rb        |  2 --
 app/helpers/posts_helper.rb            |  2 --
 app/helpers/roles_helper.rb            |  2 --
 app/helpers/scientific_names_helper.rb |  2 --
 spec/helpers/plantings_helper_spec.rb  | 14 --------------
 13 files changed, 46 deletions(-)
 delete mode 100644 app/helpers/application_helper.rb
 delete mode 100644 app/helpers/comments_helper.rb
 delete mode 100644 app/helpers/crops_helper.rb
 delete mode 100644 app/helpers/forums_helper.rb
 delete mode 100644 app/helpers/gardens_helper.rb
 delete mode 100644 app/helpers/home_helper.rb
 delete mode 100644 app/helpers/members_helper.rb
 delete mode 100644 app/helpers/notifications_helper.rb
 delete mode 100644 app/helpers/plantings_helper.rb
 delete mode 100644 app/helpers/posts_helper.rb
 delete mode 100644 app/helpers/roles_helper.rb
 delete mode 100644 app/helpers/scientific_names_helper.rb
 delete mode 100644 spec/helpers/plantings_helper_spec.rb

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
deleted file mode 100644
index a2f487023..000000000
--- a/app/helpers/application_helper.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module ApplicationHelper
-
-end
diff --git a/app/helpers/comments_helper.rb b/app/helpers/comments_helper.rb
deleted file mode 100644
index 0ec9ca5f2..000000000
--- a/app/helpers/comments_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module CommentsHelper
-end
diff --git a/app/helpers/crops_helper.rb b/app/helpers/crops_helper.rb
deleted file mode 100644
index da6fb9a78..000000000
--- a/app/helpers/crops_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module CropsHelper
-end
diff --git a/app/helpers/forums_helper.rb b/app/helpers/forums_helper.rb
deleted file mode 100644
index 2e531fd46..000000000
--- a/app/helpers/forums_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module ForumsHelper
-end
diff --git a/app/helpers/gardens_helper.rb b/app/helpers/gardens_helper.rb
deleted file mode 100644
index 015e7835f..000000000
--- a/app/helpers/gardens_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module GardensHelper
-end
diff --git a/app/helpers/home_helper.rb b/app/helpers/home_helper.rb
deleted file mode 100644
index 23de56ac6..000000000
--- a/app/helpers/home_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module HomeHelper
-end
diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb
deleted file mode 100644
index 51a8599e2..000000000
--- a/app/helpers/members_helper.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module MembersHelper
-  def shorten(str, max_length)
-    if str.length > max_length
-      return str.slice(0, max_length - 3) + "..."
-    else
-      return str
-    end
-  end
-end
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
deleted file mode 100644
index 7342393a7..000000000
--- a/app/helpers/notifications_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module NotificationsHelper
-end
diff --git a/app/helpers/plantings_helper.rb b/app/helpers/plantings_helper.rb
deleted file mode 100644
index bc609d05e..000000000
--- a/app/helpers/plantings_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module PlantingsHelper
-end
diff --git a/app/helpers/posts_helper.rb b/app/helpers/posts_helper.rb
deleted file mode 100644
index a7b8cec89..000000000
--- a/app/helpers/posts_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module PostsHelper
-end
diff --git a/app/helpers/roles_helper.rb b/app/helpers/roles_helper.rb
deleted file mode 100644
index 6b6b6cc22..000000000
--- a/app/helpers/roles_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module RolesHelper
-end
diff --git a/app/helpers/scientific_names_helper.rb b/app/helpers/scientific_names_helper.rb
deleted file mode 100644
index 3b1a12371..000000000
--- a/app/helpers/scientific_names_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module ScientificNamesHelper
-end
diff --git a/spec/helpers/plantings_helper_spec.rb b/spec/helpers/plantings_helper_spec.rb
deleted file mode 100644
index 25a84ec96..000000000
--- a/spec/helpers/plantings_helper_spec.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'spec_helper'
-
-# Specs in this file have access to a helper object that includes
-# the PlantingsHelper. For example:
-#
-# describe PlantingsHelper do
-#   describe "string concat" do
-#     it "concats two strings with spaces" do
-#       helper.concat_strings("this","that").should == "this that"
-#     end
-#   end
-# end
-describe PlantingsHelper do
-end

From 6ab098c015e4302b7d5e5fb8356ec14e683f9f2a Mon Sep 17 00:00:00 2001
From: Miles Gould <miles@assyrian.org.uk>
Date: Wed, 1 May 2013 16:46:54 +0100
Subject: [PATCH 06/35] Move reply_link into a helper.

 - keep @reply_link as an instance var, for testability
 - always use fully-qualified URLs, to reduce code duplication
---
 app/controllers/notifications_controller.rb   | 15 ++------
 app/helpers/notifications_helper.rb           | 16 +++++++++
 app/mailers/notifier.rb                       | 15 ++------
 .../notifications_controller_spec.rb          |  4 +--
 spec/helpers/notifications_helper_spec.rb     | 34 +++++++++++++++++++
 .../notifications/show.html.haml_spec.rb      |  4 +--
 6 files changed, 58 insertions(+), 30 deletions(-)
 create mode 100644 app/helpers/notifications_helper.rb
 create mode 100644 spec/helpers/notifications_helper_spec.rb

diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index 5fa2415df..790e5d3ac 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -1,4 +1,5 @@
 class NotificationsController < ApplicationController
+  include NotificationsHelper
   load_and_authorize_resource
   # GET /notifications
   def index
@@ -14,19 +15,7 @@ class NotificationsController < ApplicationController
     @notification = Notification.find(params[:id])
     @notification.read = true
     @notification.save
-
-    # by default, reply link sends a PM in return
-    @reply_link = new_notification_path(
-      :recipient_id => @notification.sender.id,
-      :subject => @notification.subject =~ /^Re: / ?
-        @notification.subject :
-        "Re: " + @notification.subject
-    )
-
-    if @notification.post
-      # comment on the post in question
-      @reply_link = new_comment_path(:post_id => @notification.post.id)
-    end
+    @reply_link = reply_link(@notification)
 
     respond_to do |format|
       format.html # show.html.erb
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
new file mode 100644
index 000000000..dab53df95
--- /dev/null
+++ b/app/helpers/notifications_helper.rb
@@ -0,0 +1,16 @@
+module NotificationsHelper
+  def reply_link(notification)
+    if notification.post
+      # comment on the post in question
+      new_comment_url(:post_id => notification.post.id)
+    else
+      # by default, reply link sends a PM in return
+      new_notification_url(
+        :recipient_id => notification.sender.id,
+        :subject => notification.subject =~ /^Re: / ?
+          notification.subject :
+          "Re: " + notification.subject
+      )
+    end
+  end
+end
diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
index 28814bb07..579b2a8ad 100644
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -1,21 +1,10 @@
 class Notifier < ActionMailer::Base
+  include NotificationsHelper
   default from: "Growstuff <noreply@growstuff.org>"
 
   def notify(notification)
     @notification = notification
-
-    # by default, reply link sends a PM in return
-    @reply_link = new_notification_url(
-      :recipient_id => @notification.sender.id,
-      :subject => @notification.subject =~ /^Re: / ?
-        @notification.subject :
-        "Re: " + @notification.subject
-    )
-
-    if @notification.post
-      # comment on the post in question
-      @reply_link = new_comment_url(:post_id => @notification.post.id)
-    end
+    @reply_link = reply_link(@notification)
 
     mail(:to => @notification.recipient.email,
          :subject => @notification.subject)
diff --git a/spec/controllers/notifications_controller_spec.rb b/spec/controllers/notifications_controller_spec.rb
index 635ccb38b..be3fe5400 100644
--- a/spec/controllers/notifications_controller_spec.rb
+++ b/spec/controllers/notifications_controller_spec.rb
@@ -50,7 +50,7 @@ describe NotificationsController do
 
       get :show, {:id => notification.to_param}
       assigns(:reply_link).should_not be_nil
-      assigns(:reply_link).should eq new_notification_path(
+      assigns(:reply_link).should eq new_notification_url(
         :recipient_id => notification.sender_id,
         :subject => subject
       )
@@ -61,7 +61,7 @@ describe NotificationsController do
 
       get :show, {:id => notification.to_param}
       assigns(:reply_link).should_not be_nil
-      assigns(:reply_link).should eq new_comment_path(
+      assigns(:reply_link).should eq new_comment_url(
         :post_id => notification.post.id
       )
     end
diff --git a/spec/helpers/notifications_helper_spec.rb b/spec/helpers/notifications_helper_spec.rb
new file mode 100644
index 000000000..9db3a95aa
--- /dev/null
+++ b/spec/helpers/notifications_helper_spec.rb
@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe NotificationsHelper do
+  describe "reply_link" do
+
+    before(:each) do
+      @member = FactoryGirl.create(:member)
+    end
+
+    it "replies to PMs with PMs" do
+      notification = FactoryGirl.create(:notification, :recipient_id => @member.id, :post_id => nil)
+      subject = "Re: " + notification.subject
+
+      link = helper.reply_link(notification)
+      link.should_not be_nil
+      link.should eq new_notification_url(
+        :recipient_id => notification.sender_id,
+        :subject => subject
+      )
+    end
+
+    it "replies to post comments with post comments" do
+      notification = FactoryGirl.create(:notification, :recipient_id => @member.id)
+
+      link = helper.reply_link(notification)
+      link.should_not be_nil
+      link.should eq new_comment_url(
+        :post_id => notification.post.id
+      )
+    end
+
+
+  end
+end
diff --git a/spec/views/notifications/show.html.haml_spec.rb b/spec/views/notifications/show.html.haml_spec.rb
index 8b9f2159c..3028e8f0e 100644
--- a/spec/views/notifications/show.html.haml_spec.rb
+++ b/spec/views/notifications/show.html.haml_spec.rb
@@ -5,7 +5,7 @@ describe "notifications/show" do
     @member = FactoryGirl.create(:member)
     @notification = FactoryGirl.create(:notification, :recipient => @member)
     assign(:notification, @notification)
-    assign(:reply_link, new_notification_path)
+    @reply_link = assign(:reply_link, new_notification_path)
     controller.stub(:current_user) { @member }
     render
   end
@@ -20,7 +20,7 @@ describe "notifications/show" do
   end
 
   it "includes a reply button" do
-    assert_select "a", "Reply"
+    assert_select "a[href=#{@reply_link}]", "Reply"
   end
 
 end

From 4d372ab8f8588eface93c5b79a481896f4d552fc Mon Sep 17 00:00:00 2001
From: Lilly <lillian.c.ryan@gmail.com>
Date: Thu, 2 May 2013 12:13:28 +1000
Subject: [PATCH 07/35] Added crop wrangling hints to crops form.

---
 app/views/crops/_form.html.haml        | 28 +++++++++++++++++---------
 spec/views/crops/new.html.haml_spec.rb |  5 ++++-
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/app/views/crops/_form.html.haml b/app/views/crops/_form.html.haml
index 12c917702..a225c1a92 100644
--- a/app/views/crops/_form.html.haml
+++ b/app/views/crops/_form.html.haml
@@ -1,4 +1,4 @@
-= form_for @crop do |f|
+= form_for @crop, :html => {:class => 'form-horizontal'} do |f|
   - if @crop.errors.any?
     #error_explanation
       %h3= "#{pluralize(@crop.errors.count, "error")} prohibited this crop from being saved:"
@@ -6,11 +6,21 @@
         - @crop.errors.full_messages.each do |msg|
           %li= msg
 
-  .field
-    = f.label :system_name
-    = f.text_field :system_name
-  .field
-    = f.label :en_wikipedia_url
-    = f.text_field :en_wikipedia_url
-  .actions
-    = f.submit 'Save'
+  %p
+    %span.help-block
+      For detailed crop wrangling guidelines, please consult the
+      =link_to "crop wrangling guide", "http://wiki.growstuff.org/index.php/Crop_wrangling"
+      on the Growstuff wiki.
+
+  .control-group
+    = f.label :system_name, :class => 'control-label'
+    .controls
+      = f.text_field :system_name
+      %span.help-inline Name in US English; singular; capitalize proper nouns only.
+  .control-group
+    = f.label :en_wikipedia_url, 'Wikipedia URL', :class => 'control-label'
+    .controls
+      = f.text_field :en_wikipedia_url
+      %span.help-inline Link to this crop's page on the English language Wikipedia.
+  .form-actions
+    = f.submit 'Save', :class => 'btn btn-primary'
diff --git a/spec/views/crops/new.html.haml_spec.rb b/spec/views/crops/new.html.haml_spec.rb
index 548e0acd3..4016a27a3 100644
--- a/spec/views/crops/new.html.haml_spec.rb
+++ b/spec/views/crops/new.html.haml_spec.rb
@@ -10,7 +10,6 @@ describe "crops/new" do
   end
 
   it "renders new crop form" do
-    render
     # Run the generator again with the --webrat flag if you want to use webrat matchers
     assert_select "form", :action => crops_path, :method => "post" do
       assert_select "input#crop_system_name", :name => "crop[system_name]"
@@ -18,4 +17,8 @@ describe "crops/new" do
     end
   end
 
+  it "shows a link to crop wrangling guidelines" do
+    assert_select "a[href^=http://wiki.growstuff.org]", "crop wrangling guide"
+  end
+
 end

From e5526a32925cfa1daaa74436c4c0cb17291c1272 Mon Sep 17 00:00:00 2001
From: Skud <skud@infotrope.net>
Date: Thu, 2 May 2013 13:27:12 +1000
Subject: [PATCH 08/35] added validation for en_wikipedia_url

---
 app/models/crop.rb       |  6 ++++++
 spec/models/crop_spec.rb | 20 ++++++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/models/crop.rb b/app/models/crop.rb
index 7190e048b..99db0166c 100644
--- a/app/models/crop.rb
+++ b/app/models/crop.rb
@@ -6,6 +6,12 @@ class Crop < ActiveRecord::Base
   has_many :plantings
   default_scope order("lower(system_name) asc")
 
+  validates :en_wikipedia_url,
+    :format => {
+      :with => /^https?:\/\/en\.wikipedia\.org\/wiki/,
+      :message => 'is not a valid English Wikipedia URL'
+    }
+
   def Crop.random
     @crop = Crop.offset(rand(Crop.count)).first
     return @crop
diff --git a/spec/models/crop_spec.rb b/spec/models/crop_spec.rb
index 8e336d2ba..aca3d2681 100644
--- a/spec/models/crop_spec.rb
+++ b/spec/models/crop_spec.rb
@@ -27,22 +27,11 @@ describe Crop do
 
   context 'invalid data' do
     it 'should not save a crop without a system name' do
-      @crop = Crop.new
+      @crop = FactoryGirl.build(:crop, :system_name => nil)
       expect { @crop.save }.to raise_error ActiveRecord::StatementInvalid
     end
   end
 
-  context 'random' do
-    before(:each) do
-      @crop = FactoryGirl.create(:tomato)
-    end
-
-    it 'should find a random crop' do
-      @rand_crop = Crop.random
-      @rand_crop.system_name.should == 'Tomato'
-    end
-  end
-
   context 'ordering' do
     it "should be sorted case-insensitively" do
       uppercase = FactoryGirl.create(:uppercasecrop)
@@ -64,4 +53,11 @@ describe Crop do
     FactoryGirl.create(:planting, :crop => @c)
     @c.plantings_count.should eq 1
   end
+
+  it 'validates en_wikipedia_url' do
+    @crop = FactoryGirl.build(:tomato, :en_wikipedia_url => 'this is not valid')
+    @crop.should_not be_valid
+    @crop = FactoryGirl.build(:tomato, :en_wikipedia_url => 'http://en.wikipedia.org/wiki/SomePage')
+    @crop.should be_valid
+  end
 end

From 2d444423e4459831bc599554292d865995b9d982 Mon Sep 17 00:00:00 2001
From: Skud <skud@infotrope.net>
Date: Tue, 7 May 2013 22:09:48 +1000
Subject: [PATCH 09/35] moved member post feed to HAML

---
 app/views/members/show.html.haml               |  2 +-
 app/views/members/show.rss.builder             | 18 ------------------
 app/views/members/show.rss.haml                | 17 +++++++++++++++++
 ...s.builder_spec.rb => show.rss.haml_spec.rb} |  2 +-
 4 files changed, 19 insertions(+), 20 deletions(-)
 delete mode 100644 app/views/members/show.rss.builder
 create mode 100644 app/views/members/show.rss.haml
 rename spec/views/members/{show.rss.builder_spec.rb => show.rss.haml_spec.rb} (89%)

diff --git a/app/views/members/show.html.haml b/app/views/members/show.html.haml
index 297bac8c7..f84db801b 100644
--- a/app/views/members/show.html.haml
+++ b/app/views/members/show.html.haml
@@ -66,7 +66,7 @@
 
             %div
               :markdown
-                #{g.description}
+                #{ strip_tags g.description }
 
             %h3 What's planted here?
             - g.featured_plantings.each do |p|
diff --git a/app/views/members/show.rss.builder b/app/views/members/show.rss.builder
deleted file mode 100644
index 69a0ebba4..000000000
--- a/app/views/members/show.rss.builder
+++ /dev/null
@@ -1,18 +0,0 @@
-xml.instruct! :xml, :version => "1.0" 
-xml.rss :version => "2.0" do
-  xml.channel do
-    xml.title "#{Growstuff::Application.config.site_name} - #{@member.login_name}'s recent posts"
-    xml.link member_url(@member)
-
-    for post in @posts
-      xml.item do
-        xml.author @member.login_name
-        xml.title post.subject
-        xml.description post.body
-        xml.pubDate post.created_at.to_s(:rfc822)
-        xml.link post_url(post)
-        xml.guid post_url(post)
-      end
-    end
-  end
-end
diff --git a/app/views/members/show.rss.haml b/app/views/members/show.rss.haml
new file mode 100644
index 000000000..f88f44db4
--- /dev/null
+++ b/app/views/members/show.rss.haml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+%feed{:version => "2.0", "xmlns:atom"=>"http://www.w3.org/2005/Atom"}
+  %channel
+    %title #{Growstuff::Application.config.site_name} - #{@member.login_name}'s recent posts
+    %atom:link= member_url(@member)
+    %atom:link{ :type => "application/rss+xml", :href => member_url(@member), :rel  => "self" }
+
+    - @posts.each do |post|
+      %entry
+        %updated post.created_at.to_s(:rfc822)
+        %link{ :href =>  post_url(post) }
+        %guid post_url(post)
+        %author @member.login_name
+        %title post.subject
+        %description
+          :markdown
+            #{ strip_tags post.body }
diff --git a/spec/views/members/show.rss.builder_spec.rb b/spec/views/members/show.rss.haml_spec.rb
similarity index 89%
rename from spec/views/members/show.rss.builder_spec.rb
rename to spec/views/members/show.rss.haml_spec.rb
index 320229e3a..a9a73686a 100644
--- a/spec/views/members/show.rss.builder_spec.rb
+++ b/spec/views/members/show.rss.haml_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'members/show.rss.builder', :type => "view" do
+describe 'members/show.rss.haml', :type => "view" do
   before(:each) do
     @member = assign(:member, FactoryGirl.create(:member))
     assign(:posts, [

From 1348a2a492f1b0cd5e43b58c83cb21764ee7a563 Mon Sep 17 00:00:00 2001
From: Ryan Clark <rclark.sf@gmail.com>
Date: Wed, 8 May 2013 13:13:14 -0700
Subject: [PATCH 10/35] Add validation for name in garden model with test.

---
 app/models/garden.rb       | 2 ++
 spec/models/garden_spec.rb | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/app/models/garden.rb b/app/models/garden.rb
index d8ed4056d..83ce39283 100644
--- a/app/models/garden.rb
+++ b/app/models/garden.rb
@@ -7,6 +7,8 @@ class Garden < ActiveRecord::Base
   has_many :plantings, :order => 'created_at DESC', :dependent => :destroy
   has_many :crops, :through => :plantings
 
+  validates_presence_of :name
+
   default_scope order("lower(name) asc")
 
   def garden_slug
diff --git a/spec/models/garden_spec.rb b/spec/models/garden_spec.rb
index 1523c504b..1def495d2 100644
--- a/spec/models/garden_spec.rb
+++ b/spec/models/garden_spec.rb
@@ -14,6 +14,12 @@ describe Garden do
     @garden.description.should == "This is a **totally** cool garden"
   end
 
+  it "should have a name" do
+    @no_name_garden = FactoryGirl.build(:garden, :name => nil, :description => "New Garden")
+    @no_name_garden.should_not be_valid
+    @no_name_garden.errors[:name].should include("can't be blank")
+  end
+
   it "should have an owner" do
     @garden.owner.should be_an_instance_of Member
   end

From 536cf21e3edf67d1beb1182fea61911addd43e27 Mon Sep 17 00:00:00 2001
From: Skud <skud@infotrope.net>
Date: Thu, 9 May 2013 11:39:22 +1000
Subject: [PATCH 11/35] make it easier to wrangle scientific names

---
 .../scientific_names_controller.rb            |  8 ++--
 app/views/crops/show.html.haml                | 31 ++++++++++-----
 app/views/scientific_names/_form.html.haml    | 26 ++++++++-----
 app/views/scientific_names/edit.html.haml     |  2 +-
 app/views/scientific_names/new.html.haml      |  2 +-
 spec/controllers/crops_controller_spec.rb     |  5 ++-
 .../scientific_names_controller_spec.rb       | 39 +++++++++++++++++--
 spec/factories/scientific_name.rb             |  5 +++
 spec/views/crops/show.html.haml_spec.rb       | 10 ++++-
 .../scientific_names/edit.html.haml_spec.rb   |  2 +-
 .../scientific_names/new.html.haml_spec.rb    |  2 +-
 11 files changed, 100 insertions(+), 32 deletions(-)

diff --git a/app/controllers/scientific_names_controller.rb b/app/controllers/scientific_names_controller.rb
index b54cac6af..691c51872 100644
--- a/app/controllers/scientific_names_controller.rb
+++ b/app/controllers/scientific_names_controller.rb
@@ -26,6 +26,7 @@ class ScientificNamesController < ApplicationController
   # GET /scientific_names/new.json
   def new
     @scientific_name = ScientificName.new
+    @crop = Crop.find_by_id(params[:crop_id]) || Crop.new
 
     respond_to do |format|
       format.html # new.html.haml
@@ -45,7 +46,7 @@ class ScientificNamesController < ApplicationController
 
     respond_to do |format|
       if @scientific_name.save
-        format.html { redirect_to @scientific_name, notice: 'Scientific name was successfully created.' }
+        format.html { redirect_to @scientific_name.crop, notice: 'Scientific name was successfully created.' }
         format.json { render json: @scientific_name, status: :created, location: @scientific_name }
       else
         format.html { render action: "new" }
@@ -61,7 +62,7 @@ class ScientificNamesController < ApplicationController
 
     respond_to do |format|
       if @scientific_name.update_attributes(params[:scientific_name])
-        format.html { redirect_to @scientific_name, notice: 'Scientific name was successfully updated.' }
+        format.html { redirect_to @scientific_name.crop, notice: 'Scientific name was successfully updated.' }
         format.json { head :no_content }
       else
         format.html { render action: "edit" }
@@ -74,10 +75,11 @@ class ScientificNamesController < ApplicationController
   # DELETE /scientific_names/1.json
   def destroy
     @scientific_name = ScientificName.find(params[:id])
+    @crop = @scientific_name.crop
     @scientific_name.destroy
 
     respond_to do |format|
-      format.html { redirect_to scientific_names_url }
+      format.html { redirect_to @crop }
       format.json { head :no_content }
     end
   end
diff --git a/app/views/crops/show.html.haml b/app/views/crops/show.html.haml
index e3364fa15..30612955c 100644
--- a/app/views/crops/show.html.haml
+++ b/app/views/crops/show.html.haml
@@ -9,19 +9,30 @@
       = render :partial => "plantings/thumbnail", :locals => { :planting => p, :title => 'owner' }
 
   .span3
+    - if can? :edit, @crop or can? :destroy, @crop
+      %h4 Crop wrangling
+      %p
+        You are a
+        = succeed "." do
+          %strong CROP WRANGLER
+      %p
+        - if can? :edit, @crop
+          = link_to 'Edit crop', edit_crop_path(@crop), { :class => 'btn btn-mini' }
+        - if can? :destroy, @crop
+          = link_to 'Delete crop', @crop, method: :delete, data: { confirm: 'Are you sure?' }, :class => 'btn btn-mini'
+
     %h4 Scientific names:
     %ul
       - @crop.scientific_names.each do |sn|
-        %li= sn.scientific_name
+        %li
+          = sn.scientific_name
+          - if can? :edit, sn
+            = link_to 'Edit', edit_scientific_name_path(sn), { :class => 'btn btn-mini' }
+          - if can? :destroy, sn
+            = link_to 'Delete', sn, method: :delete, data: { confirm: 'Are you sure?' }, :class => 'btn btn-mini'
+    %p
+    - if can? :edit, @crop
+      = link_to 'Add', new_scientific_name_path( :crop_id => @crop.id ), { :class => 'btn btn-mini' }
     %h4 More information:
     %ul
       %li= link_to 'Wikipedia (English)', @crop.en_wikipedia_url
-
-    - if can? :edit, @crop or can? :destroy, @crop
-      %h4 Crop wrangling:
-      %p
-        - if can? :edit, @crop
-          = link_to 'Edit', edit_crop_path(@crop), { :class => 'btn btn-mini' }
-        - if can? :destroy, @crop
-          = link_to 'Delete', @crop, method: :delete, data: { confirm: 'Are you sure?' }, :class => 'btn btn-mini'
-
diff --git a/app/views/scientific_names/_form.html.haml b/app/views/scientific_names/_form.html.haml
index d2389e58d..503d324a2 100644
--- a/app/views/scientific_names/_form.html.haml
+++ b/app/views/scientific_names/_form.html.haml
@@ -1,4 +1,4 @@
-= form_for @scientific_name do |f|
+= form_for @scientific_name, :html => {:class => 'form-horizontal'} do |f|
   - if @scientific_name.errors.any?
     #error_explanation
       %h2= "#{pluralize(@scientific_name.errors.count, "error")} prohibited this scientific_name from being saved:"
@@ -6,11 +6,19 @@
         - @scientific_name.errors.full_messages.each do |msg|
           %li= msg
 
-  .field
-    = f.label :scientific_name
-    = f.text_field :scientific_name
-  .field
-    = f.label :crop_id
-    = f.number_field :crop_id
-  .actions
-    = f.submit 'Save'
+  %p
+    %span.help-block
+      For detailed crop wrangling guidelines, please consult the
+      =link_to "crop wrangling guide", "http://wiki.growstuff.org/index.php/Crop_wrangling"
+      on the Growstuff wiki.
+
+  .control-group
+    = f.label :crop_id, :class => 'control-label'
+    .controls
+      = collection_select(:scientific_name, :crop_id, Crop.all, :id, :system_name, :selected => @scientific_name.crop_id || @crop.id)
+  .control-group
+    = f.label :scientific_name, :class => 'control-label'
+    .controls
+      = f.text_field :scientific_name
+  .form-actions
+    = f.submit 'Save', :class => 'btn btn-primary'
diff --git a/app/views/scientific_names/edit.html.haml b/app/views/scientific_names/edit.html.haml
index 58d434c3e..493ee3e44 100644
--- a/app/views/scientific_names/edit.html.haml
+++ b/app/views/scientific_names/edit.html.haml
@@ -1,3 +1,3 @@
-%h1 Editing scientific_name
+- content_for :title, "Edit scientific name"
 
 = render 'form'
diff --git a/app/views/scientific_names/new.html.haml b/app/views/scientific_names/new.html.haml
index af8bef174..104a4b5a6 100644
--- a/app/views/scientific_names/new.html.haml
+++ b/app/views/scientific_names/new.html.haml
@@ -1,3 +1,3 @@
-%h1 New scientific_name
+- content_for :title, "New scientific name"
 
 = render 'form'
diff --git a/spec/controllers/crops_controller_spec.rb b/spec/controllers/crops_controller_spec.rb
index ed7b0e0e9..db4c070bc 100644
--- a/spec/controllers/crops_controller_spec.rb
+++ b/spec/controllers/crops_controller_spec.rb
@@ -5,7 +5,10 @@ describe CropsController do
   login_member(:crop_wrangling_member)
 
   def valid_attributes
-     { :system_name => "Tomato" }
+    {
+      :system_name => "Tomato",
+      :en_wikipedia_url => 'http://en.wikipedia.org/wiki/Tomato'
+    }
   end
 
   describe "GET index" do
diff --git a/spec/controllers/scientific_names_controller_spec.rb b/spec/controllers/scientific_names_controller_spec.rb
index dda252d6b..0cf431a4a 100644
--- a/spec/controllers/scientific_names_controller_spec.rb
+++ b/spec/controllers/scientific_names_controller_spec.rb
@@ -4,8 +4,12 @@ describe ScientificNamesController do
 
   login_member(:crop_wrangling_member)
 
+  before(:each) do
+    @crop = FactoryGirl.create(:tomato)
+  end
+
   def valid_attributes
-    { :scientific_name => 'Solanum lycopersicum', :crop_id => 1 }
+    { :scientific_name => 'Solanum lycopersicum', :crop_id => @crop.id }
   end
 
   describe "GET index" do
@@ -29,6 +33,32 @@ describe ScientificNamesController do
       get :new, {}
       assigns(:scientific_name).should be_a_new(ScientificName)
     end
+
+    it "assigns crop if specified" do
+      get :new, { :crop_id => 1 }
+      assigns(:crop).should be_an_instance_of Crop
+    end
+
+    it "assigns crop if specified" do
+    end
+  end
+
+  describe "GET edit" do
+    it "assigns the requested scientific_name as @scientific_name" do
+      scientific_name = ScientificName.create! valid_attributes
+      get :edit, {:id => scientific_name.to_param}
+      assigns(:scientific_name).should eq(scientific_name)
+    end
+  end
+
+  describe "POST create" do
+    describe "with valid params" do
+      it "creates a new ScientificName" do
+        expect {
+          post :create, {:scientific_name => valid_attributes}
+        }.to change(ScientificName, :count).by(1)
+      end
+    end
   end
 
   describe "GET edit" do
@@ -55,7 +85,7 @@ describe ScientificNamesController do
 
       it "redirects to the created scientific_name" do
         post :create, {:scientific_name => valid_attributes}
-        response.should redirect_to(ScientificName.last)
+        response.should redirect_to(ScientificName.last.crop)
       end
     end
 
@@ -97,7 +127,7 @@ describe ScientificNamesController do
       it "redirects to the scientific_name" do
         scientific_name = ScientificName.create! valid_attributes
         put :update, {:id => scientific_name.to_param, :scientific_name => valid_attributes}
-        response.should redirect_to(scientific_name)
+        response.should redirect_to(scientific_name.crop)
       end
     end
 
@@ -130,8 +160,9 @@ describe ScientificNamesController do
 
     it "redirects to the scientific_names list" do
       scientific_name = ScientificName.create! valid_attributes
+      crop = scientific_name.crop
       delete :destroy, {:id => scientific_name.to_param}
-      response.should redirect_to(scientific_names_url)
+      response.should redirect_to(crop)
     end
   end
 
diff --git a/spec/factories/scientific_name.rb b/spec/factories/scientific_name.rb
index 7bb3e4cd9..e1bffb5cd 100644
--- a/spec/factories/scientific_name.rb
+++ b/spec/factories/scientific_name.rb
@@ -1,12 +1,17 @@
 FactoryGirl.define do
   factory :scientific_name do
+    association :crop, factory: :crop
+    scientific_name "Beanus Magicus"
+
     factory :zea_mays do
       association :crop, factory: :maize
       scientific_name "Zea mays"
     end
+
     factory :solanum_lycopersicum do
       association :crop, factory: :tomato
       scientific_name "Solanum lycopersicum"
     end
+
   end
 end
diff --git a/spec/views/crops/show.html.haml_spec.rb b/spec/views/crops/show.html.haml_spec.rb
index 8467e19b9..81099aabd 100644
--- a/spec/views/crops/show.html.haml_spec.rb
+++ b/spec/views/crops/show.html.haml_spec.rb
@@ -54,7 +54,15 @@ describe "crops/show" do
     end
 
     it "links to the edit crop form" do
-      rendered.should contain "Edit"
+      assert_select "a[href=#{edit_crop_path(@crop)}]", :text => "Edit crop"
+    end
+
+    it "links to the add scientific name form" do
+      assert_select "a[href^=#{new_scientific_name_path}]", :text => "Add"
+    end
+
+    it "links to the edit scientific name form" do
+      assert_select "a[href=#{edit_scientific_name_path(@crop.scientific_names.first)}]", :text => "Edit"
     end
   end
 
diff --git a/spec/views/scientific_names/edit.html.haml_spec.rb b/spec/views/scientific_names/edit.html.haml_spec.rb
index bdaa4b6c1..30e195f52 100644
--- a/spec/views/scientific_names/edit.html.haml_spec.rb
+++ b/spec/views/scientific_names/edit.html.haml_spec.rb
@@ -15,7 +15,7 @@ describe "scientific_names/edit" do
     it "renders the edit scientific_name form" do
       assert_select "form", :action => scientific_names_path(@scientific_name), :method => "post" do
         assert_select "input#scientific_name_scientific_name", :name => "scientific_name[scientific_name]"
-        assert_select "input#scientific_name_crop_id", :name => "scientific_name[crop_id]"
+        assert_select "select#scientific_name_crop_id", :name => "scientific_name[crop_id]"
       end
     end
   end
diff --git a/spec/views/scientific_names/new.html.haml_spec.rb b/spec/views/scientific_names/new.html.haml_spec.rb
index 9d4fc93ae..9c892f5ef 100644
--- a/spec/views/scientific_names/new.html.haml_spec.rb
+++ b/spec/views/scientific_names/new.html.haml_spec.rb
@@ -18,7 +18,7 @@ describe "scientific_names/new" do
       # Run the generator again with the --webrat flag if you want to use webrat matchers
       assert_select "form", :action => scientific_names_path, :method => "post" do
         assert_select "input#scientific_name_scientific_name", :name => "scientific_name[scientific_name]"
-        assert_select "input#scientific_name_crop_id", :name => "scientific_name[crop_id]"
+        assert_select "select#scientific_name_crop_id", :name => "scientific_name[crop_id]"
       end
     end
 

From 14021a4fae787ce944c00b51cc2666d288e52286 Mon Sep 17 00:00:00 2001
From: Lilly <lillian.c.ryan@gmail.com>
Date: Thu, 9 May 2013 13:39:31 +1000
Subject: [PATCH 12/35] Redirect to Garden after deleting planting

---
 app/controllers/plantings_controller.rb       |  3 ++-
 db/schema.rb                                  | 22 +------------------
 spec/controllers/plantings_controller_spec.rb |  5 +++--
 3 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/app/controllers/plantings_controller.rb b/app/controllers/plantings_controller.rb
index 98f038870..ff9ebe886 100644
--- a/app/controllers/plantings_controller.rb
+++ b/app/controllers/plantings_controller.rb
@@ -85,10 +85,11 @@ class PlantingsController < ApplicationController
   # DELETE /plantings/1.json
   def destroy
     @planting = Planting.find(params[:id])
+    @garden = @planting.garden
     @planting.destroy
 
     respond_to do |format|
-      format.html { redirect_to plantings_url }
+      format.html { redirect_to @garden }
       format.json { head :no_content }
     end
   end
diff --git a/db/schema.rb b/db/schema.rb
index 090be1b27..4c82164fe 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130508050711) do
+ActiveRecord::Schema.define(:version => 20130418102558) do
 
   create_table "authentications", :force => true do |t|
     t.integer  "member_id",  :null => false
@@ -120,18 +120,6 @@ ActiveRecord::Schema.define(:version => 20130508050711) do
     t.datetime "updated_at",                      :null => false
   end
 
-  create_table "orders", :force => true do |t|
-    t.string   "member_id",    :null => false
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-    t.datetime "completed_at"
-  end
-
-  create_table "orders_products", :id => false, :force => true do |t|
-    t.integer "order_id"
-    t.integer "product_id"
-  end
-
   create_table "payments", :force => true do |t|
     t.integer  "payer_id"
     t.string   "payment_type"
@@ -167,14 +155,6 @@ ActiveRecord::Schema.define(:version => 20130508050711) do
   add_index "posts", ["created_at", "author_id"], :name => "index_updates_on_created_at_and_user_id"
   add_index "posts", ["slug"], :name => "index_updates_on_slug", :unique => true
 
-  create_table "products", :force => true do |t|
-    t.string   "name",        :null => false
-    t.string   "description", :null => false
-    t.decimal  "min_price",   :null => false
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
   create_table "roles", :force => true do |t|
     t.string   "name",        :null => false
     t.text     "description"
diff --git a/spec/controllers/plantings_controller_spec.rb b/spec/controllers/plantings_controller_spec.rb
index 77f9c519a..ff3fc9e36 100644
--- a/spec/controllers/plantings_controller_spec.rb
+++ b/spec/controllers/plantings_controller_spec.rb
@@ -161,10 +161,11 @@ describe PlantingsController do
       }.to change(Planting, :count).by(-1)
     end
 
-    it "redirects to the plantings list" do
+    it "redirects to the garden" do
       planting = Planting.create! valid_attributes
+      garden = planting.garden
       delete :destroy, {:id => planting.to_param}
-      response.should redirect_to(plantings_url)
+      response.should redirect_to(garden)
     end
   end
 

From ee136666d5f816ea100186957e2f5fa0cd7c555b Mon Sep 17 00:00:00 2001
From: Ryan Clark <rclark.sf@gmail.com>
Date: Thu, 9 May 2013 13:06:29 -0700
Subject: [PATCH 13/35] Replace name validation with before_filter and add rake
 tast for empty names. Replace validation testing with before_filter tests.

---
 Pathogen:                  |  1 +
 app/models/garden.rb       |  8 +++++++-
 lib/tasks/growstuff.rake   | 12 ++++++++++++
 spec/models/garden_spec.rb | 15 ++++++++++++---
 4 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 Pathogen:

diff --git a/Pathogen: b/Pathogen:
new file mode 100644
index 000000000..a5b3293af
--- /dev/null
+++ b/Pathogen:
@@ -0,0 +1 @@
+clean up extra line in garden_spec.
diff --git a/app/models/garden.rb b/app/models/garden.rb
index 83ce39283..029502a5a 100644
--- a/app/models/garden.rb
+++ b/app/models/garden.rb
@@ -7,7 +7,7 @@ class Garden < ActiveRecord::Base
   has_many :plantings, :order => 'created_at DESC', :dependent => :destroy
   has_many :crops, :through => :plantings
 
-  validates_presence_of :name
+  before_create :replace_blank_name
 
   default_scope order("lower(name) asc")
 
@@ -31,6 +31,12 @@ class Garden < ActiveRecord::Base
     return unique_plantings[0..3]
   end
 
+  def replace_blank_name
+    if self.name.nil? or self.name =~ /^\s*$/
+      self.name = "(no name)"
+    end
+  end
+
   def to_s
     name
   end
diff --git a/lib/tasks/growstuff.rake b/lib/tasks/growstuff.rake
index e75887bd8..15cdb61a6 100644
--- a/lib/tasks/growstuff.rake
+++ b/lib/tasks/growstuff.rake
@@ -26,6 +26,18 @@ namespace :growstuff do
       end
     end
 
+    task :empty_names => :environment do
+      desc "May 2013: replace any empty garden names with (no subject)"
+
+      # this is inefficient as it checks every Garden, but the
+      # site is small and there aren't many of them, so it shouldn't matter
+      # for this one-off script.
+      Garden.all.each do |n|
+        n.replace_blank_name
+        n.save
+      end
+    end
+
   end
 
 end
diff --git a/spec/models/garden_spec.rb b/spec/models/garden_spec.rb
index 1def495d2..d4d36636b 100644
--- a/spec/models/garden_spec.rb
+++ b/spec/models/garden_spec.rb
@@ -15,9 +15,8 @@ describe Garden do
   end
 
   it "should have a name" do
-    @no_name_garden = FactoryGirl.build(:garden, :name => nil, :description => "New Garden")
-    @no_name_garden.should_not be_valid
-    @no_name_garden.errors[:name].should include("can't be blank")
+    @no_name_garden = FactoryGirl.create(:garden, :name => nil, :description => "New Garden")
+    @no_name_garden.name.should_not be_blank
   end
 
   it "should have an owner" do
@@ -87,4 +86,14 @@ describe Garden do
     Planting.count.should == all - 2
   end
 
+  it "replaces missing name with (no name)" do
+    @no_name_garden = FactoryGirl.create(:garden, :name => nil)
+    @no_name_garden.name.should == "(no name)"
+  end
+
+  it "replaces whitespace-only names with (no name)" do
+    @no_name_garden = FactoryGirl.create(:garden, :name => "    ")
+    @no_name_garden.name.should == "(no name)"
+  end
+
 end

From 5d03ffdf87a3df8bd70fa4eaf923b2537090f014 Mon Sep 17 00:00:00 2001
From: Ryan Clark <rclark.sf@gmail.com>
Date: Mon, 13 May 2013 17:28:37 -0700
Subject: [PATCH 14/35] Added validation for garden names.

---
 app/models/garden.rb       |  7 ++++++-
 spec/models/garden_spec.rb | 26 +++++++++++++-------------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/app/models/garden.rb b/app/models/garden.rb
index 029502a5a..a2bd553e7 100644
--- a/app/models/garden.rb
+++ b/app/models/garden.rb
@@ -7,10 +7,15 @@ class Garden < ActiveRecord::Base
   has_many :plantings, :order => 'created_at DESC', :dependent => :destroy
   has_many :crops, :through => :plantings
 
-  before_create :replace_blank_name
+  # before_create :replace_blank_name
 
   default_scope order("lower(name) asc")
 
+  validates :name,
+    :format => {
+      :with => /\S/
+    }
+
   def garden_slug
     "#{owner.login_name}-#{name}".downcase.gsub(' ', '-')
   end
diff --git a/spec/models/garden_spec.rb b/spec/models/garden_spec.rb
index d4d36636b..cbbf3a950 100644
--- a/spec/models/garden_spec.rb
+++ b/spec/models/garden_spec.rb
@@ -14,9 +14,19 @@ describe Garden do
     @garden.description.should == "This is a **totally** cool garden"
   end
 
-  it "should have a name" do
-    @no_name_garden = FactoryGirl.create(:garden, :name => nil, :description => "New Garden")
-    @no_name_garden.name.should_not be_blank
+  it "doesn't allow a nil name" do
+    @garden = FactoryGirl.build(:garden, :name => nil)
+    @garden.should_not be_valid
+  end
+
+  it "doesn't allow a blank name" do
+    @garden = FactoryGirl.build(:garden, :name => "")
+    @garden.should_not be_valid
+  end
+  
+  it "doesn't allow a name with only spaces" do
+    @garden = FactoryGirl.build(:garden, :name => "    ")
+    @garden.should_not be_valid
   end
 
   it "should have an owner" do
@@ -86,14 +96,4 @@ describe Garden do
     Planting.count.should == all - 2
   end
 
-  it "replaces missing name with (no name)" do
-    @no_name_garden = FactoryGirl.create(:garden, :name => nil)
-    @no_name_garden.name.should == "(no name)"
-  end
-
-  it "replaces whitespace-only names with (no name)" do
-    @no_name_garden = FactoryGirl.create(:garden, :name => "    ")
-    @no_name_garden.name.should == "(no name)"
-  end
-
 end

From 95a2007683c2bf53ee035862b4ab7314261e1993 Mon Sep 17 00:00:00 2001
From: Ryan Clark <rclark.sf@gmail.com>
Date: Mon, 13 May 2013 17:36:37 -0700
Subject: [PATCH 15/35] fix up existing gardens with blank names.

---
 .gitignore               |  1 +
 Pathogen:                |  1 -
 app/models/garden.rb     |  6 ------
 lib/tasks/growstuff.rake | 12 +++++++-----
 4 files changed, 8 insertions(+), 12 deletions(-)
 delete mode 100644 Pathogen:

diff --git a/.gitignore b/.gitignore
index ead788319..5b8787714 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 *~
 *.DS_Store
 credentials.sh
+Pathogen:
\ No newline at end of file
diff --git a/Pathogen: b/Pathogen:
deleted file mode 100644
index a5b3293af..000000000
--- a/Pathogen:
+++ /dev/null
@@ -1 +0,0 @@
-clean up extra line in garden_spec.
diff --git a/app/models/garden.rb b/app/models/garden.rb
index a2bd553e7..13d8927c6 100644
--- a/app/models/garden.rb
+++ b/app/models/garden.rb
@@ -36,12 +36,6 @@ class Garden < ActiveRecord::Base
     return unique_plantings[0..3]
   end
 
-  def replace_blank_name
-    if self.name.nil? or self.name =~ /^\s*$/
-      self.name = "(no name)"
-    end
-  end
-
   def to_s
     name
   end
diff --git a/lib/tasks/growstuff.rake b/lib/tasks/growstuff.rake
index 15cdb61a6..fb87ea319 100644
--- a/lib/tasks/growstuff.rake
+++ b/lib/tasks/growstuff.rake
@@ -26,15 +26,17 @@ namespace :growstuff do
       end
     end
 
-    task :empty_names => :environment do
-      desc "May 2013: replace any empty garden names with (no subject)"
+    task :empty_garden_names => :environment do
+      desc "May 2013: replace any empty garden names with Garden"
 
       # this is inefficient as it checks every Garden, but the
       # site is small and there aren't many of them, so it shouldn't matter
       # for this one-off script.
-      Garden.all.each do |n|
-        n.replace_blank_name
-        n.save
+      Garden.all.each do |g|
+        if g.name.nil? or g.name =~ /^\s*$/
+          g.name = "Garden"
+          g.save
+        end
       end
     end
 

From c227c1179491a6ca950cda71b16a5b4cbeca4221 Mon Sep 17 00:00:00 2001
From: Skud <skud@infotrope.net>
Date: Tue, 14 May 2013 22:33:55 +1000
Subject: [PATCH 16/35] Added flickr icon, updated twitter icon

---
 Gemfile                                       |   1 -
 Gemfile.lock                                  |   2 --
 app/assets/images/flickr_32.png               | Bin 0 -> 2528 bytes
 app/assets/images/twitter_32.png              | Bin 0 -> 1561 bytes
 app/views/devise/registrations/edit.html.haml |   1 +
 app/views/members/show.html.haml              |   2 +-
 6 files changed, 2 insertions(+), 4 deletions(-)
 create mode 100644 app/assets/images/flickr_32.png
 create mode 100644 app/assets/images/twitter_32.png

diff --git a/Gemfile b/Gemfile
index 3f4318236..3802d0dde 100644
--- a/Gemfile
+++ b/Gemfile
@@ -79,7 +79,6 @@ gem 'bootstrap-datepicker-rails'
 gem 'omniauth'
 gem 'omniauth-twitter'
 gem 'omniauth-flickr'
-gem 'authbuttons-rails'
 
 # for phusion passenger (i.e. mod_rails) on the server
 gem 'passenger'
diff --git a/Gemfile.lock b/Gemfile.lock
index 35ab7f28b..6493ad58b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -29,7 +29,6 @@ GEM
       i18n (= 0.6.1)
       multi_json (~> 1.0)
     arel (3.0.2)
-    authbuttons-rails (0.1.2)
     bcrypt-ruby (3.0.1)
     bluecloth (2.2.0)
     bootstrap-datepicker-rails (1.0.0)
@@ -233,7 +232,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  authbuttons-rails
   bluecloth
   bootstrap-datepicker-rails
   bundler (>= 1.1.5)
diff --git a/app/assets/images/flickr_32.png b/app/assets/images/flickr_32.png
new file mode 100644
index 0000000000000000000000000000000000000000..82a350e221f874956e6a69f0c8ea28ce9f94ca73
GIT binary patch
literal 2528
zcmcIlc~nzp7LTHqNyS0b7f@z+#Ckwl$Od8}L6Lw$Wf3Ba)=Eeo5Fv|6Ff0yB0R@q<
zpr}|yDywA^Sp*aaf)<r!utHl%*fD{y?~6iT0MYi$nfc3m?)$#??zz9;z2EP<CyBDR
zJ*0x%jzl03DprRn4)6{t9%UtXrKDVZ25(CIgH}{!W#!gRyAJsCZ`{MKd<5ciHN~^$
zl_cmb9Mlw8xCk6M9s(ha2O-QD9Crw`Wbz;(hv&@)%^e9hnk^NS+Z1``JcuS>a@Zi1
z$$}7gV+;X<CCai=E+G)>HY*ZbY>trV9F_r1!DHaZ;v!7;`*CS>Z%6>TL!L}F84ZFU
z8e}raXlElEtPR&3@?sti;6aW7wp4n6H=W2p?>9x7_>o{R3lh*kKb8-hPx2$9mpDoA
zyCRH1gG(s_Z!&thX%`!N(451AKtltZJ{?Oi1P%8X;EnM_<2_%2jx+&iO=E+2V-SzU
z!V8{+!;uVea5GDWHbug_36J4Ha-dkQ)P%ptXfJ_)OTu7;LZN|>V8G#dVsJzv5rf5J
z@OXVVL!a-@7SR0k+5DZ$B=31B5TDLta+l;%@Y38lz5+5Dtthl=D~F?TR|~QEE8@X2
zV*F@a49)<HS!ITSCUB6nbP*gLmBaBd{V#WBqCoyB=|j~Ic!)w1K&G%BM13qlA8$;>
z8IkaNNd(;SkMPS$e}UU@7)%fUkKi!FUMikI!VyT=_wbLBR^TQWg%BSJv!uG>On-@k
z|3@$eeN`{6FVAP`S{QT;<O8uFwtx?7hWoQ-3_8h!!(-6|rc4&i6T)!Wo+g+N!T;Ic
za@X)!z+;J7oy+&FuU_RRdHJCGC!t>^{gg#gRktl75Ni+EAE8>nzam*#Sx=WNH8nLY
zEiFAgy{xQEBobAMM4KFvH#wxJQZrPYvedqPtahqwi%ZT{*W9h1wOc*wP|SLDMzuQh
zOr6!NaWY@yWWkP84|li~@8Gunllz+%U!o=G0ME2&dpyzhsn=%zqAln^3wys{{`>{A
zW>-MJj`wpN-tRiXE*<|jyMspb0{hAQ0!l!+ZTQP$mzwzrHT;{;FJyNnCnu+*q@<?8
zzS3SsM#jB+_kMz{{MXFPOt}9n(eF7qIk~yH_wV0-@Zdo~K|x_*VNp@hLlmtT_Tu6a
z6jV}DQd(O2sG;xi<Huzv&vF#Ayu7>ub-JRWLWJTd&I@p!0K6y7V^sjJiV|E^RaI>f
zQUe4$hu!?b3yY|iKyWSWC{}H4Z5<F=hho>)*EcjYG@^VPE#n#w#WkM&v9Yo773%CO
z;oW8+xY;711qf|vX=!bRy;TfEiBY~{l%H7KDi(_+C_hP7wIsVrB9XMA&bDPgZEI_5
z4=iX8ENstx+TPX<TSrGnXJ=<uS64R>+6{ztcX#)o&h_;4^gd|l?d_EUAyVMH6o{6h
zLZniu3<#6SWPLzPUteE85Z>S4F9%}fs0evslUyzz7#J7?q6Xm=wxPkHp`l?QW_Wmb
z1c(_K85tcN9UB`P2ja$oE92v1<KyEK6BCn@uuo1+O-)Zv&&<rs&d$!w&CSoxzkU1m
z-Me=S3k!>ji$MYB;lD2gQs7|gi1_~dSQrUg;J`x_c)}i8QOv078tW_VGUJbJ6?L|M
z8#p+gC`VVy@0^H=>R^Fp8VUK4x173@HmKa3h`EVu)RFBBS2}toF3AHKP!a*P{URxo
z-YT1FA={xb<;v@wHDl~GeeJnHZ1QvCJKyMPn^_-F4i67shfNgE9et6G+7*x-NTG1_
zBikbD!NF4}dNBK=d(15(b?kPhc5263jvWqjT=Z&?5R#?ZiR5W9fxeOCj}>@blAXN0
zjy!2=-HARiC~%7n#~DX8zlj8Fj#rD_uX))Vk9!?|v?%Z70Usmlt4Tf@c@etwaPP~m
z9<1W2oE+`VwY8!w`?!q^xm?*bI{Y(l)y<pFM7bRL)okLq(p>Fp&$NW7m^njtb1N&l
z<`rW3?A)2sb90Z3O5#7WJC!E+QfmCtH~&ZG)lseeCRd?=xgOd4z3clLrcGVSiwlE&
z|DoCvc(SIhJ#Ax4@M2%)-gBdE2Hz0pWv^Z1V+}Q>UU>-JADn;ao82d^8EJ0JFZ1U)
zYgE6v46SvW^-Pfa)*-GBQKCYN8uwiJN)4g^Z~j>&u(v2d4c*xpxKnzIe~n*qJIE;w
zAJ4nL@8<yn?GsFt`PaL5U5;+eTjZr)u??;$HKC}J-0SLN!j3tK8^kxHPZtIW!(+1E
zAUlJUa|?6c#O-&qD%z^+=i5yauMgIJeZlVU6UT`)nX>~d8&<?*pw_?2s^0d{etWUW
zHfUzUV);z;w#YBnXL9|#sF@q6n{dt|#G1?vh%To*q{lH_zV*vjl|O|xl_odosk;?A
z;AA&5EF+Lq&7_0hA-Ac9o<5(j=I*n*+i!_3T?}1oX{5Jj$F|nvPm|o^k6g<mS>4ui
zk*vwLUM~_ch{BTjj=?Qy8*V7Mg*b<tJ3YKWW=*#?eXfGc{*SJTt|2lzD`>W9%kJQT
n{)=H<{Vf+tEkk(eF^g+@^b*;X9tC1}xDi$swv?QMZr}X@_o@%6

literal 0
HcmV?d00001

diff --git a/app/assets/images/twitter_32.png b/app/assets/images/twitter_32.png
new file mode 100644
index 0000000000000000000000000000000000000000..550232344362bdced8c0991dbd374edc57e53f61
GIT binary patch
literal 1561
zcmV+!2Il#RP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%yGcYrRCwCFS4(VERT%!xote(ihqWz*
zJ}3}g3L*#ugSs$LF~ktvuyKW9p%`^xVuT$rN|d<J1#UF)vGJXtq6rE_R)7){sH9_u
ziXar|w3K$}YdUk!?|;rc=iYOtg-{ng$(b|f^*_G<asDfy+7r7T;NO?HFT?D#9_}CD
z$iCCUFn{ma9nY*>aqr@}>8fPHmvY)$3D1Mts~kNcAc<mUZgsC%D*L(Yg@G?V{yxiF
zuPOmP+V<SjTbHg})RHZfW<~wg^%>;4{=W9@rw4ybD%d-gv^94PPdY~gK*13Fad!l-
z&~3<z@Q&bt#MGU$L*rPwq`g`3PHGmOmmu<kZJOq0xX#Q;>M;~dofG67p>U0?{IPkU
zfJmkiYN`b&F->Xgrb!dDp7y@5mn;`!Z!(940|=2Lu)Xh26eYelUh)wNFh0q)mzt{{
zAS^L6A&L}1v?qcsUJq9dcp@}`rfDU!sPe$h7zt1!<;5~&WHq)#DU!%pMWne!M0tqj
zBO_0cRv{5i)bSE|4g$qVHh~B)O?5J=a4&Z?Xb;b?#hS)y{r`C12s#JHVkSjQbj8zm
z5#VLUUWSK+<GD12p+&?B^hirB_N;H$Ygb2#_%(MGrLjpQGHEAngvChTnJ_-5aTqI>
zbfS<fgcd~lJgP47?xuy<vta=?&8y`zyyr{pu<DE&YuJ}xThkf}*;<>%-bYv9$%PH(
zoDA;i^Q8GGy2Y}KfQqcZRboIXxla#_Vf#JJtYsapjZWgTTt5!|d&B5M*tx0|wLwIM
ztuCF!?v0BePn^e*{MeM7LhNI{VWbfVw5CvE=^IVCe|;{GbAzM$a7#@UcCBm2=Z`Pf
zHm~*swy>tRYOk#CKyrLSJGhh)P02Z@9E*Zd2?^FhNoMV3HJqQxV0mLrjIe_FtxbzV
z!EV*+(kVRDm_}DwVBNfW9J+YjNpKV)V6`USj(%vf?!ghf$xu$$Dg~Raz47Gz_~xnA
zAh!8LVMHU~EB|s$AcUtG`qpWPVrJ+m6mfI1{J$Tczw!mFu4ROM>x9IpJ0_6f^GRXe
zAjctl3**Q!+#6czXUzO4hvau>FX4|X!#dm(b26HTbi<I0gIELthanv<Y8;*@;f0^G
z*mo>DV*%bi(urdiu46n^g;X7fGV@WU_JkLALXV3DauR0j@inhqUV1ZPexUOrF0&6+
zx6Oy}l0l-QAWaM7jG+&N_UHcm+68E-PKC+FqR~BY6Q_D_+!6EMp)u?|bOs(nuA)jB
z+iRr#Anap4pdTasm=KO$=*Nd!?&Am;W!ncieMM6Z9$VCON6aq|jpD^GkE6hjn`y3(
ze2fgLjA+TMMFL1NxtfseAHlY-e#iTpS7GP+g)@TvaJCn(ANUP7%M$6vhJd0^&N~nk
zG~^1P?4ZNLd4LK$?)d3XZ0)GW_Ki!hs<q*^jDN{q#wRDbaq^!$l9@TEYPy>Vds?~Z
z6(!?j1g?D}0k|GRQBwH&Tjx_*>)@qf9OyodmXyGQ9Zgu!P!r2!T~~*2@_Zi(94U!R
z719k2@X}S9hPAVZJ@G-7McK&%B9;r_91px-a60be*$*s??CIB;(rsR*8tJ=IT4U0*
zC{``FGhuU$=eYuq5kSPsSN9zc);(sHsVGJ49Wo_cSRhr@&mvY`d2pftD);N+GO&>j
z2x|sS*s`JMWfc}6a)6alRZk+k<CH~VPVwNyolwPSWt}HQG?$JZ(pK&i*R8UcB}-7k
zl=2aH$%G>SS3hMIAQ{x|rqnebC$ZPlpy8HfQF&fjEK>YYvELIKP8P1@m#y+WL%sd^
zwmDvaf=)`%CL!BZh?0aUoTGKqbtz}h>2S7lQ{w4r+RXWWTgJm+Z(m;VRtW6Ro$6c$
zu?FpJbK7R)+pz!2z!m11Q@n-#z}UQdEl*ya<<Il|boiY!{|PVvnB3A+Eamek00000
LNkvXXu0mjfJW=;;

literal 0
HcmV?d00001

diff --git a/app/views/devise/registrations/edit.html.haml b/app/views/devise/registrations/edit.html.haml
index d8a36e1ce..14733b9a6 100644
--- a/app/views/devise/registrations/edit.html.haml
+++ b/app/views/devise/registrations/edit.html.haml
@@ -53,6 +53,7 @@
         - else
           =link_to 'Connect to Twitter', '/auth/twitter'
       %p
+        = image_tag "flickr_32.png", :size => "32x32", :alt => 'Flickr logo'
         - if @flickr_auth
           You are connected to Flickr as
           = succeed "." do
diff --git a/app/views/members/show.html.haml b/app/views/members/show.html.haml
index 44ec0aa5f..90e2a698c 100644
--- a/app/views/members/show.html.haml
+++ b/app/views/members/show.html.haml
@@ -25,7 +25,7 @@
 
       - if @flickr_auth
         %p
-          Flickr:
+          = image_tag "flickr_32.png", :size => "32x32", :alt => 'Flickr logo'
           =link_to @flickr_auth.name, "http://flickr.com/photos/#{@flickr_auth.uid}"
 
       - if @member.show_email

From ebd2446a3307f85b9036b3b269f06c515db6d3e0 Mon Sep 17 00:00:00 2001
From: Skud <skud@infotrope.net>
Date: Tue, 14 May 2013 23:24:06 +1000
Subject: [PATCH 17/35] added crop hierarchy basics

---
 app/models/crop.rb                            |  7 +++-
 app/views/crops/_form.html.haml               |  5 +++
 app/views/crops/show.html.haml                | 13 +++++++
 .../20130514124515_add_parent_to_crop.rb      |  5 +++
 db/schema.rb                                  | 36 ++++++++++++++++++-
 spec/factories/crop.rb                        | 10 ++++++
 spec/models/crop_spec.rb                      |  9 +++++
 spec/views/crops/new.html.haml_spec.rb        |  1 +
 spec/views/crops/show.html.haml_spec.rb       | 19 ++++++++++
 9 files changed, 103 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20130514124515_add_parent_to_crop.rb

diff --git a/app/models/crop.rb b/app/models/crop.rb
index 99db0166c..105afe0b5 100644
--- a/app/models/crop.rb
+++ b/app/models/crop.rb
@@ -1,9 +1,14 @@
 class Crop < ActiveRecord::Base
   extend FriendlyId
   friendly_id :system_name, use: :slugged
-  attr_accessible :en_wikipedia_url, :system_name
+  attr_accessible :en_wikipedia_url, :system_name, :parent_id
+
   has_many :scientific_names
   has_many :plantings
+
+  belongs_to :parent, :class_name => 'Crop'
+  has_many :varieties, :class_name => 'Crop', :foreign_key => 'parent_id'
+
   default_scope order("lower(system_name) asc")
 
   validates :en_wikipedia_url,
diff --git a/app/views/crops/_form.html.haml b/app/views/crops/_form.html.haml
index a225c1a92..2b75de0b6 100644
--- a/app/views/crops/_form.html.haml
+++ b/app/views/crops/_form.html.haml
@@ -22,5 +22,10 @@
     .controls
       = f.text_field :en_wikipedia_url
       %span.help-inline Link to this crop's page on the English language Wikipedia.
+  .control-group
+    = f.label :parent_id, 'Parent crop', :class => 'control-label'
+    .controls
+      = collection_select(:crop, :parent_id, Crop.all, :id, :system_name, {:include_blank => true})
+      %span.help-inline Optional. For setting up crop hierarchies for varieties etc.
   .form-actions
     = f.submit 'Save', :class => 'btn btn-primary'
diff --git a/app/views/crops/show.html.haml b/app/views/crops/show.html.haml
index 8756bea56..f9a08a076 100644
--- a/app/views/crops/show.html.haml
+++ b/app/views/crops/show.html.haml
@@ -2,6 +2,19 @@
 
 .row
   .span9
+    - if @crop.parent
+      %p
+        = @crop.system_name 
+        is a variety of
+        = succeed "." do
+          = link_to @crop.parent, @crop.parent
+    - if @crop.varieties.count > 0
+      %p
+        Varieties of
+        = succeed ":" do
+          = @crop.system_name
+        != @crop.varieties.map{ |c| link_to c, c }.join(", ")
+
     - if @crop.plantings_count > 0
       %p
         Planted
diff --git a/db/migrate/20130514124515_add_parent_to_crop.rb b/db/migrate/20130514124515_add_parent_to_crop.rb
new file mode 100644
index 000000000..8a6019808
--- /dev/null
+++ b/db/migrate/20130514124515_add_parent_to_crop.rb
@@ -0,0 +1,5 @@
+class AddParentToCrop < ActiveRecord::Migration
+  def change
+    add_column :crops, :parent_id, :integer
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 4c82164fe..024a15b7a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130418102558) do
+ActiveRecord::Schema.define(:version => 20130514124515) do
 
   create_table "authentications", :force => true do |t|
     t.integer  "member_id",  :null => false
@@ -40,6 +40,7 @@ ActiveRecord::Schema.define(:version => 20130418102558) do
     t.datetime "created_at",       :null => false
     t.datetime "updated_at",       :null => false
     t.string   "slug"
+    t.integer  "parent_id"
   end
 
   add_index "crops", ["slug"], :name => "index_crops_on_slug", :unique => true
@@ -120,6 +121,18 @@ ActiveRecord::Schema.define(:version => 20130418102558) do
     t.datetime "updated_at",                      :null => false
   end
 
+  create_table "orders", :force => true do |t|
+    t.string   "member_id",    :null => false
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+    t.datetime "completed_at"
+  end
+
+  create_table "orders_products", :id => false, :force => true do |t|
+    t.integer "order_id"
+    t.integer "product_id"
+  end
+
   create_table "payments", :force => true do |t|
     t.integer  "payer_id"
     t.string   "payment_type"
@@ -128,6 +141,19 @@ ActiveRecord::Schema.define(:version => 20130418102558) do
     t.datetime "updated_at",   :null => false
   end
 
+  create_table "photos", :force => true do |t|
+    t.integer  "owner_id",        :null => false
+    t.integer  "flickr_photo_id", :null => false
+    t.string   "thumbnail_url",   :null => false
+    t.string   "fullsize_url",    :null => false
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+    t.string   "title",           :null => false
+    t.string   "license_name",    :null => false
+    t.string   "license_url"
+    t.string   "link_url",        :null => false
+  end
+
   create_table "plantings", :force => true do |t|
     t.integer  "garden_id",   :null => false
     t.integer  "crop_id",     :null => false
@@ -155,6 +181,14 @@ ActiveRecord::Schema.define(:version => 20130418102558) do
   add_index "posts", ["created_at", "author_id"], :name => "index_updates_on_created_at_and_user_id"
   add_index "posts", ["slug"], :name => "index_updates_on_slug", :unique => true
 
+  create_table "products", :force => true do |t|
+    t.string   "name",        :null => false
+    t.string   "description", :null => false
+    t.decimal  "min_price",   :null => false
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
   create_table "roles", :force => true do |t|
     t.string   "name",        :null => false
     t.text     "description"
diff --git a/spec/factories/crop.rb b/spec/factories/crop.rb
index 4ae2367d0..76fd31433 100644
--- a/spec/factories/crop.rb
+++ b/spec/factories/crop.rb
@@ -30,6 +30,16 @@ FactoryGirl.define do
       system_name "Pear"
     end
 
+    # for testing varieties
+    factory :roma do
+      system_name "Roma tomato"
+    end
+
+    factory :popcorn do
+      system_name "popcorn"
+    end
+
+
     # This should have a name that is alphabetically earlier than :uppercase
     # crop to ensure that the ordering tests work.
     factory :lowercasecrop do
diff --git a/spec/models/crop_spec.rb b/spec/models/crop_spec.rb
index aca3d2681..bea69ed01 100644
--- a/spec/models/crop_spec.rb
+++ b/spec/models/crop_spec.rb
@@ -60,4 +60,13 @@ describe Crop do
     @crop = FactoryGirl.build(:tomato, :en_wikipedia_url => 'http://en.wikipedia.org/wiki/SomePage')
     @crop.should be_valid
   end
+
+  context 'varieties' do
+    it 'has a crop hierarchy' do
+      @tomato = FactoryGirl.create(:tomato)
+      @roma = FactoryGirl.create(:roma, :parent_id => @tomato.id)
+      @roma.parent.should eq @tomato
+      @tomato.varieties.should eq [@roma]
+    end
+  end
 end
diff --git a/spec/views/crops/new.html.haml_spec.rb b/spec/views/crops/new.html.haml_spec.rb
index 4016a27a3..73e22dacc 100644
--- a/spec/views/crops/new.html.haml_spec.rb
+++ b/spec/views/crops/new.html.haml_spec.rb
@@ -14,6 +14,7 @@ describe "crops/new" do
     assert_select "form", :action => crops_path, :method => "post" do
       assert_select "input#crop_system_name", :name => "crop[system_name]"
       assert_select "input#crop_en_wikipedia_url", :name => "crop[en_wikipedia_url]"
+      assert_select "select#crop_parent_id", :name => "crop[parent_id]"
     end
   end
 
diff --git a/spec/views/crops/show.html.haml_spec.rb b/spec/views/crops/show.html.haml_spec.rb
index 81099aabd..0b34be50e 100644
--- a/spec/views/crops/show.html.haml_spec.rb
+++ b/spec/views/crops/show.html.haml_spec.rb
@@ -44,6 +44,25 @@ describe "crops/show" do
     rendered.should contain "Springfield Community Garden"
   end
 
+  context 'varieties' do
+    before(:each) do
+      @popcorn = FactoryGirl.create(:popcorn, :parent_id => @crop.id)
+      @ubercrop = FactoryGirl.create(:crop, :system_name => 'ubercrop')
+      @crop.parent_id = @ubercrop.id
+      @crop.save
+      render
+    end
+
+    it 'shows popcorn as a child variety' do
+      rendered.should contain @popcorn.system_name
+    end
+
+    it 'shows parent crop' do
+      rendered.should contain @ubercrop.system_name
+    end
+
+  end
+
   context "logged in and crop wrangler" do
 
     before(:each) do

From bc400a14834f8a5b56435de539ccf23f17d4fde9 Mon Sep 17 00:00:00 2001
From: Miles Gould <miles@assyrian.org.uk>
Date: Wed, 15 May 2013 12:58:41 +0100
Subject: [PATCH 18/35] Stop Rake from telling us every spec it's about to run.

As per
https://github.com/rspec/rspec-core/issues/266#issuecomment-1866898
---
 lib/tasks/testing.rake | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/tasks/testing.rake b/lib/tasks/testing.rake
index 033245928..cb58df2c9 100644
--- a/lib/tasks/testing.rake
+++ b/lib/tasks/testing.rake
@@ -1,5 +1,9 @@
 require 'rake'
 begin
   require 'rspec/core/rake_task'
+  task(:spec).clear
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    t.verbose = false
+  end
 rescue LoadError
 end

From 65431ed41f572bf13366ab4a7d6bfafe20fffcda Mon Sep 17 00:00:00 2001
From: Skud <skud@infotrope.net>
Date: Thu, 16 May 2013 21:39:17 +1000
Subject: [PATCH 19/35] some improvements to the HAML RSS

---
 app/views/members/show.rss.haml | 18 ++++++++---------
 db/schema.rb                    | 35 ++++++++++++++++++++++++++-------
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/app/views/members/show.rss.haml b/app/views/members/show.rss.haml
index f88f44db4..85a598de8 100644
--- a/app/views/members/show.rss.haml
+++ b/app/views/members/show.rss.haml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-%feed{:version => "2.0", "xmlns:atom"=>"http://www.w3.org/2005/Atom"}
+%rss{:version => 2.0}
   %channel
     %title #{Growstuff::Application.config.site_name} - #{@member.login_name}'s recent posts
-    %atom:link= member_url(@member)
-    %atom:link{ :type => "application/rss+xml", :href => member_url(@member), :rel  => "self" }
-
+    %link= member_url(@member)
     - @posts.each do |post|
-      %entry
-        %updated post.created_at.to_s(:rfc822)
-        %link{ :href =>  post_url(post) }
-        %guid post_url(post)
-        %author @member.login_name
-        %title post.subject
+      %item
+        %pubDate= post.created_at.to_s(:rfc822)
+        %link= post_url(post)
+        %guid= post_url(post)
+        %author= @member.login_name
+        %title= post.subject
         %description
           :markdown
             #{ strip_tags post.body }
diff --git a/db/schema.rb b/db/schema.rb
index 4c82164fe..d4bf0005f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130418102558) do
+ActiveRecord::Schema.define(:version => 20130515122301) do
 
   create_table "authentications", :force => true do |t|
     t.integer  "member_id",  :null => false
@@ -120,12 +120,25 @@ ActiveRecord::Schema.define(:version => 20130418102558) do
     t.datetime "updated_at",                      :null => false
   end
 
-  create_table "payments", :force => true do |t|
-    t.integer  "payer_id"
-    t.string   "payment_type"
-    t.decimal  "amount"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
+  create_table "order_items", :force => true do |t|
+    t.integer  "order_id"
+    t.integer  "product_id"
+    t.integer  "price"
+    t.integer  "quantity"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "orders", :force => true do |t|
+    t.integer  "member_id",    :limit => 255, :null => false
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+    t.datetime "completed_at"
+  end
+
+  create_table "orders_products", :id => false, :force => true do |t|
+    t.integer "order_id"
+    t.integer "product_id"
   end
 
   create_table "plantings", :force => true do |t|
@@ -155,6 +168,14 @@ ActiveRecord::Schema.define(:version => 20130418102558) do
   add_index "posts", ["created_at", "author_id"], :name => "index_updates_on_created_at_and_user_id"
   add_index "posts", ["slug"], :name => "index_updates_on_slug", :unique => true
 
+  create_table "products", :force => true do |t|
+    t.string   "name",        :null => false
+    t.string   "description", :null => false
+    t.integer  "min_price",   :null => false
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
   create_table "roles", :force => true do |t|
     t.string   "name",        :null => false
     t.text     "description"

From bf9521b98bb7cd3ad21d25fb93d8295013e23166 Mon Sep 17 00:00:00 2001
From: Miles Gould <miles@assyrian.org.uk>
Date: Thu, 16 May 2013 13:25:14 +0100
Subject: [PATCH 20/35] Fix "km miles of" typo.

---
 app/views/members/nearby.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/members/nearby.html.haml b/app/views/members/nearby.html.haml
index cbcf51da6..059196ae2 100644
--- a/app/views/members/nearby.html.haml
+++ b/app/views/members/nearby.html.haml
@@ -7,7 +7,7 @@
     = label_tag :distance, "Find members within", :class => 'control-label'
     = text_field_tag :distance, @distance, :class => 'input-mini'
     = select_tag :units, options_for_select({"miles" => :mi, "km" => :km}, @units), :class => 'input-small'
-    = label_tag :location, "miles of", :class => 'control-label'
+    = label_tag :location, "of", :class => 'control-label'
     = text_field_tag :location, @location
     = submit_tag "Search", :class => 'btn btn-primary'
 

From 6b487ab1f604b690c7944bb9d1383f5c81179240 Mon Sep 17 00:00:00 2001
From: Miles Gould <miles@assyrian.org.uk>
Date: Thu, 16 May 2013 15:08:50 +0100
Subject: [PATCH 21/35] Escaped_Markdown HAML filter, for use in RSS.

I tried to do this using Haml::Filters::Markdown so it would be
independent of our Markdown renderer, but I couldn't get
Haml::Filters::Markdown.render to work programmatically - whatever I
did, it returned its input unchanged. So I hardcoded a dependence on
bluecloth.
---
 app/views/members/show.rss.haml         |  2 +-
 config/initializers/escaped_markdown.rb |  1 +
 lib/haml/filters/escaped_markdown.rb    | 10 ++++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 config/initializers/escaped_markdown.rb
 create mode 100644 lib/haml/filters/escaped_markdown.rb

diff --git a/app/views/members/show.rss.haml b/app/views/members/show.rss.haml
index 85a598de8..f6244623d 100644
--- a/app/views/members/show.rss.haml
+++ b/app/views/members/show.rss.haml
@@ -11,5 +11,5 @@
         %author= @member.login_name
         %title= post.subject
         %description
-          :markdown
+          :escaped_markdown
             #{ strip_tags post.body }
diff --git a/config/initializers/escaped_markdown.rb b/config/initializers/escaped_markdown.rb
new file mode 100644
index 000000000..87837b0c5
--- /dev/null
+++ b/config/initializers/escaped_markdown.rb
@@ -0,0 +1 @@
+require 'haml/filters/escaped_markdown'
diff --git a/lib/haml/filters/escaped_markdown.rb b/lib/haml/filters/escaped_markdown.rb
new file mode 100644
index 000000000..5c172079c
--- /dev/null
+++ b/lib/haml/filters/escaped_markdown.rb
@@ -0,0 +1,10 @@
+gem 'bluecloth'
+
+module Haml::Filters::Escaped_Markdown
+  include Haml::Filters::Base
+
+  def render(text)
+    bc = BlueCloth.new(text)
+    return Haml::Helpers.html_escape bc.to_html
+  end
+end

From d5c781a97ff6636556c0b24b42c28284eea02b1d Mon Sep 17 00:00:00 2001
From: Miles Gould <miles@assyrian.org.uk>
Date: Thu, 16 May 2013 18:00:00 +0100
Subject: [PATCH 22/35] Tests for Haml::Filters::EscapedMarkdown.

---
 lib/haml/filters/escaped_markdown.rb          | 19 +++++++++++++------
 .../lib/haml/filters/escaped_markdown_spec.rb | 16 ++++++++++++++++
 2 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 spec/lib/haml/filters/escaped_markdown_spec.rb

diff --git a/lib/haml/filters/escaped_markdown.rb b/lib/haml/filters/escaped_markdown.rb
index 5c172079c..c60256ac9 100644
--- a/lib/haml/filters/escaped_markdown.rb
+++ b/lib/haml/filters/escaped_markdown.rb
@@ -1,10 +1,17 @@
-gem 'bluecloth'
+require 'bluecloth'
 
-module Haml::Filters::Escaped_Markdown
-  include Haml::Filters::Base
+module Haml::Filters
+  module EscapedMarkdown
+    include Haml::Filters::Base
 
-  def render(text)
-    bc = BlueCloth.new(text)
-    return Haml::Helpers.html_escape bc.to_html
+    def render(text)
+      bc = BlueCloth.new(text)
+      return Haml::Helpers.html_escape bc.to_html
+    end
   end
+
+# Register it as the handler for the :escaped_markdown HAML command.
+# The automatic system gives us :escapedmarkdown, which is ugly.
+defined['escaped_markdown'] = EscapedMarkdown
+
 end
diff --git a/spec/lib/haml/filters/escaped_markdown_spec.rb b/spec/lib/haml/filters/escaped_markdown_spec.rb
new file mode 100644
index 000000000..99c779e88
--- /dev/null
+++ b/spec/lib/haml/filters/escaped_markdown_spec.rb
@@ -0,0 +1,16 @@
+require 'haml/filters'
+require 'haml/filters/escaped_markdown'
+require 'haml/helpers'
+
+describe 'Haml::Filters::Escaped_Markdown' do
+  it 'is registered as the handler for :escaped_markdown' do
+    Haml::Filters::defined['escaped_markdown'].should ==
+      Haml::Filters::EscapedMarkdown
+  end
+
+  it 'converts Markdown to escaped HTML' do
+    rendered = Haml::Filters::EscapedMarkdown.render("**foo**")
+    rendered.should == "&lt;p&gt;&lt;strong&gt;foo&lt;/strong&gt;&lt;/p&gt;"
+  end
+
+end

From 2d3b594ae160f80786d54de1af7c0e2348c8a444 Mon Sep 17 00:00:00 2001
From: Miles Gould <miles@assyrian.org.uk>
Date: Thu, 16 May 2013 18:24:22 +0100
Subject: [PATCH 23/35] Test for expanded-markdown rendering.

---
 spec/views/members/show.rss.haml_spec.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/spec/views/members/show.rss.haml_spec.rb b/spec/views/members/show.rss.haml_spec.rb
index a9a73686a..adb6e0bc3 100644
--- a/spec/views/members/show.rss.haml_spec.rb
+++ b/spec/views/members/show.rss.haml_spec.rb
@@ -5,7 +5,7 @@ describe 'members/show.rss.haml', :type => "view" do
     @member = assign(:member, FactoryGirl.create(:member))
     assign(:posts, [
       FactoryGirl.build(:post, :id => 1, :author => @member),
-      FactoryGirl.build(:post, :id => 2, :author => @member)
+      FactoryGirl.build(:markdown_post, :id => 2, :author => @member)
     ])
     render
   end
@@ -18,4 +18,10 @@ describe 'members/show.rss.haml', :type => "view" do
     rendered.should contain "This is some text."
   end
 
+  it 'renders post bodies to HTML and XML-escapes them' do
+# The variable "rendered" has been entity-replaced and tag-stripped
+# The literal string output contains "&lt;strong&gt;" etc.
+    rendered.should contain "<strong>strong</strong>"
+  end
+
 end

From e588b312f9a3850a6eac32237f11918ed575f0c6 Mon Sep 17 00:00:00 2001
From: Skud <skud@infotrope.net>
Date: Mon, 20 May 2013 14:56:53 +1000
Subject: [PATCH 24/35] Added list of contributors

I know git(hub) gives us much of this, but it doesn't credit the
"copilot" from pairing, so this is a way to list *everyone* who's
contributed to our code, even if they didn't do the actual commit with
their own github account.
---
 CONTRIBUTORS.md | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 CONTRIBUTORS.md

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
new file mode 100644
index 000000000..176cbf63d
--- /dev/null
+++ b/CONTRIBUTORS.md
@@ -0,0 +1,33 @@
+This is a list of contributors to Growstuff's codebase.  We maintain
+this list because we work in pairs, but Github only knows about the
+person who actually does the commits. This gives credit to both members
+of the pair.
+
+If you contribute, please add yourself to the bottom of the list and
+submit the change with your pull request.
+
+- Alex Bayley / [Skud](https://github.com/Skud)
+- Ricky Amianym / [amianym](https://github.com/amianym)
+- Cesy / [cesy](https://github.com/cesy)
+- Miles Gould / [pozorvlak](https://github.com/pozorvlak)
+- Juliet Kemp / [julietk](https://github.com/julietk)
+- Federico Mena Quintero / [federicomenaquintero](https://github.com/federicomenaquintero)
+- Jay Springett / [thejaymo](https://github.com/thejaymo)
+- Maia Sauren / [sauramaia](https://github.com/sauramaia)
+- Joseph Caudle / [jcaudle](https://github.com/jcaudle)
+- Norman Ancajas / [nbancajas](https://github.com/nbancajas)
+- Jonathan "Duke" Leto / [leto](https://github.com/leto)
+- Mackenzie Morgan / [maco](https://github.com/maco)
+- Amy Hendrix / [sabreuse](https://github.com/sabreuse)
+- CephLPod / [cephLpod](https://github.com/cephLpod/)
+- Gemma Mason / [gemmaellen](https://github.com/gemmaellen)
+- Courtney Webster / [phazel](https://github.com/phazel/)
+- Cathy Sullivan / [cesullivan](https://github.com/cesullivan)
+- Jared McCorkindale / [jmcorkindale](https://github.com/jmcorkindale)
+- Florian Vallen / [flov](https://github.com/flov)
+- Samuel Cochrane / [sj26](https://github.com/sj26)
+- Ju Transcendancing / [transcendancing](https://github.com/transcendancing)
+- Lillian Ryan / [attlebish](https://github.com/attlebish)
+- Gary Traffanstedt / [blimey85](https://github.com/blimey85)
+- Yaw Boakye [yawboakye](https://github.com/yawboakye)
+- Ryan Clark / [IAMRYO](https://github.com/IAMRYO)

From 1ad27fc8851ce2a2a400791c8a4cc22b1db077a1 Mon Sep 17 00:00:00 2001
From: Skud <skud@infotrope.net>
Date: Mon, 20 May 2013 15:00:29 +1000
Subject: [PATCH 25/35] Broke out "committers" and "contributors"

I figured this would make it easier to show who's a good person to ask
for help or information, while still crediting everyone who's
contributed.
---
 CONTRIBUTORS.md | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 176cbf63d..9f8a3c74a 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -6,15 +6,20 @@ of the pair.
 If you contribute, please add yourself to the bottom of the list and
 submit the change with your pull request.
 
+## Committers
+
 - Alex Bayley / [Skud](https://github.com/Skud)
-- Ricky Amianym / [amianym](https://github.com/amianym)
 - Cesy / [cesy](https://github.com/cesy)
 - Miles Gould / [pozorvlak](https://github.com/pozorvlak)
+- Joseph Caudle / [jcaudle](https://github.com/jcaudle)
+
+## Contributors
+
+- Ricky Amianym / [amianym](https://github.com/amianym)
 - Juliet Kemp / [julietk](https://github.com/julietk)
 - Federico Mena Quintero / [federicomenaquintero](https://github.com/federicomenaquintero)
 - Jay Springett / [thejaymo](https://github.com/thejaymo)
 - Maia Sauren / [sauramaia](https://github.com/sauramaia)
-- Joseph Caudle / [jcaudle](https://github.com/jcaudle)
 - Norman Ancajas / [nbancajas](https://github.com/nbancajas)
 - Jonathan "Duke" Leto / [leto](https://github.com/leto)
 - Mackenzie Morgan / [maco](https://github.com/maco)
@@ -29,5 +34,5 @@ submit the change with your pull request.
 - Ju Transcendancing / [transcendancing](https://github.com/transcendancing)
 - Lillian Ryan / [attlebish](https://github.com/attlebish)
 - Gary Traffanstedt / [blimey85](https://github.com/blimey85)
-- Yaw Boakye [yawboakye](https://github.com/yawboakye)
+- Yaw Boakye / [yawboakye](https://github.com/yawboakye)
 - Ryan Clark / [IAMRYO](https://github.com/IAMRYO)

From bc03a5c488650e9c49a8d34f6e6a045daf80266d Mon Sep 17 00:00:00 2001
From: Craig Read <craigabread@gmail.com>
Date: Fri, 24 May 2013 11:58:40 +1000
Subject: [PATCH 26/35] Converted Posts RSS to HAML

---
 app/views/posts/index.rss.builder             | 18 --------
 app/views/posts/index.rss.haml                | 15 +++++++
 db/schema.rb                                  | 41 ++++++-------------
 ...builder_spec.rb => index.rss.haml_spec.rb} |  2 +-
 4 files changed, 29 insertions(+), 47 deletions(-)
 delete mode 100644 app/views/posts/index.rss.builder
 create mode 100644 app/views/posts/index.rss.haml
 rename spec/views/posts/{index.rss.builder_spec.rb => index.rss.haml_spec.rb} (89%)

diff --git a/app/views/posts/index.rss.builder b/app/views/posts/index.rss.builder
deleted file mode 100644
index 88025252c..000000000
--- a/app/views/posts/index.rss.builder
+++ /dev/null
@@ -1,18 +0,0 @@
-xml.instruct! :xml, :version => "1.0" 
-xml.rss :version => "2.0" do
-  xml.channel do
-    xml.title "#{Growstuff::Application.config.site_name} - Recent posts from all members"
-    xml.link posts_url
-
-    for post in @recent_posts
-      xml.item do
-        xml.author post.author.login_name
-        xml.title post.subject
-        xml.description post.body
-        xml.pubDate post.created_at.to_s(:rfc822)
-        xml.link post_url(post)
-        xml.guid post_url(post)
-      end
-    end
-  end
-end
diff --git a/app/views/posts/index.rss.haml b/app/views/posts/index.rss.haml
new file mode 100644
index 000000000..d54ea83da
--- /dev/null
+++ b/app/views/posts/index.rss.haml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+%rss{:version => 2.0}
+  %channel
+    %title #{Growstuff::Application.config.site_name} - Recent posts from all members
+    %link= posts_url
+    - @recent_posts.each do |post|
+      %item
+        %author= post.author.login_name
+        %title= post.subject
+        %description
+          :escaped_markdown
+            #{ strip_tags post.body }
+        %pubDate= post.created_at.to_s(:rfc822)
+        %link= post_url(post)
+        %guid= post_url(post)
diff --git a/db/schema.rb b/db/schema.rb
index d4bf0005f..c26161002 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130515122301) do
+ActiveRecord::Schema.define(:version => 20130409162140) do
 
   create_table "authentications", :force => true do |t|
     t.integer  "member_id",  :null => false
@@ -95,6 +95,11 @@ ActiveRecord::Schema.define(:version => 20130515122301) do
     t.string   "location"
     t.float    "latitude"
     t.float    "longitude"
+    t.text     "about_me"
+    t.string   "full_name"
+    t.string   "gardening_since"
+    t.string   "wish_i_could_grow"
+    t.string   "gardening_clothes"
     t.boolean  "send_notification_email", :default => true
   end
 
@@ -120,25 +125,13 @@ ActiveRecord::Schema.define(:version => 20130515122301) do
     t.datetime "updated_at",                      :null => false
   end
 
-  create_table "order_items", :force => true do |t|
-    t.integer  "order_id"
-    t.integer  "product_id"
-    t.integer  "price"
-    t.integer  "quantity"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "orders", :force => true do |t|
-    t.integer  "member_id",    :limit => 255, :null => false
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-    t.datetime "completed_at"
-  end
-
-  create_table "orders_products", :id => false, :force => true do |t|
-    t.integer "order_id"
-    t.integer "product_id"
+  create_table "payments", :force => true do |t|
+    t.integer  "payer_id"
+    t.decimal  "amount"
+    t.date     "paid_period_begins"
+    t.date     "paid_period_ends"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
   end
 
   create_table "plantings", :force => true do |t|
@@ -168,14 +161,6 @@ ActiveRecord::Schema.define(:version => 20130515122301) do
   add_index "posts", ["created_at", "author_id"], :name => "index_updates_on_created_at_and_user_id"
   add_index "posts", ["slug"], :name => "index_updates_on_slug", :unique => true
 
-  create_table "products", :force => true do |t|
-    t.string   "name",        :null => false
-    t.string   "description", :null => false
-    t.integer  "min_price",   :null => false
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
   create_table "roles", :force => true do |t|
     t.string   "name",        :null => false
     t.text     "description"
diff --git a/spec/views/posts/index.rss.builder_spec.rb b/spec/views/posts/index.rss.haml_spec.rb
similarity index 89%
rename from spec/views/posts/index.rss.builder_spec.rb
rename to spec/views/posts/index.rss.haml_spec.rb
index f2b6c87e4..b839cf945 100644
--- a/spec/views/posts/index.rss.builder_spec.rb
+++ b/spec/views/posts/index.rss.haml_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'posts/index.rss.builder', :type => "view" do
+describe 'posts/index.rss.haml', :type => "view" do
   before(:each) do
     controller.stub(:current_user) { nil }
     @author = FactoryGirl.create(:member)

From 9c2fed461ddd4415543063fe9c08d080b95b0d2b Mon Sep 17 00:00:00 2001
From: Craig Read <craigabread@gmail.com>
Date: Fri, 24 May 2013 12:05:47 +1000
Subject: [PATCH 27/35] Removed redundant @recent_posts instance variable

Not required, as we have pagination by default
---
 app/controllers/posts_controller.rb       | 1 -
 app/views/posts/index.rss.haml            | 2 +-
 spec/controllers/posts_controller_spec.rb | 1 -
 spec/views/posts/index.rss.haml_spec.rb   | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 1ca2b5f94..6bec61061 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -5,7 +5,6 @@ class PostsController < ApplicationController
 
   def index
     @posts = Post.paginate(:page => params[:page])
-    @recent_posts = Post.limit(100).order('created_at desc').all
 
     respond_to do |format|
       format.html # index.html.haml
diff --git a/app/views/posts/index.rss.haml b/app/views/posts/index.rss.haml
index d54ea83da..12402d0cf 100644
--- a/app/views/posts/index.rss.haml
+++ b/app/views/posts/index.rss.haml
@@ -3,7 +3,7 @@
   %channel
     %title #{Growstuff::Application.config.site_name} - Recent posts from all members
     %link= posts_url
-    - @recent_posts.each do |post|
+    - @posts.each do |post|
       %item
         %author= post.author.login_name
         %title= post.subject
diff --git a/spec/controllers/posts_controller_spec.rb b/spec/controllers/posts_controller_spec.rb
index 5fe9c1ddd..f87f90fb9 100644
--- a/spec/controllers/posts_controller_spec.rb
+++ b/spec/controllers/posts_controller_spec.rb
@@ -13,7 +13,6 @@ describe PostsController do
       post = Post.create! valid_attributes
       get :index, {}
       assigns(:posts).should eq([post])
-      assigns(:recent_posts).should eq([post])
     end
   end
 
diff --git a/spec/views/posts/index.rss.haml_spec.rb b/spec/views/posts/index.rss.haml_spec.rb
index b839cf945..cd5f74c4d 100644
--- a/spec/views/posts/index.rss.haml_spec.rb
+++ b/spec/views/posts/index.rss.haml_spec.rb
@@ -4,7 +4,7 @@ describe 'posts/index.rss.haml', :type => "view" do
   before(:each) do
     controller.stub(:current_user) { nil }
     @author = FactoryGirl.create(:member)
-    assign(:recent_posts, [
+    assign(:posts, [
       FactoryGirl.build(:post, :id => 1, :author => @author),
       FactoryGirl.build(:post, :id => 2, :author => @author)
     ])

From d563f0ceae71185b72cff5a061b46fceb9f0e750 Mon Sep 17 00:00:00 2001
From: Craig Read <craigabread@gmail.com>
Date: Fri, 24 May 2013 12:22:41 +1000
Subject: [PATCH 28/35] Converting crops RSS to HAML

Added spec for crops RSS

Removed redundant @new_crops instance variable (not needed as we now
have pagination).
---
 app/controllers/crops_controller.rb       |  1 -
 app/views/crops/index.rss.builder         | 16 ----------------
 app/views/crops/index.rss.haml            | 11 +++++++++++
 spec/controllers/crops_controller_spec.rb |  1 -
 spec/views/crops/index.rss.haml_spec.rb   | 23 +++++++++++++++++++++++
 5 files changed, 34 insertions(+), 18 deletions(-)
 delete mode 100644 app/views/crops/index.rss.builder
 create mode 100644 app/views/crops/index.rss.haml
 create mode 100644 spec/views/crops/index.rss.haml_spec.rb

diff --git a/app/controllers/crops_controller.rb b/app/controllers/crops_controller.rb
index f0cfe2525..26a3de663 100644
--- a/app/controllers/crops_controller.rb
+++ b/app/controllers/crops_controller.rb
@@ -5,7 +5,6 @@ class CropsController < ApplicationController
   # GET /crops.json
   def index
     @crops = Crop.paginate(:page => params[:page])
-    @new_crops = Crop.limit(20).order('created_at desc').all
 
     respond_to do |format|
       format.html # index.html.haml
diff --git a/app/views/crops/index.rss.builder b/app/views/crops/index.rss.builder
deleted file mode 100644
index 9410a6080..000000000
--- a/app/views/crops/index.rss.builder
+++ /dev/null
@@ -1,16 +0,0 @@
-xml.instruct! :xml, :version => "1.0" 
-xml.rss :version => "2.0" do
-  xml.channel do
-    xml.title "#{Growstuff::Application.config.site_name} - Recently added crops"
-    xml.link crops_url
-
-    for crop in @new_crops
-      xml.item do
-        xml.title crop.system_name
-        xml.pubDate crop.created_at.to_s(:rfc822)
-        xml.link crop_url(crop)
-        xml.guid crop_url(crop)
-      end
-    end
-  end
-end
diff --git a/app/views/crops/index.rss.haml b/app/views/crops/index.rss.haml
new file mode 100644
index 000000000..1fd02870e
--- /dev/null
+++ b/app/views/crops/index.rss.haml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+%rss{:version => 2.0}
+  %channel
+    %title #{Growstuff::Application.config.site_name} - Recently added crops
+    %link= crops_url
+    - @crops.each do |crop|
+      %item
+        %title= crop.system_name
+        %pubDate= crop.created_at.to_s(:rfc822)
+        %link= post_url(crop)
+        %guid= post_url(crop)
\ No newline at end of file
diff --git a/spec/controllers/crops_controller_spec.rb b/spec/controllers/crops_controller_spec.rb
index db4c070bc..f56c7ee3b 100644
--- a/spec/controllers/crops_controller_spec.rb
+++ b/spec/controllers/crops_controller_spec.rb
@@ -16,7 +16,6 @@ describe CropsController do
       crop = Crop.create! valid_attributes
       get :index, {}
       assigns(:crops).should eq([crop])
-      assigns(:new_crops).should eq([crop])
     end
   end
 
diff --git a/spec/views/crops/index.rss.haml_spec.rb b/spec/views/crops/index.rss.haml_spec.rb
new file mode 100644
index 000000000..8790a7d80
--- /dev/null
+++ b/spec/views/crops/index.rss.haml_spec.rb
@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe 'crops/index.rss.haml' do
+  before(:each) do
+    controller.stub(:current_user) { nil }
+    @author = FactoryGirl.create(:member)
+    assign(:crops, [
+      FactoryGirl.create(:tomato),
+      FactoryGirl.create(:maize)
+    ])
+    render
+  end
+
+  it 'shows RSS feed title' do
+    rendered.should contain "Recently added crops"
+  end
+
+  it 'shows names of crops' do
+    rendered.should contain "Tomato"
+    rendered.should contain "Maize"
+  end
+
+end

From 9437e6576340d83c1238bf76dfe1616d4f0c87fe Mon Sep 17 00:00:00 2001
From: Craig Read <craigabread@gmail.com>
Date: Fri, 24 May 2013 12:35:08 +1000
Subject: [PATCH 29/35] Replaced plantings RSS with HAML

Removed the redundant @recent_plantings variable and added pagination
---
 app/controllers/plantings_controller.rb       |  3 +-
 app/views/plantings/index.html.haml           | 10 +++++--
 app/views/plantings/index.rss.builder         | 18 -----------
 app/views/plantings/index.rss.haml            | 15 ++++++++++
 spec/controllers/plantings_controller_spec.rb |  1 -
 spec/views/plantings/index.html.haml_spec.rb  | 30 +++++++++++--------
 ...builder_spec.rb => index.rss.haml_spec.rb} |  8 ++---
 7 files changed, 46 insertions(+), 39 deletions(-)
 delete mode 100644 app/views/plantings/index.rss.builder
 create mode 100644 app/views/plantings/index.rss.haml
 rename spec/views/plantings/{index.rss.builder_spec.rb => index.rss.haml_spec.rb} (58%)

diff --git a/app/controllers/plantings_controller.rb b/app/controllers/plantings_controller.rb
index ff9ebe886..7a7c61119 100644
--- a/app/controllers/plantings_controller.rb
+++ b/app/controllers/plantings_controller.rb
@@ -3,8 +3,7 @@ class PlantingsController < ApplicationController
   # GET /plantings
   # GET /plantings.json
   def index
-    @plantings = Planting.all
-    @recent_plantings = Planting.limit(100).order('created_at desc').all
+    @plantings = Planting.paginate(:page => params[:page])
 
     respond_to do |format|
       format.html # index.html.erb
diff --git a/app/views/plantings/index.html.haml b/app/views/plantings/index.html.haml
index d359a342d..fd628410d 100644
--- a/app/views/plantings/index.html.haml
+++ b/app/views/plantings/index.html.haml
@@ -2,7 +2,13 @@
 
 %p Here are the latest things planted by #{Growstuff::Application.config.site_name} members.
 
-- @recent_plantings.each do |p|
+%div.pagination
+  = page_entries_info @plantings, :model => "plantings"
+  = will_paginate @plantings
+
+- @plantings.each do |p|
   = render :partial => "plantings/thumbnail", :locals => { :planting => p }
 
-
+%div.pagination
+  = page_entries_info @plantings, :model => "plantings"
+  = will_paginate @plantings
\ No newline at end of file
diff --git a/app/views/plantings/index.rss.builder b/app/views/plantings/index.rss.builder
deleted file mode 100644
index f203ca488..000000000
--- a/app/views/plantings/index.rss.builder
+++ /dev/null
@@ -1,18 +0,0 @@
-xml.instruct! :xml, :version => "1.0" 
-xml.rss :version => "2.0" do
-  xml.channel do
-    xml.title "#{Growstuff::Application.config.site_name} - Recent plantings from all members"
-    xml.link plantings_url
-
-    for planting in @recent_plantings
-      xml.item do
-        xml.author planting.owner.login_name
-        xml.title planting.crop.system_name
-        xml.pubDate planting.created_at.to_s(:rfc822)
-        xml.description planting.description
-        xml.link planting_url(planting)
-        xml.guid planting_url(planting)
-      end
-    end
-  end
-end
diff --git a/app/views/plantings/index.rss.haml b/app/views/plantings/index.rss.haml
new file mode 100644
index 000000000..d6ed95542
--- /dev/null
+++ b/app/views/plantings/index.rss.haml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+%rss{:version => 2.0}
+  %channel
+    %title #{Growstuff::Application.config.site_name} - Recent plantings from all members
+    %link= plantings_url
+    - @plantings.each do |planting|
+      %item
+        %author= planting.owner.login_name
+        %title= planting.crop.system_name
+        %pubDate= planting.created_at.to_s(:rfc822)
+        %description
+          :escaped_markdown
+            #{ strip_tags planting.description }
+        %link= planting_url(planting)
+        %guid= planting_url(planting)
diff --git a/spec/controllers/plantings_controller_spec.rb b/spec/controllers/plantings_controller_spec.rb
index ff3fc9e36..fec82c7e8 100644
--- a/spec/controllers/plantings_controller_spec.rb
+++ b/spec/controllers/plantings_controller_spec.rb
@@ -16,7 +16,6 @@ describe PlantingsController do
       planting = Planting.create! valid_attributes
       get :index, {}
       assigns(:plantings).should eq([planting])
-      assigns(:recent_plantings).should eq([planting])
     end
   end
 
diff --git a/spec/views/plantings/index.html.haml_spec.rb b/spec/views/plantings/index.html.haml_spec.rb
index cb7cec5a5..16339f665 100644
--- a/spec/views/plantings/index.html.haml_spec.rb
+++ b/spec/views/plantings/index.html.haml_spec.rb
@@ -7,18 +7,24 @@ describe "plantings/index" do
     @garden = FactoryGirl.create(:garden, :owner => @member)
     @tomato = FactoryGirl.create(:tomato)
     @maize  = FactoryGirl.create(:maize)
-    assign(:recent_plantings, [
-      FactoryGirl.create(:planting,
-        :garden => @garden,
-        :crop => @tomato
-      ),
-      FactoryGirl.create(:planting,
-        :garden => @garden,
-        :crop => @maize,
-        :description => '',
-        :planted_at => Time.local(2013, 1, 13)
-      )
-    ])
+    page = 1
+    per_page = 2
+    total_entries = 2
+    plantings = WillPaginate::Collection.create(page, per_page, total_entries) do |pager|
+      pager.replace([
+        FactoryGirl.create(:planting,
+          :garden => @garden,
+          :crop => @tomato
+        ),
+        FactoryGirl.create(:planting,
+          :garden => @garden,
+          :crop => @maize,
+          :description => '',
+          :planted_at => Time.local(2013, 1, 13)
+        )
+      ])
+    end
+    assign(:plantings, plantings)
     render
   end
 
diff --git a/spec/views/plantings/index.rss.builder_spec.rb b/spec/views/plantings/index.rss.haml_spec.rb
similarity index 58%
rename from spec/views/plantings/index.rss.builder_spec.rb
rename to spec/views/plantings/index.rss.haml_spec.rb
index abc847d45..a689707fc 100644
--- a/spec/views/plantings/index.rss.builder_spec.rb
+++ b/spec/views/plantings/index.rss.haml_spec.rb
@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe 'plantings/index.rss.builder', :type => "view" do
+describe 'plantings/index.rss.haml' do
   before(:each) do
     controller.stub(:current_user) { nil }
-    assign(:recent_plantings, [
+    assign(:plantings, [
       FactoryGirl.create(:planting)
     ])
     render
@@ -13,8 +13,8 @@ describe 'plantings/index.rss.builder', :type => "view" do
     rendered.should contain "Recent plantings from all members"
   end
 
-  it 'shows content of posts' do
-    rendered.should contain "This is a *really* good plant."
+  it 'shows formatted content of posts' do
+    rendered.should contain "This is a <em>really</em> good plant."
   end
 
 end

From 57f8575ab9316793ec1f7307e5bd437ab4386610 Mon Sep 17 00:00:00 2001
From: Skud <skud@infotrope.net>
Date: Fri, 24 May 2013 12:54:57 +1000
Subject: [PATCH 30/35] removed unwanted @recent_comments, replaced w
 pagination

---
 .gitignore                                   |  4 +++-
 app/controllers/comments_controller.rb       |  3 +--
 app/views/comments/index.html.haml           | 10 +++++++++-
 app/views/plantings/index.html.haml          |  2 +-
 spec/controllers/comments_controller_spec.rb |  1 -
 spec/views/comments/index.html.haml_spec.rb  | 15 +++++++++++----
 6 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5b8787714..9b5a1cf4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,6 @@
 *~
 *.DS_Store
 credentials.sh
-Pathogen:
\ No newline at end of file
+Pathogen:
+custom_plan.rb
+zeus.json
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index d6bc30bd1..969385361 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -2,8 +2,7 @@ class CommentsController < ApplicationController
   # GET /comments
   # GET /comments.json
   def index
-    @comments = Comment.all
-    @recent_comments = Comment.limit(100).order('created_at desc').all
+    @comments = Comment.paginate(:page => params[:page])
 
     respond_to do |format|
       format.html # index.html.erb
diff --git a/app/views/comments/index.html.haml b/app/views/comments/index.html.haml
index a6a95d2d9..64915fc3c 100644
--- a/app/views/comments/index.html.haml
+++ b/app/views/comments/index.html.haml
@@ -1,7 +1,15 @@
 = content_for :title, "Recent comments"
 
-- @recent_comments.each do |comment|
+%div.pagination
+  = page_entries_info @comments, :model => "comments"
+  = will_paginate @comments
+
+- @comments.each do |comment|
   %h2
     Comment on
     = link_to comment.post.subject, comment.post
   = render :partial => "single", :locals => { :comment => comment }
+
+%div.pagination
+  = page_entries_info @comments, :model => "comments"
+  = will_paginate @comments
diff --git a/app/views/plantings/index.html.haml b/app/views/plantings/index.html.haml
index fd628410d..6e98960ad 100644
--- a/app/views/plantings/index.html.haml
+++ b/app/views/plantings/index.html.haml
@@ -11,4 +11,4 @@
 
 %div.pagination
   = page_entries_info @plantings, :model => "plantings"
-  = will_paginate @plantings
\ No newline at end of file
+  = will_paginate @plantings
diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb
index 587d24407..ec76ec799 100644
--- a/spec/controllers/comments_controller_spec.rb
+++ b/spec/controllers/comments_controller_spec.rb
@@ -14,7 +14,6 @@ describe CommentsController do
       comment = Comment.create! valid_attributes
       get :index, {}
       assigns(:comments).should eq([comment])
-      assigns(:recent_comments).should eq([comment])
     end
   end
 
diff --git a/spec/views/comments/index.html.haml_spec.rb b/spec/views/comments/index.html.haml_spec.rb
index f2633c648..dac2dcc5b 100644
--- a/spec/views/comments/index.html.haml_spec.rb
+++ b/spec/views/comments/index.html.haml_spec.rb
@@ -3,10 +3,17 @@ require 'spec_helper'
 describe "comments/index" do
   before(:each) do
     controller.stub(:current_user) { nil }
-    assign(:recent_comments, [
-      FactoryGirl.create(:comment),
-      FactoryGirl.create(:comment, :body => 'ROFL')
-    ])
+    page = 1
+    per_page = 2
+    total_entries = 2
+    comments = WillPaginate::Collection.create(page, per_page, total_entries) do |pager|
+      pager.replace([
+        FactoryGirl.create(:comment),
+        FactoryGirl.create(:comment, :body => 'ROFL')
+      ])
+    end
+    assign(:comments, comments)
+    render
   end
 
   it "renders a list of comments" do

From 0d3588535ef0539fe9ddb3d890abe3f9b0c14a22 Mon Sep 17 00:00:00 2001
From: Skud <skud@infotrope.net>
Date: Fri, 24 May 2013 13:29:17 +1000
Subject: [PATCH 31/35] Added RSS feed for all comments

---
 app/controllers/comments_controller.rb       |  1 +
 app/views/comments/index.rss.haml            | 22 +++++++++++++++
 app/views/crops/index.rss.haml               |  2 +-
 spec/controllers/comments_controller_spec.rb |  9 +++++++
 spec/views/comments/index.rss.haml_spec.rb   | 28 ++++++++++++++++++++
 5 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 app/views/comments/index.rss.haml
 create mode 100644 spec/views/comments/index.rss.haml_spec.rb

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 969385361..c14b0123b 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -7,6 +7,7 @@ class CommentsController < ApplicationController
     respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @comments }
+      format.rss { render :layout => false }
     end
   end
 
diff --git a/app/views/comments/index.rss.haml b/app/views/comments/index.rss.haml
new file mode 100644
index 000000000..7408684f9
--- /dev/null
+++ b/app/views/comments/index.rss.haml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+%rss{:version => 2.0}
+  %channel
+    %title #{Growstuff::Application.config.site_name} - Recent comments on all posts
+    %link= comments_url
+    - @comments.each do |comment|
+      %item
+        %author= comment.author.login_name
+        %description
+
+          :escaped
+            <p>
+            Comment on
+            #{ link_to comment.post.subject, post_url(comment.post) }
+            </p>
+
+          :escaped_markdown
+            #{ strip_tags comment.body }
+
+        %pubDate= comment.created_at.to_s(:rfc822)
+        %link= post_url(comment.post)
+        %guid= post_url(comment.post)
diff --git a/app/views/crops/index.rss.haml b/app/views/crops/index.rss.haml
index 1fd02870e..aabd178ac 100644
--- a/app/views/crops/index.rss.haml
+++ b/app/views/crops/index.rss.haml
@@ -8,4 +8,4 @@
         %title= crop.system_name
         %pubDate= crop.created_at.to_s(:rfc822)
         %link= post_url(crop)
-        %guid= post_url(crop)
\ No newline at end of file
+        %guid= post_url(crop)
diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb
index ec76ec799..f247fc78f 100644
--- a/spec/controllers/comments_controller_spec.rb
+++ b/spec/controllers/comments_controller_spec.rb
@@ -17,6 +17,15 @@ describe CommentsController do
     end
   end
 
+  describe "GET RSS feed" do
+    it "returns an RSS feed" do
+      get :index, :format => "rss"
+      response.should be_success
+      response.should render_template("comments/index")
+      response.content_type.should eq("application/rss+xml")
+    end
+  end
+
   describe "GET show" do
     it "assigns the requested comment as @comment" do
       comment = Comment.create! valid_attributes
diff --git a/spec/views/comments/index.rss.haml_spec.rb b/spec/views/comments/index.rss.haml_spec.rb
new file mode 100644
index 000000000..73bf99b99
--- /dev/null
+++ b/spec/views/comments/index.rss.haml_spec.rb
@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe 'comments/index.rss.haml' do
+  before(:each) do
+    controller.stub(:current_user) { nil }
+    @author = FactoryGirl.create(:member)
+    @post = FactoryGirl.create(:post)
+    assign(:comments, [
+      FactoryGirl.create(:comment, :author => @author, :post => @post),
+      FactoryGirl.create(:comment, :author => @author, :post => @post)
+    ])
+    render
+  end
+
+  it 'shows RSS feed title' do
+    rendered.should contain "Recent comments on all posts"
+  end
+
+  it 'escapes html for link to post' do
+    # it's then unescaped by 'render' so we don't actually look for &lt;
+    rendered.should contain '<a href='
+  end
+
+  it 'shows content of comments' do
+    rendered.should contain "OMG LOL"
+  end
+
+end

From 425a2b03fd674e1943e9f26a9c9260006d083ed6 Mon Sep 17 00:00:00 2001
From: Skud <skud@infotrope.net>
Date: Fri, 24 May 2013 13:43:06 +1000
Subject: [PATCH 32/35] Added RSS feed for comments on a single post

---
 app/controllers/posts_controller.rb       |  4 ++++
 app/views/posts/show.rss.haml             | 22 ++++++++++++++++++
 spec/controllers/posts_controller_spec.rb | 10 +++++++++
 spec/views/posts/show.rss.haml_spec.rb    | 27 +++++++++++++++++++++++
 4 files changed, 63 insertions(+)
 create mode 100644 app/views/posts/show.rss.haml
 create mode 100644 spec/views/posts/show.rss.haml_spec.rb

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 6bec61061..de7c80091 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -22,6 +22,10 @@ class PostsController < ApplicationController
     respond_to do |format|
       format.html # show.html.haml
       format.json { render json: @post }
+      format.rss { render(
+        :layout => false,
+        :locals => { :post => @post }
+      )}
     end
   end
 
diff --git a/app/views/posts/show.rss.haml b/app/views/posts/show.rss.haml
new file mode 100644
index 000000000..2b4362225
--- /dev/null
+++ b/app/views/posts/show.rss.haml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+%rss{:version => 2.0}
+  %channel
+    %title #{Growstuff::Application.config.site_name} - Recent comments on #{@post.subject}
+    %link= post_url(@post)
+    - @post.comments.each do |comment|
+      %item
+        %author= comment.author.login_name
+        %description
+
+          :escaped
+            <p>
+            Comment on
+            #{ link_to @post.subject, post_url(@post) }
+            </p>
+
+          :escaped_markdown
+            #{ strip_tags comment.body }
+
+        %pubDate= comment.created_at.to_s(:rfc822)
+        %link= post_url(@post)
+        %guid= post_url(@post)
diff --git a/spec/controllers/posts_controller_spec.rb b/spec/controllers/posts_controller_spec.rb
index f87f90fb9..bdae1ce48 100644
--- a/spec/controllers/posts_controller_spec.rb
+++ b/spec/controllers/posts_controller_spec.rb
@@ -33,6 +33,16 @@ describe PostsController do
     end
   end
 
+  describe "GET RSS feed for individual post" do
+    it "returns an RSS feed" do
+      post = Post.create! valid_attributes
+      get :show, { :format => "rss", :id => post.slug }
+      response.should be_success
+      response.should render_template("posts/show")
+      response.content_type.should eq("application/rss+xml")
+    end
+  end
+
   describe "GET new" do
     it "assigns a new post as @post" do
       get :new, {}
diff --git a/spec/views/posts/show.rss.haml_spec.rb b/spec/views/posts/show.rss.haml_spec.rb
new file mode 100644
index 000000000..cfcf380e3
--- /dev/null
+++ b/spec/views/posts/show.rss.haml_spec.rb
@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe 'posts/show.rss.haml' do
+  before(:each) do
+    controller.stub(:current_user) { nil }
+    @author = FactoryGirl.create(:member)
+    @post = FactoryGirl.create(:post)
+    FactoryGirl.create(:comment, :author => @author, :post => @post)
+    FactoryGirl.create(:comment, :author => @author, :post => @post)
+    assign(:post, @post)
+    render
+  end
+
+  it 'shows RSS feed title' do
+    rendered.should contain "Recent comments on #{@post.subject}"
+  end
+
+  it 'escapes html for link to post' do
+    # it's then unescaped by 'render' so we don't actually look for &lt;
+    rendered.should contain '<a href='
+  end
+
+  it 'shows content of comments' do
+    rendered.should contain "OMG LOL"
+  end
+
+end

From e17dcf8671451ef4a9f60242a704a1ec538d64e7 Mon Sep 17 00:00:00 2001
From: Skud <skud@infotrope.net>
Date: Fri, 24 May 2013 14:36:58 +1000
Subject: [PATCH 33/35] Reordered comments: they are now DESC by default

Added scope "post_order" to order them ASC for display on post page.
Also tweaked post/comment views a bit.
---
 app/models/comment.rb                        |  3 +-
 app/views/comments/_form.html.haml           |  5 --
 app/views/comments/edit.html.haml            |  4 +
 app/views/comments/new.html.haml             |  6 ++
 app/views/posts/_comments.html.haml          |  6 +-
 spec/controllers/comments_controller_spec.rb |  2 +-
 spec/models/comment_spec.rb                  | 81 +++++++++++++-------
 spec/views/comments/new.html.haml_spec.rb    |  8 +-
 8 files changed, 73 insertions(+), 42 deletions(-)

diff --git a/app/models/comment.rb b/app/models/comment.rb
index ea2082bf9..f797848e0 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -3,7 +3,8 @@ class Comment < ActiveRecord::Base
   belongs_to :author, :class_name => 'Member'
   belongs_to :post
 
-  default_scope order("created_at asc")
+  default_scope order("created_at DESC")
+  scope :post_order, reorder("created_at ASC") # for display on post page
 
   after_create do
     recipient = self.post.author.id
diff --git a/app/views/comments/_form.html.haml b/app/views/comments/_form.html.haml
index 06b6d0f8b..3e3f6f66b 100644
--- a/app/views/comments/_form.html.haml
+++ b/app/views/comments/_form.html.haml
@@ -1,8 +1,3 @@
-= render :partial => "posts/single", :locals => { :post => @post || @comment.post, :subject => true }
-
-= render :partial => "posts/comments"
-
-%h2 Your comment
 = form_for @comment do |f|
   - if @comment.errors.any?
     #error_explanation
diff --git a/app/views/comments/edit.html.haml b/app/views/comments/edit.html.haml
index 7b07b546d..912c8a8b8 100644
--- a/app/views/comments/edit.html.haml
+++ b/app/views/comments/edit.html.haml
@@ -1,3 +1,7 @@
 = content_for :title, "Editing comment"
 
+%p
+  Editing comment on
+  = link_to @comment.post.subject, @comment.post
+
 = render 'form'
diff --git a/app/views/comments/new.html.haml b/app/views/comments/new.html.haml
index 66393a209..c01ee755f 100644
--- a/app/views/comments/new.html.haml
+++ b/app/views/comments/new.html.haml
@@ -1,3 +1,9 @@
 = content_for :title, "New comment"
 
+= render :partial => "posts/single", :locals => { :post => @post || @comment.post, :subject => true }
+
+= render :partial => "posts/comments", :locals => {:post => @post || @comment.post}
+
+%p Your comment:
+
 = render 'form'
diff --git a/app/views/posts/_comments.html.haml b/app/views/posts/_comments.html.haml
index c06124014..bf565debc 100644
--- a/app/views/posts/_comments.html.haml
+++ b/app/views/posts/_comments.html.haml
@@ -1,8 +1,8 @@
 %a{:name => "comments"}
-- if @comments
+- if post.comments
   %h2
-    =pluralize(@comments.length, "comment")
-  - @comments.each do |c|
+    =pluralize(post.comments.length, "comment")
+  - post.comments.post_order.each do |c|
     = render :partial => "comments/single", :locals => { :comment => c }
 
 - else
diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb
index f247fc78f..128bcdd4e 100644
--- a/spec/controllers/comments_controller_spec.rb
+++ b/spec/controllers/comments_controller_spec.rb
@@ -71,7 +71,7 @@ describe CommentsController do
       old_comment = FactoryGirl.create(:comment, :post => post)
       comment = FactoryGirl.create(:comment, :post => post)
       get :edit, {:id => comment.to_param}
-      assigns(:comments).should eq([old_comment, comment])
+      assigns(:comments).should eq([comment, old_comment])
     end
 
   end
diff --git a/spec/models/comment_spec.rb b/spec/models/comment_spec.rb
index 7bad161bf..d487d0b91 100644
--- a/spec/models/comment_spec.rb
+++ b/spec/models/comment_spec.rb
@@ -2,40 +2,65 @@ require 'spec_helper'
 
 describe Comment do
 
-  before(:each) do
-    @comment = FactoryGirl.create(:comment)
+  context "basic" do
+    before(:each) do
+      @comment = FactoryGirl.create(:comment)
+    end
+
+    it "belongs to a post" do
+      @comment.post.should be_an_instance_of Post
+    end
+
+    it "belongs to an author" do
+      @comment.author.should be_an_instance_of Member
+    end
   end
 
-  it "belongs to a post" do
-    @comment.post.should be_an_instance_of Post
+  context "notifications" do
+    before(:each) do
+      @comment = FactoryGirl.create(:comment)
+    end
+
+    it "sends a notification when a comment is posted" do
+      expect {
+        FactoryGirl.create(:comment)
+      }.to change(Notification, :count).by(1)
+    end
+
+    it "sets the notification fields" do
+      @c = FactoryGirl.create(:comment)
+      @n = Notification.first
+      @n.sender.should eq @c.author
+      @n.recipient.should eq @c.post.author
+      @n.subject.should match /commented on/
+      @n.body.should eq @c.body
+      @n.post.should eq @c.post
+    end
+
+    it "doesn't send notifications to yourself" do
+      @m = FactoryGirl.create(:member)
+      @p = FactoryGirl.create(:post, :author => @m)
+      expect {
+        FactoryGirl.create(:comment, :post => @p, :author => @m)
+      }.to change(Notification, :count).by(0)
+    end
   end
 
-  it "belongs to an author" do
-    @comment.author.should be_an_instance_of Member
-  end
+  context "ordering" do
+    before(:each) do
+      @m = FactoryGirl.create(:member)
+      @p = FactoryGirl.create(:post, :author => @m)
+      @c1 = FactoryGirl.create(:comment, :post => @p, :author => @m)
+      @c2 = FactoryGirl.create(:comment, :post => @p, :author => @m)
+    end
 
-  it "sends a notification when a comment is posted" do
-    expect {
-      FactoryGirl.create(:comment)
-    }.to change(Notification, :count).by(1)
-  end
+    it 'is in DESC order by default' do
+      Comment.all.should eq [@c2, @c1]
+    end
 
-  it "sets the notification fields" do
-    @c = FactoryGirl.create(:comment)
-    @n = Notification.first
-    @n.sender.should eq @c.author
-    @n.recipient.should eq @c.post.author
-    @n.subject.should match /commented on/
-    @n.body.should eq @c.body
-    @n.post.should eq @c.post
-  end
-
-  it "doesn't send notifications to yourself" do
-    @m = FactoryGirl.create(:member)
-    @p = FactoryGirl.create(:post, :author => @m)
-    expect {
-      FactoryGirl.create(:comment, :post => @p, :author => @m)
-    }.to change(Notification, :count).by(0)
+    it 'has a scope for ASC order for displaying on post page' do
+      Comment.post_order.should eq [@c1, @c2]
+    end
   end
 
 end
diff --git a/spec/views/comments/new.html.haml_spec.rb b/spec/views/comments/new.html.haml_spec.rb
index 90b5e1cb3..a27868a16 100644
--- a/spec/views/comments/new.html.haml_spec.rb
+++ b/spec/views/comments/new.html.haml_spec.rb
@@ -4,9 +4,9 @@ describe "comments/new" do
   before(:each) do
     controller.stub(:current_user) { nil }
     @post = FactoryGirl.create(:post)
-    @previous_comment = FactoryGirl.create(:comment, :post => @post)
-    assign(:comment, FactoryGirl.create(:comment, :post => @post))
-    assign(:comments, [@previous_comment])
+    @comment = FactoryGirl.create(:comment, :post => @post)
+    assign(:comment, @comment)
+    assign(:comments, [@comment])
     render
   end
 
@@ -15,7 +15,7 @@ describe "comments/new" do
   end
 
   it "shows previous comments" do
-    rendered.should contain @previous_comment.body
+    rendered.should contain @comment.body
   end
 
   it "shows the correct comment count" do

From 18b92b133b95c3c35b406de44853f77c4fde4251 Mon Sep 17 00:00:00 2001
From: Skud <skud@infotrope.net>
Date: Fri, 24 May 2013 14:43:45 +1000
Subject: [PATCH 34/35] Added titles to comment items in RSS

---
 app/views/comments/index.rss.haml          | 1 +
 app/views/posts/show.rss.haml              | 1 +
 spec/views/comments/index.rss.haml_spec.rb | 4 ++++
 spec/views/posts/show.rss.haml_spec.rb     | 4 ++++
 4 files changed, 10 insertions(+)

diff --git a/app/views/comments/index.rss.haml b/app/views/comments/index.rss.haml
index 7408684f9..5e4b227c5 100644
--- a/app/views/comments/index.rss.haml
+++ b/app/views/comments/index.rss.haml
@@ -5,6 +5,7 @@
     %link= comments_url
     - @comments.each do |comment|
       %item
+        %title Comment by #{comment.author.login_name} on #{comment.post.subject}
         %author= comment.author.login_name
         %description
 
diff --git a/app/views/posts/show.rss.haml b/app/views/posts/show.rss.haml
index 2b4362225..4f260a038 100644
--- a/app/views/posts/show.rss.haml
+++ b/app/views/posts/show.rss.haml
@@ -5,6 +5,7 @@
     %link= post_url(@post)
     - @post.comments.each do |comment|
       %item
+        %title Comment by #{comment.author.login_name} on #{comment.created_at.to_s}
         %author= comment.author.login_name
         %description
 
diff --git a/spec/views/comments/index.rss.haml_spec.rb b/spec/views/comments/index.rss.haml_spec.rb
index 73bf99b99..e5eeeac95 100644
--- a/spec/views/comments/index.rss.haml_spec.rb
+++ b/spec/views/comments/index.rss.haml_spec.rb
@@ -16,6 +16,10 @@ describe 'comments/index.rss.haml' do
     rendered.should contain "Recent comments on all posts"
   end
 
+  it 'shows item title' do
+    rendered.should contain "Comment by #{@author.login_name}"
+  end
+
   it 'escapes html for link to post' do
     # it's then unescaped by 'render' so we don't actually look for &lt;
     rendered.should contain '<a href='
diff --git a/spec/views/posts/show.rss.haml_spec.rb b/spec/views/posts/show.rss.haml_spec.rb
index cfcf380e3..2f2780d09 100644
--- a/spec/views/posts/show.rss.haml_spec.rb
+++ b/spec/views/posts/show.rss.haml_spec.rb
@@ -15,6 +15,10 @@ describe 'posts/show.rss.haml' do
     rendered.should contain "Recent comments on #{@post.subject}"
   end
 
+  it 'shows item title' do
+    rendered.should contain "Comment by #{@author.login_name}"
+  end
+
   it 'escapes html for link to post' do
     # it's then unescaped by 'render' so we don't actually look for &lt;
     rendered.should contain '<a href='

From 29cbd5d21ece1d7ab537c6d57974cf3ea3321fff Mon Sep 17 00:00:00 2001
From: Skud <skud@infotrope.net>
Date: Fri, 24 May 2013 14:58:23 +1000
Subject: [PATCH 35/35] added Craig to contributors list

---
 CONTRIBUTORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 9f8a3c74a..024bd1578 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -31,6 +31,7 @@ submit the change with your pull request.
 - Jared McCorkindale / [jmcorkindale](https://github.com/jmcorkindale)
 - Florian Vallen / [flov](https://github.com/flov)
 - Samuel Cochrane / [sj26](https://github.com/sj26)
+- Craig Read / [Catharz](https://github.com/Catharz)
 - Ju Transcendancing / [transcendancing](https://github.com/transcendancing)
 - Lillian Ryan / [attlebish](https://github.com/attlebish)
 - Gary Traffanstedt / [blimey85](https://github.com/blimey85)