Merge pull request #1439 from Growstuff/dev

Release 32

.rubocop.yml

@@ -19,6 +19,13 @@ Style/FileName:
 Style/StringLiterals:
   Enabled: false
 
+# Stop hound and codeclimate fighting
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    default: ()
+    '%i': ()
+    '%w': ()
+
 Style/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 
@@ -30,9 +37,8 @@ Style/AlignParameters:
 Metrics/LineLength:
   Max: 120
 
-
-# See https://github.com/bbatsov/rubocop/issues/3629
-Rails/HttpPositionalArguments:
+# turn these back on in Rails 5
+Rails/HttpPositionalArguments: # See https://github.com/bbatsov/rubocop/issues/3629
   Enabled: false
 
 Style/Documentation:
@@ -58,9 +64,9 @@ Metrics/BlockLength:
 Metrics/MethodLength:
   Max: 34
 Metrics/AbcSize:
-  Max: 32
+  Max: 31
 Metrics/ClassLength:
-  Max: 207
+  Max: 179
 Metrics/CyclomaticComplexity:
   Max: 11
 Metrics/PerceivedComplexity:

.rubocop_todo.yml

@@ -1,12 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --no-offense-counts`
-# on 2017-05-28 10:57:55 +1200 using RuboCop version 0.47.1.
+# on 2017-11-05 20:41:45 +1300 using RuboCop version 0.47.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-
 Lint/HandleExceptions:
   Exclude:
     - 'lib/tasks/testing.rake'
@@ -57,7 +56,6 @@ Rails/TimeZone:
     - 'spec/factories/member.rb'
     - 'spec/factories/post.rb'
     - 'spec/models/post_spec.rb'
-    - 'spec/views/plantings/index.html.haml_spec.rb'
 
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
@@ -122,13 +120,6 @@ Style/EachForSimpleLoop:
     - 'spec/models/crop_spec.rb'
     - 'spec/views/home/_crops.html.haml_spec.rb'
 
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: compact, expanded
-Style/EmptyMethod:
-  Exclude:
-    - 'app/controllers/roles_controller.rb'
-
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: format, sprintf, percent
 Style/FormatString:
@@ -146,7 +137,6 @@ Style/IdenticalConditionalBranches:
 Style/IfUnlessModifier:
   Exclude:
     - 'app/helpers/crops_helper.rb'
-    - 'app/models/planting.rb'
     - 'config/initializers/geocoder.rb'
     - 'lib/tasks/growstuff.rake'
 
@@ -165,7 +155,6 @@ Style/MultilineIfModifier:
 
 Style/MultilineTernaryOperator:
   Exclude:
-    - 'app/controllers/notifications_controller.rb'
     - 'app/controllers/order_items_controller.rb'
 
 # Cop supports --auto-correct.
@@ -223,7 +212,6 @@ Style/RegexpLiteral:
     - 'spec/views/devise/registrations/edit_spec.rb'
     - 'spec/views/members/index.html.haml_spec.rb'
     - 'spec/views/posts/index.html.haml_spec.rb'
-    - 'spec/views/posts/show.html.haml_spec.rb'
 
 # Cop supports --auto-correct.
 # Configuration parameters: SupportedStyles.
@@ -243,4 +231,4 @@ Style/SymbolProc:
 # SupportedStyles: percent, brackets
 Style/WordArray:
   EnforcedStyle: percent
-  MinSize: 5
+  MinSize: 4

.travis.yml

@@ -33,7 +33,7 @@ before_script:
     if [ "${STATIC_CHECKS}" = "true" ]; then
       ./script/install_linters;
     else
-      bundle exec rake db:create db:migrate db:test:prepare;
+      RAILS_ENV=test bundle exec rake db:create db:migrate;
       bundle exec rake assets:precompile;
     fi
   - set +e

CONTRIBUTORS.md

@@ -81,6 +81,7 @@ submit the change with your pull request.
 - Arun Kumar / [arun1595](https://github.com/arun1595)
 - Harry Brodsky / [hbrodsk1](https://github.com/hbrodsk1)
 - Jeff Kingswood / [ancyentmariner](https://github.com/ancyentmariner)
+- Logan Gingerich / [logangingerich](https://github.com/logangingerich)
 
 ## Bots
 

Gemfile

@@ -17,6 +17,9 @@ gem 'font-awesome-sass'
 
 gem 'uglifier' # JavaScript compressor
 
+# planting and harvest predictions
+gem 'active_median'
+
 gem 'flickraw'
 gem 'jquery-rails'
 gem 'jquery-ui-rails', '~> 5.0.2' # needs careful upgrade with change of location
@@ -124,7 +127,7 @@ group :development, :test do
   gem 'capybara-screenshot'             # for test debugging
   gem 'coveralls', require: false       # coverage analysis
   gem 'database_cleaner'
-  gem 'factory_girl_rails'              # for creating test data
+  gem 'factory_bot_rails'               # for creating test data
   gem 'haml-i18n-extractor'
   gem 'haml-rails'                      # HTML templating language
   gem 'haml_lint'                       # Checks haml files for goodness

Gemfile.lock

@@ -23,6 +23,8 @@ GEM
     active_link_to (1.0.5)
       actionpack
       addressable
+    active_median (0.1.4)
+      activerecord
     active_merchant-paypal-bogus-gateway (0.1.0)
       activemerchant
     active_utils (3.3.9)
@@ -31,7 +33,7 @@ GEM
     activejob (4.2.10)
       activesupport (= 4.2.10)
       globalid (>= 0.3.0)
-    activemerchant (1.73.0)
+    activemerchant (1.74.0)
       activesupport (>= 3.2.14, < 6.x)
       builder (>= 2.1.2, < 4.0.0)
       i18n (>= 0.6.9)
@@ -93,7 +95,7 @@ GEM
     capybara-email (2.5.0)
       capybara (~> 2.4)
       mail
-    capybara-screenshot (1.0.17)
+    capybara-screenshot (1.0.18)
       capybara (>= 1.0, < 3)
       launchy
     childprocess (0.8.0)
@@ -143,7 +145,7 @@ GEM
     d3-rails (3.5.17)
       railties (>= 3.1)
     dalli (2.7.6)
-    database_cleaner (1.6.1)
+    database_cleaner (1.6.2)
     debug_inspector (0.0.3)
     devise (4.3.0)
       bcrypt (~> 3.0)
@@ -173,10 +175,10 @@ GEM
     erubis (2.7.0)
     excon (0.59.0)
     execjs (2.7.0)
-    factory_girl (4.8.1)
+    factory_bot (4.8.2)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.8.0)
-      factory_girl (~> 4.8.0)
+    factory_bot_rails (4.8.2)
+      factory_bot (~> 4.8.2)
       railties (>= 3.0.0)
     faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
@@ -193,7 +195,7 @@ GEM
     gibbon (1.2.1)
       httparty
       multi_json (>= 1.9.0)
-    globalid (0.4.0)
+    globalid (0.4.1)
       activesupport (>= 4.2.0)
     gravatar-ultimate (2.0.0)
       activesupport (>= 2.3.14)
@@ -247,7 +249,7 @@ GEM
       ruby_parser (~> 3.5)
     httparty (0.15.6)
       multi_xml (>= 0.5.2)
-    i18n (0.9.0)
+    i18n (0.9.1)
       concurrent-ruby (~> 1.0)
     i18n-tasks (0.9.12)
       activesupport (>= 4.0.2)
@@ -305,15 +307,15 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.12)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
     memcachier (0.0.2)
     method_source (0.9.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mimemagic (0.3.2)
-    mini_mime (0.1.4)
+    mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.10.3)
     moneta (0.8.1)
@@ -417,7 +419,7 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (2.1.0)
     raindrops (0.19.0)
-    rake (12.1.0)
+    rake (12.2.1)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
@@ -462,7 +464,7 @@ GEM
     ruby_parser (3.10.1)
       sexp_processor (~> 4.9)
     rubyzip (1.2.1)
-    sass (3.5.2)
+    sass (3.5.3)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -473,7 +475,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    selenium-webdriver (3.6.0)
+    selenium-webdriver (3.7.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
     sexp_processor (4.10.0)
@@ -510,7 +512,7 @@ GEM
     timecop (0.9.1)
     tins (1.15.0)
     trollop (1.16.2)
-    tzinfo (1.2.3)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
@@ -537,6 +539,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  active_median
   active_merchant-paypal-bogus-gateway
   active_utils
   activemerchant
@@ -567,7 +570,7 @@ DEPENDENCIES
   elasticsearch-api (~> 2.0.0)
   elasticsearch-model
   elasticsearch-rails
-  factory_girl_rails
+  factory_bot_rails
   figaro
   flickraw
   font-awesome-sass

app/controllers/crops_controller.rb

@@ -137,7 +137,7 @@ class CropsController < ApplicationController
     return unless params[param_name].present?
     destroy_names(name_type)
     params[param_name].each do |_i, value|
-      create_name!(name_type, value)
+      create_name!(name_type, value) unless value.empty?
     end
   end
 
@@ -154,6 +154,7 @@ class CropsController < ApplicationController
       :name,
       :parent_id,
       :creator_id,
+      :perennial,
       :approval_status,
       :request_notes,
       :reason_for_rejection,

app/controllers/harvests_controller.rb

@@ -1,5 +1,6 @@
 class HarvestsController < ApplicationController
-  before_action :authenticate_member!, except: [:index, :show]
+  before_action :authenticate_member!, except: %i(index show)
+  after_action :update_crop_medians, only: %i(create update destroy)
   load_and_authorize_resource
   respond_to :html, :json
   respond_to :csv, only: :index
@@ -33,6 +34,7 @@ class HarvestsController < ApplicationController
 
   def create
     @harvest.crop_id = @harvest.planting.crop_id if @harvest.planting_id
+    @harvest.harvested_at = Time.zone.now if @harvest.harvested_at.blank?
     @harvest.save
     respond_with(@harvest)
   end
@@ -71,8 +73,8 @@ class HarvestsController < ApplicationController
     elsif @planting
       @planting.harvests
     else
-      Harvest
-    end.joins(:owner, :crop).paginate(page: params[:page])
+      Harvest.all
+    end.order(harvested_at: :desc).joins(:owner, :crop).paginate(page: params[:page])
   end
 
   def csv_filename
@@ -83,4 +85,13 @@ class HarvestsController < ApplicationController
                 end
     "Growstuff-#{specifics}Harvests-#{Time.zone.now.to_s(:number)}.csv"
   end
+
+  def update_crop_medians
+    # We only update medians to predict plantings
+    # if this harvest is not linked to a planting, then do nothing
+    return if @harvest.planting.nil?
+
+    @harvest.planting.update_harvest_days
+    @harvest.crop.update_harvest_medians
+  end
 end

app/controllers/photos_controller.rb

@@ -6,7 +6,13 @@ class PhotosController < ApplicationController
   responders :flash
 
   def index
-    @photos = Photo.paginate(page: params[:page])
+    if params[:crop_id]
+      @crop = Crop.find params[:crop_id]
+      @photos = @crop.photos
+    else
+      @photos = Photo.all
+    end
+    @photos = @photos.includes(:owner).order(:created_at).paginate(page: params[:page])
     respond_with(@photos)
   end
 

app/controllers/plantings_controller.rb

@@ -1,6 +1,8 @@
 class PlantingsController < ApplicationController
-  before_action :authenticate_member!, except: [:index, :show]
-  after_action :expire_homepage, only: [:create, :update, :destroy]
+  before_action :authenticate_member!, except: %i(index show)
+  after_action :expire_homepage, only: %i(create update destroy)
+  after_action :update_crop_medians, only: %i(create update destroy)
+  after_action :update_planting_medians, only: :update
   load_and_authorize_resource
 
   respond_to :html, :json
@@ -51,13 +53,11 @@ class PlantingsController < ApplicationController
   def create
     @planting = Planting.new(planting_params)
     @planting.owner = current_member
-    @planting.calc_and_set_days_before_maturity
-    @planting.save
+    @planting.save!
     respond_with @planting
   end
 
   def update
-    @planting.calc_and_set_days_before_maturity
     @planting.update(planting_params)
     respond_with @planting
   end
@@ -69,6 +69,14 @@ class PlantingsController < ApplicationController
 
   private
 
+  def update_crop_medians
+    @planting.crop.update_lifespan_medians
+  end
+
+  def update_planting_medians
+    @planting.update_harvest_days
+  end
+
   def planting_params
     params[:planted_at] = parse_date(params[:planted_at]) if params[:planted_at]
     params.require(:planting).permit(
@@ -87,6 +95,9 @@ class PlantingsController < ApplicationController
           Planting
         end
     p = p.current unless @show_all
-    p.joins(:owner, :crop, :garden).order(:created_at).paginate(page: params[:page])
+    p.joins(:owner, :crop, :garden)
+      .includes(:crop, :owner, :garden)
+      .order(:created_at)
+      .paginate(page: params[:page])
   end
 end

app/helpers/plantings_helper.rb

@@ -1,18 +1,6 @@
 module PlantingsHelper
-  def display_days_before_maturity(planting)
-    # First try to calc from finished/finished_at
-    if planting.finished? || planting.finished_at.present?
-      planting.days_until_finished.to_s
-    # then try to calc from planted at + maturity
-    elsif planting.planted_at.present? && planting.days_before_maturity.present?
-      planting.days_until_mature.to_s
-    else
-      "unknown"
-    end
-  end
-
   def display_finished(planting)
-    if !planting.finished_at.nil?
+    if planting.finished_at.present?
       planting.finished_at
     elsif planting.finished
       "Yes (no date specified)"

app/models/crop.rb

@@ -2,11 +2,14 @@ class Crop < ActiveRecord::Base
   extend FriendlyId
   friendly_id :name, use: [:slugged, :finders]
 
-  has_many :scientific_names, after_add: :update_index, after_remove: :update_index
-  accepts_nested_attributes_for :scientific_names,
-    allow_destroy: true,
-    reject_if: :all_blank
+  ##
+  ## Triggers
+  before_destroy { |crop| crop.posts.clear }
 
+  ##
+  ## Relationships
+  has_many :scientific_names, after_add: :update_index, after_remove: :update_index, dependent: :destroy
+  accepts_nested_attributes_for :scientific_names, allow_destroy: true, reject_if: :all_blank
   has_many :alternate_names, after_add: :update_index, after_remove: :update_index, dependent: :destroy
   has_many :plantings
   has_many :photos, through: :plantings
@@ -15,33 +18,32 @@ class Crop < ActiveRecord::Base
   has_many :plant_parts, -> { uniq.reorder("plant_parts.name") }, through: :harvests
   belongs_to :creator, class_name: 'Member'
   belongs_to :requester, class_name: 'Member'
-
   belongs_to :parent, class_name: 'Crop'
   has_many :varieties, class_name: 'Crop', foreign_key: 'parent_id'
   has_and_belongs_to_many :posts # rubocop:disable Rails/HasAndBelongsToMany
-  before_destroy { |crop| crop.posts.clear }
 
+  ##
+  ## Scopes
   default_scope { order("lower(crops.name) asc") }
-  scope :recent, lambda {
-    approved.reorder("created_at desc")
-  }
-  scope :toplevel, lambda {
-    approved.where(parent_id: nil)
-  }
-  scope :popular, lambda {
-    approved.reorder("plantings_count desc, lower(name) asc")
-  }
-  scope :randomized, lambda {
-    # ok on sqlite and psql, but not on mysql
-    approved.reorder('random()')
-  }
+  scope :recent, -> { approved.reorder("created_at desc") }
+  scope :toplevel, -> { approved.where(parent_id: nil) }
+  scope :popular, -> { approved.reorder("plantings_count desc, lower(name) asc") }
+  # ok on sqlite and psql, but not on mysql
+  scope :randomized, -> { approved.reorder('random()') }
   scope :pending_approval, -> { where(approval_status: "pending") }
   scope :approved, -> { where(approval_status: "approved") }
   scope :rejected, -> { where(approval_status: "rejected") }
-
   scope :interesting, -> { approved.has_photos.randomized }
   scope :has_photos, -> { includes(:photos).where.not(photos: { id: nil }) }
 
+  ##
+  ## Validations
+  # Reasons are only necessary when rejecting
+  validates :reason_for_rejection, presence: true, if: :rejected?
+  ## This validation addresses a race condition
+  validate :approval_status_cannot_be_changed_again
+  validate :must_be_rejected_if_rejected_reasons_present
+  validate :must_have_meaningful_reason_for_rejection
   ## Wikipedia urls are only necessary when approving a crop
   validates :en_wikipedia_url,
     format: {
@@ -50,16 +52,6 @@ class Crop < ActiveRecord::Base
     },
     if: :approved?
 
-  ## Reasons are only necessary when rejecting
-  validates :reason_for_rejection, presence: true, if: :rejected?
-
-  ## This validation addresses a race condition
-  validate :approval_status_cannot_be_changed_again
-
-  validate :must_be_rejected_if_rejected_reasons_present
-
-  validate :must_have_meaningful_reason_for_rejection
-
   ####################################
   # Elastic search configuration
   if ENV["GROWSTUFF_ELASTICSEARCH"] == "true"
@@ -106,6 +98,10 @@ class Crop < ActiveRecord::Base
     end
   end
 
+  def harvest_photos
+    Photo.joins(:harvests).where("harvests.crop_id": id)
+  end
+
   def as_indexed_json(_options = {})
     as_json(
       only: [:id, :name, :approval_status],
@@ -173,6 +169,10 @@ class Crop < ActiveRecord::Base
       .count("harvests.id")
   end
 
+  def annual?
+    perennial != true
+  end
+
   def interesting?
     min_plantings = 3 # needs this many plantings to be interesting
     min_photos    = 3 # needs this many photos to be interesting
@@ -206,51 +206,25 @@ class Crop < ActiveRecord::Base
     reason_for_rejection
   end
 
-  # Crop.search(string)
+  # # Crop.search(string)
   def self.search(query)
-    if ENV['GROWSTUFF_ELASTICSEARCH'] == "true"
-      search_str = query.nil? ? "" : query.downcase
-      response = __elasticsearch__.search( # Finds documents which match any field, but uses the _score from
-        # the best field insead of adding up _score from each field.
-        query: {
-          multi_match: {
-            query: search_str.to_s,
-            analyzer: "standard",
-            fields: ["name",
-                     "scientific_names.scientific_name",
-                     "alternate_names.name"]
-          }
-        },
-        filter: {
-          term: { approval_status: "approved" }
-        },
-        size: 50
-      )
-      response.records.to_a
-    else
-      # if we don't have elasticsearch, just do a basic SQL query.
-      # also, make sure it's an actual array not an activerecord
-      # collection, so it matches what we get from elasticsearch and we can
-      # manipulate it in the same ways (eg. deleting elements without deleting
-      # the whole record from the db)
-      matches = Crop.approved.where("name ILIKE ?", "%#{query}%").to_a
-
-      # we want to make sure that exact matches come first, even if not
-      # using elasticsearch (eg. in development)
-      exact_match = Crop.approved.find_by(name: query)
-      if exact_match
-        matches.delete(exact_match)
-        matches.unshift(exact_match)
-      end
-
-      matches
-    end
+    CropSearchService.search(query)
   end
 
   def self.case_insensitive_name(name)
     where(["lower(crops.name) = :value", { value: name.downcase }])
   end
 
+  def update_lifespan_medians
+    # Median lifespan of plantings
+    update(median_lifespan: Planting.where(crop: self).median(:lifespan))
+  end
+
+  def update_harvest_medians
+    update(median_days_to_first_harvest: Planting.where(crop: self).median(:days_to_first_harvest))
+    update(median_days_to_last_harvest: Planting.where(crop: self).median(:days_to_last_harvest))
+  end
+
   private
 
   def count_uses_of_property(col_name)

app/models/forum.rb

@@ -1,7 +1,7 @@
 class Forum < ActiveRecord::Base
   extend FriendlyId
   validates :name, presence: true
-  friendly_id :name, use: [:slugged, :finders]
+  friendly_id :name, use: %i(slugged finders)
 
   has_many :posts
   belongs_to :owner, class_name: "Member"

app/models/garden.rb

@@ -2,7 +2,7 @@ class Garden < ActiveRecord::Base
   extend FriendlyId
   include Geocodable
   include PhotoCapable
-  friendly_id :garden_slug, use: [:slugged, :finders]
+  friendly_id :garden_slug, use: %i(slugged finders)
 
   belongs_to :owner, class_name: 'Member', foreign_key: 'owner_id', counter_cache: true
   has_many :plantings, dependent: :destroy
@@ -23,7 +23,7 @@ class Garden < ActiveRecord::Base
 
   validates :name,
     format: {
-      with: /\A\w+[\w ]+\z/
+      with: /\A\w+[\w ()]+\z/
     },
     length: { maximum: 255 }
 
@@ -41,7 +41,7 @@ class Garden < ActiveRecord::Base
     "acres" => "acre"
   }.freeze
   validates :area_unit, inclusion: { in: AREA_UNITS_VALUES.values,
-                                     message: "%{value} is not a valid area unit" },
+                                     message: "%<value>s is not a valid area unit" },
                         allow_nil: true,
                         allow_blank: true
 

app/models/harvest.rb

@@ -1,28 +1,11 @@
 class Harvest < ActiveRecord::Base
-  extend FriendlyId
   include ActionView::Helpers::NumberHelper
+  extend FriendlyId
   include PhotoCapable
-  friendly_id :harvest_slug, use: [:slugged, :finders]
 
-  belongs_to :crop
-  belongs_to :owner, class_name: 'Member', counter_cache: true
-  belongs_to :plant_part
-  belongs_to :planting
-
-  default_scope { joins(:owner).order(created_at: :desc) }
-  validates :crop, approved: true
-
-  validates :crop, presence: { message: "must be present and exist in our database" }
-
-  validates :plant_part, presence: { message: "must be present and exist in our database" }
-
-  validates :quantity,
-    numericality: {
-      only_integer: false,
-      greater_than_or_equal_to: 0
-    },
-    allow_nil: true
+  friendly_id :harvest_slug, use: %i(slugged finders)
 
+  # Constants
   UNITS_VALUES = {
     "individual" => "individual",
     "bunches" => "bunch",
@@ -35,29 +18,53 @@ class Harvest < ActiveRecord::Base
     "baskets" => "basket",
     "bushels" => "bushel"
   }.freeze
-  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",
     "oz" => "oz"
   }.freeze
-  validates :weight_unit, inclusion: { in: WEIGHT_UNITS_VALUES.values,
-                                       message: "%{value} is not a valid unit" },
-                          allow_nil: true,
-                          allow_blank: true
 
+  ##
+  ## Triggers
   after_validation :cleanup_quantities
-
   before_save :set_si_weight
 
+  ##
+  ## Relationships
+  belongs_to :crop
+  belongs_to :owner, class_name: 'Member', counter_cache: true
+  belongs_to :plant_part
+  belongs_to :planting
+
+  ##
+  ## Scopes
+  default_scope { joins(:owner) }
+
+  ##
+  ## Validations
+  validates :crop, approved: true
+  validates :crop, presence: { message: "must be present and exist in our database" }
+  validates :plant_part, presence: { message: "must be present and exist in our database" }
+  validates :harvested_at, presence: true
+  validates :quantity, allow_nil: true, numericality: {
+    only_integer: false, greater_than_or_equal_to: 0
+  }
+  validates :unit, allow_nil: true, allow_blank: true, inclusion: {
+    in: UNITS_VALUES.values, message: "%<value>s is not a valid unit"
+  }
+  validates :weight_quantity, allow_nil: true, numericality: { only_integer: false }
+  validates :weight_unit, allow_nil: true, allow_blank: true, inclusion: {
+    in: WEIGHT_UNITS_VALUES.values, message: "%<value>s is not a valid unit"
+  }
+  validate :crop_must_match_planting
+  validate :harvest_must_be_after_planting
+
+  def time_from_planting_to_harvest
+    return if planting.blank?
+    harvested_at - planting.planted_at
+  end
+
   # we're storing the harvest weight in kilograms in the db too
   # to make data manipulation easier
   def set_si_weight
@@ -118,4 +125,15 @@ class Harvest < ActiveRecord::Base
   def default_photo
     photos.first || crop.default_photo
   end
+
+  def crop_must_match_planting
+    return if planting.blank? # only check if we are linked to a planting
+    errors.add(:planting, "must be the same crop") unless crop == planting.crop
+  end
+
+  def harvest_must_be_after_planting
+    # only check if we are linked to a planting
+    return unless harvested_at.present? && planting.present? && planting.planted_at.present?
+    errors.add(:planting, "cannot be harvested before planting") unless harvested_at > planting.planted_at
+  end
 end

app/models/member.rb

@@ -4,7 +4,7 @@ class Member < ActiveRecord::Base
   include Geocodable
   extend FriendlyId
 
-  friendly_id :login_name, use: [:slugged, :finders]
+  friendly_id :login_name, use: %i(slugged finders)
 
   has_many :posts, foreign_key: 'author_id'
   has_many :comments, foreign_key: 'author_id'
@@ -91,7 +91,7 @@ class Member < ActiveRecord::Base
 
   # and an account record (for paid accounts etc)
   # we use find_or_create to avoid accidentally creating a second one,
-  # which can happen sometimes especially with FactoryGirl associations
+  # which can happen sometimes especially with FactoryBot associations
   after_create { |member| Account.find_or_create_by(member_id: member.id) }
 
   after_save :update_newsletter_subscription

app/models/plant_part.rb

@@ -1,6 +1,6 @@
 class PlantPart < ActiveRecord::Base
   extend FriendlyId
-  friendly_id :name, use: [:slugged, :finders]
+  friendly_id :name, use: %i(slugged finders)
 
   has_many :harvests
   has_many :crops, -> { uniq }, through: :harvests

app/models/planting.rb

@@ -1,48 +1,10 @@
 class Planting < ActiveRecord::Base
   extend FriendlyId
   include PhotoCapable
-  friendly_id :planting_slug, use: [:slugged, :finders]
-
-  belongs_to :garden
-  belongs_to :owner, class_name: 'Member', counter_cache: true
-  belongs_to :crop, counter_cache: true
-  has_many :harvests, dependent: :destroy
-
-  default_scope { joins(:owner).order(created_at: :desc) }
-  scope :finished, -> { where(finished: true) }
-  scope :current, -> { where(finished: false) }
-
-  scope :interesting, -> { has_photos.one_per_owner }
-  scope :one_per_owner, lambda {
-    joins("JOIN members m ON (m.id=plantings.owner_id)
-           LEFT OUTER JOIN plantings p2
-           ON (m.id=p2.owner_id AND plantings.id < p2.id)").where("p2 IS NULL")
-  }
-
-  delegate :name,
-    :en_wikipedia_url,
-    :default_scientific_name,
-    :plantings_count,
-    to: :crop,
-    prefix: true
-
-  validates :garden, presence: true
-  validates :crop, presence: true
-  validates :crop, approved: { message: "must be present and exist in our database" }
-
-  validates :quantity,
-    numericality: {
-      only_integer: true,
-      greater_than_or_equal_to: 0
-    },
-    allow_nil: true
+  friendly_id :planting_slug, use: %i(slugged finders)
 
+  # Constants
   SUNNINESS_VALUES = %w(sun semi-shade shade)
-  validates :sunniness, inclusion: { in: SUNNINESS_VALUES,
-                                     message: "%{value} is not a valid sunniness value" },
-                        allow_nil: true,
-                        allow_blank: true
-
   PLANTED_FROM_VALUES = [
     'seed',
     'seedling',
@@ -56,23 +18,47 @@ class Planting < ActiveRecord::Base
     'graft',
     'layering'
   ]
-  validates :planted_from, inclusion: { in: PLANTED_FROM_VALUES,
-                                        message: "%{value} is not a valid planting method" },
-                           allow_nil: true,
-                           allow_blank: true
 
+  ##
+  ## Triggers
+  before_save :calculate_lifespan
+
+  belongs_to :garden
+  belongs_to :owner, class_name: 'Member', counter_cache: true
+  belongs_to :crop, counter_cache: true
+  has_many :harvests, dependent: :destroy
+
+  ##
+  ## Scopes
+  default_scope { joins(:owner).order(created_at: :desc) }
+  scope :finished, -> { where(finished: true) }
+  scope :current, -> { where(finished: false) }
+  scope :interesting, -> { has_photos.one_per_owner }
+  scope :one_per_owner, lambda {
+    joins("JOIN members m ON (m.id=plantings.owner_id)
+           LEFT OUTER JOIN plantings p2
+           ON (m.id=p2.owner_id AND plantings.id < p2.id)").where("p2 IS NULL")
+  }
+
+  ##
+  ## Delegations
+  delegate :name, :en_wikipedia_url, :default_scientific_name, :plantings_count,
+    to: :crop, prefix: true
+
+  ##
+  ## Validations
+  validates :garden, presence: true
+  validates :crop, presence: true, approved: { message: "must be present and exist in our database" }
   validate :finished_must_be_after_planted
-
-  delegate :days_until_finished, to: :predict
-  delegate :days_until_mature, to: :predict
-  delegate :percentage_grown, to: :predict
-  delegate :start_to_finish_diff, to: :predict
-
-  # check that any finished_at date occurs after planted_at
-  def finished_must_be_after_planted
-    return unless planted_at && finished_at # only check if we have both
-    errors.add(:finished_at, "must be after the planting date") unless planted_at < finished_at
-  end
+  validates :quantity, allow_nil: true, numericality: {
+    only_integer: true, greater_than_or_equal_to: 0
+  }
+  validates :sunniness, allow_nil: true, allow_blank: true, inclusion: {
+    in: SUNNINESS_VALUES, message: "%<value>s is not a valid sunniness value"
+  }
+  validates :planted_from, allow_nil: true, allow_blank: true, inclusion: {
+    in: PLANTED_FROM_VALUES, message: "%<value>s is not a valid planting method"
+  }
 
   def planting_slug
     [
@@ -100,13 +86,60 @@ class Planting < ActiveRecord::Base
     planted_at.present? && planted_at <= Date.current
   end
 
-  def calc_and_set_days_before_maturity
-    self.days_before_maturity = predict.predict_days_before_maturity
+  def finish_predicted_at
+    planted_at + crop.median_lifespan.days if crop.median_lifespan.present? && planted_at.present?
+  end
+
+  def calculate_lifespan
+    self.lifespan = (planted_at.present? && finished_at.present? ? finished_at - planted_at : nil)
+  end
+
+  def expected_lifespan
+    if planted_at.present? && finished_at.present?
+      return (finished_at - planted_at).to_i
+    end
+    crop.median_lifespan
+  end
+
+  def days_since_planted
+    (Time.zone.today - planted_at).to_i if planted_at.present?
+  end
+
+  def percentage_grown
+    return 100 if finished
+    return if planted_at.blank? || expected_lifespan.blank?
+    p = (days_since_planted / expected_lifespan.to_f) * 100
+    return p if p <= 100
+    100
+  end
+
+  def update_harvest_days
+    days_to_first_harvest = nil
+    days_to_last_harvest = nil
+    if planted_at.present? && harvests_with_dates.size.positive?
+      days_to_first_harvest = (first_harvest_date - planted_at).to_i
+      days_to_last_harvest = (last_harvest_date - planted_at).to_i if finished?
+    end
+    update(days_to_first_harvest: days_to_first_harvest, days_to_last_harvest: days_to_last_harvest)
   end
 
   private
 
-  def predict
-    PlantingPredictions.new(self)
+  def harvests_with_dates
+    harvests.where.not(harvested_at: nil)
+  end
+
+  def first_harvest_date
+    harvests_with_dates.minimum(:harvested_at)
+  end
+
+  def last_harvest_date
+    harvests_with_dates.maximum(:harvested_at)
+  end
+
+  # check that any finished_at date occurs after planted_at
+  def finished_must_be_after_planted
+    return unless planted_at && finished_at # only check if we have both
+    errors.add(:finished_at, "must be after the planting date") unless planted_at < finished_at
   end
 end

app/models/post.rb

@@ -1,7 +1,7 @@
 class Post < ActiveRecord::Base
   extend FriendlyId
   include Likeable
-  friendly_id :author_date_subject, use: [:slugged, :finders]
+  friendly_id :author_date_subject, use: %i(slugged finders)
   belongs_to :author, class_name: 'Member'
   belongs_to :forum
   has_many :comments, dependent: :destroy

app/models/role.rb

@@ -1,11 +1,11 @@
 class Role < ActiveRecord::Base
   extend FriendlyId
-  friendly_id :name, use: [:slugged, :finders]
+  friendly_id :name, use: %i(slugged finders)
 
   has_and_belongs_to_many :members # rubocop:disable Rails/HasAndBelongsToMany
 
   class << self
-    [:crop_wranglers, :admins].each do |method|
+    %i(crop_wranglers admins).each do |method|
       define_method method do
         slug = method.to_s.singularize.dasherize
         Role.where(slug: slug).try(:first).try(:members)

app/services/crop_search_service.rb

@@ -0,0 +1,42 @@
+class CropSearchService
+  # Crop.search(string)
+  def self.search(query)
+    if ENV['GROWSTUFF_ELASTICSEARCH'] == "true"
+      search_str = query.nil? ? "" : query.downcase
+      response = Crop.__elasticsearch__.search( # Finds documents which match any field, but uses the _score from
+        # the best field insead of adding up _score from each field.
+        query: {
+          multi_match: {
+            query: search_str.to_s,
+            analyzer: "standard",
+            fields: ["name",
+                     "scientific_names.scientific_name",
+                     "alternate_names.name"]
+          }
+        },
+        filter: {
+          term: { approval_status: "approved" }
+        },
+        size: 50
+      )
+      response.records.to_a
+    else
+      # if we don't have elasticsearch, just do a basic SQL query.
+      # also, make sure it's an actual array not an activerecord
+      # collection, so it matches what we get from elasticsearch and we can
+      # manipulate it in the same ways (eg. deleting elements without deleting
+      # the whole record from the db)
+      matches = Crop.approved.where("name ILIKE ?", "%#{query}%").to_a
+
+      # we want to make sure that exact matches come first, even if not
+      # using elasticsearch (eg. in development)
+      exact_match = Crop.approved.find_by(name: query)
+      if exact_match
+        matches.delete(exact_match)
+        matches.unshift(exact_match)
+      end
+
+      matches
+    end
+  end
+end

app/services/planting_predictions.rb

@@ -1,58 +0,0 @@
-class PlantingPredictions
-  def initialize(planting)
-    @planting = planting
-  end
-
-  def days_until_finished
-    return 0 if @planting.finished?
-    days = (@planting.finished_at - Date.current).to_i
-    days.positive? ? days : 0
-  end
-
-  def days_until_mature
-    days = ((@planting.planted_at + @planting.days_before_maturity) - Date.current).to_i
-    days.positive? ? days : 0
-  end
-
-  def percentage_grown
-    return nil unless @planting.days_before_maturity && @planting.planted?
-
-    days = (Date.current - @planting.planted_at.to_date).to_f
-
-    return 0 if Date.current < @planting.planted_at
-    return 100 if days > @planting.days_before_maturity
-    percent = (days / @planting.days_before_maturity * 100).to_i
-
-    percent = 100 if percent >= 100
-
-    percent
-  end
-
-  def start_to_finish_diff
-    (@planting.finished_at - @planting.planted_at).to_i if @planting.finished_at && @planting.planted_at
-  end
-
-  def predict_days_before_maturity
-    # calculate the number of days, from planted_at, until maturity
-    if @planting.planted_at && @planting.finished_at
-      start_to_finish_diff
-    elsif @planting.crop_id
-      plantings = other_finished_plantings_same_crop
-      PlantingPredictions.mean_days_until_maturity(plantings)
-    end
-  end
-
-  def self.mean_days_until_maturity(plantings)
-    ## Given a set of finished plantings, calculate the average/mean time from start to finish
-    differences = plantings.collect(&:start_to_finish_diff)
-    differences.compact.sum / differences.compact.size unless differences.compact.empty?
-  end
-
-  private
-
-  def other_finished_plantings_same_crop
-    Planting.where(crop_id: @planting.crop_id)
-      .where.not(id: @planting.id)
-      .where.not(finished_at: nil)
-  end
-end

app/views/crops/_form.html.haml

@@ -29,6 +29,16 @@
           Wranglers: please ensure this is singular, and capitalize
           proper nouns only.
 
+  .form-group
+    = f.label :perennial, 'Lifespan', class: 'control-label col-md-2'
+    .col-md-8
+      = f.radio_button(:perennial, false)
+      = f.label(:perennial_false, "Annual")
+      %span.help-block Living and reproducing in a single year or less
+      = f.radio_button(:perennial, true)
+      = f.label(:perennial_true, "Perennial")
+      %span.help-block Living more than two years
+
   .form-group
     = f.label :en_wikipedia_url, 'Wikipedia URL', class: 'control-label col-md-2'
     .col-md-8

app/views/crops/_index_card.html.haml

@@ -12,11 +12,23 @@
       %p
         %b Scientific name:
         = crop.default_scientific_name
-      %p
-        %b
-          Planted
-          = pluralize(crop.plantings.size, "time")
-        by #{ENV['GROWSTUFF_SITE_NAME']} members
+
+      - if crop.annual? && crop.median_lifespan.present?
+        %p
+          Median Lifespan
+          %b= crop.median_lifespan
+          days
+      - unless crop.median_days_to_first_harvest.nil?
+        %p
+          First harvest expected
+          %b= crop.median_days_to_first_harvest
+          days after planting
+
+      - if crop.annual? && crop.median_days_to_last_harvest.present?
+        %p
+          Last harvest expected
+          %b= crop.median_days_to_last_harvest
+          days after planting
 
       - if can? :create, Planting
         = link_to 'Plant this', new_planting_path(params: { crop_id: crop.id }), class: 'btn btn-primary'

app/views/crops/_photos.html.haml

@@ -1,5 +1,15 @@
+- unless crop.harvest_photos.empty?
+  %h3 Photos of #{crop.name} harvests
+  .row
+    - crop.harvest_photos.first(6).each do |p|
+      .col-xs-6.col-md-2
+        = render "photos/thumbnail", photo: p
+
+- unless crop.photos.empty?
+  %h3 Photos of #{crop.name} plants
+  .row
+    - crop.photos.first(6).each do |p|
+      .col-xs-6.col-md-2
+        = render "photos/thumbnail", photo: p
 .row
-  - unless crop.photos.empty?
-    - crop.photos.first(3).each do |p|
-      .col-md-4
-        = render partial: "photos/thumbnail", locals: { photo: p }
+  = link_to "more photos", crop_photos_path(crop_id: crop.id)

app/views/crops/_predictions.html.haml

@@ -0,0 +1,29 @@
+- unless crop.perennial.nil?
+  %p
+    #{crop.name} is
+    - if crop.perennial == true
+      = link_to 'https://en.wikipedia.org/wiki/Annual_vs._perennial_plant_evolution' do
+        a perennial crop
+      (living more than two years)
+    - elsif crop.perennial == false
+      = link_to 'https://en.wikipedia.org/wiki/Annual_vs._perennial_plant_evolution' do
+        an annual crop
+      (living and reproducing in a single year or less)
+
+- unless crop.median_lifespan.nil?
+  %p
+    Median lifespan of #{crop.name} plants is
+    %b= crop.median_lifespan
+    days
+
+- unless crop.median_days_to_first_harvest.nil?
+  %p
+    First harvest expected
+    %b= crop.median_days_to_first_harvest
+    days after planting
+
+- if crop.perennial == false && crop.median_days_to_last_harvest.present?
+  %p
+    Last harvest expected
+    %b= crop.median_days_to_last_harvest
+    days after planting

app/views/crops/show.html.haml

@@ -20,19 +20,17 @@
 
     - if can? :create, Seed
       = link_to 'Add seeds to stash', new_seed_path(params: { crop_id: @crop.id }), class: 'btn btn-default'
-  - if member_signed_in?
-    = display_seed_availability(@current_member, @crop)
-    = link_to "View your seeds", seeds_by_owner_path(owner: current_member.slug)
 
 .row
   .col-md-9
-    - unless current_member
-      Learn how to grow #{@crop.name.pluralize} from growers around the world.
-      #{ENV['GROWSTUFF_SITE_NAME']} has tips and advice from real-life growers,
-      including when to plant #{@crop.name.pluralize}, how to harvest
-      #{@crop.name.pluralize}, and more.
+    - if member_signed_in?
+      = display_seed_availability(@current_member, @crop)
+      = link_to "View your seeds", seeds_by_owner_path(owner: current_member.slug)
 
-    = render partial: 'photos', locals: { crop: @crop }
+    %h2 Predictions
+    = render 'predictions', crop: @crop
+
+    %p= render 'crops/photos', crop: @crop
 
     %h2
       - if !@crop.plantings.empty?
@@ -86,18 +84,18 @@
 
     %h4 How to grow #{@crop.name.pluralize}
 
-    = render partial: 'grown_for', locals: { crop: @crop }
-    = render partial: 'planting_advice', locals: { crop: @crop }
+    = render 'grown_for', crop: @crop
+    = render 'planting_advice', crop: @crop
 
-    = render partial: 'scientific_names', locals: { crop: @crop }
-    = render partial: 'alternate_names', locals: { crop: @crop }
+    = render 'scientific_names', crop: @crop
+    = render 'alternate_names', crop: @crop
 
     %h4 #{@crop.name.capitalize} varieties
-    = render partial: 'varieties', locals: { crop: @crop }
+    = render 'varieties', crop: @crop
 
-    = render partial: 'plantings', locals: { crop: @crop }
-    = render partial: 'harvests', locals: { crop: @crop }
-    = render partial: 'find_seeds', locals: { crop: @crop }
+    = render 'plantings', crop: @crop
+    = render 'harvests', crop: @crop
+    = render 'find_seeds', crop: @crop
 
 
     %h4 Learn more about #{@crop.name.pluralize}

app/views/photos/index.html.haml

@@ -1,11 +1,15 @@
 - content_for :title, "Photos"
 
+- if @crop
+  %h2= @crop.name
+
 %p Most recent photos added to #{ENV['GROWSTUFF_SITE_NAME']}.
 
 .pagination
   = page_entries_info @photos
   = will_paginate @photos
 
+
 .row
   - @photos.each do |p|
     .col-md-2.six-across
@@ -19,5 +23,3 @@
 .pagination
   = page_entries_info @photos
   = will_paginate @photos
-
-

app/views/plantings/_card.html.haml

@@ -33,10 +33,8 @@
           %dt Planted from:
           %dd= display_planted_from(planting)
 
-          %dt Mature in:
-          %dd
-            = display_days_before_maturity(planting)
-            days
+          %dt Finish expected:
+          %dd= planting.finish_predicted_at if planting.finish_predicted_at.present?
 
     %p= render 'plantings/progress', planting: planting, show_explanation: true
 

app/views/plantings/_harvests.html.haml

@@ -1,7 +1,7 @@
 - unless planting.harvests.empty?
   Harvests:
   %ul
-    - planting.harvests.each do |harvest|
+    - planting.harvests.includes(:crop).each do |harvest|
       %li
         = harvest.harvested_at ? harvest.harvested_at : "undated"
         = link_to harvest, harvest_path(harvest)

app/views/plantings/_progress.html.haml

@@ -1,19 +1,15 @@
-- if !planting.planted?
+- if planting.crop.perennial
+  %p Perennial
+- elsif !planting.planted?
   - if show_explanation == true
     Progress: 0% - not planted yet
   = render "plantings/progress_bar", status: "not planted", progress: 0
-
 - elsif planting.finished?
-  - if show_explanation == true
-    Progress: 100%
   = render "plantings/progress_bar", status: 'finished', progress: 100
-
-- elsif planting.days_before_maturity.nil?
+- elsif planting.finish_predicted_at.nil?
   - if show_explanation == true
-    Progress: Not calculated, days before maturity unknown
+    Progress: Not enough data
   = render "plantings/progress_bar", status: "unknown", progress: nil
 
 - else
-  - if show_explanation == true
-    Progress: #{planting.percentage_grown}%
   = render "plantings/progress_bar", status: 'growing', progress: planting.percentage_grown

app/views/plantings/_progress_bar.html.haml

@@ -5,7 +5,7 @@
     -# haml-lint:disable InlineStyles
     %div{ class: "progress-bar progress-bar-#{status}", role: "progressbar", style: "width: #{progress}%" }
       - if progress >= 30
-        #{progress}%
+        #{sprintf '%.0f', progress}%
     - if progress < 30
-      #{progress}%
+      #{sprintf '%.0f', progress}%
     -# haml-lint:enable InlineStyles

app/views/plantings/show.html.haml

@@ -28,13 +28,11 @@
         - unless  @planting.owner.location.blank?
           (#{@planting.owner.location})
       %dt Quantity:
-      %dd
-        = display_planting_quantity(@planting)
+      %dd= display_planting_quantity(@planting)
 
       - unless @planting.planted_from.blank?
         %dt Planted from:
-        %dd
-          = display_planted_from(@planting)
+        %dd= display_planted_from(@planting)
 
       %dt Sun or shade?
       %dd
@@ -42,11 +40,28 @@
         = image_tag("sunniness_#{sunniness}.png", size: "25x25", alt: sunniness, title: sunniness)
         = sunniness
 
-      %dt Days until maturity:
-      %dd= display_days_before_maturity(@planting)
+      - unless @planting.crop.perennial
+        %dt Predicted finish:
+        %dd
+          - if @planting.finish_predicted_at.present?
+            = @planting.finish_predicted_at
+          - else
+            %strong Set planted date to get predictions
+        %dt Finished:
+        %dd= display_finished(@planting)
 
-      %dt Finished:
-      %dd= display_finished(@planting)
+        - if @planting.crop.median_lifespan.present?
+          %dt Expected Lifespan:
+          %dd #{@planting.crop.median_lifespan} days
+        - if @planting.lifespan.present?
+          %dt Actual Lifespan:
+          %dd #{@planting.lifespan} days
+        - if @planting.days_to_first_harvest.present?
+          %dt First Harvest:
+          %dd #{@planting.days_to_first_harvest} days after planting
+        - if @planting.days_to_last_harvest.present?
+          %dt Last Harvest:
+          %dd #{@planting.days_to_last_harvest} days after planting
 
     %p= render 'plantings/harvests', planting: @planting
     %p= render 'plantings/progress', planting: @planting, show_explanation: true
@@ -67,10 +82,10 @@
     #{ @planting.description != "" ? strip_tags(@planting.description) : "No description given." }
 
 - if !@planting.photos.empty? || (can?(:edit, @planting) && can?(:create, Photo))
-  %h2 Pictures
+  %h2 Photos
 
   .row
-    - @planting.photos.each do |p|
+    - @planting.photos.includes(:owner).each do |p|
       .col-md-2.six-across
         = render partial: 'photos/thumbnail', locals: { photo: p }
     - if can?(:create, Photo) && can?(:edit, @planting)

config/environments/development.rb

@@ -44,7 +44,7 @@ Growstuff::Application.configure do
   # config.action_view.raise_on_missing_translations = true
 
   # Growstuff config
-  config.action_mailer.default_url_options = { host: 'localhost:8080' }
+  config.action_mailer.default_url_options = { host: 'localhost:3000' }
 
   config.action_mailer.delivery_method = :letter_opener
   config.action_mailer.smtp_settings = {
@@ -55,7 +55,7 @@ Growstuff::Application.configure do
     authentication: :login
   }
 
-  config.host = 'localhost:8080'
+  config.host = 'localhost:3000'
   config.analytics_code = ''
 
   # this config variable cannot be put in application.yml as it is needed

config/factory_bot.rb

@@ -0,0 +1,9 @@
+ActionDispatch::Callbacks.after do
+  # Reload the factories
+  return unless Rails.env.development? || Rails.env.test?
+
+  if FactoryBot.factories.present? # first init will load factories, this should only run on subsequent reloads
+    FactoryBot.factories.clear
+    FactoryBot.find_definitions
+  end
+end

config/factory_girl.rb

@@ -1,9 +0,0 @@
-ActionDispatch::Callbacks.after do
-  # Reload the factories
-  return unless Rails.env.development? || Rails.env.test?
-
-  unless FactoryGirl.factories.blank? # first init will load factories, this should only run on subsequent reloads
-    FactoryGirl.factories.clear
-    FactoryGirl.find_definitions
-  end
-end

config/routes.rb

@@ -48,7 +48,9 @@ Growstuff::Application.routes.draw do
   get 'crops/wrangle' => 'crops#wrangle', :as => 'wrangle_crops'
   get 'crops/hierarchy' => 'crops#hierarchy', :as => 'crops_hierarchy'
   get 'crops/search' => 'crops#search', :as => 'crops_search'
-  resources :crops
+  resources :crops do
+    get 'photos' => 'photos#index'
+  end
 
   resources :comments
   resources :roles

db/migrate/20171022032108_all_the_predictions.rb

@@ -0,0 +1,22 @@
+class AllThePredictions < ActiveRecord::Migration
+  def change
+    add_column :crops, :perennial, :boolean, default: false
+
+    # time from planted, to finished
+    add_column :plantings, :lifespan, :integer
+
+    # how old was planting at first harvest
+    add_column :plantings, :days_to_first_harvest, :integer
+    add_column :plantings, :days_to_last_harvest, :integer
+
+    # Keep the median values for the crop
+    add_column :crops, :median_lifespan, :integer
+    add_column :crops, :median_days_to_first_harvest, :integer
+    add_column :crops, :median_days_to_last_harvest, :integer
+
+    remove_column :plantings, :days_before_maturity, :integer
+
+    create_table :median_functions do |t|
+    end
+  end
+end

db/migrate/20171028230429_create_median_function.rb

@@ -0,0 +1,9 @@
+class CreateMedianFunction < ActiveRecord::Migration
+  def up
+    ActiveMedian.create_function
+  end
+
+  def down
+    ActiveMedian.drop_function
+  end
+end

db/migrate/20171105011017_set_prediction_data.rb

@@ -0,0 +1,13 @@
+class SetPredictionData < ActiveRecord::Migration
+  def up
+    say "Updating all plantings time to first harvest"
+    Planting.all.each(&:update_harvest_days)
+    say "Updating crop median time to first harvest, and lifespan"
+    Crop.all.each do |crop|
+      crop.update_lifespan_medians
+      crop.update_harvest_medians
+    end
+  end
+
+  def down; end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170520060252) do
+ActiveRecord::Schema.define(version: 20171105011017) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -181,19 +181,23 @@ ActiveRecord::Schema.define(version: 20170520060252) do
   end
 
   create_table "crops", force: :cascade do |t|
-    t.string   "name",                                      null: false
+    t.string   "name",                                              null: false
     t.string   "en_wikipedia_url"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "slug"
     t.integer  "parent_id"
-    t.integer  "plantings_count",      default: 0
+    t.integer  "plantings_count",              default: 0
     t.integer  "creator_id"
     t.integer  "requester_id"
-    t.string   "approval_status",      default: "approved"
+    t.string   "approval_status",              default: "approved"
     t.text     "reason_for_rejection"
     t.text     "request_notes"
     t.text     "rejection_notes"
+    t.boolean  "perennial",                    default: false
+    t.integer  "median_lifespan"
+    t.integer  "median_days_to_first_harvest"
+    t.integer  "median_days_to_last_harvest"
   end
 
   add_index "crops", ["name"], name: "index_crops_on_name", using: :btree
@@ -290,6 +294,9 @@ ActiveRecord::Schema.define(version: 20170520060252) do
   add_index "likes", ["likeable_type", "likeable_id"], name: "index_likes_on_likeable_type_and_likeable_id", using: :btree
   add_index "likes", ["member_id"], name: "index_likes_on_member_id", using: :btree
 
+  create_table "median_functions", force: :cascade do |t|
+  end
+
   create_table "members", force: :cascade do |t|
     t.string   "email",                   default: "",   null: false
     t.string   "encrypted_password",      default: "",   null: false
@@ -409,8 +416,8 @@ ActiveRecord::Schema.define(version: 20170520060252) do
   end
 
   create_table "plantings", force: :cascade do |t|
-    t.integer  "garden_id",                            null: false
-    t.integer  "crop_id",                              null: false
+    t.integer  "garden_id",                             null: false
+    t.integer  "crop_id",                               null: false
     t.date     "planted_at"
     t.integer  "quantity"
     t.text     "description"
@@ -420,9 +427,11 @@ ActiveRecord::Schema.define(version: 20170520060252) do
     t.string   "sunniness"
     t.string   "planted_from"
     t.integer  "owner_id"
-    t.boolean  "finished",             default: false
+    t.boolean  "finished",              default: false
     t.date     "finished_at"
-    t.integer  "days_before_maturity"
+    t.integer  "lifespan"
+    t.integer  "days_to_first_harvest"
+    t.integer  "days_to_last_harvest"
   end
 
   add_index "plantings", ["slug"], name: "index_plantings_on_slug", unique: true, using: :btree

spec/controllers/accounts_controller_spec.rb

@@ -24,7 +24,7 @@ describe AccountsController do
     # member; creating them manually will just cause errors as only one is
     # allowed. This method has been left here in case it's useful in
     # future.
-    member = FactoryGirl.create(:member)
+    member = FactoryBot.create(:member)
     member.account
   end
 end

spec/controllers/admin/orders_controller_spec.rb

@@ -17,7 +17,7 @@ describe Admin::OrdersController do
 
   describe "GET search" do
     it "assigns @orders" do
-      order = FactoryGirl.create(:order)
+      order = FactoryBot.create(:order)
       get :search, search_by: 'order_id', search_text: order.id
       assigns(:orders).should eq([order])
     end

spec/controllers/admin_controller_spec.rb

@@ -23,7 +23,7 @@ describe AdminController do
     end
 
     it 'assigns @members' do
-      m = FactoryGirl.create(:newsletter_recipient_member)
+      m = FactoryBot.create(:newsletter_recipient_member)
       get :newsletter
       assigns(:members).should eq [m]
     end

spec/controllers/authentications_controller_spec.rb

@@ -14,10 +14,10 @@ require 'rails_helper'
 
 describe AuthenticationsController do
   before(:each) do
-    @member = FactoryGirl.create(:member)
+    @member = FactoryBot.create(:member)
     sign_in @member
     controller.stub(:current_member) { @member }
-    @auth = FactoryGirl.create(:authentication, member: @member)
+    @auth = FactoryBot.create(:authentication, member: @member)
     request.env['omniauth.auth'] = {
       'provider' => 'foo',
       'uid' => 'bar',

spec/controllers/comments_controller_spec.rb

@@ -14,13 +14,13 @@ require 'rails_helper'
 
 describe CommentsController do
   before(:each) do
-    @member = FactoryGirl.create(:member)
+    @member = FactoryBot.create(:member)
     sign_in @member
     controller.stub(:current_member) { @member }
   end
 
   def valid_attributes
-    @post = FactoryGirl.create(:post)
+    @post = FactoryBot.create(:post)
     { post_id: @post.id, body: "some text" }
   end
 
@@ -34,7 +34,7 @@ describe CommentsController do
   end
 
   describe "GET new" do
-    let(:post) { FactoryGirl.create(:post) }
+    let(:post) { FactoryBot.create(:post) }
 
     describe "with valid params" do
       before { get :new, post_id: post.id }
@@ -43,7 +43,7 @@ describe CommentsController do
         assigns(:post).should eq(post)
       end
 
-      let(:old_comment) { FactoryGirl.create(:comment, post: post) }
+      let(:old_comment) { FactoryBot.create(:comment, post: post) }
       it "assigns the old comments as @comments" do
         assigns(:comments).should eq [old_comment]
       end
@@ -56,19 +56,19 @@ describe CommentsController do
   end
 
   describe "GET edit" do
-    let(:post) { FactoryGirl.create(:post) }
+    let(:post) { FactoryBot.create(:post) }
     before { get :edit, id: comment.to_param }
 
     describe "my comment" do
-      let!(:comment) { FactoryGirl.create :comment, author: @member, post: post }
-      let!(:old_comment) { FactoryGirl.create(:comment, post: post, created_at: Time.zone.yesterday) }
+      let!(:comment) { FactoryBot.create :comment, author: @member, post: post }
+      let!(:old_comment) { FactoryBot.create(:comment, post: post, created_at: Time.zone.yesterday) }
       it "assigns previous comments as @comments" do
         assigns(:comments).should eq([comment, old_comment])
       end
     end
 
     describe "not my comment" do
-      let(:comment) { FactoryGirl.create :comment, post: post }
+      let(:comment) { FactoryBot.create :comment, post: post }
       it { expect(response).not_to be_success }
     end
   end
@@ -77,20 +77,20 @@ describe CommentsController do
     before { put :update, id: comment.to_param, comment: valid_attributes }
 
     describe "my comment" do
-      let(:comment) { FactoryGirl.create :comment, author: @member }
+      let(:comment) { FactoryBot.create :comment, author: @member }
       it "redirects to the comment's post" do
         expect(response).to redirect_to(comment.post)
       end
     end
     describe "not my comment" do
-      let(:comment) { FactoryGirl.create :comment }
+      let(:comment) { FactoryBot.create :comment }
       it { expect(response).not_to be_success }
     end
     describe "attempting to change post_id" do
-      let(:post) { FactoryGirl.create :post, subject: 'our post' }
-      let(:other_post) { FactoryGirl.create :post, subject: 'the other post' }
+      let(:post) { FactoryBot.create :post, subject: 'our post' }
+      let(:other_post) { FactoryBot.create :post, subject: 'the other post' }
       let(:valid_attributes) { { post_id: other_post.id, body: "kōrero" } }
-      let(:comment) { FactoryGirl.create :comment, author: @member, post: post }
+      let(:comment) { FactoryBot.create :comment, author: @member, post: post }
       it "does not change post_id" do
         comment.reload
         expect(comment.post_id).to eq(post.id)
@@ -102,14 +102,14 @@ describe CommentsController do
     before { delete :destroy, id: comment.to_param }
 
     describe "my comment" do
-      let(:comment) { FactoryGirl.create :comment, author: @member }
+      let(:comment) { FactoryBot.create :comment, author: @member }
       it "redirects to the post the comment was on" do
         expect(response).to redirect_to(comment.post)
       end
     end
 
     describe "not my comment" do
-      let(:comment) { FactoryGirl.create :comment }
+      let(:comment) { FactoryBot.create :comment }
       it { expect(response).not_to be_success }
     end
   end

spec/controllers/gardens_controller_spec.rb

@@ -53,7 +53,7 @@ RSpec.describe GardensController, type: :controller do
   context "when signed in" do
     before(:each) { sign_in member }
 
-    let!(:member) { FactoryGirl.create(:member) }
+    let!(:member) { FactoryBot.create(:member) }
 
     describe "for another member's garden" do
       let(:not_my_garden) { double('garden') }

spec/controllers/harvests_controller_spec.rb

@@ -18,19 +18,20 @@ describe HarvestsController do
   def valid_attributes
     {
       owner_id: subject.current_member.id,
-      crop_id: FactoryGirl.create(:crop).id,
-      plant_part_id: FactoryGirl.create(:plant_part).id
+      crop_id: FactoryBot.create(:crop).id,
+      plant_part_id: FactoryBot.create(:plant_part).id,
+      harvested_at: '2017-01-01'
     }
   end
 
   describe "GET index" do
     before do
-      @member1 = FactoryGirl.create(:member)
-      @member2 = FactoryGirl.create(:member)
-      @tomato = FactoryGirl.create(:tomato)
-      @maize = FactoryGirl.create(:maize)
-      @harvest1 = FactoryGirl.create(:harvest, owner_id: @member1.id, crop_id: @tomato.id)
-      @harvest2 = FactoryGirl.create(:harvest, owner_id: @member2.id, crop_id: @maize.id)
+      @member1 = FactoryBot.create(:member)
+      @member2 = FactoryBot.create(:member)
+      @tomato = FactoryBot.create(:tomato)
+      @maize = FactoryBot.create(:maize)
+      @harvest1 = FactoryBot.create(:harvest, owner_id: @member1.id, crop_id: @tomato.id)
+      @harvest2 = FactoryBot.create(:harvest, owner_id: @member2.id, crop_id: @maize.id)
     end
 
     it "assigns all harvests as @harvests" do
@@ -104,7 +105,7 @@ describe HarvestsController do
       end
 
       it "links to planting" do
-        planting = FactoryGirl.create(:planting, owner_id: member.id)
+        planting = FactoryBot.create(:planting, owner_id: member.id)
         post :create, harvest: valid_attributes.merge(planting_id: planting.id)
         expect(Harvest.last.planting.id).to eq(planting.id)
       end
@@ -126,8 +127,8 @@ describe HarvestsController do
     end
 
     describe "not my planting" do
-      let(:not_my_planting) { FactoryGirl.create(:planting) }
-      let(:harvest) { FactoryGirl.create(:harvest) }
+      let(:not_my_planting) { FactoryBot.create(:planting) }
+      let(:harvest) { FactoryBot.create(:harvest) }
       it "does not save planting_id" do
         allow(Harvest).to receive(:new).and_return(harvest)
         post :create, harvest: valid_attributes.merge(planting_id: not_my_planting.id)
@@ -178,8 +179,8 @@ describe HarvestsController do
     end
 
     describe "not my planting" do
-      let(:not_my_planting) { FactoryGirl.create(:planting) }
-      let(:harvest) { FactoryGirl.create(:harvest) }
+      let(:not_my_planting) { FactoryBot.create(:planting) }
+      let(:harvest) { FactoryBot.create(:harvest) }
       it "does not save planting_id" do
         put :update, id: harvest.to_param,
                      harvest: valid_attributes.merge(planting_id: not_my_planting.id)

spec/controllers/likes_controller_spec.rb

@@ -1,10 +1,10 @@
 require 'rails_helper'
 
 describe LikesController do
-  let(:like) { FactoryGirl.create :like, member: member }
-  let(:member) { FactoryGirl.create(:member) }
-  let(:blogpost) { FactoryGirl.create(:post) }
-  let(:mypost) { FactoryGirl.create(:post, author: member) }
+  let(:like) { FactoryBot.create :like, member: member }
+  let(:member) { FactoryBot.create(:member) }
+  let(:blogpost) { FactoryBot.create(:post) }
+  let(:mypost) { FactoryBot.create(:post, author: member) }
 
   before { sign_in member }
 
@@ -20,7 +20,7 @@ describe LikesController do
     end
 
     describe "Liking your own post" do
-      let(:blogpost) { FactoryGirl.create(:post, author: member) }
+      let(:blogpost) { FactoryBot.create(:post, author: member) }
     end
   end
 
@@ -34,7 +34,7 @@ describe LikesController do
     end
 
     describe "Deleting someone else's like" do
-      let(:like) { FactoryGirl.create :like }
+      let(:like) { FactoryBot.create :like }
       it { expect(response.code).to eq('403') }
       it { JSON.parse(response.body)["error"] == "Unable to like" }
     end

spec/controllers/member_controller_spec.rb

@@ -14,10 +14,10 @@ require 'rails_helper'
 
 describe MembersController do
   before :each do
-    @member = FactoryGirl.create(:member)
-    @posts = [FactoryGirl.create(:post, author: @member)]
-    @twitter_auth = FactoryGirl.create(:authentication, member: @member)
-    @flickr_auth = FactoryGirl.create(:flickr_authentication, member: @member)
+    @member = FactoryBot.create(:member)
+    @posts = [FactoryBot.create(:post, author: @member)]
+    @twitter_auth = FactoryBot.create(:authentication, member: @member)
+    @flickr_auth = FactoryBot.create(:flickr_authentication, member: @member)
   end
 
   describe "GET index" do
@@ -60,7 +60,7 @@ describe MembersController do
     end
 
     it "doesn't show unconfirmed members" do
-      @member2 = FactoryGirl.create(:unconfirmed_member)
+      @member2 = FactoryBot.create(:unconfirmed_member)
       lambda { get :show, id: @member2.id }.should raise_error(ActiveRecord::RecordNotFound)
     end
   end

spec/controllers/notifications_controller_spec.rb

@@ -18,7 +18,7 @@ describe NotificationsController do
   def valid_attributes
     {
       "recipient_id" => subject.current_member.id,
-      "sender_id" => FactoryGirl.create(:member).id,
+      "sender_id" => FactoryBot.create(:member).id,
       "subject" => 'test'
     }
   end
@@ -31,7 +31,7 @@ describe NotificationsController do
   def valid_attributes_for_sender
     {
       "sender_id" => subject.current_member.id,
-      "recipient_id" => FactoryGirl.create(:member).id,
+      "recipient_id" => FactoryBot.create(:member).id,
       "subject" => 'test'
     }
   end
@@ -42,7 +42,7 @@ describe NotificationsController do
 
   describe "GET index" do
     it "assigns all notifications as @notifications" do
-      notification = FactoryGirl.create(:notification, recipient_id: subject.current_member.id)
+      notification = FactoryBot.create(:notification, recipient_id: subject.current_member.id)
       get :index, {}
       assigns(:notifications).should eq([notification])
     end
@@ -50,13 +50,13 @@ describe NotificationsController do
 
   describe "GET show" do
     it "assigns the requested notification as @notification" do
-      notification = FactoryGirl.create(:notification, recipient_id: subject.current_member.id)
+      notification = FactoryBot.create(:notification, recipient_id: subject.current_member.id)
       get :show, id: notification.to_param
       assigns(:notification).should eq(notification)
     end
 
     it "assigns the reply link for a post comment" do
-      notification = FactoryGirl.create(:notification, recipient_id: subject.current_member.id)
+      notification = FactoryBot.create(:notification, recipient_id: subject.current_member.id)
 
       get :show, id: notification.to_param
       assigns(:reply_link).should_not be_nil
@@ -66,7 +66,7 @@ describe NotificationsController do
     end
 
     it "marks notifications as read" do
-      notification = FactoryGirl.create(:notification, recipient_id: subject.current_member.id)
+      notification = FactoryBot.create(:notification, recipient_id: subject.current_member.id)
       get :show, id: notification.to_param
       # we need to fetch it from the db again, can't test against the old one
       n = Notification.find(notification.id)
@@ -76,7 +76,7 @@ describe NotificationsController do
 
   describe "GET reply" do
     it "marks notifications as read" do
-      notification = FactoryGirl.create(:notification, recipient_id: subject.current_member.id)
+      notification = FactoryBot.create(:notification, recipient_id: subject.current_member.id)
       get :reply, id: notification.to_param
       # we need to fetch it from the db again, can't test against the old one
       n = Notification.find(notification.id)
@@ -86,7 +86,7 @@ describe NotificationsController do
 
   describe "GET new" do
     it "assigns a recipient" do
-      @recipient = FactoryGirl.create(:member)
+      @recipient = FactoryBot.create(:member)
       get :new, recipient_id: @recipient.id
       assigns(:recipient).should be_an_instance_of(Member)
     end
@@ -95,7 +95,7 @@ describe NotificationsController do
   describe "POST create" do
     describe "with valid params" do
       it "redirects to the recipient's profile" do
-        @recipient = FactoryGirl.create(:member)
+        @recipient = FactoryBot.create(:member)
         post :create, notification: { recipient_id: @recipient.id, subject: 'foo' }
         response.should redirect_to(notifications_path)
       end

spec/controllers/order_items_controller_spec.rb

@@ -16,11 +16,11 @@ describe OrderItemsController do
   login_member(:admin_member)
 
   before(:each) do
-    @member = FactoryGirl.create(:member)
+    @member = FactoryBot.create(:member)
     sign_in @member
-    @product = FactoryGirl.create(:product)
-    @order = FactoryGirl.create(:order, member: @member)
-    @order_item = FactoryGirl.create(:order_item,
+    @product = FactoryBot.create(:product)
+    @order = FactoryBot.create(:order, member: @member)
+    @order_item = FactoryBot.create(:order_item,
       order: @order,
       product: @product,
       price: @product.min_price)
@@ -28,7 +28,7 @@ describe OrderItemsController do
 
   describe "POST create" do
     it "redirects to order" do
-      @order = FactoryGirl.create(:order, member: @member)
+      @order = FactoryBot.create(:order, member: @member)
       post :create, order_item: {
         order_id: @order.id,
         product_id: @product.id,
@@ -38,9 +38,9 @@ describe OrderItemsController do
     end
 
     it 'creates an order for you' do
-      @member = FactoryGirl.create(:member)
+      @member = FactoryBot.create(:member)
       sign_in @member
-      @product = FactoryGirl.create(:product)
+      @product = FactoryBot.create(:product)
       expect {
         post :create, order_item: {
           product_id: @product.id,
@@ -52,8 +52,8 @@ describe OrderItemsController do
 
     describe "with non-int price" do
       it "converts 3.33 to 333 cents" do
-        @order = FactoryGirl.create(:order, member: @member)
-        @product = FactoryGirl.create(:product, min_price: 1)
+        @order = FactoryBot.create(:order, member: @member)
+        @product = FactoryBot.create(:product, min_price: 1)
         expect {
           post :create, order_item: {
             order_id: @order.id,

spec/controllers/orders_controller_spec.rb

@@ -25,7 +25,7 @@ describe OrdersController do
 
   describe "GET checkout" do
     it 'sets the referral_code' do
-      member = FactoryGirl.create(:member)
+      member = FactoryBot.create(:member)
       sign_in member
       order = Order.create!(member_id: member.id)
       get :checkout, id: order.to_param, referral_code: 'FOOBAR'
@@ -34,7 +34,7 @@ describe OrdersController do
     end
 
     it "redirects to Paypal" do
-      member = FactoryGirl.create(:member)
+      member = FactoryBot.create(:member)
       sign_in member
       order = Order.create!(member_id: member.id)
       get :checkout, id: order.to_param
@@ -45,7 +45,7 @@ describe OrdersController do
 
   describe "GET complete" do
     it "assigns the requested order as @order" do
-      member = FactoryGirl.create(:member)
+      member = FactoryBot.create(:member)
       sign_in member
       order = Order.create!(member_id: member.id)
       get :complete, id: order.to_param
@@ -55,7 +55,7 @@ describe OrdersController do
 
   describe "DELETE destroy" do
     it "redirects to the shop" do
-      member = FactoryGirl.create(:member)
+      member = FactoryBot.create(:member)
       sign_in member
       order = Order.create!(member_id: member.id)
       delete :destroy, id: order.id

spec/controllers/photo_associations_controller_spec.rb

@@ -15,8 +15,8 @@ describe PhotoAssociationsController do
     before { photo.harvests << harvest }
 
     describe "my harvest my photo" do
-      let(:harvest) { FactoryGirl.create :harvest, owner: member }
-      let(:photo) { FactoryGirl.create :photo, owner: member }
+      let(:harvest) { FactoryBot.create :harvest, owner: member }
+      let(:photo) { FactoryBot.create :photo, owner: member }
 
       it "removes link" do
         expect { delete :destroy, valid_params }.to change { photo.harvests.count }.by(-1)
@@ -24,8 +24,8 @@ describe PhotoAssociationsController do
     end
 
     describe "another member's harvest from another member's photo" do
-      let(:harvest) { FactoryGirl.create :harvest }
-      let(:photo) { FactoryGirl.create :photo }
+      let(:harvest) { FactoryBot.create :harvest }
+      let(:photo) { FactoryBot.create :photo }
       it do
         expect do
           begin

spec/controllers/photos_controller_spec.rb

@@ -17,7 +17,7 @@ describe PhotosController do
   login_member
 
   def valid_attributes
-    member = FactoryGirl.create(:member)
+    member = FactoryBot.create(:member)
     {
       "owner_id" => member.id,
       "flickr_photo_id" => 1,
@@ -35,7 +35,7 @@ describe PhotosController do
 
   describe "GET new" do
     before(:each) do
-      @member = FactoryGirl.create(:member)
+      @member = FactoryBot.create(:member)
       sign_in @member
       @member.stub(:flickr_photos) { [[], 0] }
       @member.stub(:flickr_sets) { { "foo" => "bar" } }
@@ -43,7 +43,7 @@ describe PhotosController do
     end
 
     it "assigns the flickr auth as @flickr_auth" do
-      @auth = FactoryGirl.create(:flickr_authentication, member: @member)
+      @auth = FactoryBot.create(:flickr_authentication, member: @member)
       get :new, {}
       assigns(:flickr_auth).should be_an_instance_of(Authentication)
     end
@@ -86,11 +86,11 @@ describe PhotosController do
                                                            link_url: "http://example.com")
     end
 
-    let(:member) { FactoryGirl.create(:member) }
-    let(:garden) { FactoryGirl.create(:garden, owner: member) }
-    let(:planting) { FactoryGirl.create(:planting, garden: garden, owner: member) }
-    let(:harvest) { FactoryGirl.create(:harvest, owner: member) }
-    let(:photo) { FactoryGirl.create(:photo, owner: member) }
+    let(:member) { FactoryBot.create(:member) }
+    let(:garden) { FactoryBot.create(:garden, owner: member) }
+    let(:planting) { FactoryBot.create(:planting, garden: garden, owner: member) }
+    let(:harvest) { FactoryBot.create(:harvest, owner: member) }
+    let(:photo) { FactoryBot.create(:photo, owner: member) }
     describe "with valid params" do
       before { controller.stub(:current_member) { member } }
       it "attaches the photo to a planting" do
@@ -120,7 +120,7 @@ describe PhotosController do
       end
 
       it "doesn't attach photo to a comment" do
-        comment = FactoryGirl.create(:comment)
+        comment = FactoryBot.create(:comment)
         post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "comment", id: comment.id
         expect(flash[:alert]).to be_present
       end
@@ -140,8 +140,8 @@ describe PhotosController do
     describe "with matching owners" do
       before { controller.stub(:current_member) { member } }
       it "creates the planting/photo link" do
-        planting = FactoryGirl.create(:planting, garden: garden, owner: member)
-        photo = FactoryGirl.create(:photo, owner: member)
+        planting = FactoryBot.create(:planting, garden: garden, owner: member)
+        photo = FactoryBot.create(:photo, owner: member)
         post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "planting", id: planting.id
         expect(flash[:alert]).not_to be_present
         Photo.last.plantings.first.should eq planting
@@ -155,10 +155,10 @@ describe PhotosController do
     end
 
     describe "with mismatched owners" do
-      let(:photo) { FactoryGirl.create(:photo) }
+      let(:photo) { FactoryBot.create(:photo) }
       it "does not create the planting/photo link" do
         # members will be auto-created, and different
-        another_planting = FactoryGirl.create(:planting)
+        another_planting = FactoryBot.create(:planting)
         post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "planting", id: another_planting.id
         expect(flash[:alert]).to be_present
         Photo.last.plantings.first.should_not eq another_planting
@@ -166,7 +166,7 @@ describe PhotosController do
 
       it "does not create the harvest/photo link" do
         # members will be auto-created, and different
-        another_harvest = FactoryGirl.create(:harvest)
+        another_harvest = FactoryBot.create(:harvest)
         post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "harvest", id: another_harvest.id
         expect(flash[:alert]).to be_present
         Photo.last.harvests.first.should_not eq another_harvest

spec/controllers/places_controller_spec.rb

@@ -19,8 +19,8 @@ describe PlacesController do
 
   describe "GET show" do
     before(:each) do
-      @member_london = FactoryGirl.create(:london_member)
-      @member_south_pole = FactoryGirl.create(:south_pole_member)
+      @member_london = FactoryBot.create(:london_member)
+      @member_south_pole = FactoryBot.create(:south_pole_member)
     end
 
     it "assigns place name" do

spec/controllers/plantings_controller_spec.rb

@@ -17,19 +17,19 @@ describe PlantingsController do
 
   def valid_attributes
     {
-      garden_id: FactoryGirl.create(:garden, owner: subject.current_member).id,
-      crop_id: FactoryGirl.create(:crop).id
+      garden_id: FactoryBot.create(:garden, owner: subject.current_member).id,
+      crop_id: FactoryBot.create(:crop).id
     }
   end
 
   describe "GET index" do
     before do
-      @member1 = FactoryGirl.create(:member)
-      @member2 = FactoryGirl.create(:member)
-      @tomato = FactoryGirl.create(:tomato)
-      @maize = FactoryGirl.create(:maize)
-      @planting1 = FactoryGirl.create(:planting, crop: @tomato, owner: @member1)
-      @planting2 = FactoryGirl.create(:planting, crop: @maize, owner: @member2)
+      @member1 = FactoryBot.create(:member)
+      @member2 = FactoryBot.create(:member)
+      @tomato = FactoryBot.create(:tomato)
+      @maize = FactoryBot.create(:maize)
+      @planting1 = FactoryBot.create(:planting, crop: @tomato, owner: @member1)
+      @planting2 = FactoryBot.create(:planting, crop: @maize, owner: @member2)
     end
 
     it "assigns all plantings as @plantings" do
@@ -52,7 +52,7 @@ describe PlantingsController do
 
   describe "GET new" do
     it "picks up crop from params" do
-      crop = FactoryGirl.create(:crop)
+      crop = FactoryBot.create(:crop)
       get :new, crop_id: crop.id
       assigns(:crop).should eq(crop)
     end
@@ -63,28 +63,28 @@ describe PlantingsController do
     end
 
     it "picks up member's garden from params" do
-      garden = FactoryGirl.create(:garden, owner: member)
+      garden = FactoryBot.create(:garden, owner: member)
       get :new, garden_id: garden.id
       assigns(:garden).should eq(garden)
     end
 
     it "Doesn't display another member's garden on planting form" do
-      member = FactoryGirl.create(:member) # over-riding member from login_member()
-      garden = FactoryGirl.create(:garden, owner: member)
+      member = FactoryBot.create(:member) # over-riding member from login_member()
+      garden = FactoryBot.create(:garden, owner: member)
       get :new, garden_id: garden.id
       assigns(:garden).should_not eq(garden)
     end
 
     it "Doesn't display un-approved crops on planting form" do
-      crop = FactoryGirl.create(:crop, approval_status: 'pending')
-      FactoryGirl.create(:garden, owner: member)
+      crop = FactoryBot.create(:crop, approval_status: 'pending')
+      FactoryBot.create(:garden, owner: member)
       get :new, crop_id: crop.id
       assigns(:crop).should_not eq(crop)
     end
 
     it "Doesn't display rejected crops on planting form" do
-      crop = FactoryGirl.create(:crop, approval_status: 'rejected', reason_for_rejection: 'nope')
-      FactoryGirl.create(:garden, owner: member)
+      crop = FactoryBot.create(:crop, approval_status: 'rejected', reason_for_rejection: 'nope')
+      FactoryBot.create(:garden, owner: member)
       get :new, crop_id: crop.id
       assigns(:crop).should_not eq(crop)
     end

spec/controllers/posts_controller_spec.rb

@@ -16,7 +16,7 @@ describe PostsController do
   login_member
 
   def valid_attributes
-    member = FactoryGirl.create(:member)
+    member = FactoryBot.create(:member)
     { author_id: member.id, subject: "blah", body: "blah blah" }
   end
 

spec/controllers/registrations_controller_spec.rb

@@ -14,7 +14,7 @@ require 'rails_helper'
 
 describe RegistrationsController do
   before :each do
-    @member = FactoryGirl.create(:member)
+    @member = FactoryBot.create(:member)
     sign_in @member
     controller.stub(:current_user) { @member }
     controller.stub(:devise_mapping).and_return(Devise.mappings[:member])
@@ -27,13 +27,13 @@ describe RegistrationsController do
     end
 
     it "picks up the twitter auth" do
-      @auth = FactoryGirl.create(:authentication, member: @member)
+      @auth = FactoryBot.create(:authentication, member: @member)
       get :edit
       assigns(:twitter_auth).should eq @auth
     end
 
     it "picks up the flickr auth" do
-      @auth = FactoryGirl.create(:flickr_authentication, member: @member)
+      @auth = FactoryBot.create(:flickr_authentication, member: @member)
       get :edit
       assigns(:flickr_auth).should eq @auth
     end

spec/controllers/scientific_names_controller_spec.rb

@@ -16,7 +16,7 @@ describe ScientificNamesController do
   login_member(:crop_wrangling_member)
 
   before(:each) do
-    @crop = FactoryGirl.create(:tomato)
+    @crop = FactoryBot.create(:tomato)
   end
 
   def valid_attributes

spec/controllers/seeds_controller_spec.rb

@@ -15,7 +15,7 @@ require 'rails_helper'
 describe SeedsController do
   describe "GET index" do
     it "picks up owner from params" do
-      owner = FactoryGirl.create(:member)
+      owner = FactoryBot.create(:member)
       get :index, owner: owner.slug
       assigns(:owner).should eq(owner)
     end

spec/controllers/shop_controller_spec.rb

@@ -14,8 +14,8 @@ require 'rails_helper'
 
 describe ShopController do
   before :each do
-    @product1 = FactoryGirl.create(:product)
-    @product2 = FactoryGirl.create(:product)
+    @product1 = FactoryBot.create(:product)
+    @product2 = FactoryBot.create(:product)
   end
 
   describe "GET index" do
@@ -35,9 +35,9 @@ describe ShopController do
     end
 
     it "assigns @order as current_order if there is one" do
-      @member = FactoryGirl.create(:member)
+      @member = FactoryBot.create(:member)
       sign_in @member
-      @order = FactoryGirl.create(:order, member: @member)
+      @order = FactoryBot.create(:order, member: @member)
       get :index, {}
       assigns(:order).should eq @order
     end

spec/factories/account_types.rb

@@ -1,6 +1,6 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :account_type do
     name "Free"
     is_paid false

spec/factories/accounts.rb

@@ -1,6 +1,6 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
+FactoryBot.define do
   # never do this directly.
   # create a member then look at member.account_detail instead.
   # (because it's auto-created, and there can only be one.)

spec/factories/alternate_names.rb

@@ -1,6 +1,6 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :alternate_name do
     name "alternate name"
     crop

spec/factories/authentications.rb

@@ -1,6 +1,6 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :authentication do
     member
     provider 'twitter'

spec/factories/comments.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :comment do
     post
     author

spec/factories/crop.rb

@@ -1,10 +1,17 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :crop do
     name "magic bean"
     en_wikipedia_url "http://en.wikipedia.org/wiki/Magic_bean"
     approval_status "approved"
     creator
 
+    factory :annual_crop, parent: :crop do
+      perennial false
+    end
+    factory :perennial_crop, parent: :crop do
+      perennial true
+    end
+
     factory :tomato do
       name "tomato"
       en_wikipedia_url "http://en.wikipedia.org/wiki/Tomato"

spec/factories/follows.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :follow do
     follower
     followed

spec/factories/forums.rb

@@ -1,6 +1,6 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :forum do
     name "Permaculture"
     description "*Everything* about permaculture!"

spec/factories/garden.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :garden do
     name 'Springfield Community Garden'
     description "This is a **totally** cool garden"

spec/factories/harvests.rb

@@ -1,11 +1,11 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :harvest do
     crop
     plant_part
     owner
-    harvested_at "2013-09-17"
+    harvested_at Time.zone.local(2015, 9, 17)
     quantity "3"
     unit "individual"
     weight_quantity 6

spec/factories/like.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :like do
     member
     association :likeable, factory: "post"

spec/factories/member.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   sequence(:email) { |n| "member#{n}@example.com" }
   sequence(:login_name) { |n| "member#{n}" }
 
@@ -60,11 +60,11 @@ FactoryGirl.define do
     end
 
     factory :admin_member do
-      roles { [FactoryGirl.create(:admin)] }
+      roles { [FactoryBot.create(:admin)] }
     end
 
     factory :crop_wrangling_member do
-      roles { [FactoryGirl.create(:crop_wrangler)] }
+      roles { [FactoryBot.create(:crop_wrangler)] }
       sequence(:login_name) { |n| "wrangler#{n}" }
     end
 

spec/factories/notifications.rb

@@ -1,6 +1,6 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :notification, aliases: [:message] do
     sender
     recipient
@@ -10,7 +10,7 @@ FactoryGirl.define do
     post
 
     factory :no_email_notification do
-      recipient { FactoryGirl.create(:no_email_notifications_member) }
+      recipient { FactoryBot.create(:no_email_notifications_member) }
     end
   end
 end

spec/factories/order_items.rb

@@ -1,6 +1,6 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :order_item do
     order
     product

spec/factories/orders.rb

@@ -1,6 +1,6 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :order do
     member
     factory :completed_order do

spec/factories/photos.rb

@@ -1,6 +1,6 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :photo do
     owner
     flickr_photo_id 1

spec/factories/plant_parts.rb

@@ -1,6 +1,6 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :plant_part do
     name "pollen"
   end

spec/factories/planting.rb

@@ -1,9 +1,9 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :planting do
     garden
     owner
     crop
-    planted_at Time.zone.today
+    planted_at Time.zone.local(2014, 7, 30)
     quantity 33
     description "This is a *really* good plant."
 
@@ -33,8 +33,8 @@ FactoryGirl.define do
 
     factory :finished_planting do
       finished true
-      planted_at '2014-07-30'
-      finished_at '2014-08-30'
+      planted_at Time.zone.local(2014, 7, 30)
+      finished_at Time.zone.local(2014, 8, 30)
     end
   end
 end

spec/factories/post.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :post do
     subject "A Post"
     body "This is some text."

spec/factories/products.rb

@@ -1,6 +1,6 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :product do
     name "annual subscription"
     description "paid membership, renewing yearly, *hurrah*"

spec/factories/roles.rb

@@ -1,6 +1,6 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :role do
     name "Moderator"
     description "These people moderate the forums"

spec/factories/scientific_name.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :scientific_name do
     association :crop, factory: :crop
     name "Beanus Magicus"

spec/factories/seeds.rb

@@ -1,6 +1,6 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :seed do
     owner
     crop

spec/features/crops/crop_detail_page_spec.rb

@@ -168,4 +168,88 @@ feature "crop detail page", js: true do
       expect(current_path).to eq seeds_by_owner_path(owner: member.slug)
     end
   end
+
+  shared_examples "lots of harvests" do
+    def planting
+      FactoryBot.create :planting, crop: crop, planted_at: 100.days.ago, finished_at: 1.day.ago
+    end
+    before do
+      # 50 days to harvest
+      FactoryBot.create(:harvest, harvested_at: 50.days.ago, crop: crop, planting: planting)
+      # 20 days to harvest
+      FactoryBot.create(:harvest, harvested_at: 80.days.ago, crop: crop, planting: planting)
+      # 10 days to harvest
+      FactoryBot.create(:harvest, harvested_at: 90.days.ago, crop: crop, planting: planting)
+      planting.crop.plantings.each(&:update_harvest_days)
+      planting.crop.update_lifespan_medians
+      planting.crop.update_harvest_medians
+    end
+    it { is_expected.to have_text("First harvest expected 20 days after planting") }
+    it { is_expected.to have_text "Median lifespan of #{crop.name} plants is 99 days" }
+  end
+
+  subject do
+    visit crop_path(crop)
+    page
+  end
+
+  context 'predictions' do
+    context 'crop is an annual' do
+      let(:crop) { FactoryBot.create :annual_crop }
+
+      describe 'with no harvests' do
+      end
+
+      describe 'with harvests' do
+        include_examples "lots of harvests"
+      end
+      it do
+        is_expected.to have_text(
+          "#{crop.name} is an annual crop (living and reproducing in a single year or less)"
+        )
+      end
+    end
+
+    context 'crop is perennial' do
+      let(:crop) { FactoryBot.create :perennial_crop }
+
+      describe 'with no harvests' do
+      end
+
+      describe 'with harvests' do
+        include_examples "lots of harvests"
+      end
+      it { is_expected.to have_text("#{crop.name} is a perennial crop (living more than two years)") }
+    end
+
+    context 'crop perennial value is null' do
+      let(:crop) { FactoryBot.create :crop, perennial: nil }
+
+      describe 'with no harvests' do
+      end
+
+      describe 'with harvests' do
+        include_examples "lots of harvests"
+      end
+    end
+  end
+
+  context 'annual and perennial' do
+    before { visit crop_path(crop) }
+    context 'crop is an annual' do
+      let(:crop) { FactoryBot.create :annual_crop }
+      it { expect(page).to have_text 'annual crop (living and reproducing in a single year or less)' }
+      it { expect(page).not_to have_text 'perennial crop (living more than two years)' }
+    end
+    context 'crop is perennial' do
+      let(:crop) { FactoryBot.create :perennial_crop }
+      it { expect(page).to have_text 'perennial crop (living more than two years)' }
+      it { expect(page).not_to have_text 'annual crop (living and reproducing in a single year or less)' }
+    end
+    context 'crop perennial value is null' do
+      let(:crop) { FactoryBot.create :crop, perennial: nil }
+      it { expect(page).not_to have_text 'perennial crop (living more than two years)' }
+      it { expect(page).not_to have_text 'annual crop (living and reproducing in a single year or less)' }
+    end
+  end
 end

spec/features/crops/crop_photos_spec.rb

@@ -0,0 +1,53 @@
+require 'rails_helper'
+
+feature "crop detail page", js: true do
+  let(:member) { create :member }
+  let(:crop) { create :crop, plantings: [planting], harvests: [harvest] }
+  let(:planting) { create :planting, owner: member, photos: [photo1, photo2] }
+  let(:harvest) { create :harvest, owner: member, photos: [photo3, photo4] }
+  let(:photo1) do
+    create(:photo, owner: member, title: 'photo 1',
+                   fullsize_url: 'photo1.jpg', thumbnail_url: 'thumb1.jpg')
+  end
+  let(:photo2) do
+    create(:photo, owner: member, title: 'photo 2',
+                   fullsize_url: 'photo2.jpg', thumbnail_url: 'thumb2.jpg')
+  end
+  let(:photo3) do
+    create(:photo, owner: member, title: 'photo 3',
+                   fullsize_url: 'photo3.jpg', thumbnail_url: 'thumb3.jpg')
+  end
+  let(:photo4) do
+    create(:photo, owner: member, title: 'photo 4',
+                   fullsize_url: 'photo4.jpg', thumbnail_url: 'thumb4.jpg')
+  end
+
+  before { visit crop_path(crop) }
+  subject { page }
+
+  shared_examples "shows photos" do
+    describe "show planting photos" do
+      it { is_expected.to have_xpath("//img[contains(@src,'#{photo1.thumbnail_url}')]") }
+      it { is_expected.to have_xpath("//img[contains(@src,'#{photo2.thumbnail_url}')]") }
+    end
+    describe "show harvest photos" do
+      it { is_expected.to have_xpath("//img[contains(@src,'#{photo3.thumbnail_url}')]") }
+      it { is_expected.to have_xpath("//img[contains(@src,'#{photo4.thumbnail_url}')]") }
+    end
+    describe "link to more photos" do
+      it { is_expected.to have_link "more photos" }
+    end
+  end
+
+  context "when signed in" do
+    background { login_as(create(:member)) }
+    include_examples "shows photos"
+  end
+  context "when signed in as photos owner" do
+    background { login_as(member) }
+    include_examples "shows photos"
+  end
+  context "when not signed in " do
+    include_examples "shows photos"
+  end
+end

spec/features/gardens/adding_gardens_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 require 'custom_matchers'
 
 feature "Gardens", :js do
-  let(:member) { FactoryGirl.create :member }
+  let(:member) { FactoryBot.create :member }
 
   background do
     login_as member

spec/features/likeable_spec.rb

@@ -1,9 +1,9 @@
 require 'rails_helper'
 
 feature 'Likeable', js: true do
-  let(:member) { FactoryGirl.create(:member) }
-  let(:another_member) { FactoryGirl.create(:london_member) }
-  let(:post) { FactoryGirl.create(:post) }
+  let(:member) { FactoryBot.create(:member) }
+  let(:another_member) { FactoryBot.create(:london_member) }
+  let(:post) { FactoryBot.create(:post) }
 
   context 'logged in member' do
     background do

spec/features/members/deletion_spec.rb

@@ -2,16 +2,16 @@ require 'rails_helper'
 
 feature "member deletion" do
   context "with activity and followers" do
-    let(:member) { FactoryGirl.create(:member) }
-    let(:other_member) { FactoryGirl.create(:member) }
-    let(:memberpost) { FactoryGirl.create(:post, author: member) }
-    let(:othermemberpost) { FactoryGirl.create(:post, author: other_member) }
-    let!(:planting) { FactoryGirl.create(:planting, owner: member) }
-    let!(:harvest) { FactoryGirl.create(:harvest, owner: member) }
-    let!(:seed) { FactoryGirl.create(:seed, owner: member) }
-    let!(:secondgarden) { FactoryGirl.create(:garden, owner: member) }
-    let!(:order) { FactoryGirl.create(:order, member: member, completed_at: Time.zone.now) }
-    let(:admin) { FactoryGirl.create(:admin_member) }
+    let(:member) { FactoryBot.create(:member) }
+    let(:other_member) { FactoryBot.create(:member) }
+    let(:memberpost) { FactoryBot.create(:post, author: member) }
+    let(:othermemberpost) { FactoryBot.create(:post, author: other_member) }
+    let!(:planting) { FactoryBot.create(:planting, owner: member) }
+    let!(:harvest) { FactoryBot.create(:harvest, owner: member) }
+    let!(:seed) { FactoryBot.create(:seed, owner: member) }
+    let!(:secondgarden) { FactoryBot.create(:garden, owner: member) }
+    let!(:order) { FactoryBot.create(:order, member: member, completed_at: Time.zone.now) }
+    let(:admin) { FactoryBot.create(:admin_member) }
     background do
       login_as(member)
       visit member_path(other_member)
@@ -22,12 +22,12 @@ feature "member deletion" do
       click_link 'Follow'
       logout
       login_as(member)
-      FactoryGirl.create(:comment, author: member, post: othermemberpost)
-      FactoryGirl.create(:comment, author: other_member, post: memberpost, body: "Fun comment-y thing")
+      FactoryBot.create(:comment, author: member, post: othermemberpost)
+      FactoryBot.create(:comment, author: other_member, post: memberpost, body: "Fun comment-y thing")
       # deletion breaks if no wranglers exist
-      FactoryGirl.create(:cropbot)
+      FactoryBot.create(:cropbot)
       # deletion breaks if ex_member doesn't exist
-      FactoryGirl.create(:member, login_name: "ex_member")
+      FactoryBot.create(:member, login_name: "ex_member")
     end
 
     scenario "has option to delete on member profile page" do
@@ -143,11 +143,11 @@ feature "member deletion" do
   end
 
   context "for a crop wrangler" do
-    let(:member) { FactoryGirl.create(:crop_wrangling_member) }
-    let(:otherwrangler) { FactoryGirl.create(:crop_wrangling_member) }
-    let(:crop) { FactoryGirl.create(:crop, creator: member) }
-    FactoryGirl.create(:cropbot)
-    let!(:ex_wrangler) { FactoryGirl.create(:crop_wrangling_member, login_name: "ex_wrangler") }
+    let(:member) { FactoryBot.create(:crop_wrangling_member) }
+    let(:otherwrangler) { FactoryBot.create(:crop_wrangling_member) }
+    let(:crop) { FactoryBot.create(:crop, creator: member) }
+    FactoryBot.create(:cropbot)
+    let!(:ex_wrangler) { FactoryBot.create(:crop_wrangling_member, login_name: "ex_wrangler") }
 
     scenario "leaves crops behind" do
       login_as(otherwrangler)

spec/features/notifications_spec.rb

@@ -31,7 +31,7 @@ feature "Notifications", :js do
 
   describe 'pagination' do
     before do
-      34.times { FactoryGirl.create :notification, recipient: recipient }
+      34.times { FactoryBot.create :notification, recipient: recipient }
       login_as recipient
       visit notifications_path
     end

spec/features/plantings/planting_a_crop_spec.rb

@@ -43,7 +43,7 @@ feature "Planting a crop", :js, :elasticsearch do
     end
 
     expect(page).to have_content "planting was successfully created"
-    expect(page).to have_content "Progress: Not calculated, days before maturity unknown"
+    expect(page).to have_content "Progress: Not enough data"
   end
 
   scenario "Clicking link to owner's profile" do
@@ -91,8 +91,7 @@ feature "Planting a crop", :js, :elasticsearch do
       end
 
       expect(page).to have_content "planting was successfully created"
-      expect(page).to have_content "Progress: Not calculated, days before maturity unknown"
-      expect(page).to have_content "Days until maturity: unknown"
+      expect(page).to have_content "Progress: Not enough data"
     end
 
     it "should show that planting is in progress" do
@@ -110,7 +109,7 @@ feature "Planting a crop", :js, :elasticsearch do
 
       expect(page).to have_content "planting was successfully created"
       expect(page).to_not have_content "Progress: 0% - not planted yet"
-      expect(page).to_not have_content "Progress: Not calculated, days before maturity unknown"
+      expect(page).to_not have_content "Not enough data"
     end
 
     it "should show that planting is 100% complete (no date specified)" do
@@ -127,9 +126,8 @@ feature "Planting a crop", :js, :elasticsearch do
       end
 
       expect(page).to have_content "planting was successfully created"
-      expect(page).to have_content "Progress: 100%"
+      expect(page).to have_content "100%"
       expect(page).to have_content "Yes (no date specified)"
-      expect(page).to have_content "Days until maturity: 0"
     end
 
     it "should show that planting is 100% complete (date specified)" do
@@ -146,8 +144,7 @@ feature "Planting a crop", :js, :elasticsearch do
       end
 
       expect(page).to have_content "planting was successfully created"
-      expect(page).to have_content "Progress: 100%"
-      expect(page).to have_content "Days until maturity: 0"
+      expect(page).to have_content "100%"
     end
   end
 
@@ -173,13 +170,13 @@ feature "Planting a crop", :js, :elasticsearch do
 
   scenario "Editing a planting to fill in the finished date" do
     visit planting_path(planting)
-    expect(page).to have_content "Progress: Not calculated, days before maturity unknown"
+    expect(page).to have_content "Progress: Not enough data"
     click_link "Edit"
     check "finished"
     fill_in "Finished date", with: "2015-06-25"
     click_button "Save"
     expect(page).to have_content "planting was successfully updated"
-    expect(page).to_not have_content "Progress: Not calculated, days before maturity unknown"
+    expect(page).to_not have_content "Progress: Not enough data"
   end
 
   scenario "Marking a planting as finished" do
@@ -232,7 +229,7 @@ feature "Planting a crop", :js, :elasticsearch do
     end
     expect(page).to have_content "planting was successfully created"
     expect(page).to have_content "Finished: Yes (no date specified)"
-    expect(page).to have_content "Progress: 100%"
+    expect(page).to have_content "100%"
   end
 
   describe "Planting sunniness" do

spec/helpers/application_helper_spec.rb

@@ -23,7 +23,7 @@ describe ApplicationHelper do
   describe '#avatar_uri' do
     context 'with a normal user' do
       before :each do
-        @member = FactoryGirl.build(:member, email: 'example@example.com', preferred_avatar_uri: nil)
+        @member = FactoryBot.build(:member, email: 'example@example.com', preferred_avatar_uri: nil)
       end
       it 'should render a gravatar uri' do
         expect(avatar_uri(@member)).to eq 'http://www.gravatar.com/avatar/23463b99b62a72f26ed677cc556c44e8?size=150&default=identicon'
@@ -36,7 +36,7 @@ describe ApplicationHelper do
 
     context 'with a user who specified a preferred avatar uri' do
       before :each do
-        @member = FactoryGirl.build(:member, email: 'example@example.com', preferred_avatar_uri: 'http://media.catmoji.com/post/ujg/cat-in-hat.jpg')
+        @member = FactoryBot.build(:member, email: 'example@example.com', preferred_avatar_uri: 'http://media.catmoji.com/post/ujg/cat-in-hat.jpg')
       end
       it 'should render a the specified uri' do
         expect(avatar_uri(@member)).to eq 'http://media.catmoji.com/post/ujg/cat-in-hat.jpg'

spec/helpers/gardens_helper_spec.rb

@@ -3,28 +3,28 @@ require 'rails_helper'
 describe GardensHelper do
   describe "garden description" do
     it "is missing" do
-      garden = FactoryGirl.create(:garden,
+      garden = FactoryBot.create(:garden,
         description: nil)
       result = helper.display_garden_description(garden)
       expect(result).to eq "no description provided."
     end
 
     it "is less than 130 characters long" do
-      garden = FactoryGirl.create(:garden,
+      garden = FactoryBot.create(:garden,
         description: 'a' * 20)
       result = helper.display_garden_description(garden)
       expect(result).to eq 'a' * 20
     end
 
     it "is 130 characters long" do
-      garden = FactoryGirl.create(:garden,
+      garden = FactoryBot.create(:garden,
         description: 'a' * 130)
       result = helper.display_garden_description(garden)
       expect(result).to eq 'a' * 130
     end
 
     it "is more than 130 characters long" do
-      garden = FactoryGirl.create(:garden,
+      garden = FactoryBot.create(:garden,
         description: 'a' * 140)
       result = helper.display_garden_description(garden)
       expect(result).to eq 'a' * 126 + '...' + ' ' + link_to("Read more", garden_path(garden))
@@ -38,8 +38,8 @@ describe GardensHelper do
     end
 
     it "has 1 planting" do
-      crop = FactoryGirl.create(:crop)
-      plantings = [FactoryGirl.create(:planting, quantity: 10, crop: crop)]
+      crop = FactoryBot.create(:crop)
+      plantings = [FactoryBot.create(:planting, quantity: 10, crop: crop)]
       result = helper.display_garden_plantings(plantings)
 
       output = '<ul class="plantings"><li>'
@@ -52,11 +52,11 @@ describe GardensHelper do
     it "has 2 plantings" do
       plantings = []
 
-      crop1 = FactoryGirl.create(:crop)
-      plantings << FactoryGirl.create(:planting, quantity: 10, crop: crop1)
+      crop1 = FactoryBot.create(:crop)
+      plantings << FactoryBot.create(:planting, quantity: 10, crop: crop1)
 
-      crop2 = FactoryGirl.create(:crop)
-      plantings << FactoryGirl.create(:planting, quantity: 10, crop: crop2)
+      crop2 = FactoryBot.create(:crop)
+      plantings << FactoryBot.create(:planting, quantity: 10, crop: crop2)
 
       result = helper.display_garden_plantings(plantings.first(2))
 
@@ -74,14 +74,14 @@ describe GardensHelper do
     it "has 3 plantings" do
       plantings = []
 
-      crop1 = FactoryGirl.create(:crop)
-      plantings << FactoryGirl.create(:planting, quantity: 10, crop: crop1)
+      crop1 = FactoryBot.create(:crop)
+      plantings << FactoryBot.create(:planting, quantity: 10, crop: crop1)
 
-      crop2 = FactoryGirl.create(:crop)
-      plantings << FactoryGirl.create(:planting, quantity: 10, crop: crop2)
+      crop2 = FactoryBot.create(:crop)
+      plantings << FactoryBot.create(:planting, quantity: 10, crop: crop2)
 
-      crop3 = FactoryGirl.create(:crop)
-      plantings << FactoryGirl.create(:planting, quantity: 10, crop: crop3)
+      crop3 = FactoryBot.create(:crop)
+      plantings << FactoryBot.create(:planting, quantity: 10, crop: crop3)
 
       result = helper.display_garden_plantings(plantings.first(2))
 

spec/helpers/harvests_helper_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 describe HarvestsHelper do
   describe "display_quantity" do
     it "blank" do
-      harvest = FactoryGirl.create(:harvest,
+      harvest = FactoryBot.create(:harvest,
         quantity: nil,
         weight_quantity: nil)
       result = helper.display_quantity(harvest)
@@ -11,7 +11,7 @@ describe HarvestsHelper do
     end
 
     it '3 individual' do
-      harvest = FactoryGirl.create(:harvest,
+      harvest = FactoryBot.create(:harvest,
         quantity: 3,
         unit: 'individual',
         weight_quantity: nil)
@@ -20,7 +20,7 @@ describe HarvestsHelper do
     end
 
     it '1 bunch' do
-      harvest = FactoryGirl.create(:harvest,
+      harvest = FactoryBot.create(:harvest,
         quantity: 1,
         unit: 'bunch',
         weight_quantity: nil)
@@ -29,7 +29,7 @@ describe HarvestsHelper do
     end
 
     it '3 bunches' do
-      harvest = FactoryGirl.create(:harvest,
+      harvest = FactoryBot.create(:harvest,
         quantity: 3,
         unit: 'bunch',
         weight_quantity: nil)
@@ -38,7 +38,7 @@ describe HarvestsHelper do
     end
 
     it '3 kg' do
-      harvest = FactoryGirl.create(:harvest,
+      harvest = FactoryBot.create(:harvest,
         quantity: nil,
         unit: nil,
         weight_quantity: 3,
@@ -48,7 +48,7 @@ describe HarvestsHelper do
     end
 
     it '3 individual weighing 3 kg' do
-      harvest = FactoryGirl.create(:harvest,
+      harvest = FactoryBot.create(:harvest,
         quantity: 3,
         unit: 'individual',
         weight_quantity: 3,
@@ -58,7 +58,7 @@ describe HarvestsHelper do
     end
 
     it '3 bunches weighing 3 kg' do
-      harvest = FactoryGirl.create(:harvest,
+      harvest = FactoryBot.create(:harvest,
         quantity: 3,
         unit: 'bunch',
         weight_quantity: 3,

spec/helpers/notifications_helper_spec.rb

@@ -2,17 +2,17 @@ require 'rails_helper'
 
 describe NotificationsHelper do
   describe "reply_link" do
-    let(:member) { FactoryGirl.create(:member) }
+    let(:member) { FactoryBot.create(:member) }
 
     it "replies to PMs with PMs" do
-      notification = FactoryGirl.create(:notification, recipient_id: member.id, post_id: nil)
+      notification = FactoryBot.create(:notification, recipient_id: member.id, post_id: nil)
       link = helper.reply_link(notification)
       link.should_not be_nil
       link.should eq reply_notification_url(notification)
     end
 
     it "replies to post comments with post comments" do
-      notification = FactoryGirl.create(:notification, recipient_id: member.id)
+      notification = FactoryBot.create(:notification, recipient_id: member.id)
 
       link = helper.reply_link(notification)
       link.should_not be_nil

spec/helpers/plantings_helper_spec.rb

@@ -1,69 +1,11 @@
 require 'rails_helper'
 
 describe PlantingsHelper do
-  describe "display_days_before_maturity" do
-    it "handles nil planted_at, nil finished_at, non-nil days_until_maturity" do
-      planting = FactoryGirl.build(:planting,
-        quantity: 5,
-        planted_at: nil,
-        finished_at: nil,
-        days_before_maturity: 17)
-      result = helper.display_days_before_maturity(planting)
-      expect(result).to eq "unknown"
-    end
-
-    it "handles non-nil planted_at and d_b_m, nil finished_at" do
-      planting = FactoryGirl.build(:planting,
-        quantity: 5,
-        planted_at: Date.current,
-        finished_at: nil,
-        days_before_maturity: 17)
-      result = helper.display_days_before_maturity(planting)
-      expect(result).to eq "17"
-    end
-
-    it "handles completed plantings" do
-      planting = FactoryGirl.build(:planting, finished: true)
-      result = helper.display_days_before_maturity(planting)
-      expect(result).to eq "0"
-    end
-
-    it "handles plantings that should have finished" do
-      planting = FactoryGirl.build(:planting,
-        quantity: 5,
-        planted_at: Date.new(0, 1, 1),
-        finished_at: nil,
-        days_before_maturity: "17")
-      result = helper.display_days_before_maturity(planting)
-      expect(result).to eq "0"
-    end
-
-    it "handles nil d_b_m and nil finished_at" do
-      planting = FactoryGirl.build(:planting,
-        quantity: 5,
-        planted_at: Date.new(2012, 5, 12),
-        finished_at: nil,
-        days_before_maturity: nil)
-      result = helper.display_days_before_maturity(planting)
-      expect(result).to eq "unknown"
-    end
-
-    it "handles finished_at dates in the future" do
-      planting = FactoryGirl.build(:planting,
-        quantity: 5,
-        planted_at: Date.current,
-        finished_at: Date.current + 5,
-        days_before_maturity: nil)
-      result = helper.display_days_before_maturity(planting)
-      expect(result).to eq "5"
-    end
-  end
-
   describe "display_planting" do
-    let!(:member) { FactoryGirl.build(:member, login_name: 'crop_lady') }
+    let!(:member) { FactoryBot.build(:member, login_name: 'crop_lady') }
 
     it "does not have a quantity nor a planted from value provided" do
-      planting = FactoryGirl.build(:planting,
+      planting = FactoryBot.build(:planting,
         quantity: nil,
         planted_from: '',
         owner: member)
@@ -72,7 +14,7 @@ describe PlantingsHelper do
     end
 
     it "does not have a quantity provided" do
-      planting = FactoryGirl.build(:planting,
+      planting = FactoryBot.build(:planting,
         quantity: nil,
         planted_from: 'seed',
         owner: member)
@@ -82,7 +24,7 @@ describe PlantingsHelper do
 
     context "when quantity is greater than 1" do
       it "does not have a planted from value provided" do
-        planting = FactoryGirl.build(:planting,
+        planting = FactoryBot.build(:planting,
           quantity: 10,
           planted_from: '',
           owner: member)
@@ -91,7 +33,7 @@ describe PlantingsHelper do
       end
 
       it "does have a planted from value provided" do
-        planting = FactoryGirl.build(:planting,
+        planting = FactoryBot.build(:planting,
           quantity: 5,
           planted_from: 'seed',
           owner: member)
@@ -102,7 +44,7 @@ describe PlantingsHelper do
 
     context "when quantity is 1" do
       it "does not have a planted from value provided" do
-        planting = FactoryGirl.build(:planting,
+        planting = FactoryBot.build(:planting,
           quantity: 1,
           planted_from: '',
           owner: member)
@@ -111,7 +53,7 @@ describe PlantingsHelper do
       end
 
       it "does have a planted from value provided" do
-        planting = FactoryGirl.build(:planting,
+        planting = FactoryBot.build(:planting,
           quantity: 1,
           planted_from: 'seed',
           owner: member)

spec/helpers/seeds_helper_spec.rb

@@ -3,28 +3,28 @@ require 'rails_helper'
 describe SeedsHelper do
   describe "seed description" do
     it "is missing" do
-      seed = FactoryGirl.create(:seed,
+      seed = FactoryBot.create(:seed,
         description: nil)
       result = helper.display_seed_description(seed)
       expect(result).to eq "no description provided."
     end
 
     it "is less than 130 characters long" do
-      seed = FactoryGirl.create(:seed,
+      seed = FactoryBot.create(:seed,
         description: 'a' * 20)
       result = helper.display_seed_description(seed)
       expect(result).to eq 'a' * 20
     end
 
     it "is 130 characters long" do
-      seed = FactoryGirl.create(:seed,
+      seed = FactoryBot.create(:seed,
         description: 'a' * 130)
       result = helper.display_seed_description(seed)
       expect(result).to eq 'a' * 130
     end
 
     it "is more than 130 characters long" do
-      seed = FactoryGirl.create(:seed,
+      seed = FactoryBot.create(:seed,
         description: 'a' * 140)
       result = helper.display_seed_description(seed)
       expect(result).to eq 'a' * 126 + '...' + ' ' + link_to("Read more", seed_path(seed))

spec/lib/haml/filters/escaped_markdown_spec.rb

@@ -15,7 +15,7 @@ describe 'Haml::Filters::Escaped_Markdown' do
   end
 
   it 'converts quick crop links' do
-    @crop = FactoryGirl.create(:crop)
+    @crop = FactoryBot.create(:crop)
     rendered = Haml::Filters::EscapedMarkdown.render("[#{@crop.name}](crop)")
     rendered.should match(/<a href="/)
   end