Specify ruby version for heroku's benefit

Quick tweaks

Gemfile

@@ -1,17 +1,23 @@
 source 'https://rubygems.org'
 
+ruby "1.9.3"
+
 gem 'bundler', '>=1.1.5'
 
 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
 
 gem 'gibbon' # for Mailchimp newsletter subscriptions
 
+gem 'csv_shaper' # CSV export
+
 # vendored activemerchant for testing- needed for bogus paypal
 # gateway monkeypatch
 gem 'activemerchant', '1.33.0',
@@ -25,6 +31,7 @@ group :production, :staging do
   gem 'newrelic_rpm'
   gem 'dalli'
   gem 'memcachier'
+  gem 'rails_12factor' # supresses heroku plugin injection
 end
 
 # Gems used only for assets and not required
@@ -69,6 +76,8 @@ group :development do
   # Installation of the debugger gem fails on Travis CI,
   # so we don't use it in the test environment
   gem 'debugger'
+  gem 'better_errors'
+  gem 'binding_of_caller'
 end
 
 # Markdown formatting for updates etc
@@ -87,7 +96,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
@@ -53,12 +60,18 @@ GEM
       multi_json (~> 1.0)
     arel (3.0.2)
     bcrypt-ruby (3.1.1)
+    better_errors (1.0.1)
+      coderay (>= 1.0.0)
+      erubis (>= 2.6.6)
+    binding_of_caller (0.7.2)
+      debug_inspector (>= 0.0.1)
     bluecloth (2.2.0)
     bootstrap-datepicker-rails (1.1.1.3)
       railties (>= 3.0)
     builder (3.0.4)
     cancan (1.6.10)
     chunky_png (1.2.8)
+    coderay (1.1.0)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
@@ -81,7 +94,10 @@ GEM
       rest-client
       simplecov (>= 0.7)
       thor
+    csv_shaper (1.0.0)
+      activesupport (>= 3.0.0)
     dalli (2.6.4)
+    debug_inspector (0.0.2)
     debugger (1.6.1)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
@@ -105,7 +121,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 +144,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)
@@ -176,6 +194,11 @@ GEM
       activesupport (= 3.2.13)
       bundler (~> 1.0)
       railties (= 3.2.13)
+    rails_12factor (0.0.2)
+      rails_serve_static_assets
+      rails_stdout_logging
+    rails_serve_static_assets (0.0.1)
+    rails_stdout_logging (0.0.3)
     railties (3.2.13)
       actionpack (= 3.2.13)
       activesupport (= 3.2.13)
@@ -244,6 +267,8 @@ PLATFORMS
 DEPENDENCIES
   active_utils (= 1.0.5)!
   activemerchant (= 1.33.0)!
+  better_errors
+  binding_of_caller
   bluecloth
   bootstrap-datepicker-rails
   bundler (>= 1.1.5)
@@ -251,19 +276,22 @@ DEPENDENCIES
   coffee-rails (~> 3.2.1)
   compass-rails (~> 1.0.3)
   coveralls
+  csv_shaper
   dalli
   debugger
   devise
   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
@@ -273,6 +301,7 @@ DEPENDENCIES
   pg
   rack (~> 1.4.5)
   rails (= 3.2.13)
+  rails_12factor
   rake (>= 10.0.0)
   rspec-rails (~> 2.12.1)
   sass-rails (~> 3.2.3)

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/harvests.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

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,19 @@ p.stats {
   margin-left: 0px;
 }
 
+#map {
+  height: 500px;
+}
+
+.member-location {
+  font-size: small;
+  font-style: italic;
+}
+
+.member-location a {
+  color: @brown;
+}
+
 // Overrides applying only to mobile view
 
 @media only screen and (max-width: 767px) {
@@ -155,4 +172,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
 
@@ -9,13 +10,21 @@ class CropsController < ApplicationController
     @crops = Crop.includes(:scientific_names, {:plantings => :photos}).paginate(:page => params[:page])
 
     respond_to do |format|
-      format.html # index.html.haml
-      format.json { render json: @crops }
-      format.rss { render :layout => false }
+      format.html 
+      format.json { render :json => @crops }
+      format.rss do
+        @crops = Crop.recent.includes(:scientific_names, :creator)
+        render :rss => @crops
+      end
+      format.csv do
+        @filename = "Growstuff-Crops-#{Time.zone.now.to_s(:number)}.csv"
+        @crops = Crop.includes(:scientific_names, :plantings, :seeds, :creator)
+        render :csv => @crops
+      end
     end
   end
 
-  # GET /wrangle
+  # GET /crops/wrangle
   def wrangle
     @crops = Crop.recent.paginate(:page => params[:page])
 
@@ -24,6 +33,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/harvests_controller.rb

@@ -0,0 +1,106 @@
+class HarvestsController < ApplicationController
+
+  load_and_authorize_resource
+
+  # GET /harvests
+  # GET /harvests.json
+  def index
+    @owner = Member.find_by_slug(params[:owner])
+    if @owner
+      @harvests = @owner.harvests.includes(:owner, :crop).paginate(:page => params[:page])
+    else
+      @harvests = Harvest.includes(:owner, :crop).paginate(:page => params[:page])
+    end
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @harvests }
+      format.csv do
+        if @owner
+          @filename = "Growstuff-#{@owner}-Harvests-#{Time.zone.now.to_s(:number)}.csv"
+          @harvests = @owner.harvests.includes(:owner, :crop)
+        else
+          @filename = "Growstuff-Harvests-#{Time.zone.now.to_s(:number)}.csv"
+          @harvests = Harvest.includes(:owner, :crop)
+        end
+        render :csv => @harvests
+      end
+    end
+  end
+
+  # GET /harvests/1
+  # GET /harvests/1.json
+  def show
+    @harvest = Harvest.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @harvest }
+    end
+  end
+
+  # GET /harvests/new
+  # GET /harvests/new.json
+  def new
+    @harvest = Harvest.new('harvested_at' => Date.today)
+
+    # using find_by_id here because it returns nil, unlike find
+    @crop     = Crop.find_by_id(params[:crop_id]) || Crop.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @harvest }
+    end
+  end
+
+  # GET /harvests/1/edit
+  def edit
+    @harvest = Harvest.find(params[:id])
+  end
+
+  # POST /harvests
+  # POST /harvests.json
+  def create
+    params[:harvest][:owner_id] = current_member.id
+    params[:harvested_at] = parse_date(params[:harvested_at])
+    @harvest = Harvest.new(params[:harvest])
+
+    respond_to do |format|
+      if @harvest.save
+        format.html { redirect_to @harvest, notice: 'Harvest was successfully created.' }
+        format.json { render json: @harvest, status: :created, location: @harvest }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @harvest.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /harvests/1
+  # PUT /harvests/1.json
+  def update
+    @harvest = Harvest.find(params[:id])
+
+    respond_to do |format|
+      if @harvest.update_attributes(params[:harvest])
+        format.html { redirect_to @harvest, notice: 'Harvest was successfully updated.' }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @harvest.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /harvests/1
+  # DELETE /harvests/1.json
+  def destroy
+    @harvest = Harvest.find(params[:id])
+    @harvest.destroy
+
+    respond_to do |format|
+      format.html { redirect_to harvests_url }
+      format.json { head :no_content }
+    end
+  end
+end

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/controllers/plantings_controller.rb

@@ -17,6 +17,16 @@ class PlantingsController < ApplicationController
       format.html # index.html.erb
       format.json { render json: @plantings }
       format.rss { render :layout => false } #index.rss.builder
+      format.csv do
+        if @owner
+          @filename = "Growstuff-#{@owner}-Plantings-#{Time.zone.now.to_s(:number)}.csv"
+          @plantings = @owner.plantings.includes(:owner, :crop, :garden)
+        else
+          @filename = "Growstuff-Plantings-#{Time.zone.now.to_s(:number)}.csv"
+          @plantings = Planting.includes(:owner, :crop, :garden)
+        end
+        render :csv => @plantings
+      end
     end
   end
 

app/controllers/seeds_controller.rb

@@ -17,6 +17,16 @@ class SeedsController < ApplicationController
       format.html # index.html.erb
       format.json { render json: @seeds }
       format.rss { render :layout => false } #index.rss.builder
+      format.csv do
+        if @owner
+          @filename = "Growstuff-#{@owner}-Seeds-#{Time.zone.now.to_s(:number)}.csv"
+          @seeds = @owner.seeds.includes(:owner, :crop)
+        else
+          @filename = "Growstuff-Seeds-#{Time.zone.now.to_s(:number)}.csv"
+          @seeds = Seed.includes(:owner, :crop)
+        end
+        render :csv => @seeds
+      end
     end
   end
 

app/helpers/harvests_helper.rb

@@ -0,0 +1,40 @@
+module HarvestsHelper
+
+  def display_quantity(harvest)
+    human_quantity = display_human_quantity(harvest)
+    weight = display_weight(harvest)
+
+    if human_quantity && weight
+      return "#{human_quantity}, weighing #{weight}"
+    elsif human_quantity
+      return human_quantity
+    elsif weight
+      return weight
+    else
+      return 'not specified'
+    end
+  end
+
+  def display_human_quantity(harvest)
+    if ! harvest.quantity.blank? && harvest.quantity > 0
+      if harvest.unit == 'individual' # just the number
+        number_to_human(harvest.quantity, :strip_insignificant_zeros => true)
+      elsif ! harvest.unit.blank? # pluralize anything else
+        return pluralize(number_to_human(harvest.quantity, :strip_insignificant_zeros => true), harvest.unit)
+      else
+        return "#{number_to_human(harvest.quantity, :strip_insignificant_zeros => true)} #{harvest.unit}"
+      end
+    else
+      return nil
+    end
+  end
+
+  def display_weight(harvest)
+    if ! harvest.weight_quantity.blank? && harvest.weight_quantity > 0
+      return "#{number_to_human(harvest.weight_quantity, :strip_insignificant_zeros => true)} #{harvest.weight_unit}"
+    else
+      return nil
+    end
+  end
+
+end

app/models/ability.rb

@@ -64,6 +64,10 @@ class Ability
       can :update,  Planting, :garden => { :owner_id => member.id }
       can :destroy, Planting, :garden => { :owner_id => member.id }
 
+      can :create,  Harvest
+      can :update,  Harvest, :owner_id => member.id
+      can :destroy, Harvest, :owner_id => member.id
+
       can :create, Photo
       can :update, Photo, :owner_id => member.id
       can :destroy, Photo, :owner_id => member.id

app/models/crop.rb

@@ -1,19 +1,21 @@
 class Crop < ActiveRecord::Base
   extend FriendlyId
-  friendly_id :system_name, use: :slugged
-  attr_accessible :en_wikipedia_url, :system_name, :parent_id, :creator_id
+  friendly_id :name, use: :slugged
+  attr_accessible :en_wikipedia_url, :name, :parent_id, :creator_id
 
   has_many :scientific_names
   has_many :plantings
   has_many :photos, :through => :plantings
   has_many :seeds
+  has_many :harvests
   belongs_to :creator, :class_name => 'Member'
 
   belongs_to :parent, :class_name => 'Crop'
   has_many :varieties, :class_name => 'Crop', :foreign_key => 'parent_id'
 
-  default_scope order("lower(system_name) asc")
+  default_scope order("lower(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,
@@ -28,7 +30,7 @@ class Crop < ActiveRecord::Base
   end
 
   def to_s
-    return system_name
+    return name
   end
 
   def default_scientific_name
@@ -97,4 +99,52 @@ class Crop < ActiveRecord::Base
     return interesting_crops
   end
 
+# Crop.create_from_csv(row)
+# used by db/seeds.rb and rake growstuff:import_crops
+# CSV fields:
+# - name (required)
+# - scientific name (optional, can be picked up from parent if it has one)
+# - en_wikipedia_url (required)
+# - parent (name, optional)
+
+  def Crop.create_from_csv(row)
+    name,scientific_name,en_wikipedia_url,parent = row
+
+    @cropbot = Member.find_by_login_name('cropbot')
+    raise "cropbot account not found: run rake db:seed" unless @cropbot
+
+    @crop = Crop.find_or_create_by_name(name)
+    @crop.update_attributes(
+      :en_wikipedia_url => en_wikipedia_url,
+      :creator_id => @cropbot.id
+    )
+    if parent
+      @parent = Crop.find_by_name(parent)
+      if @parent
+        @crop.update_attributes(:parent_id => @parent.id)
+      else
+        logger.warn("Warning: parent crop #{parent} not found")
+      end
+    end
+
+    unless @crop.scientific_names.exists?(:scientific_name => scientific_name)
+      @sn = ''
+      if scientific_name
+        @sn = scientific_name
+      elsif @crop.parent
+        @sn = @crop.parent.scientific_names.first.scientific_name
+      end
+
+      if @sn
+        @crop.scientific_names.create(
+          :scientific_name => @sn,
+          :creator_id => @cropbot.id
+        )
+      else
+        logger.warn("Warning: no scientific name (not even on parent crop) for #{@crop}")
+      end
+
+    end
+  end
+
 end

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/garden.rb

@@ -1,21 +1,55 @@
 class Garden < ActiveRecord::Base
+  include Geocodable
   extend FriendlyId
   friendly_id :garden_slug, use: :slugged
 
-  attr_accessible :name, :slug, :owner_id, :description
+  attr_accessible :name, :slug, :owner_id, :description, :active,
+    :location, :latitude, :longitude, :area, :area_unit
+
   belongs_to :owner, :class_name => 'Member', :foreign_key => 'owner_id'
   has_many :plantings, :order => 'created_at DESC', :dependent => :destroy
   has_many :crops, :through => :plantings
 
-  # before_create :replace_blank_name
+  # set up geocoding
+  geocoded_by :location
+  after_validation :geocode
+  after_validation :empty_unwanted_geocodes
 
   default_scope order("lower(name) asc")
+  scope :active, where(:active => true)
+  scope :inactive, where(:active => false)
 
   validates :name,
     :format => {
       :with => /\S/
     }
 
+  validates :area,
+    :numericality => { :only_integer => false },
+    :allow_nil => true
+
+  AREA_UNITS_VALUES = {
+    "square metres" => "square metre",
+    "square feet" => "square foot",
+    "hectares" => "hectare",
+    "acres" => "acre"
+  }
+  validates :area_unit, :inclusion => { :in => AREA_UNITS_VALUES.values,
+        :message => "%{value} is not a valid area unit" },
+        :allow_nil => true,
+        :allow_blank => true
+
+  after_validation :cleanup_area
+
+  def cleanup_area
+    if area == 0
+      self.area = nil
+    end
+    if area.blank?
+      self.area_unit = nil
+    end
+  end
+
   def garden_slug
     "#{owner.login_name}-#{name}".downcase.gsub(' ', '-')
   end

app/models/harvest.rb

@@ -0,0 +1,71 @@
+class Harvest < ActiveRecord::Base
+  extend FriendlyId
+  friendly_id :harvest_slug, use: :slugged
+
+  attr_accessible :crop_id, :harvested_at, :description, :owner_id,
+    :quantity, :unit, :weight_quantity, :weight_unit, :slug
+
+  belongs_to :crop
+  belongs_to :owner, :class_name => 'Member'
+
+  default_scope order('created_at DESC')
+
+  validates :quantity,
+    :numericality => { :only_integer => false },
+    :allow_nil => true
+
+  UNITS_VALUES = {
+    "individual" => "individual",
+    "bunches" => "bunch",
+    "sprigs" => "sprig",
+    "handfuls" => "handful",
+    "litres" => "litre",
+    "pints" => "ping",
+    "quarts" => "quart",
+    "buckets" => "bucket",
+    "baskets" => "basket",
+    "bushels" => "bushel"
+  }
+  validates :unit, :inclusion => { :in => UNITS_VALUES.values,
+        :message => "%{value} is not a valid unit" },
+        :allow_nil => true,
+        :allow_blank => true
+
+  validates :weight_quantity,
+    :numericality => { :only_integer => false },
+    :allow_nil => true
+
+  WEIGHT_UNITS_VALUES = {
+    "kg" => "kg",
+    "lb" => "lb"
+  }
+  validates :weight_unit, :inclusion => { :in => WEIGHT_UNITS_VALUES.values,
+        :message => "%{value} is not a valid unit" },
+        :allow_nil => true,
+        :allow_blank => true
+
+  after_validation :cleanup_quantities
+
+  def cleanup_quantities
+    if quantity == 0
+      self.quantity = nil
+    end
+
+    if quantity.blank?
+      self.unit = nil
+    end
+
+    if weight_quantity == 0
+      self.weight_quantity = nil
+    end
+
+    if weight_quantity.blank?
+      self.weight_unit = nil
+    end
+  end
+
+  def harvest_slug
+    "#{owner.login_name}-#{crop}".downcase.gsub(' ', '-')
+  end
+
+end

app/models/member.rb

@@ -1,5 +1,7 @@
 class Member < ActiveRecord::Base
+  include Geocodable
   extend FriendlyId
+
   friendly_id :login_name, use: :slugged
 
   has_many :posts,   :foreign_key => 'author_id'
@@ -10,6 +12,7 @@ class Member < ActiveRecord::Base
   has_many :plantings, :foreign_key => 'owner_id'
 
   has_many :seeds, :foreign_key => 'owner_id'
+  has_many :harvests, :foreign_key => 'owner_id'
 
   has_and_belongs_to_many :roles
 
@@ -26,7 +29,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,13 +207,15 @@ class Member < ActiveRecord::Base
     return interesting_members
   end
 
-  private
-
-  def empty_unwanted_geocodes
-    if self.location.to_s == ''
-      self.latitude = nil
-      self.longitude = nil
+  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
 
   def update_newsletter_subscription

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

@@ -14,7 +14,7 @@ class Planting < ActiveRecord::Base
 
   default_scope order("created_at desc")
 
-  delegate :system_name,
+  delegate :name,
     :en_wikipedia_url,
     :default_scientific_name,
     :plantings_count,
@@ -39,6 +39,7 @@ class Planting < ActiveRecord::Base
     'cutting',
     'root division',
     'runner',
+    'bulb',
     'bare root plant',
     'advanced plant',
     'graft',
@@ -60,7 +61,7 @@ class Planting < ActiveRecord::Base
 
   # stringify as "beet in Skud's backyard" or similar
   def to_s
-    self.crop_system_name + " in " + self.location
+    self.crop_name + " in " + self.location
   end
 
   def default_photo

app/models/seed.rb

@@ -55,6 +55,6 @@ class Seed < ActiveRecord::Base
   end
 
   def seed_slug
-    "#{owner.login_name}-#{crop.system_name}".downcase.gsub(' ', '-')
+    "#{owner.login_name}-#{crop.name}".downcase.gsub(' ', '-')
   end
 end

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/comments/index.html.haml

@@ -13,3 +13,8 @@
 %div.pagination
   = page_entries_info @comments, :model => "comments"
   = will_paginate @comments
+
+%p
+  Subscribe to the #{Growstuff::Application.config.site_name}
+  = succeed "." do
+    = link_to "comments RSS feed", comments_path(:format => 'rss')

app/views/crops/_find_seeds.html.haml

@@ -6,13 +6,8 @@
   %ul
     - crop.seeds.tradable.each do |seed|
       %li
-        = link_to seed.owner, seed.owner
-        - if seed.owner.location
-          in #{seed.owner.location}
-        - else
-          (location unknown)
-        will trade #{seed.tradable_to}.
-        = link_to "View details.", seed_path(seed)
+        = link_to "#{seed.owner} will trade #{seed.tradable_to}.", seed_path(seed)
+        = render :partial => 'members/location', :locals => { :member => seed.owner }
 - if current_member
   = link_to "List your seeds to trade.", new_seed_path()
 - else

app/views/crops/_form.html.haml

@@ -13,9 +13,9 @@
       on the Growstuff wiki.
 
   .control-group
-    = f.label :system_name, :class => 'control-label'
+    = f.label :name, :class => 'control-label'
     .controls
-      = f.text_field :system_name
+      = f.text_field :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'
@@ -25,7 +25,7 @@
   .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})
+      = collection_select(:crop, :parent_id, Crop.all, :id, :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'

app/views/crops/_harvests.html.haml

@@ -0,0 +1,19 @@
+%h4 Harvests
+- if crop.harvests.empty?
+  %p
+    Nobody has harvested this crop yet.
+- else
+  %ul
+    - crop.harvests.each do |harvest|
+      %li
+        = link_to "#{harvest.owner} harvested #{display_quantity(harvest)}.", harvest_path(harvest)
+        = render :partial => 'members/location', :locals => { :member => harvest.owner }
+        %small
+          = distance_of_time_in_words(harvest.created_at, Time.zone.now)
+          ago.
+
+- if current_member
+  = link_to "Track your #{crop.name} harvests.", new_harvest_path()
+- else
+  = render :partial => 'shared/signin_signup', :locals => { :to => "track your #{crop.name} harvests" }
+

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/_image_with_popover.html.haml

@@ -2,11 +2,11 @@
   = link_to |
     image_tag( |
       crop.default_photo ?  crop.default_photo.thumbnail_url : 'placeholder_150.png', |
-      :alt => crop.system_name |
+      :alt => crop.name |
     ), |
     crop, |
     :rel => "popover", |
     'data-trigger' => 'hover', |
-    'data-title' => crop.system_name, |
+    'data-title' => crop.name, |
     'data-content' => "#{ render :partial => 'crops/popover', :locals => { :crop => crop } }", |
     'data-html' => true

app/views/crops/_thumbnail.html.haml

@@ -1,8 +1,8 @@
 .thumbnail(style='height: 220px')
   - if crop
-    = link_to image_tag((crop.default_photo ?  crop.default_photo.thumbnail_url : 'placeholder_150.png'), :alt => crop.system_name, :class => 'img-rounded'), crop
+    = link_to image_tag((crop.default_photo ?  crop.default_photo.thumbnail_url : 'placeholder_150.png'), :alt => crop.name, :class => 'img-rounded'), crop
     %p
-      = link_to crop.system_name, crop
+      = link_to crop.name, crop
       - if crop.scientific_names.count > 0
         %br/
         %i

app/views/crops/_varieties.html.haml

@@ -1,12 +1,10 @@
 - if crop.parent
   %p
-    = crop.system_name
+    = crop.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(", ")
+    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.csv.shaper

@@ -0,0 +1,83 @@
+csv.headers :id, :name,
+  :growstuff_url, :en_wikipedia_url,
+  :default_scientific_name,
+  :scientific_name_count,
+  :parent_crop_id, :parent_crop_name,
+  :plantings_count,
+  :seeds_count,
+  :recommended_sunniness,
+  :planted_in_sun,
+  :planted_in_semi_shade,
+  :planted_in_shade,
+  :plant_from_recommendation,
+  :planted_from_seed,
+  :planted_from_seedling,
+  :planted_from_cutting,
+  :planted_from_root_division,
+  :planted_from_runner,
+  :planted_from_bulb,
+  :planted_from_bare_root_plant,
+  :planted_from_advanced_plant,
+  :planted_from_graft,
+  :planted_from_layering,
+  :added_by_member_id,
+  :added_by_member_name,
+  :date_added,
+  :last_modified,
+  :license
+
+@crops.each do |c|
+  csv.row c do |csv, crop|
+
+
+    csv.cells :id, :name, :en_wikipedia_url
+    csv.cell :growstuff_url, crop_url(c)
+
+    if c.scientific_names.any?
+      csv.cell :default_scientific_name, c.default_scientific_name
+      csv.cell :scientific_name_count, c.scientific_names.count
+    end
+
+    if c.parent
+      csv.cell :parent_crop_id, c.parent.id
+      csv.cell :parent_crop_name, c.parent.name
+    end
+
+    csv.cell :plantings_count || 0
+    csv.cell :seeds_count, c.seeds.count
+
+    sunniness = c.sunniness
+    sunniness_rec = sunniness.max_by{|k,v| v}
+    if sunniness_rec
+      csv.cell :recommended_sunniness, sunniness_rec[0]
+    end
+    csv.cell :planted_in_sun, sunniness['sun']
+    csv.cell :planted_in_semi_shade, sunniness['semi_shade']
+    csv.cell :planted_in_shade, sunniness['shade']
+
+    planted_from  = c.planted_from
+    planted_from_rec = planted_from.max_by{|k,v| v}
+    if planted_from_rec
+      csv.cell :plant_from_recommendation, planted_from_rec[0]
+    end
+
+    csv.cell :planted_from_seed, planted_from['seed']
+    csv.cell :planted_from_seedling, planted_from['seedling']
+    csv.cell :planted_from_cutting, planted_from['cutting']
+    csv.cell :planted_from_root_division, planted_from['root division']
+    csv.cell :planted_from_runner, planted_from['runner']
+    csv.cell :planted_from_bulb, planted_from['bulb']
+    csv.cell :planted_from_bare_root_plant, planted_from['bare root plant']
+    csv.cell :planted_from_advanced_plant, planted_from['advanced plant']
+    csv.cell :planted_from_graft, planted_from['graft']
+    csv.cell :planted_from_layering, planted_from['layering']
+
+    csv.cell :added_by_member_id, c.creator.id
+    csv.cell :added_by_member_name, c.creator.to_s
+    csv.cell :date_added, c.created_at.to_s(:db)
+    csv.cell :last_modified, c.updated_at.to_s(:db)
+
+    csv.cell :license, "CC-BY-SA Growstuff http://growstuff.org/"
+
+  end
+end

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
@@ -17,3 +22,9 @@
   = page_entries_info @crops, :model => "crops"
   = will_paginate @crops
 
+
+%ul.inline
+  %li The data on this page is available in the following formats:
+  %li= link_to "CSV", crops_path(:format => 'csv')
+  %li= link_to "JSON", crops_path(:format => 'json')
+  %li= link_to "RSS", crops_path(:format => 'rss')

app/views/crops/index.rss.haml

@@ -5,7 +5,7 @@
     %link= crops_url
     - @crops.each do |crop|
       %item
-        %title= crop.system_name
+        %title= crop.name
         %pubDate= crop.created_at.to_s(:rfc822)
         %link= post_url(crop)
         %guid= post_url(crop)

app/views/crops/show.html.haml

@@ -1,30 +1,38 @@
-- content_for :title, @crop.system_name
+- content_for :title, @crop.name
 
 .row-fluid
   .span9
-    = render :partial => 'photos', :locals => { :crop => @crop }
-
-    = render :partial => 'varieties', :locals => { :crop => @crop }
-
-    = render :partial => 'planting_advice', :locals => { :crop => @crop }
-
-    %p
-      - if @crop.plantings.size > 0
-        Planted
-        = pluralize(@crop.plantings.size, "time")
-        by #{Growstuff::Application.config.site_name} members
-      - else
-        Nobody is growing this yet. You could be the first!
-
     %p
       - if can? :create, Planting
         = link_to "Plant this", new_planting_path(:crop_id => @crop.id), :class => 'btn btn-primary'
       - else
         = render :partial => 'shared/signin_signup', :locals => { :to => 'plant this crop' }
 
+      - if can? :create, Harvest
+        = link_to "Harvest this", new_harvest_path(:crop_id => @crop.id), :class => 'btn btn-primary'
+
       - if can? :create, Seed
         = link_to 'Add seeds to stash', new_seed_path(:params => { :crop_id => @crop.id }), :class => 'btn btn-primary'
 
+    = render :partial => 'photos', :locals => { :crop => @crop }
+
+    = render :partial => 'varieties', :locals => { :crop => @crop }
+
+    = render :partial => 'planting_advice', :locals => { :crop => @crop }
+
+
+    %h2 Who's planted this crop?
+
+    %p
+      - if @crop.plantings.size > 0
+        = @crop.name.titleize
+        has been planted
+        = pluralize(@crop.plantings.size, "time")
+        by #{Growstuff::Application.config.site_name} members.
+      - else
+        Nobody is growing this yet. You could be the first!
+
+
     - if @crop.plantings.size > 0
       - @crop.plantings.each do |p|
         = render :partial => "plantings/thumbnail", :locals => { :planting => p, :title => 'owner' }
@@ -59,4 +67,5 @@
     %ul
       %li= link_to 'Wikipedia (English)', @crop.en_wikipedia_url
 
+    = render :partial => 'harvests', :locals => { :crop => @crop }
     = render :partial => 'find_seeds', :locals => { :crop => @crop }

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
@@ -22,7 +23,7 @@
     %th When
   - @crops.each do |c|
     %tr
-      %td= link_to c.system_name, c
+      %td= link_to c.name, c
       %td= link_to c.en_wikipedia_url, c.en_wikipedia_url
       %td
         - c.scientific_names.each do |s|

app/views/gardens/_form.html.haml

@@ -1,4 +1,4 @@
-= form_for @garden, :html => {} do |f|
+= form_for(@garden, :html => {:class => "form-horizontal"}) do |f|
   - if @garden.errors.any?
     #error_explanation
       %h2= "#{pluralize(@garden.errors.count, "error")} prohibited this garden from being saved:"
@@ -6,12 +6,41 @@
         - @garden.errors.full_messages.each do |msg|
           %li= msg
 
-  .control_group
-    = f.label "Garden name: ", :class => 'control-label'
-    .controls= f.text_field :name
   .control-group
-    = f.label 'Description: ', :class => 'control-label'
-    .controls= f.text_area :description, :rows => 6
+    = f.label :name, :class => 'control-label'
+    .controls
+      = f.text_field :name
+
+  .control-group
+    = f.label :description, :class => 'control-label'
+    .controls
+      = f.text_area :description, :rows => 6
+
+  .control-group
+    = f.label :location, :class => 'control-label'
+    .controls
+      = f.text_field :location, :value => @garden.location || current_member.location
+      %span.help-block
+        If you have a location set in your profile, it will be used when
+        you create a new garden.
+        - if current_member.location.blank?
+          =link_to "Set your location now.", edit_member_registration_path
+        - else
+          =link_to "Change your location.", edit_member_registration_path
+
+  .control-group
+    = f.label :area, :class => 'control-label'
+    .controls
+      = f.number_field :area, :class => 'input-small'
+      = f.select(:area_unit, Garden::AREA_UNITS_VALUES, {:include_blank => false}, :class => 'input-medium')
+
+  .control-group
+    = f.label 'Active? ', :class => 'control-label'
+    .controls
+      = f.check_box :active
+      %span.help-inline
+        You can mark a garden as inactive if you no longer use it.
+
 
   .form-actions
     = f.submit 'Save Garden', :class => 'btn btn-primary'

app/views/gardens/index.html.haml

@@ -26,6 +26,9 @@
         %th Owner
       %th Garden name
       %th Description
+      %th Location
+      %th Area
+      %th Active?
       %th Plantings
       %th
 
@@ -35,6 +38,13 @@
           %td= link_to garden.owner.login_name, garden.owner
         %td= link_to garden.name, garden
         %td= garden.description
+        %td
+          - if ! garden.location.blank?
+            = link_to garden.location, place_path(garden.location)
+        %td
+          - if garden.area
+            = pluralize(garden.area, garden.area_unit)
+        %td= garden.active ? "Yes" : "No"
         %td
           - if garden.plantings.empty?
             None
@@ -43,7 +53,7 @@
             - garden.plantings.each do |p|
               %li
                 = p.quantity
-                = link_to p.crop.system_name, p
+                = link_to p.crop.name, p
                 - if p.planted_at
                   planted on
                   = p.planted_at

app/views/gardens/show.html.haml

@@ -1,22 +1,25 @@
 =content_for :title, "#{@garden.owner}'s #{@garden}"
 
 .row-fluid
-  .span3
-    = render :partial => "members/avatar", :locals => { :member => @garden.owner }
-
-    %h4= "#{@garden.owner}'s gardens"
-    %ul
-      - @garden.owner.gardens.each do |othergarden|
-        %li
-          - if @garden == othergarden
-            = @garden
-          - else
-            = link_to "#{othergarden}", garden_path(othergarden)
-
-    - if can? :create, @garden
-      = link_to 'Add New Garden', new_garden_path, :class => 'btn btn-mini'
-
   .span9
+    - if ! @garden.active
+      .alert.alert-notice
+        NOTE: This garden is inactive.
+        - if can? :edit, @garden
+          = link_to 'Set it to active', edit_garden_path(@garden)
+          to plant something in this garden.
+    %p
+      %strong Owner:
+      = link_to @garden.owner, @garden.owner
+    - if ! @garden.location.blank?
+      %p
+        %strong Location:
+        = @garden.location
+    - if ! @garden.area.blank?
+      %p
+        %strong Area:
+        = pluralize(@garden.area, @garden.area_unit)
+
     %div
       :markdown
         #{strip_tags @garden.description}
@@ -28,9 +31,30 @@
 
     %h3
       What's planted here?
-      - if can? :edit, @garden
+      - if can? :edit, @garden and @garden.active
         = link_to "Plant something", new_planting_path(:garden_id => @garden.id), :class => 'btn btn-primary'
 
     - @garden.plantings.each do |p|
       = render :partial => "plantings/thumbnail", :locals => { :planting => p }
 
+  .span3
+    %h4= "#{@garden.owner}'s gardens"
+    %ul
+      - @garden.owner.gardens.active.each do |othergarden|
+        %li
+          - if @garden == othergarden
+            = @garden
+          - else
+            = link_to "#{othergarden}", garden_path(othergarden)
+
+    %h4= "Inactive gardens"
+    %ul
+      - @garden.owner.gardens.inactive.each do |othergarden|
+        %li
+          - if @garden == othergarden
+            = @garden
+          - else
+            = link_to "#{othergarden}", garden_path(othergarden)
+
+    - if can? :create, @garden
+      = link_to 'Add New Garden', new_garden_path, :class => 'btn btn-mini'

app/views/harvests/_form.html.haml

@@ -0,0 +1,39 @@
+= form_for(@harvest, :html => {:class => "form-horizontal"}) do |f|
+  - if @harvest.errors.any?
+    #error_explanation
+      %h2= "#{pluralize(@harvest.errors.count, "error")} prohibited this harvest from being saved:"
+      %ul
+        - @harvest.errors.full_messages.each do |msg|
+          %li= msg
+
+  .control-group
+    = f.label 'What did you harvest?', :class => 'control-label'
+    .controls
+      = collection_select(:harvest, :crop_id, Crop.all, :id, :name, :selected => @harvest.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 'When?', :class => 'control-label'
+    .controls= f.text_field :harvested_at, :value => @harvest.harvested_at ? @harvest.harvested_at.to_s(:ymd) : '', :class => 'add-datepicker'
+
+  .control-group
+    = f.label 'How many?', :class => 'control-label'
+    .controls
+      = f.number_field :quantity, :class => 'input-small'
+      = f.select(:unit, Harvest::UNITS_VALUES, {:include_blank => false}, :class => 'input-medium')
+
+  .control-group
+    = f.label 'Weighing:', :class => 'control-label'
+    .controls
+      = f.number_field :weight_quantity, :class => 'input-small'
+      = f.select(:weight_unit, Harvest::WEIGHT_UNITS_VALUES, {:include_blank => false}, :class => 'input-medium')
+      in total
+  .control-group
+    = f.label 'Notes', :class => 'control-label'
+    .controls= f.text_area :description, :rows => 6
+
+    .form-actions
+      = f.submit 'Save', :class => 'btn btn-primary'
+

app/views/harvests/edit.html.haml

@@ -0,0 +1,7 @@
+- content_for :title, "Editing harvest"
+
+= render 'form'
+
+= link_to 'Show', @harvest
+\|
+= link_to 'Back', harvests_path

app/views/harvests/index.csv.shaper

@@ -0,0 +1,41 @@
+csv.headers :id,
+  :growstuff_url,
+  :owner_id,
+  :owner_name,
+  :crop_id,
+  :crop_name,
+  :quantity,
+  :unit,
+  :weight_quantity,
+  :weight_unit,
+  :date_harvested,
+  :description,
+  :date_added,
+  :last_modified,
+  :license
+
+@harvests.each do |h|
+  csv.row h do |csv, harvest|
+
+    csv.cell :id
+    csv.cell :growstuff_url, harvest_url(h)
+
+    csv.cell :owner_id, h.owner.id
+    csv.cell :owner_name, h.owner.to_s
+
+    csv.cell :crop_id, h.crop.id
+    csv.cell :crop_name, h.crop.to_s
+
+    csv.cells :quantity, :unit, :weight_quantity, :weight_unit
+
+    csv.cell :date_harvested, h.created_at.to_s(:db)
+
+    csv.cell :description
+
+    csv.cell :date_added, h.created_at.to_s(:db)
+    csv.cell :last_modified, h.updated_at.to_s(:db)
+
+    csv.cell :license, "CC-BY-SA Growstuff http://growstuff.org/"
+
+  end
+end

app/views/harvests/index.html.haml

@@ -0,0 +1,58 @@
+- content_for :title, @owner ? "#{@owner}'s harvests" : "Everyone's harvests"
+
+%p
+  #{Growstuff::Application.config.site_name} helps you track what you're
+  harvesting from your home garden and see how productive it is.
+
+%p
+  - if can? :create, Harvest
+    - if @owner
+      %p
+        - if @owner == current_member
+          = link_to 'Add harvest', new_harvest_path, :class => 'btn btn-primary'
+        = link_to "View everyone's harvests", harvests_path, :class => 'btn'
+    - else # everyone's harvests
+      = link_to 'Add harvest', new_harvest_path, :class => 'btn btn-primary'
+      - if current_member
+        = link_to 'View your harvests', harvests_by_owner_path(:owner => current_member.slug), :class => 'btn'
+  - else
+    = render :partial => 'shared/signin_signup', :locals => { :to => 'track your harvests' }
+
+%div.pagination
+  = page_entries_info @harvests, :model => "harvests"
+  = will_paginate @harvests
+
+- if @harvests.length > 0
+
+  %table.table.table-striped
+    %tr
+      - unless @owner
+        %th Owner
+      %th Crop
+      %th Date
+      %th Quantity
+      %th Description
+      %th
+
+    - @harvests.each do |harvest|
+      %tr
+        - unless @owner
+          %td= link_to harvest.owner.login_name, harvest.owner
+        %td= link_to harvest.crop.name, harvest.crop
+        %td= harvest.harvested_at
+        %td= display_quantity(harvest)
+        %td= harvest.description
+        %td= link_to 'Details', harvest, :class => 'btn btn-mini'
+
+  %div.pagination
+    = page_entries_info @harvests, :model => "harvests"
+    = will_paginate @harvests
+
+  %ul.inline
+    %li The data on this page is available in the following formats:
+    - if @owner
+      %li= link_to "CSV", harvests_by_owner_path(@owner, :format => 'csv')
+      %li= link_to "JSON", harvests_by_owner_path(@owner, :format => 'json')
+    - else
+      %li= link_to "CSV", harvests_path(:format => 'csv')
+      %li= link_to "JSON", harvests_path(:format => 'json')

app/views/harvests/new.html.haml

@@ -0,0 +1,3 @@
+- content_for :title, "New Harvest"
+
+= render 'form'

app/views/harvests/show.html.haml

@@ -0,0 +1,30 @@
+=content_for :title, "#{@harvest.crop} harvested by #{@harvest.owner}"
+
+.row-fluid
+  .span6
+    %p
+      %b Owner:
+      = link_to @harvest.owner, @harvest.owner
+      —
+      = link_to "view all #{@harvest.owner}'s harvests", harvests_by_owner_path(:owner => @harvest.owner.slug)
+    %p
+      %b Harvested:
+      = @harvest.harvested_at ? @harvest.harvested_at : "not specified"
+    %p
+      %b Quantity:
+      = display_quantity(@harvest)
+
+    - if can? :edit, @harvest or can? :destroy, @harvest
+      %p
+      - if can? :edit, @harvest
+        =link_to 'Edit', edit_harvest_path(@harvest), :class => 'btn btn-mini'
+      - if can? :destroy, @harvest
+        =link_to 'Delete', @harvest, method: :delete, data: { confirm: 'Are you sure?' }, :class => 'btn btn-mini'
+
+  .span6
+    = render :partial => "crops/index_card", :locals => { :crop => @harvest.crop}
+
+%h2 Notes
+
+:markdown
+  #{ @harvest.description != "" ? @harvest.description : "No description given." }

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/home/_seeds.html.haml

@@ -18,7 +18,7 @@
         - seeds.each do |seed|
           %tr
             %td= link_to seed.owner.login_name, seed.owner
-            %td= link_to seed.crop.system_name, seed.crop
+            %td= link_to seed.crop.name, seed.crop
             %td.hidden-phone.hidden-tablet= truncate(seed.description, :length => 40, :separator => ' ')
             %td= seed.tradable? ? seed.tradable_to : ''
             %td

app/views/home/index.html.haml

@@ -7,13 +7,13 @@
           = Growstuff::Application.config.site_name
         = current_member
       = render :partial => 'stats'
-      %ul.inline
-        %li{ :style => 'padding-left: 0px' }
-          %strong Quick links:
-        %li= link_to "Plant something", new_planting_path
-        %li= link_to "Add seeds", new_seed_path
-        %li= link_to "Post", new_post_path
-        %li= link_to "Edit profile", edit_member_registration_path
+      %p
+        .btn-group
+          = link_to "Plant", new_planting_path, :class => 'btn'
+          = link_to "Harvest", new_harvest_path, :class => 'btn'
+          = link_to "Add seeds", new_seed_path, :class => 'btn'
+          = link_to "Post", new_post_path, :class => 'btn'
+          = link_to "Edit profile", edit_member_registration_path, :class => 'btn'
 
     - else
       .visible-desktop.visible-tablet

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,25 @@
                 - 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 "Harvests", harvests_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/_location.html.haml

@@ -0,0 +1,5 @@
+.member-location
+  - if member.location.blank?
+    unknown location
+  - else
+    = link_to member.location, place_path(:place => member.location)

app/views/members/_popover.html.haml

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

app/views/members/_thumbnail.html.haml

@@ -14,4 +14,4 @@
             %small
               %br/
               Recently planted:
-              != member.plantings.first(3).map{|p| link_to p.crop_system_name, p }.join(", ")
+              != member.plantings.first(3).map{|p| link_to p.crop_name, p }.join(", ")

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, :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.active.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/plantings/_thumbnail.html.haml

@@ -8,7 +8,7 @@
         - if defined?(title) && title == 'owner'
           = link_to planting.owner, planting.owner
         - else
-          = link_to planting.crop.system_name, planting
+          = link_to planting.crop.name, planting
 
       %p
         Planted

app/views/plantings/index.csv.shaper

@@ -0,0 +1,45 @@
+csv.headers :id,
+  :growstuff_url,
+  :owner_id,
+  :owner_name,
+  :garden_id,
+  :garden_name,
+  :crop_id,
+  :crop_name,
+  :quantity,
+  :planted_from,
+  :sunniness,
+  :date_planted,
+  :description,
+  :date_added,
+  :last_modified,
+  :license
+
+@plantings.each do |p|
+  csv.row p do |csv, planting|
+
+    csv.cell :id
+    csv.cell :growstuff_url, planting_url(p)
+
+    csv.cell :owner_id, p.owner.id
+    csv.cell :owner_name, p.owner.to_s
+
+    csv.cell :garden_id, p.garden.id
+    csv.cell :garden_name, p.garden.to_s
+
+    csv.cell :crop_id, p.crop.id
+    csv.cell :crop_name, p.crop.to_s
+
+    csv.cells :quantity, :planted_from, :sunniness
+
+    csv.cell :date_planted, p.planted_at ? p.planted_at.to_s(:db) : ''
+
+    csv.cell :description
+
+    csv.cell :date_added, p.created_at.to_s(:db)
+    csv.cell :last_modified, p.updated_at.to_s(:db)
+
+    csv.cell :license, "CC-BY-SA Growstuff http://growstuff.org/"
+
+  end
+end

app/views/plantings/index.html.haml

@@ -37,7 +37,7 @@
       %tr
         - unless @owner
           %td= link_to planting.owner.login_name, planting.owner
-        %td= link_to planting.crop.system_name, planting.crop
+        %td= link_to planting.crop.name, planting.crop
         %td= link_to planting.garden.name, planting.garden
         %td
           :markdown
@@ -51,3 +51,14 @@
   %div.pagination
     = page_entries_info @plantings, :model => "plantings"
     = will_paginate @plantings
+
+  %ul.inline
+    %li The data on this page is available in the following formats:
+    - if @owner
+      %li= link_to "CSV", plantings_by_owner_path(@owner, :format => 'csv')
+      %li= link_to "JSON", plantings_by_owner_path(@owner, :format => 'json')
+      %li= link_to "RSS", plantings_by_owner_path(@owner, :format => 'rss')
+    - else
+      %li= link_to "CSV", plantings_path(:format => 'csv')
+      %li= link_to "JSON", plantings_path(:format => 'json')
+      %li= link_to "RSS", plantings_path(:format => 'rss')

app/views/plantings/show.html.haml

@@ -2,6 +2,11 @@
 
 .row-fluid
   .span6
+    %p
+      %b Owner:
+      = link_to @planting.owner, @planting.owner
+      —
+      = link_to "view all #{@planting.owner}'s plantings", plantings_by_owner_path(:owner => @planting.owner.slug)
     %p
       %b Planted:
       = @planting.planted_at ? @planting.planted_at : "not specified"
@@ -41,9 +46,6 @@
 :markdown
   #{ @planting.description != "" ? @planting.description : "No description given." }
 
-- if can? :edit, @planting
-  = link_to 'Edit', edit_planting_path(@planting), :class => 'btn btn-mini'
-
 - if @planting.photos.count > 0 or (can? :edit, @planting and can? :create, Photo)
   %h2 Pictures
 

app/views/posts/index.html.haml

@@ -25,3 +25,16 @@
   %div.pagination
     = page_entries_info @posts, :model => "posts"
     = will_paginate @posts
+
+%p
+  - if @author
+    Subscribe to
+    = succeed "." do
+      = link_to "#{@author}'s posts RSS feed", posts_path(:format => 'rss')
+
+  - else
+    Subscribe to the #{Growstuff::Application.config.site_name}
+    = link_to "posts RSS feed", posts_path(:format => 'rss')
+    or
+    = succeed "." do
+      = link_to "comments RSS feed", comments_path(:format => 'rss')

app/views/scientific_names/_form.html.haml

@@ -15,7 +15,7 @@
   .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)
+      = collection_select(:scientific_name, :crop_id, Crop.all, :id, :name, :selected => @scientific_name.crop_id || @crop.id)
   .control-group
     = f.label :scientific_name, :class => 'control-label'
     .controls

app/views/seeds/_form.html.haml

@@ -8,7 +8,7 @@
 
   .control-group
     = f.label 'Crop:', :class => 'control-label'
-    .controls= collection_select(:seed, :crop_id, Crop.all, :id, :system_name, :selected => @seed.crop_id || @crop.id)
+    .controls= collection_select(:seed, :crop_id, Crop.all, :id, :name, :selected => @seed.crop_id || @crop.id)
   .control-group
     = f.label 'Quantity:', :class => 'control-label'
     .controls
@@ -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.csv.shaper

@@ -0,0 +1,47 @@
+csv.headers :id,
+  :growstuff_url,
+  :owner_id,
+  :owner_name,
+  :crop_id,
+  :crop_name,
+  :quantity,
+  :plant_before,
+  :tradable_to,
+  :from_location,
+  :latitude,
+  :longitude,
+  :description,
+  :date_added,
+  :last_modified,
+  :license
+
+@seeds.each do |s|
+  csv.row s do |csv, seed|
+
+    csv.cell :id
+    csv.cell :growstuff_url, seed_url(s)
+
+    csv.cell :owner_id, s.owner.id
+    csv.cell :owner_name, s.owner.to_s
+
+    csv.cell :crop_id, s.crop.id
+    csv.cell :crop_name, s.crop.to_s
+
+    csv.cell :quantity
+
+    csv.cell :plant_before, s.plant_before ? s.plant_before.to_s(:db) : ''
+
+    csv.cell :tradable_to
+    csv.cell :from_location, s.owner.location
+    csv.cell :latitude, s.owner.latitude
+    csv.cell :longitude, s.owner.longitude
+
+    csv.cell :description
+
+    csv.cell :date_added, s.created_at.to_s(:db)
+    csv.cell :last_modified, s.updated_at.to_s(:db)
+
+    csv.cell :license, "CC-BY-SA Growstuff http://growstuff.org/"
+
+  end
+end

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
@@ -36,16 +40,30 @@
       %tr
         - unless @owner
           %td= link_to seed.owner.login_name, seed.owner
-        %td= link_to seed.crop.system_name, seed.crop
+        %td= link_to seed.crop.name, seed.crop
         %td= seed.description
         %td= seed.quantity
         %td= seed.plant_before
         %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
     = page_entries_info @seeds, :model => "seeds"
     = will_paginate @seeds
+
+  %ul.inline
+    %li The data on this page is available in the following formats:
+    - if @owner
+      %li= link_to "CSV", seeds_by_owner_path(@owner, :format => 'csv')
+      %li= link_to "JSON", seeds_by_owner_path(@owner, :format => 'json')
+      %li= link_to "RSS", seeds_by_owner_path(@owner, :format => 'rss')
+    - else
+      %li= link_to "CSV", seeds_path(:format => 'csv')
+      %li= link_to "JSON", seeds_path(:format => 'json')
+      %li= link_to "RSS", seeds_path(:format => 'rss')

app/views/seeds/show.html.haml

@@ -6,7 +6,7 @@
       %b Owner:
       = link_to @seed.owner, @seed.owner
       —
-      = link_to "view all #{@seed.owner}'s seeds", seeds_path(:owner_id => @seed.owner.id)
+      = link_to "view all #{@seed.owner}'s seeds", seeds_by_owner_path(:owner => @seed.owner.slug)
     %p
       %b Quantity:
       = @seed.quantity.blank? ? "not specified" : @seed.quantity
@@ -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,17 @@
-Geocoder.configure(:units => :km)
+require 'geocodable'
+
+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/initializers/inflections.rb

@@ -13,3 +13,7 @@
 # ActiveSupport::Inflector.inflections do |inflect|
 #   inflect.acronym 'RESTful'
 # end
+
+ActiveSupport::Inflector.inflections do |inflect|
+  inflect.plural 'square foot', 'square feet'
+end

config/routes.rb

@@ -16,12 +16,16 @@ Growstuff::Application.routes.draw do
   resources :seeds
   match '/seeds/owner/:owner' => 'seeds#index', :as => 'seeds_by_owner'
 
+  resources :harvests
+  match '/harvests/owner/:owner' => 'harvests#index', :as => 'harvests_by_owner'
+
   resources :posts
   match '/posts/author/:author' => 'posts#index', :as => 'posts_by_author'
 
   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 +33,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 +49,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/migrate/20130917053547_create_harvests.rb

@@ -0,0 +1,14 @@
+class CreateHarvests < ActiveRecord::Migration
+  def change
+    create_table :harvests do |t|
+      t.integer :crop_id, :null => false
+      t.integer :owner_id, :null => false
+      t.date :harvested_at
+      t.decimal :quantity
+      t.string :units
+      t.text :notes
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20130917060257_change_harvest_notes_to_description.rb

@@ -0,0 +1,5 @@
+class ChangeHarvestNotesToDescription < ActiveRecord::Migration
+  def change
+    rename_column :harvests, :notes, :description
+  end
+end

db/migrate/20130917071545_change_harvest_units_to_unit.rb

@@ -0,0 +1,5 @@
+class ChangeHarvestUnitsToUnit < ActiveRecord::Migration
+  def change
+    rename_column :harvests, :units, :unit
+  end
+end

db/migrate/20130917075803_add_slug_to_harvests.rb

@@ -0,0 +1,5 @@
+class AddSlugToHarvests < ActiveRecord::Migration
+  def change
+    add_column :harvests, :slug, :string
+  end
+end

db/migrate/20130925050304_add_weight_to_harvests.rb

@@ -0,0 +1,6 @@
+class AddWeightToHarvests < ActiveRecord::Migration
+  def change
+    add_column :harvests, :weight_quantity, :decimal
+    add_column :harvests, :weight_unit, :string
+  end
+end

db/migrate/20131018101204_rename_system_name_to_name.rb

@@ -0,0 +1,15 @@
+class RenameSystemNameToName < ActiveRecord::Migration
+  def up
+    # Rails is smart enough to alter the column being indexed, but not the name
+    # of the index, and there's no rename_index command.
+    remove_index :crops, :system_name
+    rename_column :crops, :system_name, :name
+    add_index :crops, :name
+  end
+
+  def down
+    remove_index :crops, :name
+    rename_column :crops, :name, :system_name
+    add_index :crops, :system_name
+  end
+end

db/migrate/20131025104228_add_fields_to_gardens.rb

@@ -0,0 +1,10 @@
+class AddFieldsToGardens < ActiveRecord::Migration
+  def change
+    add_column :gardens, :active, :boolean, :default => true
+    add_column :gardens, :location, :string
+    add_column :gardens, :latitude, :float
+    add_column :gardens, :longitude, :float
+    add_column :gardens, :area, :decimal
+    add_column :gardens, :area_unit, :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 => 20131025104228) do
 
   create_table "account_types", :force => true do |t|
     t.string   "name",              :null => false
@@ -51,7 +51,7 @@ ActiveRecord::Schema.define(:version => 20130828114516) do
   end
 
   create_table "crops", :force => true do |t|
-    t.string   "system_name",      :null => false
+    t.string   "name",             :null => false
     t.string   "en_wikipedia_url"
     t.datetime "created_at",       :null => false
     t.datetime "updated_at",       :null => false
@@ -61,8 +61,8 @@ ActiveRecord::Schema.define(:version => 20130828114516) do
     t.integer  "creator_id"
   end
 
+  add_index "crops", ["name"], :name => "index_crops_on_name"
   add_index "crops", ["slug"], :name => "index_crops_on_slug", :unique => true
-  add_index "crops", ["system_name"], :name => "index_crops_on_system_name"
 
   create_table "forums", :force => true do |t|
     t.string   "name",        :null => false
@@ -76,20 +76,35 @@ ActiveRecord::Schema.define(:version => 20130828114516) do
   add_index "forums", ["slug"], :name => "index_forums_on_slug", :unique => true
 
   create_table "gardens", :force => true do |t|
-    t.string   "name",        :null => false
+    t.string   "name",                          :null => false
     t.integer  "owner_id"
-    t.string   "slug",        :null => false
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
+    t.string   "slug",                          :null => false
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
     t.text     "description"
+    t.boolean  "active",      :default => true
+    t.string   "location"
+    t.float    "latitude"
+    t.float    "longitude"
+    t.decimal  "area"
+    t.string   "area_unit"
   end
 
   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"
+  create_table "harvests", :force => true do |t|
+    t.integer  "crop_id",         :null => false
+    t.integer  "owner_id",        :null => false
+    t.date     "harvested_at"
+    t.decimal  "quantity"
+    t.string   "unit"
+    t.text     "description"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+    t.string   "slug"
+    t.decimal  "weight_quantity"
+    t.string   "weight_unit"
   end
 
   create_table "members", :force => true do |t|
@@ -163,6 +178,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|

db/seeds.rb

@@ -1,12 +1,5 @@
 # This file should contain all the record creation needed to seed the database with its default values.
 # The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
-#
-# Examples:
-#
-#   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
-#   Mayor.create(name: 'Emanuel', city: cities.first)
-
-# import crops from CSV
 
 require 'csv'
 
@@ -29,18 +22,12 @@ def load_data
 end
 
 def load_crops
-  puts "Loading crops..."
-  CSV.foreach(Rails.root.join('db', 'seeds', 'crops.csv')) do |row|
-    system_name,scientific_name,en_wikipedia_url = row
-    @crop = Crop.create(
-      :system_name => system_name,
-      :en_wikipedia_url => en_wikipedia_url,
-      :creator_id => @cropbot_user.id
-    )
-    @crop.scientific_names.create(
-      :scientific_name => scientific_name,
-      :creator_id => @cropbot_user.id
-    )
+  source_path = Rails.root.join('db', 'seeds')
+  Dir.glob("#{source_path}/crops*.csv").each do |crop_file|
+    puts "Loading crops from #{crop_file}..."
+    CSV.foreach(crop_file) do |row|
+      Crop.create_from_csv(row)
+    end
   end
   puts "Finished loading crops"
 end

db/seeds/crops-10-peppers.csv

@@ -0,0 +1,61 @@
+Capsicum,Capsicum,http://en.wikipedia.org/wiki/Capsicum,,This is the top parent variety -- the entire family of all kinds of peppers
+Capsicum annuum,Capsicum annuum,http://en.wikipedia.org/wiki/Capsicum_annuum,Capsicum,
+Capsicum baccatum,Capsicum baccatum,http://en.wikipedia.org/wiki/Capsicum_baccatum,Capsicum,
+Capsicum chinense,Capsicum chinense,http://en.wikipedia.org/wiki/Capsicum_chinense,Capsicum,
+rocoto,Capsicum pubescens,http://en.wikipedia.org/wiki/Capsicum_pubescens,Capsicum,AKA locoto
+Capsicum frutescens,Capsicum frutescens,http://en.wikipedia.org/wiki/Capsicum_frutescens,Capsicum,
+Aleppo pepper,,http://en.wikipedia.org/wiki/Aleppo_pepper,Capsicum annuum,"AKA pul biber, halaby pepper"
+Anaheim pepper,,http://en.wikipedia.org/wiki/Anaheim_pepper,Capsicum annuum,"AKA New Mexico pepper, California chili, Magdalena chili"
+banana pepper,,http://en.wikipedia.org/wiki/Banana_pepper,Capsicum annuum,"AKA yellow wax pepper, banana chili"
+bell pepper,,http://en.wikipedia.org/wiki/Bell_pepper,Capsicum annuum,"AKA capsicum, sweet pepper, pepper, poivron, peperoni, piment"
+bird's eye chili,,http://en.wikipedia.org/wiki/Bird%27s_eye_chili,Capsicum annuum,"AKA Thai chili pepper, bird's chili"
+cascabel chili,,http://en.wikipedia.org/wiki/Cascabel_chili,Capsicum annuum,"AKA  rattle chile, bola chile, chile bola"
+cayenne pepper,,http://en.wikipedia.org/wiki/Cayenne_pepper,Capsicum annuum,"AKA Guinea spice, cow-horn pepper, aleva, bird pepper, red pepper"
+pasilla pepper,,http://en.wikipedia.org/wiki/Pasilla,Capsicum annuum,"AKA chilaca pepper, chile negro"
+chiltepin pepper,Capsicum annuum var. glabriusculum,http://en.wikipedia.org/wiki/Capsicum_annuum_var._glabriusculum,Capsicum annuum,"AKA wild chiltepin, chiltepe, chile tepin, turkey pepper, bird’s eye pepper, bird pepper"
+Chungyang red pepper,,http://en.wikipedia.org/wiki/Chungyang_Red_Pepper,Capsicum annuum,
+cubanelle pepper,,http://en.wikipedia.org/wiki/Cubanelle,Capsicum annuum,
+chile de árbol pepper,,http://en.wikipedia.org/wiki/Chile_de_%C3%A1rbol,Capsicum annuum,"AKA bird's beak chile, rat's tail chile"
+dundicut,,http://en.wikipedia.org/wiki/Dundicut,Capsicum annuum,AKA  lal mirch
+facing heaven pepper,Capsicum annuum var. conoides,http://en.wikipedia.org/wiki/Facing_heaven_pepper,Capsicum annuum,
+Fresno pepper,,http://en.wikipedia.org/wiki/Fresno_pepper,Capsicum annuum,
+guajillo pepper,,http://en.wikipedia.org/wiki/Guajillo_chili,Capsicum annuum,"AKA guajillo chili, guajillo chilli, chile guajillo"
+Guntur Sannam chili,Capsicum Annuum var. Longhum,http://en.wikipedia.org/wiki/Guntur_Sannam,Capsicum annuum,
+Hungarian wax pepper,,http://en.wikipedia.org/wiki/Hungarian_wax_pepper,Capsicum annuum,
+Italian sweet pepper,,http://en.wikipedia.org/wiki/Italian_sweet_pepper,Capsicum annuum,
+jalapeño pepper,,http://en.wikipedia.org/wiki/Jalape%C3%B1o,Capsicum annuum,
+shishito pepper,,http://en.wikipedia.org/wiki/Shishito,Capsicum annuum,
+medusa pepper,,http://en.wikipedia.org/wiki/Medusa_pepper,Capsicum annuum,
+mulato pepper,,http://en.wikipedia.org/wiki/Mulato_pepper,Capsicum annuum,
+peter pepper,Capsicum annuum var. annuum,http://en.wikipedia.org/wiki/Peter_pepper,Capsicum annuum,AKA chilli willy pepper
+peperoncini pepper,,http://en.wikipedia.org/wiki/Peperoncini,Capsicum annuum,"AKA friggitello, peperone"
+pequin pepper,"Capsicum annuum var. glabriusculum
+",http://en.wikipedia.org/wiki/Pequin_pepper,Capsicum annuum,AKA piquin
+pimento pepper,,http://en.wikipedia.org/wiki/Pimiento,Capsicum annuum,"AKA cherry pepper, pimiento pepper"
+poblano pepper,,http://en.wikipedia.org/wiki/Poblano,Capsicum annuum,
+Santa Fe Grande pepper,,http://en.wikipedia.org/wiki/Santa_Fe_Grande_pepper,Capsicum annuum,"AKA yellow hot chili pepper, guero chili pepper"
+serrano pepper,,http://en.wikipedia.org/wiki/Serrano_pepper,Capsicum annuum,
+bishop's crown pepper,Capsicum baccatum var. pendulum,http://en.wikipedia.org/wiki/Bishop%27s_Crown,Capsicum baccatum,AKA Christmas bell
+lemon drop pepper,,http://en.wikipedia.org/wiki/Lemon_drop_%28pepper%29,Capsicum baccatum,"AKA ají limon, kellu uchu, hot lemon"
+peppadew pepper,,http://en.wikipedia.org/wiki/Peppadew,Capsicum baccatum,
+Brazilian starfish,,http://en.wikipedia.org/wiki/Capsicum_baccatum,Capsicum baccatum,
+wild baccatum,,http://en.wikipedia.org/wiki/Capsicum_baccatum,Capsicum baccatum,
+adjuma pepper,,http://en.wikipedia.org/wiki/Adjuma,Capsicum chinense,"AKA adjoema, aji umba, ojemma"
+ají dulce pepper,,http://en.wikipedia.org/wiki/Aj%C3%AD_dulce,Capsicum chinense,"AKA ajicito, ajice, rubra, biquinho"
+datil pepper,,http://en.wikipedia.org/wiki/Datil_pepper,Capsicum chinense,
+fatalii pepper,,http://en.wikipedia.org/wiki/Fatalii,Capsicum chinense,
+Madame Jeanette pepper,,http://en.wikipedia.org/wiki/Madame_Jeanette,Capsicum chinense,
+habanero pepper,,http://en.wikipedia.org/wiki/Habanero,Capsicum chinense,AKA habañero
+black habanero pepper,,http://en.wikipedia.org/wiki/Habanero,Capsicum chinense,
+red savino pepper,,http://en.wikipedia.org/wiki/Red_Savina_pepper,Capsicum chinense,
+bhut jolokia pepper,,http://en.wikipedia.org/wiki/Bhut_Jolokia,Capsicum chinense,"AKA ghost pepper, ghost chili pepper, red naga chilli, ghost chilli, naga jolokia"
+Scotch bonnet pepper,,http://en.wikipedia.org/wiki/Scotch_bonnet_%28pepper%29,Capsicum chinense,"AKA boabs bonnet, Scotty bons, Bonney peppers, Caribbean red peppers, ball of fire"
+cachucha pepper,,http://en.wikipedia.org/wiki/Scotch_bonnet_%28pepper%29,Capsicum chinense,
+Trinidad scorpion butch T pepper,,http://en.wikipedia.org/wiki/Trinidad_Scorpion_Butch_T_pepper,Capsicum chinense,
+Trinidad Moruga scorpion pepper,,http://en.wikipedia.org/wiki/Trinidad_Moruga_Scorpion,Capsicum chinense,
+Hainan yellow lantern,,http://en.wikipedia.org/wiki/Hainan_Yellow_Lantern_Chili,Capsicum chinense,AKA yellow emperor chili
+piri-piri pepper,,http://en.wikipedia.org/wiki/Piri_piri,Capsicum frutescens,"AKA African bird's eye pepper, peri peri, pili pili"
+Tabasco pepper,,http://en.wikipedia.org/wiki/Tabasco_pepper,Capsicum frutescens,
+malagueta pepper,,http://en.wikipedia.org/wiki/Malagueta_pepper,Capsicum frutescens,
+siling labuyo pepper,,http://en.wikipedia.org/wiki/Siling_labuyo,Capsicum frutescens,"AKA chileng bundok, siling palay, pasitis, pasite, katumbal, kitikot, siling kolikot, silit-diablo, lada, rimorimo, paktin"
+kambuzi,,http://en.wikipedia.org/wiki/Kambuzi,Capsicum frutescens,

lib/geocodable.rb

@@ -0,0 +1,22 @@
+module Geocodable
+  def self.included(base)
+    base.extend(self)
+  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.blank?
+      self.latitude = nil
+      self.longitude = nil
+    end
+  end
+
+end

lib/tasks/growstuff.rake

@@ -10,6 +10,32 @@ namespace :growstuff do
     member.roles << admin
   end
 
+  desc "Upload crops from a CSV file"
+  # usage: rake growstuff:import_crops file=filename.csv
+
+  task :import_crops => :environment do
+    require 'csv'
+
+    @file = ENV['file'] or raise "Usage: rake growstuff:import_crops file=file.csv"
+
+    puts "Loading crops from #{@file}..."
+    CSV.foreach(@file) do |row|
+      Crop.create_from_csv(row)
+    end
+    puts "Finished loading crops"
+
+  end
+
+  desc "Depopulate Null Island"
+  # this fixes up anyone who has erroneously wound up with a 0,0 lat/long
+  task :depopulate_null_island => :environment do
+    Member.find_each do |m|
+      if m.location and (m.latitude == nil and m.longitude == nil)
+        m.geocode
+        m.save
+      end
+    end
+  end
 
   desc "One-off tasks needed at various times and kept for posterity"
   namespace :oneoff do
@@ -167,6 +193,21 @@ namespace :growstuff do
       end
     end
 
+    desc "October 2013: set garden locations to member locations"
+    task :initialize_garden_locations => :environment do
+      Member.located.find_each do |m|
+        m.gardens.each do |g|
+          if g.location.blank?
+            g.location = m.location
+            g.latitude = m.latitude
+            g.longitude = m.longitude
+            g.save
+          end
+        end
+      end
+    end
+
+
   end
 
 end