Merge pull request #321 from Growstuff/dev

Production push: order referral codes and some CSS fixes

Gemfile

@@ -6,6 +6,8 @@ gem 'rails', '3.2.13'
 gem 'rack', '~>1.4.5'
 gem 'json', '~>1.7.7'
 gem 'haml'
+gem 'leaflet-rails'
+gem 'leaflet-markercluster-rails'
 gem 'unicorn' # http server
 
 gem 'cancan' # for checking member privileges
@@ -87,7 +89,9 @@ gem 'friendly_id'
 gem 'gravatar-ultimate'
 
 # For geolocation
-gem 'geocoder'
+gem 'geocoder',
+  :git => 'https://github.com/alexreisner/geocoder.git',
+  :ref => '104d46'
 
 # For easy calendar selection
 gem 'bootstrap-datepicker-rails'

Gemfile.lock

@@ -1,3 +1,10 @@
+GIT
+  remote: https://github.com/alexreisner/geocoder.git
+  revision: 104d466ba7097b7dce5ba19f8e4091b7f69ccdf6
+  ref: 104d46
+  specs:
+    geocoder (1.1.8)
+
 GIT
   remote: https://github.com/seyhunak/twitter-bootstrap-rails.git
   revision: 2c7c527c354d9068ce49346d4fd8389328d32ce6
@@ -105,7 +112,6 @@ GEM
     flickraw (0.9.6)
     friendly_id (4.0.9)
     fssm (0.2.10)
-    geocoder (1.1.8)
     gibbon (1.0.0)
       httparty
       multi_json (>= 1.3.4)
@@ -129,6 +135,9 @@ GEM
       thor (>= 0.14, < 2.0)
     json (1.7.7)
     kgio (2.8.0)
+    leaflet-markercluster-rails (0.6.0)
+      railties (>= 3.1)
+    leaflet-rails (0.6.2)
     less (2.3.2)
       commonjs (~> 0.2.6)
     less-rails (2.3.3)
@@ -257,13 +266,15 @@ DEPENDENCIES
   factory_girl_rails (~> 4.0)
   flickraw
   friendly_id
-  geocoder
+  geocoder!
   gibbon
   gravatar-ultimate
   haml
   haml-rails
   jquery-rails
   json (~> 1.7.7)
+  leaflet-markercluster-rails
+  leaflet-rails
   less-rails
   memcachier
   newrelic_rpm

app/assets/javascripts/application.js

@@ -10,6 +10,8 @@
 // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
 // GO AFTER THE REQUIRES BELOW.
 //
+//= require leaflet
+//= require leaflet.markercluster
 //= require jquery
 //= require jquery_ujs
 //= require twitter/bootstrap

app/assets/javascripts/places.js.erb

@@ -0,0 +1,48 @@
+places_base_path = "/places";
+things_to_map = location.pathname + '.json';
+cloudmade_key = "<%= Growstuff::Application.config.cloudmade_key %>";
+cloudmade_url = "http://{s}.tile.cloudmade.com/" + cloudmade_key + "/73038/256/{z}/{x}/{y}.png";
+nominatim_base_url = 'http://nominatim.openstreetmap.org/search/';
+nominatim_user_agent_email = "<%= Growstuff::Application.config.user_agent_email %>";
+
+L.Icon.Default.imagePath = '/assets'
+
+if (location.pathname === places_base_path) { //places index page
+  map = L.map('map').setView([0.0, -0.0], 2);
+  showMap(map);
+} else { // specific place page
+  place = location.pathname.replace(places_base_path + "/", '');
+  nominatim_query_url = nominatim_base_url + place;
+  nominatim_options = {
+    format: "json",
+    callback: "placeholder",
+    limit: 1,
+    email: nominatim_user_agent_email
+  };
+  $.getJSON(nominatim_query_url, nominatim_options, function(data) {
+    map = L.map('map').setView([data[0].lat, data[0].lon], 5);
+    showMap(map);
+  })
+}
+
+function showMap(map) {
+  L.tileLayer(cloudmade_url, {
+    attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors under <a href="http://www.openstreetmap.org/copyright">ODbL</a> | Map imagery &copy; <a href="http://cloudmade.com">Cloudmade</a>',
+    maxZoom: 18
+  }).addTo(map);
+  markers = new L.MarkerClusterGroup({showCoverageOnHover: false});
+
+  $.getJSON(things_to_map, function(members) {
+    $.each(members, function(i, m) {
+      if (m.latitude && m.longitude) {
+        marker = new L.Marker(new L.LatLng(m.latitude, m.longitude));
+        link = "<p><a href='/members/" + m.login_name + "'>" + m.login_name + "</a></p>";
+        where = "<p><i>" + m.location + "</i></p>";
+        marker.bindPopup(link + where).openPopup();
+        markers.addLayer(marker);
+      }
+    });
+  });
+
+  map.addLayer(markers);
+}

app/assets/stylesheets/application.css

@@ -3,6 +3,10 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
- *= require_tree .
  *= require bootstrap-datepicker
+ *= require leaflet.ie
+ *= require leaflet
+ *= require leaflet.markercluster
+ *= require leaflet.markercluster.default
+ *= require_tree .
 */

app/assets/stylesheets/bootstrap_and_overrides.css.less

@@ -1,4 +1,11 @@
 @import "twitter/bootstrap/bootstrap";
+
+// this padding needs to be done before the responsive stuff is imported
+body {
+  padding-top: @navbarHeight + 10px;
+  padding-bottom: @navbarHeight + 10px;
+}
+
 @import "twitter/bootstrap/responsive";
 
 // Set the correct sprite paths
@@ -77,10 +84,7 @@
 @dropdownLinkColorHover: @brown;
 @dropdownLinkBackgroundHover: lighten(@green, 50%);
 
-body {
-  padding-top: @navbarHeight + 10px;
-  padding-bottom: @navbarHeight + 10px;
-}
+
 ul.inline > li.first {
   padding-left: 0px;
 }
@@ -147,6 +151,10 @@ p.stats {
   margin-left: 0px;
 }
 
+#map {
+  height: 500px;
+}
+
 // Overrides applying only to mobile view
 
 @media only screen and (max-width: 767px) {
@@ -155,4 +163,12 @@ p.stats {
     border-left: none;
     padding-left: 0;
   }
+
+  #map {
+    height: 300px;
+  }
+}
+
+li.crop-hierarchy {
+  list-style-type: disc;
 }

app/assets/stylesheets/leaflet_overrides.css.less

@@ -0,0 +1,3 @@
+.leaflet-popup-content-wrapper, .leaflet-popup-tip {
+  border: none;
+}

app/controllers/admin/orders_controller.rb

@@ -8,34 +8,10 @@ class Admin::OrdersController < ApplicationController
 
   def search
     authorize! :manage, :all
-    @orders = []
+    @orders = Order.search({:by => params[:search_by], :for => params[:search_text]})
 
-    if params[:search_text]
-      case params[:search_by]
-        when "member"
-          member = Member.find_by_login_name(params[:search_text])
-          if member
-            @orders = member.orders
-          end
-        when "order_id"
-          order = Order.find_by_id(params[:search_text])
-          if order
-            @orders = [order]
-          end
-        when "paypal_token"
-          order = Order.find_by_paypal_express_token(params[:search_text])
-          if order
-            @orders = [order]
-          end
-        when "paypal_payer_id"
-          order = Order.find_by_paypal_express_payer_id(params[:search_text])
-          if order
-            @orders = [order]
-          end
-      end
-      if @orders.empty?
-        flash[:alert] = "Couldn't find order with #{params[:search_by]} = #{params[:search_text]}"
-      end
+    if @orders.empty?
+      flash[:alert] = "Couldn't find order with #{params[:search_by]} = #{params[:search_text]}"
     end
 
     respond_to do |format|

app/controllers/crops_controller.rb

@@ -1,5 +1,6 @@
 class CropsController < ApplicationController
   load_and_authorize_resource
+  skip_authorize_resource :only => :hierarchy
 
   cache_sweeper :crop_sweeper
 
@@ -15,7 +16,7 @@ class CropsController < ApplicationController
     end
   end
 
-  # GET /wrangle
+  # GET /crops/wrangle
   def wrangle
     @crops = Crop.recent.paginate(:page => params[:page])
 
@@ -24,6 +25,14 @@ class CropsController < ApplicationController
     end
   end
 
+  # GET /crops/hierarchy
+  def hierarchy
+    @crops = Crop.toplevel
+    respond_to do |format|
+      format.html
+    end
+  end
+
   # GET /crops/1
   # GET /crops/1.json
   def show

app/controllers/members_controller.rb

@@ -32,31 +32,4 @@ class MembersController < ApplicationController
     end
   end
 
-  def nearby
-    if !params[:location].blank?
-      @location = params[:location]
-    elsif current_member
-      @location = current_member.location
-    else
-      @location = nil
-    end
-
-    if !params[:distance].blank?
-      @distance = params[:distance]
-    else
-      @distance = 100
-    end
-
-    if params[:units] == "mi"
-      @units = :mi
-    else
-      @units = :km
-    end
-
-    @nearby_members = @location ? Member.near(@location, @distance, :units => @units) : []
-    respond_to do |format|
-      format.html # nearby.html.haml
-    end
-  end
-
 end

app/controllers/orders_controller.rb

@@ -32,24 +32,28 @@ class OrdersController < ApplicationController
   def checkout
     @order = Order.find(params[:id])
 
-    response = EXPRESS_GATEWAY.setup_purchase(
-      @order.total,
-      :items             => @order.activemerchant_items,
-      :currency          => Growstuff::Application.config.currency,
-      :no_shipping       => true,
-      :ip                => request.remote_ip,
-      :return_url        => complete_order_url,
-      :cancel_return_url => shop_url
-    )
-    redirect_to EXPRESS_GATEWAY.redirect_url_for(response.token)
+    respond_to do |format|
+      if @order.update_attributes(:referral_code => params[:referral_code])
+        response = EXPRESS_GATEWAY.setup_purchase(
+          @order.total,
+          :items             => @order.activemerchant_items,
+          :currency          => Growstuff::Application.config.currency,
+          :no_shipping       => true,
+          :ip                => request.remote_ip,
+          :return_url        => complete_order_url,
+          :cancel_return_url => shop_url
+        )
+        format.html { redirect_to EXPRESS_GATEWAY.redirect_url_for(response.token) }
+      else
+        format.html { render action: "show" }
+      end
+    end
 
   end
 
   def complete
     @order = Order.find(params[:id])
 
-    @order.save
-
     if (params[:token] && params['PayerID'])
       purchase = EXPRESS_GATEWAY.purchase(
         @order.total,

app/controllers/places_controller.rb

@@ -0,0 +1,31 @@
+class PlacesController < ApplicationController
+  skip_authorize_resource
+
+  def index
+    respond_to do |format|
+      format.html
+      # json response is whatever we want to map here
+      format.json { render :json => Member.located.to_json(:only => [:id, :login_name, :location, :latitude, :longitude]) }
+    end
+  end
+
+  # GET /places/london
+  # GET /places/london.json
+  def show
+    @place = params[:place] # used for page title
+    @nearby_members = Member.nearest_to(params[:place])
+    respond_to do |format|
+      format.html # show.html.haml
+      format.json { render :json => @nearby_members.to_json(:only => [:id, :login_name, :location, :latitude, :longitude]) }
+    end
+  end
+
+  def search
+    respond_to do |format|
+      format.html do
+        redirect_to place_path(params[:new_place])
+      end
+    end
+  end
+
+end

app/models/crop.rb

@@ -14,6 +14,7 @@ class Crop < ActiveRecord::Base
 
   default_scope order("lower(system_name) asc")
   scope :recent, reorder("created_at desc")
+  scope :toplevel, where(:parent_id => nil)
   scope :randomized, reorder('random()') # ok on sqlite and psql, but not on mysql
 
   validates :en_wikipedia_url,

app/models/crop_sweeper.rb

@@ -4,6 +4,7 @@ class CropSweeper < ActionController::Caching::Sweeper
   def after_create(crop)
     expire_fragment('homepage_stats')
     expire_fragment('recent_crops')
+    expire_fragment('full_crop_hierarchy')
   end
 
   def after_update(crop)
@@ -13,6 +14,7 @@ class CropSweeper < ActionController::Caching::Sweeper
   def after_destroy(crop)
     expire_fragment('homepage_stats')
     expire_fragment('recent_crops')
+    expire_fragment('full_crop_hierarchy')
   end
 
 end

app/models/member.rb

@@ -26,7 +26,7 @@ class Member < ActiveRecord::Base
 
   default_scope order("lower(login_name) asc")
   scope :confirmed, where('confirmed_at IS NOT NULL')
-  scope :located, where("location <> ''")
+  scope :located, where("location <> '' and latitude IS NOT NULL and longitude IS NOT NULL")
   scope :recently_signed_in, reorder('updated_at DESC')
   scope :wants_newsletter, where(:newsletter => true)
 
@@ -204,10 +204,28 @@ class Member < ActiveRecord::Base
     return interesting_members
   end
 
+  def Member.nearest_to(place)
+    nearby_members = []
+    if place
+      latitude, longitude = Geocoder.coordinates(place, params: {limit: 1})
+      if latitude && longitude
+        nearby_members = Member.located.sort_by { |x| x.distance_from([latitude, longitude]) }
+      end
+    end
+    return nearby_members
+  end
+
   private
 
+  def geocode
+    unless self.location.blank?
+      self.latitude, self.longitude =
+        Geocoder.coordinates(location, params: {limit: 1})
+    end
+  end
+
   def empty_unwanted_geocodes
-    if self.location.to_s == ''
+    if self.location.blank?
       self.latitude = nil
       self.longitude = nil
     end

app/models/order.rb

@@ -1,11 +1,18 @@
 class Order < ActiveRecord::Base
-  attr_accessible :member_id, :completed_at
+  attr_accessible :member_id, :completed_at, :referral_code
   belongs_to :member
 
   has_many :order_items, :dependent => :destroy
 
   default_scope order('created_at DESC')
 
+  validates :referral_code, :format => {
+    :with => /\A[a-zA-Z0-9 ]*\z/,
+    :message => "may only include letters and numbers"
+  }
+
+  before_save :standardize_referral_code
+
   # total price of an order
   def total
     sum = 0
@@ -45,4 +52,46 @@ class Order < ActiveRecord::Base
     end
   end
 
+  # removes whitespace and forces to uppercase (we're somewhat liberal
+  # in what we accept, but we clean it up anyway.)
+  def standardize_referral_code
+    if referral_code
+      self.referral_code = referral_code.upcase.gsub /\s/, ''
+    end
+  end
+
+  # search orders (used by admin/orders)
+  # usage: Order.search({ :by => 'member', :for => 'Skud' })
+  # can search by: member, order_id, paypal_token, paypal_payer_id,
+  def Order.search(args={})
+    if args[:for]
+      case args[:by]
+        when "member"
+          member = Member.find_by_login_name(args[:for])
+          if member
+            return member.orders
+          end
+        when "order_id"
+          order = Order.find_by_id(args[:for])
+          if order
+            return [order]
+          end
+        when "paypal_token"
+          order = Order.find_by_paypal_express_token(args[:for])
+          if order
+            return [order]
+          end
+        when "paypal_payer_id"
+          order = Order.find_by_paypal_express_payer_id(args[:for])
+          if order
+            return [order]
+          end
+        when "referral_code"
+          # coerce to uppercase
+          return Order.where(:referral_code => args[:for].upcase)
+      end
+    end
+    return []
+  end
+
 end

app/models/planting.rb

@@ -39,6 +39,7 @@ class Planting < ActiveRecord::Base
     'cutting',
     'root division',
     'runner',
+    'bulb',
     'bare root plant',
     'advanced plant',
     'graft',

app/views/admin/orders/_searchform.html.haml

@@ -1,5 +1,5 @@
 = form_tag(url_for(:controller => 'admin/orders', :action => 'search'), :method => :get, :class => 'form-inline') do
   = label_tag :distance, "Search orders:", :class => 'control-label'
   = text_field_tag :search_text
-  = select_tag :search_by, options_for_select({'Member' => 'member', 'Order ID' => 'order_id', 'Paypal Token' => 'paypal_token', 'Paypal Payer ID' => 'paypal_payer_id' })
+  = select_tag :search_by, options_for_select({'Member' => 'member', 'Referral code' => 'referral_code', 'Order ID' => 'order_id', 'Paypal Token' => 'paypal_token', 'Paypal Payer ID' => 'paypal_payer_id' })
   = submit_tag "Search", :class => 'btn btn-primary'

app/views/admin/orders/search.html.haml

@@ -12,6 +12,7 @@
       %th Member
       %th Order number
       %th Date completed
+      %th Referral code
       %th Items
       %th
 
@@ -24,6 +25,8 @@
             = order.completed_at.to_s
           - else
             In progress
+        %td
+          = order.referral_code
         %td
           - if order.order_items.count > 0
             - order.order_items.each do |o|

app/views/crops/_hierarchy.html.haml

@@ -0,0 +1,7 @@
+%ul
+  - display_crops.each do |c|
+    %li.crop-hierarchy
+      = link_to c, c
+      - if c.varieties.present?
+        - c.varieties.each do |v|
+          = render :partial => 'hierarchy', :locals => { :display_crops => [ v ] }

app/views/crops/_varieties.html.haml

@@ -6,7 +6,5 @@
       = 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(", ")
+    Varieties:
+  = render :partial => 'hierarchy', :locals => { :display_crops => [ crop ] }

app/views/crops/hierarchy.html.haml

@@ -0,0 +1,9 @@
+- content_for :title, "Crop Hierarchy"
+
+%p
+  This page shows the hierarchical tree of all crops in our
+  = succeed "." do
+    = link_to "crops database", crops_path
+
+- cache("full_crop_hierarchy") do
+  = render :partial => "hierarchy", :locals => { :display_crops => @crops }

app/views/crops/index.html.haml

@@ -1,5 +1,10 @@
 - content_for :title, "Crops"
 
+%p
+  #{Growstuff::Application.config.site_name} tracks who's growing what, where.
+  View any crop page to see which of our members have planted it and find
+  information on how to grow it yourself.
+
 %div.pagination
   = page_entries_info @crops, :model => "crops"
   = will_paginate @crops

app/views/crops/wrangle.html.haml

@@ -5,6 +5,7 @@
   %li= link_to "Requests for new crops", 'http://growstuff.org/posts/skud-20130319-requests-for-new-crops'
   %li= link_to "Crop wrangler guidelines", "http://wiki.growstuff.org/index.php/Crop_wrangling"
   %li= link_to "crop-wranglers mailing list", "http://lists.growstuff.org/listinfo/crop-wranglers"
+  %li= link_to "Full crop hierarchy", crops_hierarchy_path
   %li= link_to "Add Crop", new_crop_path
 
 %h2 Recently added crops

app/views/home/_crops.html.haml

@@ -1,5 +1,5 @@
 .row-fluid
-  .span6
+  .span6.hidden-phone
     - cache "interesting_crops", :expires_in => 1.day do
       %h2 Some of our crops
       - Crop.interesting.each do |c|

app/views/home/_members.html.haml

@@ -1,17 +1,13 @@
 - cache "interesting_members" do
-  - members = Member.interesting.first(6)
-  - if members.present?
-    %h2 Some of our members
+  .visible-desktop.visible-tablet
+    - members = Member.interesting.first(6)
+    - if members.present?
+      %h2 Some of our members
 
-    .visible-desktop.visible-tablet
       .row-fluid
         - members.each do |m|
           .span6.homepage-members
             = render :partial => "members/thumbnail", :locals => { :member => m }
 
-    .visible-phone
-      - members.each do |m|
-        = render :partial => "members/thumbnail", :locals => { :member => m }
-
-    %p.text-right
-      = link_to "View all members »", members_path
+      %p.text-right
+        = link_to "View all members »", members_path

app/views/layouts/_footer.html.haml

@@ -1,12 +1,11 @@
-.container
-  .navbar.navbar-fixed-bottom
-    .navbar-inner
-      .container
-        %ul.nav
-          %li= link_to "About", "http://wiki.growstuff.org/index.php/About%20Growstuff"
-          %li= link_to "Contact", url_for(:controller => '/about', :action => 'contact')
-          %li= link_to "Terms of Service", url_for(:controller => '/policy', :action => 'tos')
-          %li= link_to "Privacy Policy", url_for(:controller => %'/policy', :action => 'privacy')
-          %li= link_to "Community Guidelines", url_for(:controller => '/policy', :action => 'community')
-          %li= link_to "Support/FAQ", url_for(:controller => '/support')
-          %li= link_to "Open Source", "https://github.com/Growstuff/growstuff"
+.navbar.navbar-fixed-bottom
+  .navbar-inner
+    .container
+      %ul.nav
+        %li= link_to "About", "http://wiki.growstuff.org/index.php/About%20Growstuff"
+        %li= link_to "Contact", url_for(:controller => '/about', :action => 'contact')
+        %li= link_to "Terms of Service", url_for(:controller => '/policy', :action => 'tos')
+        %li= link_to "Privacy Policy", url_for(:controller => %'/policy', :action => 'privacy')
+        %li= link_to "Community Guidelines", url_for(:controller => '/policy', :action => 'community')
+        %li= link_to "Support/FAQ", url_for(:controller => '/support')
+        %li= link_to "Open Source", "https://github.com/Growstuff/growstuff"

app/views/layouts/_header.html.haml

@@ -10,6 +10,7 @@
         %ul.nav
           %li= link_to "Crops", crops_path
           %li= link_to "Seeds", seeds_path
+          %li= link_to "Places", places_path
           %li.dropdown<
             %a.dropdown-toggle{'data-toggle' => 'dropdown', :href => members_path}
               Community
@@ -19,7 +20,7 @@
               %li= link_to "Posts", posts_path
               %li= link_to "Forums", forums_path
 
-            %li.divider-vertical
+          %li.divider-vertical
 
           - if member_signed_in?
             %li.dropdown<
@@ -29,24 +30,24 @@
                 - else
                   Your Stuff
                 %b.caret
-                %ul.dropdown-menu
-                  %li= link_to "Profile", member_path(current_member)
-                  %li= link_to "Gardens", gardens_by_owner_path(:owner => current_member.slug)
-                  %li= link_to "Plantings", plantings_by_owner_path(:owner => current_member.slug)
-                  %li= link_to "Seeds", seeds_by_owner_path(:owner => current_member.slug)
-                  %li= link_to "Posts", posts_by_author_path(:author => current_member.slug)
-                  %li= link_to "Account", orders_path
-                  %li
-                    - if current_member.notifications.unread_count > 0
-                      = link_to("Inbox (#{current_member.notifications.unread_count})", notifications_path)
-                    - else
-                      = link_to("Inbox", notifications_path)
+              %ul.dropdown-menu
+                %li= link_to "Profile", member_path(current_member)
+                %li= link_to "Gardens", gardens_by_owner_path(:owner => current_member.slug)
+                %li= link_to "Plantings", plantings_by_owner_path(:owner => current_member.slug)
+                %li= link_to "Seeds", seeds_by_owner_path(:owner => current_member.slug)
+                %li= link_to "Posts", posts_by_author_path(:author => current_member.slug)
+                %li= link_to "Account", orders_path
+                %li
+                  - if current_member.notifications.unread_count > 0
+                    = link_to("Inbox (#{current_member.notifications.unread_count})", notifications_path)
+                  - else
+                    = link_to("Inbox", notifications_path)
 
-              %li= link_to "Shop", shop_path
-              - if current_member.has_role?(:crop_wrangler)
-                %li= link_to "Crop Wrangling", wrangle_crops_path
-              - if current_member.has_role?(:admin)
-                %li= link_to "Admin", admin_path
+            %li= link_to "Shop", shop_path
+            - if current_member.has_role?(:crop_wrangler)
+              %li= link_to "Crop Wrangling", wrangle_crops_path
+            - if current_member.has_role?(:admin)
+              %li= link_to "Admin", admin_path
 
             %li= link_to "Sign out", destroy_member_session_path, :method => :delete
 

app/views/layouts/application.html.haml

@@ -17,8 +17,8 @@
               = alert
           = yield
 
-      %footer
-        = render :partial => "layouts/footer"
+    %footer
+      = render :partial => "layouts/footer"
     /
       Javascripts
       \==================================================

app/views/members/_popover.html.haml

@@ -13,4 +13,3 @@
     = pluralize(member.plantings.size, "planting")
     %br/
     = pluralize(member.seeds.size, "seed")
-

app/views/members/index.html.haml

@@ -1,11 +1,5 @@
 = content_for :title, "#{Growstuff::Application.config.site_name} members"
 
-%p
-  - if member_signed_in? && current_member.location
-    = link_to "Find members near you", nearby_members_path
-  - else
-    = link_to "Find members by location", nearby_members_path
-
 %div.pagination
   = page_entries_info @members, :model => "members"
   = will_paginate @members

app/views/members/show.html.haml

@@ -44,12 +44,9 @@
     - if @member.location.to_s != ''
       %h4 Location
       %p
-        = image_tag("http://maps.google.com/maps/api/staticmap?size=200x200&maptype=roadmap&sensor=false&markers=color:green|label:A|#{@member.latitude},#{@member.longitude}&zoom=12", :alt => "Map showing #{@member.location}", :width => 200, :height => 200 )
+        = link_to image_tag("http://maps.google.com/maps/api/staticmap?size=200x200&maptype=roadmap&sensor=false&markers=color:green|label:A|#{@member.latitude},#{@member.longitude}&zoom=12", :alt => "Map showing #{@member.location}", :width => 200, :height => 200 ), place_path(@member.location)
         %br/
-        Location:
-        = @member.location
-        %br/
-        = link_to 'Find members near here', nearby_members_path(:location => @member.location)
+        = link_to @member.location, place_path(@member.location)
 
   .span9
     %p

app/views/orders/show.html.haml

@@ -12,18 +12,23 @@
   %strong Date begun:
   = @order.created_at.to_s
 
-%p
-  - if @order.completed_at
+- if @order.completed_at
+  %p
     %strong Date completed:
     = @order.completed_at.to_s
 
-  - if current_member.has_role? :admin
-    %p
-      %strong Paypal Express token:
-      = @order.paypal_express_token
-    %p
-      %strong Paypal Express payer ID:
-      = @order.paypal_express_payer_id
+- if @order.referral_code
+  %p
+    %strong Referral code:
+    = @order.referral_code
+
+- if current_member.has_role? :admin
+  %p
+    %strong Paypal Express token:
+    = @order.paypal_express_token
+  %p
+    %strong Paypal Express payer ID:
+    = @order.paypal_express_payer_id
 
 %h2 Order items
 
@@ -53,12 +58,24 @@
         = price_with_currency(@order.total)
         = forex_link(@order.total)
 
-%p
-  - if can? :destroy, @order
-    = link_to 'Delete this order', @order, method: :delete, |
-      data: { confirm: 'Are you sure?' }, :class => 'btn'
-  - if can? :complete, @order
-    = link_to 'Checkout with PayPal', checkout_order_path(@order), :class => 'btn btn-primary'
+- if @order.errors.any?
+  .alert
+    #error_explanation
+      %h3= "#{pluralize(@order.errors.count, "error")} stopped you from checking out:"
+      %ul
+        - @order.errors.full_messages.each do |msg|
+          %li= msg
+
+- if can? :complete, @order or can? :destroy, @order
+  = form_tag(checkout_order_path(@order), :method => :get, :class => 'form-inline') do
+    %p
+      - if can? :complete, @order
+        = label_tag :referral_code, "Do you have a referral code?"
+        = text_field_tag :referral_code, @order.referral_code, :class => 'input-medium'
+        = submit_tag "Checkout with PayPal", :class => 'btn btn-primary'
+      - if can? :destroy, @order
+        = link_to 'Delete this order', @order, method: :delete, |
+          data: { confirm: 'Are you sure?' }, :class => 'btn'
+      = link_to "View other orders/order history", orders_path, :class => 'btn'
 
 %p
-  = link_to "View other orders/order history", orders_path

app/views/places/_map_attribution.html.haml

@@ -0,0 +1,6 @@
+Map data ©
+= link_to "OpenStreetMap", "http://openstreetmap.org"
+contributors under
+= link_to "ODbL", "http://www.openstreetmap.org/copyright"
+| Imagery ©
+= link_to "CloudMade", "http://cloudmade.com"

app/views/places/index.html.haml

@@ -0,0 +1,4 @@
+-content_for :title, "Places"
+
+%div#map
+

app/views/places/show.html.haml

@@ -0,0 +1,20 @@
+-content_for :title, @place
+
+= form_tag(search_places_path, :method => :get, :class => 'form-inline') do
+  = label_tag :place, "Change location:", :class => 'control-label'
+  = text_field_tag :new_place
+  = submit_tag "Search", :class => 'btn btn-primary'
+
+%div#map{ :style => "height:300px"}
+
+%h3
+  = Growstuff::Application.config.site_name
+  members near #{@place}
+
+- if !@nearby_members.empty?
+  %ul.thumbnails
+    - @nearby_members.first(30).each do |member|
+      %li.span4.three-across
+        = render :partial => "members/thumbnail", :locals => { :member => member }
+- elsif @place
+  %p No results found

app/views/plantings/_form.html.haml

@@ -8,11 +8,17 @@
 
   .control-group
     = f.label 'What did you plant?', :class => 'control-label'
-    .controls= collection_select(:planting, :crop_id, Crop.all, :id, :system_name, :selected => @planting.crop_id || @crop.id)
+    .controls
+      = collection_select(:planting, :crop_id, Crop.all, :id, :system_name, :selected => @planting.crop_id || @crop.id)
+      %span.help-inline
+        Can't find what you're looking for?
+        = link_to "Request new crops.", Growstuff::Application.config.new_crops_request_link
   .control-group
     = f.label 'Where did you plant it?', :class => 'control-label'
-    .controls= collection_select(:planting, :garden_id,
-        Garden.where(:owner_id => current_member), :id, :name, :selected => @planting.garden_id || @garden.id)
+    .controls
+      = collection_select(:planting, :garden_id, Garden.where(:owner_id => current_member), :id, :name, :selected => @planting.garden_id || @garden.id)
+      %span.help-inline
+        = link_to "Add a garden.", new_garden_path
   .control-group
     = f.label 'When?', :class => 'control-label'
     .controls= f.text_field :planted_at, :value => @planting.planted_at ? @planting.planted_at.to_s(:ymd) : '', :class => 'add-datepicker'

app/views/seeds/_form.html.haml

@@ -32,7 +32,7 @@
         - else
           from
           =succeed "." do
-            = current_member.location
+            = link_to current_member.location, place_path(current_member.location)
           =link_to "Change your location.", edit_member_registration_path
       %span.help-block
         Are you interested in trading or swapping seeds with other

app/views/seeds/index.html.haml

@@ -1,5 +1,9 @@
 - content_for :title, @owner ? "#{@owner}'s seeds" : "Everyone's seeds"
 
+%p
+  #{Growstuff::Application.config.site_name} helps you track your seed
+  stash or trade seeds with other members.
+
 %p
   - if can? :create, Seed
     - if @owner
@@ -43,7 +47,10 @@
         %td= seed.tradable? ? seed.tradable_to : ''
         %td
           - if seed.tradable?
-            = seed.owner.location.blank? ? "unspecified" : seed.owner.location
+            - if seed.owner.location.blank?
+              unspecified
+            - else
+              = link_to seed.owner.location, place_path(seed.owner.location)
         %td= link_to 'Details', seed, :class => 'btn btn-mini'
 
   %div.pagination

app/views/seeds/show.html.haml

@@ -23,7 +23,7 @@
       - else
         (from
         = succeed ")" do
-          = @seed.owner.location
+          = link_to @seed.owner.location, place_path(@seed.owner.location)
 
     %p
       %b Description:

config/application.rb

@@ -78,10 +78,27 @@ module Growstuff
         :openssl_verify_mode  => 'none'
       }
 
+    # Growstuff-specific configuration variables
+    config.currency = 'AUD'
+    config.bot_email = "noreply@growstuff.org"
+    config.user_agent = 'Growstuff'
+    config.user_agent_email = "info@growstuff.org"
     Gibbon::API.api_key = ENV['MAILCHIMP_APIKEY']
     Gibbon::API.timeout = 10
     Gibbon::API.throws_exceptions = false
     config.newsletter_list_id = ENV['MAILCHIMP_NEWSLETTER_ID']
+    config.cloudmade_key = '29a2d9e3cb3d429490a8f338b2388b1d'
+
+    # This is Growstuff's global Cloudmade key.  If you fork Growstuff for
+    # another project/website not run by the folks at http://growstuff.org/,
+    # then please change this key. (You can get one of your own at
+    # http://account.cloudmade.com/ and it's free/gratis for up to 500k tiles.)
+    # We'd much prefer to set this as an environment variable (as we do
+    # with most other things) but it turns out those aren't available at
+    # asset compile time on Heroku, when we need this to insert into our
+    # Javascript. Sigh. And yes, we know about user-env-compile but it
+    # didn't work for us.
+    config.cloudmade_key = '29a2d9e3cb3d429490a8f338b2388b1d'
 
   end
 end

config/environments/development.rb

@@ -39,6 +39,7 @@ Growstuff::Application.configure do
   config.assets.debug = true
 
   # Growstuff config
+  config.new_crops_request_link = "http://example.com/not-a-real-url"
   config.action_mailer.default_url_options = { :host => 'localhost:3000' }
 
   config.action_mailer.delivery_method = :smtp
@@ -51,12 +52,8 @@ Growstuff::Application.configure do
   }
   config.action_mailer.delivery_method = :smtp
 
-  Growstuff::Application.configure do
-    config.site_name = "Growstuff (dev)"
-    config.analytics_code = ''
-    config.currency = 'AUD'
-    config.bot_email = "noreply@growstuff.org"
-  end
+  config.site_name = "Growstuff (dev)"
+  config.analytics_code = ''
 
   config.after_initialize do
     ActiveMerchant::Billing::Base.mode = :test

config/environments/production.rb

@@ -66,6 +66,7 @@ Growstuff::Application.configure do
   # config.active_record.auto_explain_threshold_in_seconds = 0.5
 
   # Growstuff configuration
+  config.new_crops_request_link = "http://growstuff.org/posts/skud-20130319-requests-for-new-crops"
   config.action_mailer.default_url_options = { :host => 'growstuff.org' }
 
   config.action_mailer.smtp_settings = {
@@ -78,16 +79,12 @@ Growstuff::Application.configure do
   }
   config.action_mailer.delivery_method = :smtp
 
-  Growstuff::Application.configure do
-    config.site_name = "Growstuff"
-    config.analytics_code = <<-eos
-      <script src="//static.getclicky.com/js" type="text/javascript"></script>
-      <script type="text/javascript">try{ clicky.init(100594260); }catch(e){}</script>
-      <noscript><p><img alt="Clicky" width="1" height="1" src="//in.getclicky.com/100594260ns.gif" /></p></noscript>
-    eos
-    config.currency = 'AUD'
-    config.bot_email = "noreply@growstuff.org"
-  end
+  config.site_name = "Growstuff"
+  config.analytics_code = <<-eos
+    <script src="//static.getclicky.com/js" type="text/javascript"></script>
+    <script type="text/javascript">try{ clicky.init(100594260); }catch(e){}</script>
+    <noscript><p><img alt="Clicky" width="1" height="1" src="//in.getclicky.com/100594260ns.gif" /></p></noscript>
+  eos
 
   config.after_initialize do
     ActiveMerchant::Billing::Base.mode = :production

config/environments/staging.rb

@@ -66,6 +66,7 @@ Growstuff::Application.configure do
   # config.active_record.auto_explain_threshold_in_seconds = 0.5
 
   # Growstuff configuration
+  config.new_crops_request_link = "http://example.com/not-a-real-url"
   config.action_mailer.default_url_options = { :host => 'dev.growstuff.org' }
 
   config.action_mailer.smtp_settings = {
@@ -78,12 +79,8 @@ Growstuff::Application.configure do
   }
   config.action_mailer.delivery_method = :smtp
 
-  Growstuff::Application.configure do
-    config.site_name = "Growstuff (staging)"
-    config.analytics_code = ''
-    config.currency = 'AUD'
-    config.bot_email = "noreply@growstuff.org"
-  end
+  config.site_name = "Growstuff (staging)"
+  config.analytics_code = ''
 
   config.after_initialize do
     ActiveMerchant::Billing::Base.mode = :test

config/environments/test.rb

@@ -38,13 +38,13 @@ Growstuff::Application.configure do
   config.active_support.deprecation = :stderr
 
   # Growstuff config
+  config.new_crops_request_link = "http://example.com/not-a-real-url"
   config.action_mailer.default_url_options = { :host => 'localhost:3000' }
 
   Growstuff::Application.configure do
     config.site_name = "Growstuff (test)"
     config.analytics_code = ''
     config.currency = 'AUD'
-    config.bot_email = "noreply@growstuff.org"
   end
 
   config.after_initialize do
@@ -84,3 +84,5 @@ Geocoder::Lookup::Test.add_stub(
   ]
 )
 
+# Unknown location
+Geocoder::Lookup::Test.add_stub( "Tatooine", [])

config/initializers/geocoder.rb

@@ -1 +1,15 @@
-Geocoder.configure(:units => :km)
+Geocoder.configure(
+  :units => :km,
+  :timeout => 10,
+  :http_headers => {
+    "User-Agent" =>
+      "#{Growstuff::Application.config.user_agent} #{Growstuff::Application.config.user_agent_email}",
+    "From" => Growstuff::Application.config.user_agent_email
+  }
+)
+# This configuration takes precedence over environment/test.rb
+# Reported as https://github.com/alexreisner/geocoder/issues/509
+if Geocoder.config.lookup != :test
+  Geocoder.configure(:lookup => :nominatim)
+end
+

config/routes.rb

@@ -22,6 +22,7 @@ Growstuff::Application.routes.draw do
   resources :scientific_names
 
   match 'crops/wrangle' => 'crops#wrangle', :as => 'wrangle_crops'
+  match 'crops/hierarchy' => 'crops#hierarchy', :as => 'crops_hierarchy'
   resources :crops
 
   resources :comments
@@ -29,6 +30,10 @@ Growstuff::Application.routes.draw do
   resources :forums
   resources :notifications
 
+  get '/places' => 'places#index'
+  get '/places/search' => 'places#search', :as => 'search_places'
+  get '/places/:place' => 'places#show', :as => 'place'
+
   # everything for paid accounts etc
   resources :account_types
   resources :accounts
@@ -41,67 +46,10 @@ Growstuff::Application.routes.draw do
   resources :products
 
   get "home/index"
-
-  match 'search/members/nearby' => 'members#nearby', :as => :nearby_members
+  root :to => 'home#index'
 
   match 'auth/:provider/callback' => 'authentications#create'
 
-  # The priority is based upon order of creation:
-  # first created -> highest priority.
-
-  # Sample of regular route:
-  #   match 'products/:id' => 'catalog#view'
-  # Keep in mind you can assign values other than :controller and :action
-
-  # Sample of named route:
-  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
-  # This route can be invoked with purchase_url(:id => product.id)
-
-  # Sample resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Sample resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Sample resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Sample resource route with more complex sub-resources
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', :on => :collection
-  #     end
-  #   end
-
-  # Sample resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
-
-  # You can have the root of your site routed with "root"
-  # just remember to delete public/index.html.
-  root :to => 'home#index'
-
-  # See how all your routes lay out with "rake routes"
-
-  # This is a legacy wild controller route that's not recommended for RESTful applications.
-  # Note: This route will make all actions in every controller accessible via GET requests.
-  # match ':controller(/:action(/:id))(.:format)'
 
   match '/policy/:action' => 'policy#:action'
 

db/migrate/20130913015118_add_referral_code_to_order.rb

@@ -0,0 +1,5 @@
+class AddReferralCodeToOrder < ActiveRecord::Migration
+  def change
+    add_column :orders, :referral_code, :string
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130828114516) do
+ActiveRecord::Schema.define(:version => 20130913015118) do
 
   create_table "account_types", :force => true do |t|
     t.string   "name",              :null => false
@@ -87,11 +87,6 @@ ActiveRecord::Schema.define(:version => 20130828114516) do
   add_index "gardens", ["owner_id"], :name => "index_gardens_on_user_id"
   add_index "gardens", ["slug"], :name => "index_gardens_on_slug", :unique => true
 
-  create_table "gardens_members", :id => false, :force => true do |t|
-    t.integer "garden_id"
-    t.integer "member_id"
-  end
-
   create_table "members", :force => true do |t|
     t.string   "email",                   :default => "",   :null => false
     t.string   "encrypted_password",      :default => "",   :null => false
@@ -163,6 +158,7 @@ ActiveRecord::Schema.define(:version => 20130828114516) do
     t.integer  "member_id"
     t.string   "paypal_express_token"
     t.string   "paypal_express_payer_id"
+    t.string   "referral_code"
   end
 
   create_table "orders_products", :id => false, :force => true do |t|

spec/controllers/admin/orders_controller_spec.rb

@@ -2,4 +2,20 @@ require 'spec_helper'
 
 describe Admin::OrdersController do
 
+  login_member(:admin_member)
+
+  describe "GET search" do
+    it "assigns @orders" do
+      order = FactoryGirl.create(:order)
+      get :search, {:search_by => 'order_id', :search_text => order.id}
+      assigns(:orders).should eq([order])
+    end
+
+    it "sets an error message if nothing found" do
+      order = FactoryGirl.create(:order)
+      get :search, {:search_by => 'order_id', :search_text => 'foo'}
+      flash[:alert].should match /Couldn't find order with/
+    end
+  end
+
 end

spec/controllers/crops_controller_spec.rb

@@ -19,6 +19,14 @@ describe CropsController do
     end
   end
 
+  describe "GET crop hierarchy " do
+    it 'fetches the crop hierarchy page' do
+      get :hierarchy
+      response.should be_success
+      response.should render_template("crops/hierarchy")
+    end
+  end
+
   describe "GET RSS feed" do
     it "returns an RSS feed" do
       get :index, :format => "rss"

spec/controllers/member_controller_spec.rb

@@ -65,105 +65,4 @@ describe MembersController do
     end
   end
 
-  describe "GET nearby members" do
-    before(:each) do
-      @member_london = FactoryGirl.create(:london_member)
-      @member_south_pole = FactoryGirl.create(:south_pole_member)
-    end
-
-    context "when the user is logged in and has set their location" do
-      before(:each) do
-        @member = FactoryGirl.create(:london_member)
-        controller.stub(:current_member) { @member }
-      end
-
-      it "assigns the current member as nearby" do
-        get :nearby
-        assigns(:nearby_members).should include @member
-      end
-
-      it "assigns nearby members as nearby" do
-        get :nearby
-        assigns(:nearby_members).should include @member_london
-      end
-
-      it "doesn't assign far-off members as nearby" do
-        get :nearby
-        assigns(:nearby_members).should_not include @member_south_pole
-      end
-
-      it "gets members near the specified location if one is set" do
-        get :nearby, { :location => @member_south_pole.location }
-        assigns(:nearby_members).should include @member_south_pole
-      end
-
-      it "does not assign members near current_member if a location is set" do
-        get :nearby, { :location => @member_south_pole.location }
-        assigns(:nearby_members).should_not include @member_london
-      end
-
-      it "finds faraway members if you increase the distance" do
-        get :nearby, { :distance => "50000" }
-        assigns(:nearby_members).should include @member_south_pole
-      end
-
-      # Edinburgh and London are approximately 330mi/530km apart
-      it "finds London members within 350 miles of Edinburgh" do 
-        get :nearby, { :distance => "350", :units => :mi, :location => "Edinburgh" }
-        assigns(:nearby_members).should include @member_london
-      end
-
-      it "doesn't find London members within 350 km of Edinburgh" do
-        get :nearby, { :distance => "350", :units => :km, :location => "Edinburgh" }
-        assigns(:nearby_members).should_not include @member_london
-      end
-
-    end
-
-    context "when the user is logged in but hasn't set their location" do
-      before(:each) do
-        @member = FactoryGirl.create(:member)
-        controller.stub(:current_member) { @member }
-      end
-
-      it "doesn't assign any members as nearby if no location is set" do
-        get :nearby
-        assigns(:nearby_members).should == []
-      end
-
-      it "assigns nearby members if a location is set" do
-        get :nearby, { :location => @member_london.location }
-        assigns(:nearby_members).should include @member_london
-      end
-
-      it "does not assign far members if a location is set" do
-        get :nearby, { :location => @member_london.location }
-        assigns(:nearby_members).should_not include @member_south_pole
-      end
-
-    end
-
-    context "when the user is not logged in" do
-      before(:each) do
-        controller.stub(:current_member) { nil }
-        get :nearby
-      end
-
-      it "doesn't assign any members as nearby if no location is set" do
-        get :nearby
-        assigns(:nearby_members).should == []
-      end
-
-      it "assigns nearby members if a location is set" do
-        get :nearby, { :location => @member_london.location }
-        assigns(:nearby_members).should include @member_london
-      end
-
-      it "does not assign far members if a location is set" do
-        get :nearby, { :location => @member_london.location }
-        assigns(:nearby_members).should_not include @member_south_pole
-      end
-    end
-  end
-
 end

spec/controllers/orders_controller_spec.rb

@@ -13,6 +13,15 @@ describe OrdersController do
   end
 
   describe "GET checkout" do
+    it 'sets the referral_code' do
+      member = FactoryGirl.create(:member)
+      sign_in member
+      order = Order.create!(:member_id => member.id)
+      get :checkout, {:id => order.to_param, :referral_code => 'FOOBAR'}
+      order.reload
+      order.referral_code.should eq 'FOOBAR'
+    end
+
     it "redirects to Paypal" do
       member = FactoryGirl.create(:member)
       sign_in member

spec/controllers/places_controller_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe PlacesController do
+  before :each do
+    controller.stub(:current_member) { nil }
+  end
+
+  describe "GET show" do
+    before(:each) do
+      @member_london = FactoryGirl.create(:london_member)
+      @member_south_pole = FactoryGirl.create(:south_pole_member)
+    end
+
+    it "assigns place name" do
+      get :show, { :place => @member_london.location }
+      assigns(:place).should eq @member_london.location
+    end
+
+    it "assigns nearby members" do
+      get :show, { :place => @member_london.location }
+      assigns(:nearby_members).should eq [@member_london, @member_south_pole]
+    end
+
+  end
+
+  describe "GET search" do
+    it "redirects to the new place" do
+      get :search, { :new_place => "foo" }
+      response.should redirect_to place_path("foo")
+    end
+  end
+end

spec/factories/member.rb

@@ -41,6 +41,12 @@ FactoryGirl.define do
       longitude 0.004
     end
 
+    factory :edinburgh_member do
+      location 'Edinburgh'
+      latitude 55.953252
+      longitude -3.188267
+    end
+
     factory :south_pole_member do
       sequence(:login_name) { |n| "ScottRF#{n}" }
       location 'Amundsen-Scott Base, Antarctica'

spec/factories/orders.rb

@@ -6,5 +6,9 @@ FactoryGirl.define do
     factory :completed_order do
       completed_at '2013-05-08 01:01:01'
     end
+
+    factory :referred_order do
+      referral_code 'CAMPAIGN1'
+    end
   end
 end

spec/models/crop_spec.rb

@@ -81,6 +81,12 @@ describe Crop do
       @roma.parent.should eq @tomato
       @tomato.varieties.should eq [@roma]
     end
+
+    it 'toplevel scope works' do
+      @tomato = FactoryGirl.create(:tomato)
+      @roma = FactoryGirl.create(:roma, :parent_id => @tomato.id)
+      Crop.toplevel.should eq [ @tomato ]
+    end
   end
 
   context 'photos' do

spec/models/member_spec.rb

@@ -86,6 +86,13 @@ describe 'member' do
       @member.longitude.should be_nil
     end
 
+    it 'fails gracefully for unfound locations' do
+      @member.update_attributes(:location => 'Tatooine')
+      @member.location.should eq 'Tatooine'
+      @member.latitude.should be_nil
+      @member.longitude.should be_nil
+    end
+
   end
 
   context 'no TOS agreement' do
@@ -224,22 +231,35 @@ describe 'member' do
   end
 
   context 'located scope' do
-    it 'recognises non-blank locations as interesting' do
-      @m = FactoryGirl.create(:member, :location => 'Greenwich, UK')
-      Member.located.should include @m
+    # located members must have location, lat, long
+    it 'finds members who have locations' do
+      @london_member = FactoryGirl.create(:london_member)
+      Member.located.should include @london_member
     end
-    it 'recognises nil locations as uninteresting' do
-      @m = FactoryGirl.create(:member, :location => nil)
-      Member.located.should_not include @m
+
+    it 'ignores members with blank locations' do
+      @nowhere_member = FactoryGirl.create(:member)
+      Member.located.should_not include @nowhere_member
     end
-    it 'recognises empty string locations as uninteresting' do
-      @m = FactoryGirl.create(:member, :location => '')
-      Member.located.should_not include @m
+
+    it 'ignores members with blank lat/long' do
+      @london_member = FactoryGirl.create(:london_member)
+      @london_member.latitude = nil
+      @london_member.longitude = nil
+      @london_member.save(:validate => false)
+      Member.located.should_not include @london_member
     end
   end
 
-  context 'interesting' do
+  context 'near location' do
+    it 'finds nearby members and sorts them' do
+      @edinburgh_member = FactoryGirl.create(:edinburgh_member)
+      @london_member = FactoryGirl.create(:london_member)
+      Member.nearest_to('Greenwich, UK').should eq [@london_member, @edinburgh_member]
+    end
+  end
 
+  context 'interesting scope' do
     # interesting members are defined as:
     # 1) confirmed
     # 2) have a location

spec/models/order_spec.rb

@@ -84,4 +84,49 @@ describe Order do
 
   end
 
+  context "referral codes" do
+    it "has a referral code" do
+      referred_order = FactoryGirl.create(:referred_order)
+      referred_order.referral_code.should_not be nil
+    end
+
+    it "validates referral codes" do
+      referred_order = FactoryGirl.build(:order, :referral_code => 'CAMP_AIGN1?')
+      referred_order.should_not be_valid
+    end
+
+    it "cleans up messy referral codes" do
+      referred_order = FactoryGirl.create(:order, :referral_code => 'CaMpAiGn 1  ')
+      referred_order.referral_code.should eq 'CAMPAIGN1'
+    end
+  end
+
+  context 'search' do
+    it 'finds orders by member' do
+      order = FactoryGirl.create(:order)
+      Order.search(:by => 'member', :for => order.member.login_name).should eq [order]
+    end
+
+    it 'finds orders by order_id' do
+      order = FactoryGirl.create(:order)
+      Order.search(:by => 'order_id', :for => order.id).should eq [order]
+    end
+
+    it 'finds orders by paypal_token' do
+      order = FactoryGirl.create(:order, :paypal_express_token => 'foo')
+      Order.search(:by => 'paypal_token', :for => 'foo').should eq [order]
+    end
+
+    it 'finds orders by paypal_payer_id' do
+      order = FactoryGirl.create(:order, :paypal_express_payer_id => 'bar')
+      Order.search(:by => 'paypal_payer_id', :for => 'bar').should eq [order]
+    end
+
+    it 'finds orders by referral_code' do
+      order = FactoryGirl.create(:order, :referral_code => 'baz')
+      Order.search(:by => 'referral_code', :for => 'baz').should eq [order]
+    end
+
+  end
+
 end

spec/models/planting_spec.rb

@@ -110,7 +110,7 @@ describe Planting do
     it 'all valid planted_from values should work' do
       ['seed', 'seedling', 'cutting', 'root division',
         'runner', 'bare root plant', 'advanced plant',
-        'graft', 'layering', nil, ''].each do |p|
+        'graft', 'layering', 'bulb', nil, ''].each do |p|
         @planting = FactoryGirl.build(:planting, :planted_from => p)
         @planting.should be_valid
       end

spec/views/admin/orders/index_spec.rb

@@ -13,4 +13,8 @@ describe 'admin/orders/index.html.haml', :type => "view" do
     assert_select "input#search_text"
     assert_select "select#search_by"
   end
+
+  it "lets you search by referral code" do
+    assert_select "option[value=referral_code]", :text => "Referral code"
+  end
 end

spec/views/crops/hierarchy.html.haml_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe "crops/hierarchy" do
+  before(:each) do
+    controller.stub(:current_user) { nil }
+    @tomato = FactoryGirl.create(:tomato)
+    @roma = FactoryGirl.create(:crop, :system_name => 'Roma tomato', :parent => @tomato)
+    assign(:crops, [@tomato, @roma])
+    render
+  end
+
+  it "shows crop hierarchy" do
+    assert_select "ul>li>ul>li", :text => @roma.system_name
+  end
+end

spec/views/layouts/_header_spec.rb

@@ -24,6 +24,10 @@ describe 'layouts/_header.html.haml', :type => "view" do
       rendered.should contain "Seeds"
     end
 
+    it 'has a Places link' do
+      rendered.should contain "Places"
+    end
+
     it 'has a Community section' do
       rendered.should contain "Community"
     end

spec/views/members/nearby.html.haml_spec.rb

@@ -1,74 +0,0 @@
-require 'spec_helper'
-
-describe "members/nearby" do
-  before(:each) do
-    @member = FactoryGirl.create(:london_member)
-    @nearby_members = [FactoryGirl.create(:member)]
-  end
-
-  context "when the epicentre is the member's location" do
-    before(:each) do
-      controller.stub(:current_user) { @member }
-      controller.stub(:current_member) { @member }
-      @location = @member.location
-      render
-    end
-
-    it "shows the member's location in the textbox" do
-      assert_select "#location", :value => @location
-    end
-
-    it "shows the default distance in the textbox" do
-      assert_select "#distance", :value => "100"
-    end
-
-    it "shows a dropdown with miles and km" do
-      assert_select "select#units"
-      assert_select "select#units option[value=km]"
-      assert_select "select#units option[value=mi]"
-    end
-
-    it "shows the names of nearby members" do
-      @nearby_members.each do |m|
-        rendered.should contain m.login_name
-      end
-    end
-  end
-
-  context "when the epicentre is somewhere else" do
-    before(:each) do
-      controller.stub(:current_user) { @member }
-      controller.stub(:current_member) { @member }
-      @location = "Rothera base, Adelaide Island, Antarctica"
-      render
-    end
-
-    it "shows the selected location" do
-      view.content_for(:title).should == "Members near #{@location}"
-    end
-
-    it "shows the selected location in the textbox" do
-      assert_select "#location", :value => @location
-    end
-
-    it "shows the names of nearby members" do
-      @nearby_members.each do |m|
-        rendered.should contain m.login_name
-      end
-    end
-  end
-
-  context "when the user is not logged in and no location is given" do
-    before(:each) do
-      controller.stub(:current_user) { nil }
-      controller.stub(:current_member) { nil }
-      @location = nil
-      render
-    end
-
-    it "shows 'Find nearby members' as the title" do
-      view.content_for(:title).should == "Find nearby members"
-    end
-  end
-
-end

spec/views/members/show.html.haml_spec.rb

@@ -189,6 +189,10 @@ describe "members/show" do
     it "shows a map" do
       assert_select "img", :src => /maps\.google\.com/
     end
+
+    it 'includes a link to places page' do
+      assert_select 'a', :href => place_path(@member.location)
+    end
   end
 
   context "no location stated" do

spec/views/orders/show.html.haml_spec.rb

@@ -37,8 +37,12 @@ describe "orders/show" do
       assert_select("a[href=http://www.wolframalpha.com/input/?i=198.00+#{currency}]")
     end
 
+    it "asks for a referral code" do
+      assert_select "input[id='referral_code']"
+    end
+
     it "shows a checkout button" do
-      assert_select "a", :text => "Checkout with PayPal"
+      assert_select "input[value='Checkout with PayPal']"
     end
 
     it "shows a delete order button" do

spec/views/places/_map_attribution.html.haml_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe "places/_map_attribution.html.haml", :type => :view do
+  before(:each) do
+    render
+  end
+
+  it "links to OpenStreetMap" do
+    assert_select "a", :href => "http://openstreetmap.org",
+      :text => "OpenStreetMap"
+  end
+
+  it "links to the ODbL" do
+    assert_select "a", :href => "http://www.openstreetmap.org/copyright",
+      :text => "ODbL"
+  end
+
+  it "links to CloudMade" do
+    assert_select "a", :href => "http://cloudmade.com", :text => "CloudMade"
+  end
+end

spec/views/places/index.html.haml_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe "places/index" do
+  before(:each) do
+    render
+  end
+
+  it "shows a map" do
+    assert_select "div#map"
+  end
+end

spec/views/places/show.html.haml_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe "places/show" do
+  before(:each) do
+    @member = FactoryGirl.create(:london_member)
+    @nearby_members = [FactoryGirl.create(:member)]
+    controller.stub(:current_user) { @member }
+    controller.stub(:current_member) { @member }
+    @place = @member.location
+    render
+  end
+
+  it "shows the selected place" do
+    view.content_for(:title).should == @place
+  end
+
+  it "shows the selected place in the textbox" do
+    assert_select "#new_place", :value => @place
+  end
+
+  it "shows the names of nearby members" do
+    @nearby_members.each do |m|
+      rendered.should contain m.login_name
+    end
+  end
+
+end

spec/views/plantings/edit.html.haml_spec.rb

@@ -38,6 +38,11 @@ describe "plantings/edit" do
       end
     end
 
+    it 'includes helpful links for crops and gardens' do
+      assert_select "a[href=#{new_garden_path}]", :text => "Add a garden."
+      assert_select "a[href=#{Growstuff::Application.config.new_crops_request_link}]", :text => "Request new crops."
+    end
+
     it "chooses the right crop" do
       assert_select "select#planting_crop_id",
         :html => /option value="#{@tomato.id}" selected="selected"/

spec/views/plantings/new.html.haml_spec.rb

@@ -38,6 +38,11 @@ describe "plantings/new" do
       end
     end
 
+    it 'includes helpful links for crops and gardens' do
+      assert_select "a[href=#{new_garden_path}]", :text => "Add a garden."
+      assert_select "a[href=#{Growstuff::Application.config.new_crops_request_link}]", :text => "Request new crops."
+    end
+
     it "selects a crop given in a param" do
       assert_select "select#planting_crop_id",
         :html => /option value="#{@crop2.id}" selected="selected"/

spec/views/seeds/index.html.haml_spec.rb

@@ -39,6 +39,7 @@ describe "seeds/index" do
 
     it "shows location of seed owner" do
       assert_select "tr>td", :text => @owner.location, :count => 2
+      assert_select 'a', :href => place_path(@owner.location)
     end
   end
 end

spec/views/seeds/new.html.haml_spec.rb

@@ -37,6 +37,7 @@ describe "seeds/new" do
     it 'shows the location' do
       render
       rendered.should contain "from #{@member.location}."
+      assert_select 'a', :href => place_path(@member.location)
     end
 
     it 'links to change location' do

spec/views/seeds/show.html.haml_spec.rb

@@ -31,6 +31,7 @@ describe "seeds/show" do
     it "shows location of seed owner" do
       render
       rendered.should contain @owner.location
+      assert_select 'a', :href => place_path(@owner.location)
     end
 
     context 'with no location' do