diff --git a/app/models/forum.rb b/app/models/forum.rb index f9d7099fe..7cbc0d43d 100644 --- a/app/models/forum.rb +++ b/app/models/forum.rb @@ -1,7 +1,7 @@ class Forum < ActiveRecord::Base extend FriendlyId validates :name, presence: true - friendly_id :name, use: %i[slugged finders] + friendly_id :name, use: %i(slugged finders) has_many :posts belongs_to :owner, class_name: "Member" diff --git a/app/models/garden.rb b/app/models/garden.rb index b5e3b3c55..3a8da5828 100644 --- a/app/models/garden.rb +++ b/app/models/garden.rb @@ -2,7 +2,7 @@ class Garden < ActiveRecord::Base extend FriendlyId include Geocodable include PhotoCapable - friendly_id :garden_slug, use: %i[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 diff --git a/app/models/harvest.rb b/app/models/harvest.rb index 18fc9b183..8a05561f3 100644 --- a/app/models/harvest.rb +++ b/app/models/harvest.rb @@ -1,9 +1,9 @@ -class Harvest < ApplicationRecord +class Harvest < ActiveRecord::Base include ActionView::Helpers::NumberHelper extend FriendlyId include PhotoCapable - friendly_id :harvest_slug, use: %i[slugged finders] + friendly_id :harvest_slug, use: %i(slugged finders) # Constants UNITS_VALUES = { diff --git a/app/models/member.rb b/app/models/member.rb index f20f73540..5108cf711 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -4,7 +4,7 @@ class Member < ActiveRecord::Base include Geocodable extend FriendlyId - friendly_id :login_name, use: %i[slugged finders] + friendly_id :login_name, use: %i(slugged finders) has_many :posts, foreign_key: 'author_id' has_many :comments, foreign_key: 'author_id' @@ -75,7 +75,7 @@ class Member < ActiveRecord::Base message: "should be between 2 and 25 characters long" }, exclusion: { - in: %w[growstuff admin moderator staff nearby], + in: %w(growstuff admin moderator staff nearby), message: "name is reserved" }, format: { diff --git a/app/models/plant_part.rb b/app/models/plant_part.rb index aa689f8ef..e5045baa8 100644 --- a/app/models/plant_part.rb +++ b/app/models/plant_part.rb @@ -1,6 +1,6 @@ class PlantPart < ActiveRecord::Base extend FriendlyId - friendly_id :name, use: %i[slugged finders] + friendly_id :name, use: %i(slugged finders) has_many :harvests has_many :crops, -> { uniq }, through: :harvests diff --git a/app/models/planting.rb b/app/models/planting.rb index ab95f5042..7156caf05 100644 --- a/app/models/planting.rb +++ b/app/models/planting.rb @@ -1,10 +1,10 @@ class Planting < ActiveRecord::Base extend FriendlyId include PhotoCapable - friendly_id :planting_slug, use: %i[slugged finders] + friendly_id :planting_slug, use: %i(slugged finders) # Constants - SUNNINESS_VALUES = %w[sun semi-shade shade] + SUNNINESS_VALUES = %w(sun semi-shade shade) PLANTED_FROM_VALUES = [ 'seed', 'seedling', diff --git a/app/models/post.rb b/app/models/post.rb index 2b34d4e22..df7303c9e 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -1,7 +1,7 @@ class Post < ActiveRecord::Base extend FriendlyId include Likeable - friendly_id :author_date_subject, use: %i[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 diff --git a/app/models/role.rb b/app/models/role.rb index 1ce887a56..89b940125 100644 --- a/app/models/role.rb +++ b/app/models/role.rb @@ -1,11 +1,11 @@ class Role < ActiveRecord::Base extend FriendlyId - friendly_id :name, use: %i[slugged finders] + friendly_id :name, use: %i(slugged finders) has_and_belongs_to_many :members # rubocop:disable Rails/HasAndBelongsToMany class << self - %i[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) diff --git a/app/models/seed.rb b/app/models/seed.rb index c4ab18e3d..9b2fc510b 100644 --- a/app/models/seed.rb +++ b/app/models/seed.rb @@ -35,7 +35,7 @@ class Seed < ActiveRecord::Base scope :tradable, -> { where.not(tradable_to: 'nowhere') } scope :interesting, -> { tradable.has_location } scope :has_location, -> { joins(:owner).where.not("members.location": nil) } - TRADABLE_TO_VALUES = %w[nowhere locally nationally internationally].freeze + TRADABLE_TO_VALUES = %w(nowhere locally nationally internationally).freeze validates :tradable_to, inclusion: { in: TRADABLE_TO_VALUES, message: "You may only trade seed nowhere, "\ "locally, nationally, or internationally" }, @@ -66,7 +66,7 @@ class Seed < ActiveRecord::Base allow_nil: false, allow_blank: false - HEIRLOOM_VALUES = %w[heirloom hybrid unknown].freeze + HEIRLOOM_VALUES = %w(heirloom hybrid unknown).freeze validates :heirloom, inclusion: { in: HEIRLOOM_VALUES, message: "You must say whether the seeds are heirloom, hybrid, or unknown" }, allow_nil: false,