From c09c9bdee47770b0a403d54945b2c4be8983002d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2019 07:57:28 +0000 Subject: [PATCH 01/29] Bump sidekiq from 6.0.3 to 6.0.4 Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.0.3 to 6.0.4. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md) - [Commits](https://github.com/mperham/sidekiq/compare/v6.0.3...v6.0.4) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5569c7043..74ee7c025 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -499,7 +499,7 @@ GEM childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) sexp_processor (4.12.1) - sidekiq (6.0.3) + sidekiq (6.0.4) connection_pool (>= 2.2.2) rack (>= 2.0.0) rack-protection (>= 2.0.0) From 2cf15ddfcb639ba07e82a909d8664a5470c506d4 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 25 Dec 2019 07:24:38 +0000 Subject: [PATCH 02/29] Bump rubocop-rails from 2.4.0 to 2.4.1 Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.4.0 to 2.4.1. - [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.0...v2.4.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 74ee7c025..c353ed721 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -460,7 +460,7 @@ GEM rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rails (2.4.0) + rubocop-rails (2.4.1) rack (>= 1.1) rubocop (>= 0.72.0) rubocop-rspec (1.37.1) From f86a47b8a5d877a5f0e7b962b20896409b8aa325 Mon Sep 17 00:00:00 2001 From: Brenda Date: Thu, 26 Dec 2019 13:21:24 +1300 Subject: [PATCH 03/29] Update rubocop target to 5.2 --- .rubocop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 355a14ac6..71a408a9a 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,7 +4,7 @@ AllCops: Exclude: - 'db/schema.rb' - 'vendor/**/*' - TargetRailsVersion: 5.0 + TargetRailsVersion: 5.2 Rails: Enabled: true From c9808fdad68ed21408c9e4a3c8b5330eb3d327a1 Mon Sep 17 00:00:00 2001 From: Brenda Date: Thu, 26 Dec 2019 13:21:50 +1300 Subject: [PATCH 04/29] Rubocop renamed cops, and fixed cops in todo file --- .rubocop.yml | 35 +++++++++-------------------------- .rubocop_todo.yml | 42 ------------------------------------------ 2 files changed, 9 insertions(+), 68 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 71a408a9a..9472c8915 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -15,15 +15,6 @@ Naming/FileName: - 'Gemfile' - 'Gemfile.lock' -Style/StringLiterals: - Enabled: false - -Style/PercentLiteralDelimiters: - PreferredDelimiters: - default: () - '%i': () - '%w': () - Layout/MultilineMethodCallIndentation: EnforcedStyle: indented @@ -36,11 +27,16 @@ Layout/HashAlignment: Layout/ParameterAlignment: EnforcedStyle: with_fixed_indentation - -Style/Documentation: +Style/StringLiterals: Enabled: false -Style/FrozenStringLiteralComment: +Style/PercentLiteralDelimiters: + PreferredDelimiters: + default: () + '%i': () + '%w': () + +Style/Documentation: Enabled: false # Configuration parameters: Include. @@ -56,22 +52,9 @@ Metrics/BlockLength: - '**/*.rake' - 'config/**/*.rb' -Metrics/LineLength: +Layout/LineLength: Max: 140 -# Remove the following once the code style matches -Metrics/MethodLength: - Max: 34 -Metrics/AbcSize: - Max: 33 -# Configuration parameters: CountComments. -Metrics/ClassLength: - Max: 171 -Metrics/CyclomaticComplexity: - Max: 8 -Metrics/PerceivedComplexity: - Max: 9 - # Places we use update_all, etc even though it skips validations. Rails/SkipsModelValidations: Exclude: diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 906cc5479..91e33b14c 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -10,48 +10,6 @@ Lint/AmbiguousOperator: Exclude: - 'spec/controllers/crops_controller_spec.rb' -# Configuration parameters: AllowComments. -Lint/SuppressedException: - Exclude: - - 'lib/tasks/testing.rake' - -Lint/UselessAssignment: - Exclude: - - 'config.rb' - - 'config/compass.rb' - -Metrics/AbcSize: - Max: 125 - -# Configuration parameters: CountComments, ExcludedMethods. -# ExcludedMethods: refine -Metrics/BlockLength: - Max: 59 - -# Configuration parameters: CountComments. -Metrics/ClassLength: - Max: 186 - -Metrics/CyclomaticComplexity: - Max: 29 - -# Cop supports --auto-correct. -# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. -# URISchemes: http, https -Metrics/LineLength: - Max: 341 - -# Configuration parameters: CountComments, ExcludedMethods. -Metrics/MethodLength: - Max: 106 - -# Configuration parameters: CountComments. -Metrics/ModuleLength: - Max: 107 - -Metrics/PerceivedComplexity: - Max: 29 - # Configuration parameters: EnforcedStyle. # SupportedStyles: lowercase, uppercase Naming/HeredocDelimiterCase: From 7257b2ada1c683bd65bd3a1f29d91793782e8d15 Mon Sep 17 00:00:00 2001 From: Brenda Date: Thu, 26 Dec 2019 13:16:22 +1300 Subject: [PATCH 05/29] Update with frozen literals --- app/controllers/admin/members_controller.rb | 2 ++ app/controllers/admin/roles_controller.rb | 2 ++ app/controllers/admin_controller.rb | 2 ++ app/controllers/alternate_names_controller.rb | 2 ++ app/controllers/api/v1/base_controller.rb | 2 ++ app/controllers/api/v1/crops_controller.rb | 2 ++ app/controllers/api/v1/gardens_controller.rb | 2 ++ app/controllers/api/v1/harvests_controller.rb | 2 ++ app/controllers/api/v1/members_controller.rb | 2 ++ app/controllers/api/v1/photos_controller.rb | 2 ++ app/controllers/api/v1/plantings_controller.rb | 2 ++ app/controllers/api/v1/seeds_controller.rb | 2 ++ app/controllers/application_controller.rb | 2 ++ app/controllers/authentications_controller.rb | 2 ++ app/controllers/charts/crops_controller.rb | 2 ++ app/controllers/charts/gardens_controller.rb | 2 ++ app/controllers/comments_controller.rb | 2 ++ app/controllers/conversations_controller.rb | 2 ++ app/controllers/crops_controller.rb | 2 ++ app/controllers/follows_controller.rb | 2 ++ app/controllers/forums_controller.rb | 2 ++ app/controllers/garden_types_controller.rb | 2 ++ app/controllers/home_controller.rb | 2 ++ app/controllers/likes_controller.rb | 2 ++ app/controllers/members_controller.rb | 2 ++ app/controllers/messages_controller.rb | 2 ++ app/controllers/omniauth_callbacks_controller.rb | 2 ++ app/controllers/pages_controller.rb | 2 ++ app/controllers/passwords_controller.rb | 2 ++ app/controllers/photo_associations_controller.rb | 2 ++ app/controllers/photos_controller.rb | 2 ++ app/controllers/places_controller.rb | 2 ++ app/controllers/plant_parts_controller.rb | 2 ++ app/controllers/posts_controller.rb | 2 ++ app/controllers/registrations_controller.rb | 2 ++ app/controllers/robots_controller.rb | 4 +++- app/controllers/scientific_names_controller.rb | 2 ++ app/controllers/sessions_controller.rb | 2 ++ app/controllers/timeline_controller.rb | 2 ++ app/helpers/application_helper.rb | 2 ++ app/helpers/auto_suggest_helper.rb | 2 ++ app/helpers/buttons_helper.rb | 2 ++ app/helpers/crops_helper.rb | 2 ++ app/helpers/editable_form_helper.rb | 2 ++ app/helpers/event_helper.rb | 2 ++ app/helpers/gardens_helper.rb | 2 ++ app/helpers/harvests_helper.rb | 2 ++ app/helpers/icons_helper.rb | 2 ++ app/helpers/photos_helper.rb | 2 ++ app/helpers/plantings_helper.rb | 2 ++ app/helpers/posts_helper.rb | 2 ++ app/helpers/seeds_helper.rb | 2 ++ app/jobs/application_job.rb | 2 ++ app/mailers/application_mailer.rb | 2 ++ app/mailers/notifier.rb | 2 ++ app/models/ability.rb | 2 ++ app/models/alternate_name.rb | 2 ++ app/models/application_record.rb | 2 ++ app/models/authentication.rb | 2 ++ app/models/comment.rb | 2 ++ app/models/concerns/finishable.rb | 2 ++ app/models/concerns/likeable.rb | 2 ++ app/models/concerns/member_flickr.rb | 2 ++ app/models/concerns/member_newsletter.rb | 2 ++ app/models/concerns/open_farm_data.rb | 2 ++ app/models/concerns/ownable.rb | 2 ++ app/models/concerns/photo_capable.rb | 2 ++ app/models/concerns/predict_harvest.rb | 2 ++ app/models/concerns/predict_planting.rb | 2 ++ app/models/crop.rb | 2 ++ app/models/crop_companion.rb | 2 ++ app/models/crop_post.rb | 2 ++ app/models/csv_importer.rb | 2 ++ app/models/follow.rb | 2 ++ app/models/forum.rb | 2 ++ app/models/garden.rb | 2 ++ app/models/garden_type.rb | 2 ++ app/models/harvest.rb | 2 ++ app/models/like.rb | 2 ++ app/models/member.rb | 2 ++ app/models/notification.rb | 2 ++ app/models/photo.rb | 2 ++ app/models/photo_association.rb | 2 ++ app/models/plant_part.rb | 2 ++ app/models/planting.rb | 2 ++ app/models/post.rb | 2 ++ app/models/role.rb | 2 ++ app/models/scientific_name.rb | 2 ++ app/models/seed.rb | 2 ++ app/resources/api/v1/crop_resource.rb | 2 ++ app/resources/api/v1/garden_resource.rb | 2 ++ app/resources/api/v1/harvest_resource.rb | 2 ++ app/resources/api/v1/member_resource.rb | 2 ++ app/resources/api/v1/photo_resource.rb | 2 ++ app/resources/api/v1/planting_resource.rb | 2 ++ app/resources/api/v1/seed_resource.rb | 2 ++ app/resources/base_resource.rb | 2 ++ app/services/crop_search_service.rb | 2 ++ app/services/timeline_service.rb | 2 ++ app/validators/approved_validator.rb | 2 ++ config.rb | 2 ++ config/application.rb | 2 ++ config/boot.rb | 2 ++ config/compass.rb | 2 ++ config/environment.rb | 2 ++ config/environments/development.rb | 2 ++ config/environments/production.rb | 2 ++ config/environments/test.rb | 2 ++ config/factory_bot.rb | 2 ++ config/initializers/application_controller_renderer.rb | 1 + config/initializers/assets.rb | 2 ++ config/initializers/backtrace_silencers.rb | 1 + config/initializers/comfortable_mexican_sofa.rb | 2 ++ config/initializers/content_security_policy.rb | 1 + config/initializers/cookies_serializer.rb | 2 ++ config/initializers/devise.rb | 6 ++++-- config/initializers/escaped_markdown.rb | 2 ++ config/initializers/filter_parameter_logging.rb | 2 ++ config/initializers/friendly_id.rb | 2 ++ config/initializers/geocoder.rb | 2 ++ config/initializers/growstuff_markdown.rb | 2 ++ config/initializers/inflections.rb | 2 ++ config/initializers/jsonapi_resources.rb | 2 ++ config/initializers/leaflet.rb | 2 ++ config/initializers/mailboxer.rb | 2 ++ config/initializers/mime_types.rb | 1 + config/initializers/new_framework_defaults_5_1.rb | 2 ++ config/initializers/new_framework_defaults_5_2.rb | 1 + config/initializers/omniauth.rb | 2 ++ config/initializers/rswag_api.rb | 2 ++ config/initializers/rswag_ui.rb | 2 ++ config/initializers/session_store.rb | 2 ++ config/initializers/sidekiq.rb | 2 ++ config/initializers/swagger.rb | 2 ++ config/initializers/time_formats.rb | 2 ++ config/initializers/wrap_parameters.rb | 2 ++ config/routes.rb | 2 ++ config/setup_load_paths.rb | 2 ++ config/spring.rb | 2 ++ config/unicorn.rb | 2 ++ db/migrate/20120903092956_devise_create_users.rb | 2 ++ db/migrate/20120903112806_add_username_to_users.rb | 2 ++ db/migrate/20121001212604_create_crops.rb | 2 ++ db/migrate/20121003190731_require_system_name_for_crops.rb | 2 ++ db/migrate/20121027035231_add_slug_to_crops.rb | 2 ++ db/migrate/20121105032913_create_gardens.rb | 2 ++ db/migrate/20121106101718_add_slug_to_users.rb | 2 ++ db/migrate/20121107012827_create_scientific_names.rb | 2 ++ db/migrate/20121108105440_create_updates.rb | 2 ++ db/migrate/20121109130033_add_creation_index_to_updates.rb | 2 ++ db/migrate/20121203034745_add_tos_agreement_to_users.rb | 2 ++ db/migrate/20121214224227_add_slug_to_updates.rb | 2 ++ db/migrate/20121219022554_create_plantings.rb | 2 ++ db/migrate/20130113045802_rename_updates_to_posts.rb | 2 ++ db/migrate/20130113060852_rename_users_to_members.rb | 2 ++ db/migrate/20130113081521_rename_post_member_to_author.rb | 2 ++ db/migrate/20130113095802_rename_garden_member_to_owner.rb | 2 ++ db/migrate/20130118031942_add_description_to_gardens.rb | 2 ++ db/migrate/20130118043431_add_slug_to_plantings.rb | 2 ++ db/migrate/20130206033956_create_comments.rb | 2 ++ db/migrate/20130206051328_add_show_email_to_member.rb | 2 ++ db/migrate/20130208034248_require_fields_for_comments.rb | 2 ++ db/migrate/20130212001748_add_geo_to_members.rb | 2 ++ db/migrate/20130212123628_create_notifications.rb | 2 ++ db/migrate/20130213014511_create_forums.rb | 2 ++ db/migrate/20130213015708_add_forum_to_posts.rb | 2 ++ db/migrate/20130214024117_create_roles.rb | 2 ++ db/migrate/20130214034838_add_members_roles_table.rb | 2 ++ db/migrate/20130215131921_rename_notification_fields.rb | 2 ++ db/migrate/20130220044605_add_slug_to_forums.rb | 2 ++ db/migrate/20130220044642_add_slug_to_roles.rb | 2 ++ db/migrate/20130222060730_default_read_to_false.rb | 2 ++ db/migrate/20130326092227_change_planted_at_to_date.rb | 2 ++ db/migrate/20130327120024_add_send_email_to_member.rb | 2 ++ db/migrate/20130329045744_add_sunniness_to_planting.rb | 2 ++ db/migrate/20130404174459_create_authentications.rb | 2 ++ db/migrate/20130409103549_make_post_subject_non_null.rb | 2 ++ db/migrate/20130409162140_add_name_to_authentications.rb | 2 ++ db/migrate/20130507105357_create_products.rb | 2 ++ db/migrate/20130507110411_create_orders.rb | 2 ++ db/migrate/20130507113915_add_orders_products_table.rb | 2 ++ db/migrate/20130508050711_add_completed_to_order.rb | 2 ++ db/migrate/20130508104506_create_photos.rb | 2 ++ db/migrate/20130509123711_add_metadata_to_photos.rb | 2 ++ db/migrate/20130514124515_add_parent_to_crop.rb | 2 ++ db/migrate/20130515033842_create_order_items.rb | 2 ++ .../20130515054017_change_order_member_id_to_integer.rb | 2 ++ db/migrate/20130515122301_change_prices_to_integers.rb | 2 ++ db/migrate/20130517015920_create_account_details.rb | 2 ++ db/migrate/20130517051922_create_account_types.rb | 2 ++ db/migrate/20130517234458_require_account_type_name.rb | 2 ++ db/migrate/20130518000339_add_columns_to_product.rb | 2 ++ .../20130518002942_rename_account_detail_to_account.rb | 2 ++ db/migrate/20130529032813_add_express_token_to_orders.rb | 2 ++ db/migrate/20130531110729_add_photos_plantings_table.rb | 2 ++ .../20130601011725_change_flickr_photo_id_to_string.rb | 2 ++ .../20130606230333_change_product_description_to_text.rb | 2 ++ .../20130606233733_add_recommended_price_to_product.rb | 2 ++ db/migrate/20130705104238_add_planted_from_to_planting.rb | 2 ++ db/migrate/20130715110134_create_seeds.rb | 2 ++ .../20130718005600_change_use_by_to_plant_before_on_seed.rb | 2 ++ db/migrate/20130718011247_add_trading_to_seeds.rb | 2 ++ db/migrate/20130722050836_remove_tradable_from_seeds.rb | 2 ++ .../20130723103128_set_default_tradable_to_on_seed.rb | 2 ++ db/migrate/20130723110702_add_slug_to_seed.rb | 2 ++ db/migrate/20130809012511_add_bio_to_members.rb | 2 ++ db/migrate/20130819004549_add_planting_count_to_crop.rb | 2 ++ db/migrate/20130821011352_add_creator_to_crops.rb | 2 ++ db/migrate/20130821073736_add_creator_to_scientific_name.rb | 2 ++ db/migrate/20130826012139_add_owner_to_planting.rb | 2 ++ db/migrate/20130826023159_add_plantings_count_to_member.rb | 2 ++ db/migrate/20130827105823_add_newsletter_to_member.rb | 2 ++ db/migrate/20130913015118_add_referral_code_to_order.rb | 2 ++ db/migrate/20130917053547_create_harvests.rb | 2 ++ .../20130917060257_change_harvest_notes_to_description.rb | 2 ++ db/migrate/20130917071545_change_harvest_units_to_unit.rb | 2 ++ db/migrate/20130917075803_add_slug_to_harvests.rb | 2 ++ db/migrate/20130925050304_add_weight_to_harvests.rb | 2 ++ db/migrate/20131018101204_rename_system_name_to_name.rb | 2 ++ db/migrate/20131025104228_add_fields_to_gardens.rb | 2 ++ db/migrate/20131029053113_add_plant_part_to_harvests.rb | 2 ++ db/migrate/20131030230908_create_plant_parts.rb | 2 ++ .../20131030231202_change_plant_part_to_plant_part_id.rb | 2 ++ db/migrate/20131031000655_add_slug_to_plant_part.rb | 2 ++ .../20140718075753_default_plantings_count_to_zero.rb | 2 ++ db/migrate/20140829230600_add_finished_to_planting.rb | 2 ++ db/migrate/20140905001730_add_harvests_photos_table.rb | 2 ++ db/migrate/20140928044231_add_crops_posts_table.rb | 2 ++ .../20140928085713_add_send_planting_reminder_to_member.rb | 2 ++ db/migrate/20141002022459_create_index_harvest_photos.rb | 2 ++ db/migrate/20141018111015_create_alternate_names.rb | 2 ++ db/migrate/20141111130849_create_follows.rb | 2 ++ ...0141119130555_change_follows_member_id_to_follower_id.rb | 2 ++ db/migrate/20150124110540_add_properties_to_seeds.rb | 2 ++ db/migrate/20150127043022_add_gardens_photos_table.rb | 2 ++ db/migrate/20150129034206_add_si_weight_to_harvest.rb | 2 ++ db/migrate/20150130224814_add_requester_to_crops.rb | 2 ++ db/migrate/20150201052245_create_cms.rb | 2 ++ db/migrate/20150201053200_add_approval_status_to_crops.rb | 2 ++ .../20150201062506_add_reason_for_rejection_to_crops.rb | 2 ++ db/migrate/20150201064502_add_request_notes_to_crops.rb | 2 ++ db/migrate/20150203080226_create_likes.rb | 2 ++ db/migrate/20150209105410_add_rejection_notes_to_crops.rb | 2 ++ .../20150625224805_add_days_before_maturity_to_plantings.rb | 2 ++ db/migrate/20150824145414_add_member_preferred_image.rb | 2 ++ db/migrate/20161129021533_rename_scientific_name.rb | 2 ++ db/migrate/20161201154922_add_photos_seeds_table.rb | 2 ++ db/migrate/20170104035248_add_planting_ref_to_harvests.rb | 2 ++ db/migrate/20170413221549_counter_caches.rb | 2 ++ db/migrate/20170520060252_add_deleted_to_members.rb | 2 ++ db/migrate/20171022032108_all_the_predictions.rb | 2 ++ db/migrate/20171028230429_create_median_function.rb | 2 ++ db/migrate/20171105011017_set_prediction_data.rb | 2 ++ db/migrate/20171129041341_create_photographings.rb | 2 ++ db/migrate/20180118112809_add_datetaken_to_photos.rb | 2 ++ db/migrate/20180205000612_remove_shop.rb | 2 ++ db/migrate/20180213005731_seed_usage.rb | 2 ++ db/migrate/20180401220637_add_member_count_caches.rb | 2 ++ db/migrate/20190130090437_add_crop_to_photographings.rb | 2 ++ db/migrate/20190317023129_finished_boolean.rb | 2 ++ db/migrate/20190326063855_create_garden_types.rb | 2 ++ db/migrate/20190326224347_add_harvests_count.rb | 2 ++ db/migrate/20190712003735_add_like_counter_caches.rb | 2 ++ db/migrate/20190712234859_rename_photographings.rb | 2 ++ .../20190720000555_create_mailboxer.mailboxer_engine.rb | 2 ++ ...190720000556_add_conversation_optout.mailboxer_engine.rb | 2 ++ .../20190720000557_add_missing_indices.mailboxer_engine.rb | 2 ++ ..._tracking_info_to_mailboxer_receipts.mailboxer_engine.rb | 2 ++ db/migrate/20190720000625_notifications_to_mailboxer.rb | 2 ++ db/migrate/20190721042146_paranoia_to_discard.rb | 2 ++ db/migrate/20190902004225_add_openfarm_data_to_crops.rb | 2 ++ db/migrate/20190910022329_add_photo_source.rb | 2 ++ db/migrate/20190915065209_create_crop_companions.rb | 2 ++ db/migrate/20190918033319_unique_urls.rb | 2 ++ db/migrate/20190921211652_crop_posts.rb | 2 ++ db/migrate/20191029024101_add_saved_at_to_seeds.rb | 2 ++ db/migrate/20191119020643_upgrade_cms.rb | 2 ++ db/migrate/20191119030244_cms_tags.rb | 2 ++ db/seeds.rb | 2 ++ lib/actions/oauth_signup_action.rb | 2 ++ lib/geocodable.rb | 2 ++ lib/haml/filters/escaped_markdown.rb | 2 ++ lib/haml/filters/growstuff_markdown.rb | 2 ++ lib/tasks/growstuff.rake | 2 ++ lib/tasks/hooks.rake | 2 ++ lib/tasks/i18n.rake | 2 ++ lib/tasks/openfarm.rake | 2 ++ lib/tasks/search.rake | 2 ++ lib/tasks/testing.rake | 2 ++ script/check_contributors_md.rb | 2 ++ script/check_static.rb | 1 + script/heroku_maintenance.rb | 1 + spec/controllers/admin/roles_controller_spec.rb | 2 ++ spec/controllers/admin_controller_spec.rb | 2 ++ spec/controllers/authentications_controller_spec.rb | 2 ++ spec/controllers/charts/crops_controller_spec.rb | 2 ++ spec/controllers/charts/gardens_controller_spec.rb | 2 ++ spec/controllers/comments_controller_spec.rb | 2 ++ spec/controllers/crops_controller_spec.rb | 2 ++ spec/controllers/forums_controller_spec.rb | 2 ++ spec/controllers/garden_types_controller_spec.rb | 2 ++ spec/controllers/gardens_controller_spec.rb | 2 ++ spec/controllers/harvests_controller_spec.rb | 2 ++ spec/controllers/home_controller_spec.rb | 2 ++ spec/controllers/likes_controller_spec.rb | 2 ++ spec/controllers/member_controller_spec.rb | 2 ++ spec/controllers/photo_associations_controller_spec.rb | 2 ++ spec/controllers/places_controller_spec.rb | 2 ++ spec/controllers/plant_parts_controller_spec.rb | 2 ++ spec/controllers/plantings_controller_spec.rb | 2 ++ spec/controllers/posts_controller_spec.rb | 2 ++ spec/controllers/registrations_controller_spec.rb | 2 ++ spec/controllers/robots_controller_spec.rb | 2 ++ spec/controllers/scientific_names_controller_spec.rb | 2 ++ spec/controllers/seeds_controller_spec.rb | 2 ++ spec/custom_matchers.rb | 2 ++ spec/factories/alternate_names.rb | 2 ++ spec/factories/authentications.rb | 2 ++ spec/factories/comments.rb | 2 ++ spec/factories/crop.rb | 2 ++ spec/factories/crop_companions.rb | 2 ++ spec/factories/follows.rb | 2 ++ spec/factories/forums.rb | 2 ++ spec/factories/garden.rb | 2 ++ spec/factories/garden_types.rb | 2 ++ spec/factories/harvests.rb | 2 ++ spec/factories/like.rb | 2 ++ spec/factories/member.rb | 2 ++ spec/factories/notifications.rb | 2 ++ spec/factories/photos.rb | 2 ++ spec/factories/plant_parts.rb | 2 ++ spec/factories/planting.rb | 2 ++ spec/factories/post.rb | 2 ++ spec/factories/roles.rb | 2 ++ spec/factories/scientific_name.rb | 2 ++ spec/factories/seeds.rb | 2 ++ spec/features/admin/admin_spec.rb | 2 ++ spec/features/admin/forums_spec.rb | 2 ++ spec/features/cms_spec.rb | 2 ++ spec/features/comments/commenting_a_comment_spec.rb | 2 ++ spec/features/conversations/index_spec.rb | 2 ++ spec/features/conversations/show_spec.rb | 2 ++ spec/features/crops/alternate_name_spec.rb | 2 ++ spec/features/crops/browse_crops_spec.rb | 2 ++ spec/features/crops/creating_a_crop_spec.rb | 2 ++ spec/features/crops/crop_detail_page_spec.rb | 2 ++ spec/features/crops/crop_photos_spec.rb | 2 ++ spec/features/crops/crop_search_spec.rb | 2 ++ spec/features/crops/crop_wranglers_spec.rb | 2 ++ spec/features/crops/crop_wrangling_button_spec.rb | 2 ++ spec/features/crops/delete_crop_spec.rb | 2 ++ spec/features/crops/inflections_spec.rb | 2 ++ spec/features/crops/request_new_crop_spec.rb | 2 ++ spec/features/crops/requested_crops_spec.rb | 2 ++ spec/features/crops/scientific_name_spec.rb | 2 ++ spec/features/crops/show_spec.rb | 2 ++ spec/features/footer_spec.rb | 2 ++ spec/features/gardens/actions_spec.rb | 2 ++ spec/features/gardens/adding_gardens_spec.rb | 2 ++ spec/features/gardens/gardens_spec.rb | 2 ++ spec/features/gardens/index_spec.rb | 2 ++ spec/features/harvests/browse_harvests_spec.rb | 2 ++ spec/features/harvests/harvesting_a_crop_spec.rb | 2 ++ spec/features/home/home_spec.rb | 2 ++ spec/features/likeable_spec.rb | 2 ++ spec/features/locale_spec.rb | 2 ++ spec/features/members/ban_spec.rb | 2 ++ spec/features/members/deletion_spec.rb | 2 ++ spec/features/members/following_spec.rb | 2 ++ spec/features/members/list_spec.rb | 2 ++ spec/features/members/profile_spec.rb | 2 ++ spec/features/percy/percy_spec.rb | 2 ++ spec/features/photos/new_photo_spec.rb | 2 ++ spec/features/photos/show_photo_spec.rb | 2 ++ spec/features/places/searching_a_place_spec.rb | 2 ++ spec/features/planting_reminder_spec.rb | 2 ++ spec/features/plantings/planting_a_crop_spec.rb | 2 ++ spec/features/plantings/prediction_spec.rb | 2 ++ spec/features/plantings/show_spec.rb | 2 ++ spec/features/posts/posting_a_post_spec.rb | 2 ++ spec/features/rss/comments_spec.rb | 2 ++ spec/features/rss/crops_spec.rb | 2 ++ spec/features/rss/members_spec.rb | 2 ++ spec/features/rss/plantings_spec.rb | 2 ++ spec/features/rss/posts_spec.rb | 2 ++ spec/features/rss/seeds_spec.rb | 2 ++ spec/features/seeds/adding_seeds_spec.rb | 2 ++ spec/features/seeds/misc_seeds_spec.rb | 2 ++ spec/features/seeds/seed_photos.rb | 2 ++ spec/features/shared_examples/append_date.rb | 2 ++ spec/features/shared_examples/crop_suggest.rb | 2 ++ spec/features/signin_spec.rb | 2 ++ spec/features/signout_spec.rb | 2 ++ spec/features/signup_spec.rb | 2 ++ spec/features/timeline/index_spec.rb | 2 ++ spec/features/unsubscribing_spec.rb | 2 ++ spec/helpers/application_helper_spec.rb | 2 ++ spec/helpers/buttons_helper_spec.rb | 2 ++ spec/helpers/crops_helper_spec.rb | 2 ++ spec/helpers/event_helper_spec.rb | 2 ++ spec/helpers/gardens_helper_spec.rb | 2 ++ spec/helpers/harvests_helper_spec.rb | 2 ++ spec/helpers/photos_helper_spec.rb | 2 ++ spec/helpers/plantings_helper_spec.rb | 2 ++ spec/helpers/seeds_helper_spec.rb | 2 ++ spec/lib/actions/oauth_signup_action_spec.rb | 2 ++ spec/lib/haml/filters/escaped_markdown_spec.rb | 2 ++ spec/lib/haml/filters/growstuff_markdown_spec.rb | 1 + spec/models/ability_spec.rb | 2 ++ spec/models/alternate_name_spec.rb | 2 ++ spec/models/authentication_spec.rb | 2 ++ spec/models/comment_spec.rb | 2 ++ spec/models/crop_companion_spec.rb | 2 ++ spec/models/crop_spec.rb | 2 ++ spec/models/follow_spec.rb | 2 ++ spec/models/forum_spec.rb | 2 ++ spec/models/garden_spec.rb | 2 ++ spec/models/garden_type.rb | 2 ++ spec/models/harvest_spec.rb | 2 ++ spec/models/like_spec.rb | 2 ++ spec/models/member_spec.rb | 2 ++ spec/models/notification_spec.rb | 2 ++ spec/models/photo_spec.rb | 2 ++ spec/models/plant_part_spec.rb | 2 ++ spec/models/planting_spec.rb | 2 ++ spec/models/post_spec.rb | 2 ++ spec/models/role_spec.rb | 2 ++ spec/models/scientific_name_spec.rb | 2 ++ spec/models/seed_spec.rb | 2 ++ spec/rails_helper.rb | 2 ++ spec/requests/api/v1/crop_request_spec.rb | 2 ++ spec/requests/api/v1/gardens_request_spec.rb | 2 ++ spec/requests/api/v1/harvest_request_spec.rb | 2 ++ spec/requests/api/v1/member_request_spec.rb | 2 ++ spec/requests/api/v1/photos_request_spec.rb | 2 ++ spec/requests/api/v1/plantings_request_spec.rb | 2 ++ spec/requests/api/v1/seeds_request_spec.rb | 2 ++ spec/requests/authentications_spec.rb | 2 ++ spec/requests/conversations_spec.rb | 2 ++ spec/requests/forums_spec.rb | 2 ++ spec/requests/garden_types_spec.rb | 2 ++ spec/requests/gardens_spec.rb | 2 ++ spec/requests/harvests_spec.rb | 2 ++ spec/requests/photos_spec.rb | 2 ++ spec/requests/plant_parts_spec.rb | 2 ++ spec/requests/plantings_spec.rb | 2 ++ spec/requests/post_spec.rb | 2 ++ spec/requests/scientific_names_spec.rb | 2 ++ spec/requests/seeds_spec.rb | 2 ++ spec/routing/admin_routing_spec.rb | 2 ++ spec/routing/authentications_routing_spec.rb | 2 ++ spec/routing/comments_routing_spec.rb | 2 ++ spec/routing/crops_routing_spec.rb | 2 ++ spec/routing/follows_routing_spec.rb | 2 ++ spec/routing/forums_routing_spec.rb | 2 ++ spec/routing/garden_types_routing_spec.rb | 2 ++ spec/routing/gardens_routing_spec.rb | 2 ++ spec/routing/harvests_routing_spec.rb | 2 ++ spec/routing/photos_routing_spec.rb | 2 ++ spec/routing/plant_parts_routing_spec.rb | 2 ++ spec/routing/plantings_routing_spec.rb | 2 ++ spec/routing/roles_routing_spec.rb | 2 ++ spec/routing/scientific_names_routing_spec.rb | 2 ++ spec/routing/seeds_routing_spec.rb | 2 ++ spec/routing/updates_routing_spec.rb | 2 ++ spec/services/timeline_service_spec.rb | 2 ++ spec/spec_helper.rb | 2 ++ spec/support/controller_macros.rb | 2 ++ spec/support/database_cleaner.rb | 2 ++ spec/support/devise.rb | 2 ++ spec/support/feature_helpers.rb | 2 ++ spec/support/is_likeable.rb | 2 ++ spec/swagger_helper.rb | 2 ++ spec/views/admin/index_spec.rb | 2 ++ spec/views/admin/newsletter_spec.rb | 2 ++ spec/views/admin/roles/edit.html.haml_spec.rb | 2 ++ spec/views/admin/roles/index.html.haml_spec.rb | 2 ++ spec/views/admin/roles/new.html.haml_spec.rb | 2 ++ spec/views/comments/edit.html.haml_spec.rb | 2 ++ spec/views/comments/index.rss.haml_spec.rb | 2 ++ spec/views/comments/new.html.haml_spec.rb | 2 ++ spec/views/crops/_grown_for.html.haml_spec.rb | 2 ++ spec/views/crops/_popover.html.haml_spec.rb | 2 ++ spec/views/crops/edit.html.haml_spec.rb | 2 ++ spec/views/crops/hierarchy.html.haml_spec.rb | 2 ++ spec/views/crops/index.html.haml_spec.rb | 2 ++ spec/views/crops/index.rss.haml_spec.rb | 2 ++ spec/views/crops/new.html.haml_spec.rb | 2 ++ spec/views/crops/wrangle.html.haml_spec.rb | 2 ++ spec/views/devise/confirmations/new_spec.rb | 2 ++ spec/views/devise/mailer/confirmation_instructions_spec.rb | 2 ++ .../views/devise/mailer/reset_password_instructions_spec.rb | 2 ++ spec/views/devise/mailer/unlock_instructions_spec.rb | 2 ++ spec/views/devise/registrations/edit_spec.rb | 2 ++ spec/views/devise/registrations/new_spec.rb | 2 ++ spec/views/devise/sessions/new_spec.rb | 2 ++ spec/views/devise/shared/_links_spec.rb | 2 ++ spec/views/devise/unlocks/new_spec.rb | 2 ++ spec/views/forums/edit.html.haml_spec.rb | 2 ++ spec/views/forums/index.html.haml_spec.rb | 2 ++ spec/views/forums/new.html.haml_spec.rb | 2 ++ spec/views/forums/show.html.haml_spec.rb | 2 ++ spec/views/garden_types/edit.html.haml_spec.rb | 2 ++ spec/views/garden_types/new.html.haml_spec.rb | 2 ++ spec/views/garden_types/show.html.haml_spec.rb | 2 ++ spec/views/gardens/edit.html.haml_spec.rb | 2 ++ spec/views/gardens/new.html.haml_spec.rb | 2 ++ spec/views/gardens/show.html.haml_spec.rb | 2 ++ spec/views/harvests/edit.html.haml_spec.rb | 2 ++ spec/views/harvests/index.html.haml_spec.rb | 2 ++ spec/views/harvests/index.rss.haml_spec.rb | 2 ++ spec/views/harvests/new.html.haml_spec.rb | 2 ++ spec/views/harvests/show.html.haml_spec.rb | 2 ++ spec/views/home/_blurb.html.haml_spec.rb | 2 ++ spec/views/home/_members.html.haml_spec.rb | 2 ++ spec/views/home/_seeds.html.haml_spec.rb | 2 ++ spec/views/home/_stats.html.haml_spec.rb | 2 ++ spec/views/home/index_spec.rb | 2 ++ spec/views/layouts/_head_spec.rb | 2 ++ spec/views/layouts/_header_spec.rb | 2 ++ spec/views/layouts/application_spec.rb | 2 ++ spec/views/members/_location.html.haml_spec.rb | 2 ++ spec/views/members/index.html.haml_spec.rb | 2 ++ spec/views/members/show.rss.haml_spec.rb | 2 ++ spec/views/photos/edit.html.haml_spec.rb | 2 ++ spec/views/photos/index.html.haml_spec.rb | 2 ++ spec/views/photos/new.html.haml_spec.rb | 2 ++ spec/views/photos/show.html.haml_spec.rb | 2 ++ spec/views/places/_map_attribution.html.haml_spec.rb | 2 ++ spec/views/places/index.html.haml_spec.rb | 2 ++ spec/views/places/show.html.haml_spec.rb | 2 ++ spec/views/plant_parts/edit.html.haml_spec.rb | 2 ++ spec/views/plant_parts/index.html.haml_spec.rb | 2 ++ spec/views/plant_parts/new.html.haml_spec.rb | 2 ++ spec/views/plant_parts/show.html.haml_spec.rb | 2 ++ spec/views/plantings/_form.html.haml_spec.rb | 2 ++ spec/views/plantings/edit.html.haml_spec.rb | 2 ++ spec/views/plantings/index.html.haml_spec.rb | 2 ++ spec/views/plantings/index.rss.haml_spec.rb | 2 ++ spec/views/plantings/new.html.haml_spec.rb | 2 ++ spec/views/plantings/show.html.haml_spec.rb | 2 ++ spec/views/posts/_single.html.haml_spec.rb | 2 ++ spec/views/posts/edit.html.haml_spec.rb | 2 ++ spec/views/posts/index.html.haml_spec.rb | 2 ++ spec/views/posts/index.rss.haml_spec.rb | 2 ++ spec/views/posts/new.html.haml_spec.rb | 2 ++ spec/views/posts/show.html.haml_spec.rb | 2 ++ spec/views/posts/show.rss.haml_spec.rb | 2 ++ spec/views/scientific_names/edit.html.haml_spec.rb | 2 ++ spec/views/scientific_names/index.html.haml_spec.rb | 2 ++ spec/views/scientific_names/new.html.haml_spec.rb | 2 ++ spec/views/scientific_names/show.html.haml_spec.rb | 2 ++ spec/views/seeds/edit.html.haml_spec.rb | 2 ++ spec/views/seeds/index.rss.haml_spec.rb | 2 ++ spec/views/seeds/new.html.haml_spec.rb | 2 ++ spec/views/seeds/show.html.haml_spec.rb | 2 ++ 556 files changed, 1107 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/members_controller.rb b/app/controllers/admin/members_controller.rb index 0526a57c0..cf10b5c0d 100644 --- a/app/controllers/admin/members_controller.rb +++ b/app/controllers/admin/members_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Admin class MembersController < ApplicationController before_action :admin! diff --git a/app/controllers/admin/roles_controller.rb b/app/controllers/admin/roles_controller.rb index d08c292dc..3ad46e6ac 100644 --- a/app/controllers/admin/roles_controller.rb +++ b/app/controllers/admin/roles_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Admin class RolesController < ApplicationController before_action :admin! diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 541567430..454faf1c7 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AdminController < ApplicationController respond_to :html def index diff --git a/app/controllers/alternate_names_controller.rb b/app/controllers/alternate_names_controller.rb index 3466f72a9..922c078cf 100644 --- a/app/controllers/alternate_names_controller.rb +++ b/app/controllers/alternate_names_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AlternateNamesController < ApplicationController before_action :authenticate_member!, except: %i(index) load_and_authorize_resource diff --git a/app/controllers/api/v1/base_controller.rb b/app/controllers/api/v1/base_controller.rb index 4fbc4d806..84eb42dcc 100644 --- a/app/controllers/api/v1/base_controller.rb +++ b/app/controllers/api/v1/base_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Api module V1 class BaseController < JSONAPI::ResourceController diff --git a/app/controllers/api/v1/crops_controller.rb b/app/controllers/api/v1/crops_controller.rb index d67beaa1a..f75516a43 100644 --- a/app/controllers/api/v1/crops_controller.rb +++ b/app/controllers/api/v1/crops_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Api module V1 class CropsController < BaseController diff --git a/app/controllers/api/v1/gardens_controller.rb b/app/controllers/api/v1/gardens_controller.rb index 4343d8014..ff420cf6a 100644 --- a/app/controllers/api/v1/gardens_controller.rb +++ b/app/controllers/api/v1/gardens_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Api module V1 class GardensController < BaseController diff --git a/app/controllers/api/v1/harvests_controller.rb b/app/controllers/api/v1/harvests_controller.rb index bcf735dce..1bef4212d 100644 --- a/app/controllers/api/v1/harvests_controller.rb +++ b/app/controllers/api/v1/harvests_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Api module V1 class HarvestsController < BaseController diff --git a/app/controllers/api/v1/members_controller.rb b/app/controllers/api/v1/members_controller.rb index b9b99956d..7f08067e9 100644 --- a/app/controllers/api/v1/members_controller.rb +++ b/app/controllers/api/v1/members_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Api module V1 class MembersController < BaseController diff --git a/app/controllers/api/v1/photos_controller.rb b/app/controllers/api/v1/photos_controller.rb index a095d24cb..693edd1fa 100644 --- a/app/controllers/api/v1/photos_controller.rb +++ b/app/controllers/api/v1/photos_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Api module V1 class PhotosController < BaseController diff --git a/app/controllers/api/v1/plantings_controller.rb b/app/controllers/api/v1/plantings_controller.rb index d143676ab..dc2bc689f 100644 --- a/app/controllers/api/v1/plantings_controller.rb +++ b/app/controllers/api/v1/plantings_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Api module V1 class PlantingsController < BaseController diff --git a/app/controllers/api/v1/seeds_controller.rb b/app/controllers/api/v1/seeds_controller.rb index 43f5691c6..53722ea6a 100644 --- a/app/controllers/api/v1/seeds_controller.rb +++ b/app/controllers/api/v1/seeds_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Api module V1 class SeedsController < BaseController diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index ceafaa6cb..7e01327d6 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ApplicationController < ActionController::Base protect_from_forgery diff --git a/app/controllers/authentications_controller.rb b/app/controllers/authentications_controller.rb index fc18ff4d7..31056c6e1 100644 --- a/app/controllers/authentications_controller.rb +++ b/app/controllers/authentications_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require './lib/actions/oauth_signup_action' class AuthenticationsController < ApplicationController before_action :authenticate_member! diff --git a/app/controllers/charts/crops_controller.rb b/app/controllers/charts/crops_controller.rb index 9626a76b9..a48ec1ab2 100644 --- a/app/controllers/charts/crops_controller.rb +++ b/app/controllers/charts/crops_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Charts class CropsController < ApplicationController respond_to :json diff --git a/app/controllers/charts/gardens_controller.rb b/app/controllers/charts/gardens_controller.rb index b9d25bb53..a7048c57f 100644 --- a/app/controllers/charts/gardens_controller.rb +++ b/app/controllers/charts/gardens_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Charts class GardensController < ApplicationController respond_to :json diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index d47dae87d..37f2a5b16 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CommentsController < ApplicationController before_action :authenticate_member!, except: %i(index) load_and_authorize_resource diff --git a/app/controllers/conversations_controller.rb b/app/controllers/conversations_controller.rb index e5da3be93..14b51e8ff 100644 --- a/app/controllers/conversations_controller.rb +++ b/app/controllers/conversations_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ConversationsController < ApplicationController respond_to :html before_action :authenticate_member! diff --git a/app/controllers/crops_controller.rb b/app/controllers/crops_controller.rb index 99c702e7f..bbc158da3 100644 --- a/app/controllers/crops_controller.rb +++ b/app/controllers/crops_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'will_paginate/array' class CropsController < ApplicationController diff --git a/app/controllers/follows_controller.rb b/app/controllers/follows_controller.rb index 1555a4a7c..2caf0f336 100644 --- a/app/controllers/follows_controller.rb +++ b/app/controllers/follows_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class FollowsController < ApplicationController before_action :set_member, only: %i(index followers) load_and_authorize_resource diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb index df6d1cad2..bc75da5fa 100644 --- a/app/controllers/forums_controller.rb +++ b/app/controllers/forums_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ForumsController < ApplicationController load_and_authorize_resource respond_to :html, :json diff --git a/app/controllers/garden_types_controller.rb b/app/controllers/garden_types_controller.rb index 5fade528a..567af80ff 100644 --- a/app/controllers/garden_types_controller.rb +++ b/app/controllers/garden_types_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class GardenTypesController < ApplicationController respond_to :html, :json load_and_authorize_resource diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 1241c70f5..e5ff4d06b 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class HomeController < ApplicationController skip_authorize_resource respond_to :html diff --git a/app/controllers/likes_controller.rb b/app/controllers/likes_controller.rb index 501bc6ee1..37d302fcb 100644 --- a/app/controllers/likes_controller.rb +++ b/app/controllers/likes_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class LikesController < ApplicationController before_action :authenticate_member! respond_to :html, :json diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 0d07b303f..9b65068d0 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class MembersController < ApplicationController load_and_authorize_resource except: %i(finish_signup unsubscribe view_follows view_followers show) skip_authorize_resource only: %i(nearby unsubscribe finish_signup) diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 21bb4d0b2..9efc7ae42 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class MessagesController < ApplicationController respond_to :html, :json before_action :authenticate_member! diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index 3d642cd3d..c9243c89b 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require './lib/actions/oauth_signup_action' # diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 9ffb98af8..4da0321de 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class PagesController < ApplicationController def letsencrypt # use your code here, not mine diff --git a/app/controllers/passwords_controller.rb b/app/controllers/passwords_controller.rb index fb6852ea9..012cd352b 100644 --- a/app/controllers/passwords_controller.rb +++ b/app/controllers/passwords_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class PasswordsController < Devise::PasswordsController protected diff --git a/app/controllers/photo_associations_controller.rb b/app/controllers/photo_associations_controller.rb index 499dbefc0..00655a736 100644 --- a/app/controllers/photo_associations_controller.rb +++ b/app/controllers/photo_associations_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class PhotoAssociationsController < ApplicationController before_action :authenticate_member! respond_to :json, :html diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb index c6243ad20..9b7fb7c1b 100644 --- a/app/controllers/photos_controller.rb +++ b/app/controllers/photos_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class PhotosController < ApplicationController before_action :authenticate_member!, except: %i(index show) after_action :expire_homepage, only: %i(create destroy) diff --git a/app/controllers/places_controller.rb b/app/controllers/places_controller.rb index 4586b5d39..a30c1ae98 100644 --- a/app/controllers/places_controller.rb +++ b/app/controllers/places_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class PlacesController < ApplicationController skip_authorize_resource respond_to :html, :json diff --git a/app/controllers/plant_parts_controller.rb b/app/controllers/plant_parts_controller.rb index 1e594fd72..8fbd23c59 100644 --- a/app/controllers/plant_parts_controller.rb +++ b/app/controllers/plant_parts_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class PlantPartsController < ApplicationController load_and_authorize_resource respond_to :html, :json diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index d6561ce8e..40a70fade 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class PostsController < ApplicationController before_action :authenticate_member!, except: %i(index show) load_and_authorize_resource diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 24a8ee8e8..530321233 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class RegistrationsController < Devise::RegistrationsController respond_to :json diff --git a/app/controllers/robots_controller.rb b/app/controllers/robots_controller.rb index 84f77e906..7a000749a 100644 --- a/app/controllers/robots_controller.rb +++ b/app/controllers/robots_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + class RobotsController < ApplicationController - DEFAULT_FILENAME = 'config/robots.txt'.freeze + DEFAULT_FILENAME = 'config/robots.txt' def robots filename = "config/robots.#{subdomain}.txt" if subdomain && subdomain != 'www' diff --git a/app/controllers/scientific_names_controller.rb b/app/controllers/scientific_names_controller.rb index cf58fd4f7..94a18acf9 100644 --- a/app/controllers/scientific_names_controller.rb +++ b/app/controllers/scientific_names_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ScientificNamesController < ApplicationController before_action :authenticate_member!, except: %i(index show) load_and_authorize_resource diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index b8de4b54e..47063d75d 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class SessionsController < Devise::SessionsController respond_to :html, :json diff --git a/app/controllers/timeline_controller.rb b/app/controllers/timeline_controller.rb index da912e69a..662480525 100644 --- a/app/controllers/timeline_controller.rb +++ b/app/controllers/timeline_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class TimelineController < ApplicationController def index if current_member diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 4cdda2b98..0e3a9d86b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module ApplicationHelper def parse_date(str) str ||= '' # Date.parse barfs on nil diff --git a/app/helpers/auto_suggest_helper.rb b/app/helpers/auto_suggest_helper.rb index 85a3f0cbc..1b8521c82 100644 --- a/app/helpers/auto_suggest_helper.rb +++ b/app/helpers/auto_suggest_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module AutoSuggestHelper def auto_suggest(resource, source, options = {}) if options[:default] && !options[:default].new_record? diff --git a/app/helpers/buttons_helper.rb b/app/helpers/buttons_helper.rb index 1c4eb5306..ca5cc5d78 100644 --- a/app/helpers/buttons_helper.rb +++ b/app/helpers/buttons_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module ButtonsHelper include IconsHelper def garden_plant_something_button(garden, classes: "btn btn-default") diff --git a/app/helpers/crops_helper.rb b/app/helpers/crops_helper.rb index f307dc791..7d2187e51 100644 --- a/app/helpers/crops_helper.rb +++ b/app/helpers/crops_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module CropsHelper def display_seed_availability(member, crop) seeds = member.seeds.where(crop: crop) diff --git a/app/helpers/editable_form_helper.rb b/app/helpers/editable_form_helper.rb index 007eeb624..527baf5b2 100644 --- a/app/helpers/editable_form_helper.rb +++ b/app/helpers/editable_form_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module EditableFormHelper def editable(field_type, model, field, display_field:, collection: []) render 'shared/editable/form', field_type: field_type, diff --git a/app/helpers/event_helper.rb b/app/helpers/event_helper.rb index f2ff4a5fe..4bc8033b5 100644 --- a/app/helpers/event_helper.rb +++ b/app/helpers/event_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module EventHelper def in_weeks(days) (days / 7.0).round diff --git a/app/helpers/gardens_helper.rb b/app/helpers/gardens_helper.rb index 1f50d18f4..0ae6d1803 100644 --- a/app/helpers/gardens_helper.rb +++ b/app/helpers/gardens_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module GardensHelper def display_garden_description(garden) if garden.description.nil? diff --git a/app/helpers/harvests_helper.rb b/app/helpers/harvests_helper.rb index ff1838ce4..cce5a10fe 100644 --- a/app/helpers/harvests_helper.rb +++ b/app/helpers/harvests_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module HarvestsHelper def display_quantity(harvest) human_quantity = display_human_quantity(harvest) diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb index 00eb9fc3d..53ceb403d 100644 --- a/app/helpers/icons_helper.rb +++ b/app/helpers/icons_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module IconsHelper include FontAwesome::Sass::Rails::ViewHelpers diff --git a/app/helpers/photos_helper.rb b/app/helpers/photos_helper.rb index c13168065..9ae42c282 100644 --- a/app/helpers/photos_helper.rb +++ b/app/helpers/photos_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PhotosHelper def crop_image_path(crop) thumbnail_url(crop.default_photo) diff --git a/app/helpers/plantings_helper.rb b/app/helpers/plantings_helper.rb index 4de9102ed..3b977f656 100644 --- a/app/helpers/plantings_helper.rb +++ b/app/helpers/plantings_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PlantingsHelper def display_finished(planting) if planting.finished_at.present? diff --git a/app/helpers/posts_helper.rb b/app/helpers/posts_helper.rb index fd676e8d9..ad4afd4be 100644 --- a/app/helpers/posts_helper.rb +++ b/app/helpers/posts_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PostsHelper def display_post_truncated(post) length = 300 diff --git a/app/helpers/seeds_helper.rb b/app/helpers/seeds_helper.rb index ab9e28e72..e585a2348 100644 --- a/app/helpers/seeds_helper.rb +++ b/app/helpers/seeds_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module SeedsHelper def display_seed_quantity(seed) if seed.quantity.nil? diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb index a009ace51..d92ffddcb 100644 --- a/app/jobs/application_job.rb +++ b/app/jobs/application_job.rb @@ -1,2 +1,4 @@ +# frozen_string_literal: true + class ApplicationJob < ActiveJob::Base end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb index 286b2239d..d84cb6e71 100644 --- a/app/mailers/application_mailer.rb +++ b/app/mailers/application_mailer.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ApplicationMailer < ActionMailer::Base default from: 'from@example.com' layout 'mailer' diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb index d3ab4b2c5..c9727be3a 100644 --- a/app/mailers/notifier.rb +++ b/app/mailers/notifier.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Notifier < ApplicationMailer # include NotificationsHelper default from: "Growstuff <#{ENV['GROWSTUFF_EMAIL']}>" diff --git a/app/models/ability.rb b/app/models/ability.rb index b2231e64b..422c5454f 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Ability include CanCan::Ability diff --git a/app/models/alternate_name.rb b/app/models/alternate_name.rb index f40665b1b..c93602131 100644 --- a/app/models/alternate_name.rb +++ b/app/models/alternate_name.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AlternateName < ApplicationRecord belongs_to :crop belongs_to :creator, class_name: 'Member', inverse_of: :created_alternate_names diff --git a/app/models/application_record.rb b/app/models/application_record.rb index e14f64e66..5d2c9a2e9 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ApplicationRecord < ActiveRecord::Base self.abstract_class = true self.per_page = 36 diff --git a/app/models/authentication.rb b/app/models/authentication.rb index 91ecc8de9..98a65a633 100644 --- a/app/models/authentication.rb +++ b/app/models/authentication.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Authentication < ApplicationRecord belongs_to :member end diff --git a/app/models/comment.rb b/app/models/comment.rb index 62ebdde7e..35f0c7009 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Comment < ApplicationRecord belongs_to :author, class_name: 'Member', inverse_of: :comments belongs_to :post diff --git a/app/models/concerns/finishable.rb b/app/models/concerns/finishable.rb index 42fa4e734..6ff68e9c5 100644 --- a/app/models/concerns/finishable.rb +++ b/app/models/concerns/finishable.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Finishable extend ActiveSupport::Concern diff --git a/app/models/concerns/likeable.rb b/app/models/concerns/likeable.rb index 9db3da6e5..911317a6e 100644 --- a/app/models/concerns/likeable.rb +++ b/app/models/concerns/likeable.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Likeable extend ActiveSupport::Concern diff --git a/app/models/concerns/member_flickr.rb b/app/models/concerns/member_flickr.rb index d5d591dc8..363f74d97 100644 --- a/app/models/concerns/member_flickr.rb +++ b/app/models/concerns/member_flickr.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module MemberFlickr extend ActiveSupport::Concern diff --git a/app/models/concerns/member_newsletter.rb b/app/models/concerns/member_newsletter.rb index 882bac7cb..8f92340ce 100644 --- a/app/models/concerns/member_newsletter.rb +++ b/app/models/concerns/member_newsletter.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module MemberNewsletter extend ActiveSupport::Concern diff --git a/app/models/concerns/open_farm_data.rb b/app/models/concerns/open_farm_data.rb index e7d2306ed..f051d43ce 100644 --- a/app/models/concerns/open_farm_data.rb +++ b/app/models/concerns/open_farm_data.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module OpenFarmData extend ActiveSupport::Concern diff --git a/app/models/concerns/ownable.rb b/app/models/concerns/ownable.rb index 6cd40a2e6..8dac572a5 100644 --- a/app/models/concerns/ownable.rb +++ b/app/models/concerns/ownable.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Ownable extend ActiveSupport::Concern diff --git a/app/models/concerns/photo_capable.rb b/app/models/concerns/photo_capable.rb index f96258f87..b585d4b6b 100644 --- a/app/models/concerns/photo_capable.rb +++ b/app/models/concerns/photo_capable.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PhotoCapable extend ActiveSupport::Concern diff --git a/app/models/concerns/predict_harvest.rb b/app/models/concerns/predict_harvest.rb index 4ea241530..bd11fc116 100644 --- a/app/models/concerns/predict_harvest.rb +++ b/app/models/concerns/predict_harvest.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PredictHarvest extend ActiveSupport::Concern diff --git a/app/models/concerns/predict_planting.rb b/app/models/concerns/predict_planting.rb index a38b3582b..9f1aee587 100644 --- a/app/models/concerns/predict_planting.rb +++ b/app/models/concerns/predict_planting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PredictPlanting extend ActiveSupport::Concern diff --git a/app/models/crop.rb b/app/models/crop.rb index 78da0337a..703576e5d 100644 --- a/app/models/crop.rb +++ b/app/models/crop.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Crop < ApplicationRecord extend FriendlyId include PhotoCapable diff --git a/app/models/crop_companion.rb b/app/models/crop_companion.rb index 55d7c27a1..3d09b1947 100644 --- a/app/models/crop_companion.rb +++ b/app/models/crop_companion.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CropCompanion < ApplicationRecord belongs_to :crop_a, class_name: :Crop belongs_to :crop_b, class_name: :Crop diff --git a/app/models/crop_post.rb b/app/models/crop_post.rb index 5c520e3b6..04c8e71ec 100644 --- a/app/models/crop_post.rb +++ b/app/models/crop_post.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CropPost < ApplicationRecord belongs_to :crop belongs_to :post diff --git a/app/models/csv_importer.rb b/app/models/csv_importer.rb index d3b992aba..41ab325ce 100644 --- a/app/models/csv_importer.rb +++ b/app/models/csv_importer.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CsvImporter # used by db/seeds.rb and rake growstuff:import_crops # CSV fields: diff --git a/app/models/follow.rb b/app/models/follow.rb index a70fd15f6..1ee678ef2 100644 --- a/app/models/follow.rb +++ b/app/models/follow.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Follow < ApplicationRecord belongs_to :follower, class_name: "Member", inverse_of: :follows belongs_to :followed, class_name: "Member", inverse_of: :inverse_follows diff --git a/app/models/forum.rb b/app/models/forum.rb index 664af4f38..2ecae932c 100644 --- a/app/models/forum.rb +++ b/app/models/forum.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Forum < ApplicationRecord extend FriendlyId include Ownable diff --git a/app/models/garden.rb b/app/models/garden.rb index 865c11d6d..95c619dbe 100644 --- a/app/models/garden.rb +++ b/app/models/garden.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Garden < ApplicationRecord extend FriendlyId include Geocodable diff --git a/app/models/garden_type.rb b/app/models/garden_type.rb index b81789b69..bed371e24 100644 --- a/app/models/garden_type.rb +++ b/app/models/garden_type.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class GardenType < ApplicationRecord extend FriendlyId friendly_id :name, use: %i(slugged finders) diff --git a/app/models/harvest.rb b/app/models/harvest.rb index 4b40e56c4..6777e3c6c 100644 --- a/app/models/harvest.rb +++ b/app/models/harvest.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Harvest < ApplicationRecord include ActionView::Helpers::NumberHelper extend FriendlyId diff --git a/app/models/like.rb b/app/models/like.rb index f74903739..5cf7992a0 100644 --- a/app/models/like.rb +++ b/app/models/like.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Like < ApplicationRecord belongs_to :member belongs_to :likeable, polymorphic: true, counter_cache: true diff --git a/app/models/member.rb b/app/models/member.rb index 2762a6020..5d373000c 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Member < ApplicationRecord include Discard::Model acts_as_messageable # messages can be sent to this model diff --git a/app/models/notification.rb b/app/models/notification.rb index 466fe73be..55e270d3d 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Notification < ApplicationRecord belongs_to :sender, class_name: 'Member', inverse_of: :sent_notifications belongs_to :recipient, class_name: 'Member', inverse_of: :notifications diff --git a/app/models/photo.rb b/app/models/photo.rb index 3bdbe2554..5f9f9169c 100644 --- a/app/models/photo.rb +++ b/app/models/photo.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Photo < ApplicationRecord include Likeable include Ownable diff --git a/app/models/photo_association.rb b/app/models/photo_association.rb index 89e495b0f..425a598c5 100644 --- a/app/models/photo_association.rb +++ b/app/models/photo_association.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class PhotoAssociation < ApplicationRecord belongs_to :photo, inverse_of: :photo_associations belongs_to :photographable, polymorphic: true diff --git a/app/models/plant_part.rb b/app/models/plant_part.rb index 6fd57bff5..e7e808309 100644 --- a/app/models/plant_part.rb +++ b/app/models/plant_part.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class PlantPart < ApplicationRecord extend FriendlyId friendly_id :name, use: %i(slugged finders) diff --git a/app/models/planting.rb b/app/models/planting.rb index 716468342..a61c1d773 100644 --- a/app/models/planting.rb +++ b/app/models/planting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Planting < ApplicationRecord extend FriendlyId include PhotoCapable diff --git a/app/models/post.rb b/app/models/post.rb index fd5abb130..659291584 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Post < ApplicationRecord extend FriendlyId include Likeable diff --git a/app/models/role.rb b/app/models/role.rb index cd985d115..b89db3287 100644 --- a/app/models/role.rb +++ b/app/models/role.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Role < ApplicationRecord extend FriendlyId friendly_id :name, use: %i(slugged finders) diff --git a/app/models/scientific_name.rb b/app/models/scientific_name.rb index b2da3320f..94ab605b6 100644 --- a/app/models/scientific_name.rb +++ b/app/models/scientific_name.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ScientificName < ApplicationRecord belongs_to :crop belongs_to :creator, class_name: 'Member', inverse_of: :created_scientific_names diff --git a/app/models/seed.rb b/app/models/seed.rb index cc1cecaa2..e902a8a29 100644 --- a/app/models/seed.rb +++ b/app/models/seed.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Seed < ApplicationRecord extend FriendlyId include PhotoCapable diff --git a/app/resources/api/v1/crop_resource.rb b/app/resources/api/v1/crop_resource.rb index 8eac32091..abbf22584 100644 --- a/app/resources/api/v1/crop_resource.rb +++ b/app/resources/api/v1/crop_resource.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Api module V1 class CropResource < BaseResource diff --git a/app/resources/api/v1/garden_resource.rb b/app/resources/api/v1/garden_resource.rb index cffcb27fb..4b4a32bbe 100644 --- a/app/resources/api/v1/garden_resource.rb +++ b/app/resources/api/v1/garden_resource.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Api module V1 class GardenResource < BaseResource diff --git a/app/resources/api/v1/harvest_resource.rb b/app/resources/api/v1/harvest_resource.rb index c1ce0ae0f..502bee5bf 100644 --- a/app/resources/api/v1/harvest_resource.rb +++ b/app/resources/api/v1/harvest_resource.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Api module V1 class HarvestResource < BaseResource diff --git a/app/resources/api/v1/member_resource.rb b/app/resources/api/v1/member_resource.rb index 4013aeea4..9a2731f2e 100644 --- a/app/resources/api/v1/member_resource.rb +++ b/app/resources/api/v1/member_resource.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Api module V1 class MemberResource < BaseResource diff --git a/app/resources/api/v1/photo_resource.rb b/app/resources/api/v1/photo_resource.rb index 84c7eab16..6da294cd8 100644 --- a/app/resources/api/v1/photo_resource.rb +++ b/app/resources/api/v1/photo_resource.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Api module V1 class PhotoResource < BaseResource diff --git a/app/resources/api/v1/planting_resource.rb b/app/resources/api/v1/planting_resource.rb index 1e41078fb..0db7e40bd 100644 --- a/app/resources/api/v1/planting_resource.rb +++ b/app/resources/api/v1/planting_resource.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Api module V1 class PlantingResource < BaseResource diff --git a/app/resources/api/v1/seed_resource.rb b/app/resources/api/v1/seed_resource.rb index e994ce1a0..82dd53ee2 100644 --- a/app/resources/api/v1/seed_resource.rb +++ b/app/resources/api/v1/seed_resource.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Api module V1 class SeedResource < BaseResource diff --git a/app/resources/base_resource.rb b/app/resources/base_resource.rb index 2d54fdf0d..46de0ce53 100644 --- a/app/resources/base_resource.rb +++ b/app/resources/base_resource.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class BaseResource < JSONAPI::Resource immutable abstract diff --git a/app/services/crop_search_service.rb b/app/services/crop_search_service.rb index 645505e04..274d5a3c0 100644 --- a/app/services/crop_search_service.rb +++ b/app/services/crop_search_service.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CropSearchService # Crop.search(string) def self.search(query, page: 1, per_page: 12, current_member: nil) diff --git a/app/services/timeline_service.rb b/app/services/timeline_service.rb index 8ed765083..328eb17dd 100644 --- a/app/services/timeline_service.rb +++ b/app/services/timeline_service.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class TimelineService def self.member_query(member) query.where(owner_id: member.id) diff --git a/app/validators/approved_validator.rb b/app/validators/approved_validator.rb index 8a77fa2da..179bfef18 100644 --- a/app/validators/approved_validator.rb +++ b/app/validators/approved_validator.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ApprovedValidator < ActiveModel::EachValidator def validate_each(record, attribute, _value) record.errors[attribute] << (options[:message] || 'must be approved') unless record.crop.try(:approved?) diff --git a/config.rb b/config.rb index 214d25ef0..328f8a9de 100644 --- a/config.rb +++ b/config.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Require any additional compass plugins here. # Set this to the root of your project when deployed: http_path = "/" diff --git a/config/application.rb b/config/application.rb index a42ae3bae..b34bc36f8 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require_relative 'boot' require 'rails/all' diff --git a/config/boot.rb b/config/boot.rb index 4423c97f2..73bf2c9b7 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/compass.rb b/config/compass.rb index 2b22d5d7c..81dc9bdcd 100644 --- a/config/compass.rb +++ b/config/compass.rb @@ -1,2 +1,4 @@ +# frozen_string_literal: true + # Require any additional compass plugins here. project_type = :rails diff --git a/config/environment.rb b/config/environment.rb index 426333bb4..d5abe5580 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Load the Rails application. require_relative 'application' diff --git a/config/environments/development.rb b/config/environments/development.rb index 46106e08d..caaf7fcd9 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Rails.application.configure do # Settings specified here will take precedence over those in config/application.rb. diff --git a/config/environments/production.rb b/config/environments/production.rb index 6ffdc773b..882d7a463 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Rails.application.configure do # Settings specified here will take precedence over those in config/application.rb. diff --git a/config/environments/test.rb b/config/environments/test.rb index 2a0efb6bf..8c31b6991 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Rails.application.configure do # Settings specified here will take precedence over those in config/application.rb. diff --git a/config/factory_bot.rb b/config/factory_bot.rb index 43d50d52f..e4925f2a3 100644 --- a/config/factory_bot.rb +++ b/config/factory_bot.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + ActionDispatch::Callbacks.after do # Reload the factories return unless Rails.env.development? || Rails.env.test? diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb index 89d2efab2..f4556db39 100644 --- a/config/initializers/application_controller_renderer.rb +++ b/config/initializers/application_controller_renderer.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # Be sure to restart your server when you modify this file. # ActiveSupport::Reloader.to_prepare do diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 60484d4a4..c3da5a1a6 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Be sure to restart your server when you modify this file. # Version of your assets, change this if you want to expire all your assets. diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb index 59385cdf3..d0f0d3b5d 100644 --- a/config/initializers/backtrace_silencers.rb +++ b/config/initializers/backtrace_silencers.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # Be sure to restart your server when you modify this file. # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. diff --git a/config/initializers/comfortable_mexican_sofa.rb b/config/initializers/comfortable_mexican_sofa.rb index dc8148fdc..80dce6018 100644 --- a/config/initializers/comfortable_mexican_sofa.rb +++ b/config/initializers/comfortable_mexican_sofa.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + ComfortableMexicanSofa.configure do |config| # Title of the admin area # config.cms_title = 'ComfortableMexicanSofa CMS Engine' diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index d3bcaa5ec..497f5667c 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # Be sure to restart your server when you modify this file. # Define an application-wide content security policy diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb index 5a6a32d37..ee8dff9c9 100644 --- a/config/initializers/cookies_serializer.rb +++ b/config/initializers/cookies_serializer.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Be sure to restart your server when you modify this file. # Specify a serializer for the signed and encrypted cookie jars. diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 974551c93..1512d8f09 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -1,4 +1,6 @@ -# rubocop:disable Metrics/LineLength +# frozen_string_literal: true + +# rubocop:disable Layout/LineLength # Use this hook to configure devise mailer, warden hooks and so forth. # Many of these configuration options can be set straight in your model. Devise.setup do |config| @@ -236,4 +238,4 @@ Devise.setup do |config| # Later we may wish to ask for user_photos,user_location, however this means we need to be reviewed by facebook config.omniauth :facebook, ENV['GROWSTUFF_FACEBOOK_KEY'], ENV['GROWSTUFF_FACEBOOK_SECRET'], scope: 'email,public_profile', display: 'page', info_fields: 'email,name,first_name,last_name,id' end -# rubocop:enable Metrics/LineLength +# rubocop:enable Layout/LineLength diff --git a/config/initializers/escaped_markdown.rb b/config/initializers/escaped_markdown.rb index 87837b0c5..6cad3bdf1 100644 --- a/config/initializers/escaped_markdown.rb +++ b/config/initializers/escaped_markdown.rb @@ -1 +1,3 @@ +# frozen_string_literal: true + require 'haml/filters/escaped_markdown' diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb index 4a994e1e7..7a4f47b4c 100644 --- a/config/initializers/filter_parameter_logging.rb +++ b/config/initializers/filter_parameter_logging.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Be sure to restart your server when you modify this file. # Configure sensitive parameters which will be filtered from the log file. diff --git a/config/initializers/friendly_id.rb b/config/initializers/friendly_id.rb index 3a88f87be..90586aa83 100644 --- a/config/initializers/friendly_id.rb +++ b/config/initializers/friendly_id.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # FriendlyId Global Configuration # # Use this to set up shared configuration options for your entire application. diff --git a/config/initializers/geocoder.rb b/config/initializers/geocoder.rb index 1a2f76e54..ef916e735 100644 --- a/config/initializers/geocoder.rb +++ b/config/initializers/geocoder.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'geocodable' Geocoder.configure( diff --git a/config/initializers/growstuff_markdown.rb b/config/initializers/growstuff_markdown.rb index a7f6781b2..901237fb3 100644 --- a/config/initializers/growstuff_markdown.rb +++ b/config/initializers/growstuff_markdown.rb @@ -1 +1,3 @@ +# frozen_string_literal: true + require 'haml/filters/growstuff_markdown' diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index 039431538..39ff77ae8 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Be sure to restart your server when you modify this file. # Add new inflection rules using the following format. Inflections diff --git a/config/initializers/jsonapi_resources.rb b/config/initializers/jsonapi_resources.rb index 1a17dfc07..d4ddadb44 100644 --- a/config/initializers/jsonapi_resources.rb +++ b/config/initializers/jsonapi_resources.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + JSONAPI.configure do |config| # built in paginators are :none, :offset, :paged config.default_paginator = :offset diff --git a/config/initializers/leaflet.rb b/config/initializers/leaflet.rb index 510a97070..3a8c09b6d 100644 --- a/config/initializers/leaflet.rb +++ b/config/initializers/leaflet.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Leaflet.tile_layer = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png' Leaflet.attribution = '© OpenStreetMap contributors, CC-BY-SA' Leaflet.max_zoom = 18 diff --git a/config/initializers/mailboxer.rb b/config/initializers/mailboxer.rb index 6f1b0fa7c..b43a61519 100644 --- a/config/initializers/mailboxer.rb +++ b/config/initializers/mailboxer.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Mailboxer.setup do |config| # Configures if your application uses or not email sending for Notifications and Messages config.uses_emails = true diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb index dc1899682..6e1d16f02 100644 --- a/config/initializers/mime_types.rb +++ b/config/initializers/mime_types.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # Be sure to restart your server when you modify this file. # Add new mime types for use in respond_to blocks: diff --git a/config/initializers/new_framework_defaults_5_1.rb b/config/initializers/new_framework_defaults_5_1.rb index 9010abd5c..b33ee806c 100644 --- a/config/initializers/new_framework_defaults_5_1.rb +++ b/config/initializers/new_framework_defaults_5_1.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Be sure to restart your server when you modify this file. # # This file contains migration options to ease your Rails 5.1 upgrade. diff --git a/config/initializers/new_framework_defaults_5_2.rb b/config/initializers/new_framework_defaults_5_2.rb index c383d072b..7df9ce8f4 100644 --- a/config/initializers/new_framework_defaults_5_2.rb +++ b/config/initializers/new_framework_defaults_5_2.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # Be sure to restart your server when you modify this file. # # This file contains migration options to ease your Rails 5.2 upgrade. diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 160efb102..940d84a48 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Rails.application.config.middleware.use OmniAuth::Builder do provider :twitter, ENV['GROWSTUFF_TWITTER_KEY'], ENV['GROWSTUFF_TWITTER_SECRET'] provider :flickr, ENV['GROWSTUFF_FLICKR_KEY'], ENV['GROWSTUFF_FLICKR_SECRET'] diff --git a/config/initializers/rswag_api.rb b/config/initializers/rswag_api.rb index 3c027ffd8..307807a93 100644 --- a/config/initializers/rswag_api.rb +++ b/config/initializers/rswag_api.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Rswag::Api.configure do |c| # Specify a root folder where Swagger JSON files are located # This is used by the Swagger middleware to serve requests for API descriptions diff --git a/config/initializers/rswag_ui.rb b/config/initializers/rswag_ui.rb index 4d7adbaa8..8b632a43f 100644 --- a/config/initializers/rswag_ui.rb +++ b/config/initializers/rswag_ui.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Rswag::Ui.configure do |c| # List the Swagger endpoints that you want to be documented through the swagger-ui # The first parameter is the path (absolute or relative to the UI host) to the corresponding diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 9fc739015..26a833e0b 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Be sure to restart your server when you modify this file. Rails.application.config.session_store :cookie_store, key: '_growstuff_session' diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 4dab98d12..15990b73e 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # config/initializers/sidekiq.rb Sidekiq.configure_server do |config| diff --git a/config/initializers/swagger.rb b/config/initializers/swagger.rb index 0bdadefc0..830a9a36d 100644 --- a/config/initializers/swagger.rb +++ b/config/initializers/swagger.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Jsonapi::Swagger.config do |config| config.use_rswag = false config.version = '2.0' diff --git a/config/initializers/time_formats.rb b/config/initializers/time_formats.rb index 3f3adf454..c56b40bef 100644 --- a/config/initializers/time_formats.rb +++ b/config/initializers/time_formats.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Time::DATE_FORMATS[:default] = '%B %d, %Y at %H:%M' Date::DATE_FORMATS[:default] = "%B %d, %Y" diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb index bffab6c85..3d5ac2557 100644 --- a/config/initializers/wrap_parameters.rb +++ b/config/initializers/wrap_parameters.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Be sure to restart your server when you modify this file. # This file contains settings for ActionController::ParamsWrapper which diff --git a/config/routes.rb b/config/routes.rb index 7efb4d799..cddfbceb8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Rails.application.routes.draw do mount Rswag::Ui::Engine => '/api-docs' mount Rswag::Api::Engine => '/api-docs' diff --git a/config/setup_load_paths.rb b/config/setup_load_paths.rb index b78f9aff0..36e63028a 100644 --- a/config/setup_load_paths.rb +++ b/config/setup_load_paths.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + if ENV['MY_RUBY_HOME']&.include?('rvm') begin require 'rvm' diff --git a/config/spring.rb b/config/spring.rb index c9119b40c..ff5ba06b6 100644 --- a/config/spring.rb +++ b/config/spring.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + %w( .ruby-version .rbenv-vars diff --git a/config/unicorn.rb b/config/unicorn.rb index fa76bae3a..c4218569a 100644 --- a/config/unicorn.rb +++ b/config/unicorn.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # from https://blog.heroku.com/archives/2013/2/27/unicorn_rails worker_processes 3 timeout 30 diff --git a/db/migrate/20120903092956_devise_create_users.rb b/db/migrate/20120903092956_devise_create_users.rb index 62d84f3d1..08d044fd0 100644 --- a/db/migrate/20120903092956_devise_create_users.rb +++ b/db/migrate/20120903092956_devise_create_users.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class DeviseCreateUsers < ActiveRecord::Migration[4.2] def change create_table(:users) do |t| diff --git a/db/migrate/20120903112806_add_username_to_users.rb b/db/migrate/20120903112806_add_username_to_users.rb index 2df3aa569..f27c39cd7 100644 --- a/db/migrate/20120903112806_add_username_to_users.rb +++ b/db/migrate/20120903112806_add_username_to_users.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddUsernameToUsers < ActiveRecord::Migration[4.2] def change add_column :users, :username, :string diff --git a/db/migrate/20121001212604_create_crops.rb b/db/migrate/20121001212604_create_crops.rb index 6e6fbcc2c..4c2832f3d 100644 --- a/db/migrate/20121001212604_create_crops.rb +++ b/db/migrate/20121001212604_create_crops.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateCrops < ActiveRecord::Migration[4.2] def change create_table :crops do |t| diff --git a/db/migrate/20121003190731_require_system_name_for_crops.rb b/db/migrate/20121003190731_require_system_name_for_crops.rb index 7989fcecf..1731554ca 100644 --- a/db/migrate/20121003190731_require_system_name_for_crops.rb +++ b/db/migrate/20121003190731_require_system_name_for_crops.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class RequireSystemNameForCrops < ActiveRecord::Migration[4.2] def up change_table :crops do |t| diff --git a/db/migrate/20121027035231_add_slug_to_crops.rb b/db/migrate/20121027035231_add_slug_to_crops.rb index d360b4a44..fb31e5622 100644 --- a/db/migrate/20121027035231_add_slug_to_crops.rb +++ b/db/migrate/20121027035231_add_slug_to_crops.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddSlugToCrops < ActiveRecord::Migration[4.2] def change add_column :crops, :slug, :string diff --git a/db/migrate/20121105032913_create_gardens.rb b/db/migrate/20121105032913_create_gardens.rb index e6c7834e1..41cee2446 100644 --- a/db/migrate/20121105032913_create_gardens.rb +++ b/db/migrate/20121105032913_create_gardens.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateGardens < ActiveRecord::Migration[4.2] def change create_table :gardens do |t| diff --git a/db/migrate/20121106101718_add_slug_to_users.rb b/db/migrate/20121106101718_add_slug_to_users.rb index 5840e09d2..599eb29c0 100644 --- a/db/migrate/20121106101718_add_slug_to_users.rb +++ b/db/migrate/20121106101718_add_slug_to_users.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddSlugToUsers < ActiveRecord::Migration[4.2] def change add_column :users, :slug, :string diff --git a/db/migrate/20121107012827_create_scientific_names.rb b/db/migrate/20121107012827_create_scientific_names.rb index 0e6b179f7..bbef3d1b1 100644 --- a/db/migrate/20121107012827_create_scientific_names.rb +++ b/db/migrate/20121107012827_create_scientific_names.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateScientificNames < ActiveRecord::Migration[4.2] def change create_table :scientific_names do |t| diff --git a/db/migrate/20121108105440_create_updates.rb b/db/migrate/20121108105440_create_updates.rb index 3caacb749..35ded8d63 100644 --- a/db/migrate/20121108105440_create_updates.rb +++ b/db/migrate/20121108105440_create_updates.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateUpdates < ActiveRecord::Migration[4.2] def change create_table :updates do |t| diff --git a/db/migrate/20121109130033_add_creation_index_to_updates.rb b/db/migrate/20121109130033_add_creation_index_to_updates.rb index 57c24d559..30652d549 100644 --- a/db/migrate/20121109130033_add_creation_index_to_updates.rb +++ b/db/migrate/20121109130033_add_creation_index_to_updates.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddCreationIndexToUpdates < ActiveRecord::Migration[4.2] def change add_index :updates, %i(created_at user_id) diff --git a/db/migrate/20121203034745_add_tos_agreement_to_users.rb b/db/migrate/20121203034745_add_tos_agreement_to_users.rb index 31354ea58..466d8c452 100644 --- a/db/migrate/20121203034745_add_tos_agreement_to_users.rb +++ b/db/migrate/20121203034745_add_tos_agreement_to_users.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddTosAgreementToUsers < ActiveRecord::Migration[4.2] def change add_column :users, :tos_agreement, :boolean diff --git a/db/migrate/20121214224227_add_slug_to_updates.rb b/db/migrate/20121214224227_add_slug_to_updates.rb index 78d25ef24..e0038dba4 100644 --- a/db/migrate/20121214224227_add_slug_to_updates.rb +++ b/db/migrate/20121214224227_add_slug_to_updates.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddSlugToUpdates < ActiveRecord::Migration[4.2] def change add_column :updates, :slug, :string diff --git a/db/migrate/20121219022554_create_plantings.rb b/db/migrate/20121219022554_create_plantings.rb index d586e2426..f618875d3 100644 --- a/db/migrate/20121219022554_create_plantings.rb +++ b/db/migrate/20121219022554_create_plantings.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreatePlantings < ActiveRecord::Migration[4.2] def change create_table :plantings do |t| diff --git a/db/migrate/20130113045802_rename_updates_to_posts.rb b/db/migrate/20130113045802_rename_updates_to_posts.rb index 6329df2bb..fecca7c3b 100644 --- a/db/migrate/20130113045802_rename_updates_to_posts.rb +++ b/db/migrate/20130113045802_rename_updates_to_posts.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class RenameUpdatesToPosts < ActiveRecord::Migration[4.2] def change rename_table :updates, :posts diff --git a/db/migrate/20130113060852_rename_users_to_members.rb b/db/migrate/20130113060852_rename_users_to_members.rb index bb248186e..a278a3068 100644 --- a/db/migrate/20130113060852_rename_users_to_members.rb +++ b/db/migrate/20130113060852_rename_users_to_members.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class RenameUsersToMembers < ActiveRecord::Migration[4.2] def change rename_table :users, :members diff --git a/db/migrate/20130113081521_rename_post_member_to_author.rb b/db/migrate/20130113081521_rename_post_member_to_author.rb index a1658925b..6cb4ae04c 100644 --- a/db/migrate/20130113081521_rename_post_member_to_author.rb +++ b/db/migrate/20130113081521_rename_post_member_to_author.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class RenamePostMemberToAuthor < ActiveRecord::Migration[4.2] def change rename_column :posts, :member_id, :author_id diff --git a/db/migrate/20130113095802_rename_garden_member_to_owner.rb b/db/migrate/20130113095802_rename_garden_member_to_owner.rb index ea6bd4c72..4ebd10d08 100644 --- a/db/migrate/20130113095802_rename_garden_member_to_owner.rb +++ b/db/migrate/20130113095802_rename_garden_member_to_owner.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class RenameGardenMemberToOwner < ActiveRecord::Migration[4.2] def change rename_column :gardens, :member_id, :owner_id diff --git a/db/migrate/20130118031942_add_description_to_gardens.rb b/db/migrate/20130118031942_add_description_to_gardens.rb index f8eb0a441..e846901e4 100644 --- a/db/migrate/20130118031942_add_description_to_gardens.rb +++ b/db/migrate/20130118031942_add_description_to_gardens.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddDescriptionToGardens < ActiveRecord::Migration[4.2] def change add_column :gardens, :description, :text diff --git a/db/migrate/20130118043431_add_slug_to_plantings.rb b/db/migrate/20130118043431_add_slug_to_plantings.rb index c4e5d434d..5f451a835 100644 --- a/db/migrate/20130118043431_add_slug_to_plantings.rb +++ b/db/migrate/20130118043431_add_slug_to_plantings.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddSlugToPlantings < ActiveRecord::Migration[4.2] def change add_column :plantings, :slug, :string diff --git a/db/migrate/20130206033956_create_comments.rb b/db/migrate/20130206033956_create_comments.rb index 0c4663ec7..894da7768 100644 --- a/db/migrate/20130206033956_create_comments.rb +++ b/db/migrate/20130206033956_create_comments.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateComments < ActiveRecord::Migration[4.2] def change create_table :comments do |t| diff --git a/db/migrate/20130206051328_add_show_email_to_member.rb b/db/migrate/20130206051328_add_show_email_to_member.rb index 3185b1377..de734d587 100644 --- a/db/migrate/20130206051328_add_show_email_to_member.rb +++ b/db/migrate/20130206051328_add_show_email_to_member.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddShowEmailToMember < ActiveRecord::Migration[4.2] def change add_column :members, :show_email, :boolean diff --git a/db/migrate/20130208034248_require_fields_for_comments.rb b/db/migrate/20130208034248_require_fields_for_comments.rb index da847671b..eb4ca6467 100644 --- a/db/migrate/20130208034248_require_fields_for_comments.rb +++ b/db/migrate/20130208034248_require_fields_for_comments.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class RequireFieldsForComments < ActiveRecord::Migration[4.2] def up change_table :comments do |t| diff --git a/db/migrate/20130212001748_add_geo_to_members.rb b/db/migrate/20130212001748_add_geo_to_members.rb index e60f355f8..01406871a 100644 --- a/db/migrate/20130212001748_add_geo_to_members.rb +++ b/db/migrate/20130212001748_add_geo_to_members.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddGeoToMembers < ActiveRecord::Migration[4.2] def change add_column :members, :location, :string diff --git a/db/migrate/20130212123628_create_notifications.rb b/db/migrate/20130212123628_create_notifications.rb index b89b13656..978f3054a 100644 --- a/db/migrate/20130212123628_create_notifications.rb +++ b/db/migrate/20130212123628_create_notifications.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateNotifications < ActiveRecord::Migration[4.2] def change create_table :notifications do |t| diff --git a/db/migrate/20130213014511_create_forums.rb b/db/migrate/20130213014511_create_forums.rb index 0df3f00a2..69a4a30e7 100644 --- a/db/migrate/20130213014511_create_forums.rb +++ b/db/migrate/20130213014511_create_forums.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateForums < ActiveRecord::Migration[4.2] def change create_table :forums do |t| diff --git a/db/migrate/20130213015708_add_forum_to_posts.rb b/db/migrate/20130213015708_add_forum_to_posts.rb index 315ae0be5..e6225db23 100644 --- a/db/migrate/20130213015708_add_forum_to_posts.rb +++ b/db/migrate/20130213015708_add_forum_to_posts.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddForumToPosts < ActiveRecord::Migration[4.2] def change add_column :posts, :forum_id, :integer diff --git a/db/migrate/20130214024117_create_roles.rb b/db/migrate/20130214024117_create_roles.rb index e39c7565d..b0799ecb7 100644 --- a/db/migrate/20130214024117_create_roles.rb +++ b/db/migrate/20130214024117_create_roles.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateRoles < ActiveRecord::Migration[4.2] def change create_table :roles do |t| diff --git a/db/migrate/20130214034838_add_members_roles_table.rb b/db/migrate/20130214034838_add_members_roles_table.rb index 502266a87..32c0b191e 100644 --- a/db/migrate/20130214034838_add_members_roles_table.rb +++ b/db/migrate/20130214034838_add_members_roles_table.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddMembersRolesTable < ActiveRecord::Migration[4.2] def change create_table :members_roles, id: false do |t| diff --git a/db/migrate/20130215131921_rename_notification_fields.rb b/db/migrate/20130215131921_rename_notification_fields.rb index c2294d2fe..7fcdd3372 100644 --- a/db/migrate/20130215131921_rename_notification_fields.rb +++ b/db/migrate/20130215131921_rename_notification_fields.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class RenameNotificationFields < ActiveRecord::Migration[4.2] def change change_table :notifications do |t| diff --git a/db/migrate/20130220044605_add_slug_to_forums.rb b/db/migrate/20130220044605_add_slug_to_forums.rb index 57fbdc145..179f883af 100644 --- a/db/migrate/20130220044605_add_slug_to_forums.rb +++ b/db/migrate/20130220044605_add_slug_to_forums.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddSlugToForums < ActiveRecord::Migration[4.2] def change add_column :forums, :slug, :string diff --git a/db/migrate/20130220044642_add_slug_to_roles.rb b/db/migrate/20130220044642_add_slug_to_roles.rb index a3812d77b..e867ce131 100644 --- a/db/migrate/20130220044642_add_slug_to_roles.rb +++ b/db/migrate/20130220044642_add_slug_to_roles.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddSlugToRoles < ActiveRecord::Migration[4.2] def change add_column :roles, :slug, :string diff --git a/db/migrate/20130222060730_default_read_to_false.rb b/db/migrate/20130222060730_default_read_to_false.rb index 81a10aa40..40dea83a4 100644 --- a/db/migrate/20130222060730_default_read_to_false.rb +++ b/db/migrate/20130222060730_default_read_to_false.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class DefaultReadToFalse < ActiveRecord::Migration[4.2] def up change_table :notifications do |t| diff --git a/db/migrate/20130326092227_change_planted_at_to_date.rb b/db/migrate/20130326092227_change_planted_at_to_date.rb index 089c77ef5..b2bd78ae3 100644 --- a/db/migrate/20130326092227_change_planted_at_to_date.rb +++ b/db/migrate/20130326092227_change_planted_at_to_date.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ChangePlantedAtToDate < ActiveRecord::Migration[4.2] def change change_column :plantings, :planted_at, :date diff --git a/db/migrate/20130327120024_add_send_email_to_member.rb b/db/migrate/20130327120024_add_send_email_to_member.rb index 5421bb0d7..89ff6126d 100644 --- a/db/migrate/20130327120024_add_send_email_to_member.rb +++ b/db/migrate/20130327120024_add_send_email_to_member.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddSendEmailToMember < ActiveRecord::Migration[4.2] def change add_column :members, :send_notification_email, :boolean, default: true diff --git a/db/migrate/20130329045744_add_sunniness_to_planting.rb b/db/migrate/20130329045744_add_sunniness_to_planting.rb index 74fe7a652..ec79264c8 100644 --- a/db/migrate/20130329045744_add_sunniness_to_planting.rb +++ b/db/migrate/20130329045744_add_sunniness_to_planting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddSunninessToPlanting < ActiveRecord::Migration[4.2] def change add_column :plantings, :sunniness, :string diff --git a/db/migrate/20130404174459_create_authentications.rb b/db/migrate/20130404174459_create_authentications.rb index 226f1c34c..809ad60b2 100644 --- a/db/migrate/20130404174459_create_authentications.rb +++ b/db/migrate/20130404174459_create_authentications.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateAuthentications < ActiveRecord::Migration[4.2] def change create_table :authentications do |t| diff --git a/db/migrate/20130409103549_make_post_subject_non_null.rb b/db/migrate/20130409103549_make_post_subject_non_null.rb index ac05aca24..f11815a65 100644 --- a/db/migrate/20130409103549_make_post_subject_non_null.rb +++ b/db/migrate/20130409103549_make_post_subject_non_null.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class MakePostSubjectNonNull < ActiveRecord::Migration[4.2] change_column :posts, :subject, :string, null: false end diff --git a/db/migrate/20130409162140_add_name_to_authentications.rb b/db/migrate/20130409162140_add_name_to_authentications.rb index dabcb623a..a0e530085 100644 --- a/db/migrate/20130409162140_add_name_to_authentications.rb +++ b/db/migrate/20130409162140_add_name_to_authentications.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddNameToAuthentications < ActiveRecord::Migration[4.2] def change add_column :authentications, :name, :string diff --git a/db/migrate/20130507105357_create_products.rb b/db/migrate/20130507105357_create_products.rb index 5a1ddd995..ac2ef8b63 100644 --- a/db/migrate/20130507105357_create_products.rb +++ b/db/migrate/20130507105357_create_products.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateProducts < ActiveRecord::Migration[4.2] def change create_table :products do |t| diff --git a/db/migrate/20130507110411_create_orders.rb b/db/migrate/20130507110411_create_orders.rb index 7974f10e9..1c4c00c3a 100644 --- a/db/migrate/20130507110411_create_orders.rb +++ b/db/migrate/20130507110411_create_orders.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateOrders < ActiveRecord::Migration[4.2] def change create_table :orders do |t| diff --git a/db/migrate/20130507113915_add_orders_products_table.rb b/db/migrate/20130507113915_add_orders_products_table.rb index 3d5845081..33e34e6a3 100644 --- a/db/migrate/20130507113915_add_orders_products_table.rb +++ b/db/migrate/20130507113915_add_orders_products_table.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddOrdersProductsTable < ActiveRecord::Migration[4.2] def change create_table :orders_products, id: false do |t| diff --git a/db/migrate/20130508050711_add_completed_to_order.rb b/db/migrate/20130508050711_add_completed_to_order.rb index e7c9f422c..6640113ea 100644 --- a/db/migrate/20130508050711_add_completed_to_order.rb +++ b/db/migrate/20130508050711_add_completed_to_order.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddCompletedToOrder < ActiveRecord::Migration[4.2] def change add_column :orders, :completed_at, :datetime diff --git a/db/migrate/20130508104506_create_photos.rb b/db/migrate/20130508104506_create_photos.rb index b6fb3d19f..cb4a55e86 100644 --- a/db/migrate/20130508104506_create_photos.rb +++ b/db/migrate/20130508104506_create_photos.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreatePhotos < ActiveRecord::Migration[4.2] def change create_table :photos do |t| diff --git a/db/migrate/20130509123711_add_metadata_to_photos.rb b/db/migrate/20130509123711_add_metadata_to_photos.rb index e05c260cb..5b62473f8 100644 --- a/db/migrate/20130509123711_add_metadata_to_photos.rb +++ b/db/migrate/20130509123711_add_metadata_to_photos.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddMetadataToPhotos < ActiveRecord::Migration[4.2] def up change_table :photos do |t| diff --git a/db/migrate/20130514124515_add_parent_to_crop.rb b/db/migrate/20130514124515_add_parent_to_crop.rb index 65427c1c8..9557db8e3 100644 --- a/db/migrate/20130514124515_add_parent_to_crop.rb +++ b/db/migrate/20130514124515_add_parent_to_crop.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddParentToCrop < ActiveRecord::Migration[4.2] def change add_column :crops, :parent_id, :integer diff --git a/db/migrate/20130515033842_create_order_items.rb b/db/migrate/20130515033842_create_order_items.rb index ed7966f46..6305b3819 100644 --- a/db/migrate/20130515033842_create_order_items.rb +++ b/db/migrate/20130515033842_create_order_items.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateOrderItems < ActiveRecord::Migration[4.2] def change create_table :order_items do |t| diff --git a/db/migrate/20130515054017_change_order_member_id_to_integer.rb b/db/migrate/20130515054017_change_order_member_id_to_integer.rb index 508fb13ee..4a010dcc2 100644 --- a/db/migrate/20130515054017_change_order_member_id_to_integer.rb +++ b/db/migrate/20130515054017_change_order_member_id_to_integer.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ChangeOrderMemberIdToInteger < ActiveRecord::Migration[4.2] def up remove_column :orders, :member_id diff --git a/db/migrate/20130515122301_change_prices_to_integers.rb b/db/migrate/20130515122301_change_prices_to_integers.rb index ef84683b2..6a232fe20 100644 --- a/db/migrate/20130515122301_change_prices_to_integers.rb +++ b/db/migrate/20130515122301_change_prices_to_integers.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ChangePricesToIntegers < ActiveRecord::Migration[4.2] def up change_column :order_items, :price, :integer diff --git a/db/migrate/20130517015920_create_account_details.rb b/db/migrate/20130517015920_create_account_details.rb index c949798dc..66a04acec 100644 --- a/db/migrate/20130517015920_create_account_details.rb +++ b/db/migrate/20130517015920_create_account_details.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateAccountDetails < ActiveRecord::Migration[4.2] def change create_table :account_details do |t| diff --git a/db/migrate/20130517051922_create_account_types.rb b/db/migrate/20130517051922_create_account_types.rb index 25bef37b0..410b07013 100644 --- a/db/migrate/20130517051922_create_account_types.rb +++ b/db/migrate/20130517051922_create_account_types.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateAccountTypes < ActiveRecord::Migration[4.2] def change create_table :account_types do |t| diff --git a/db/migrate/20130517234458_require_account_type_name.rb b/db/migrate/20130517234458_require_account_type_name.rb index 2b118492a..d638ad3cd 100644 --- a/db/migrate/20130517234458_require_account_type_name.rb +++ b/db/migrate/20130517234458_require_account_type_name.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class RequireAccountTypeName < ActiveRecord::Migration[4.2] def up change_column :account_types, :name, :string, null: false diff --git a/db/migrate/20130518000339_add_columns_to_product.rb b/db/migrate/20130518000339_add_columns_to_product.rb index b3bba3023..d6f80fae4 100644 --- a/db/migrate/20130518000339_add_columns_to_product.rb +++ b/db/migrate/20130518000339_add_columns_to_product.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddColumnsToProduct < ActiveRecord::Migration[4.2] def change add_column :products, :account_type_id, :integer diff --git a/db/migrate/20130518002942_rename_account_detail_to_account.rb b/db/migrate/20130518002942_rename_account_detail_to_account.rb index a806c63a7..cb369ce93 100644 --- a/db/migrate/20130518002942_rename_account_detail_to_account.rb +++ b/db/migrate/20130518002942_rename_account_detail_to_account.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class RenameAccountDetailToAccount < ActiveRecord::Migration[4.2] def change rename_table :account_details, :accounts diff --git a/db/migrate/20130529032813_add_express_token_to_orders.rb b/db/migrate/20130529032813_add_express_token_to_orders.rb index e7d40f417..53de7e9a1 100644 --- a/db/migrate/20130529032813_add_express_token_to_orders.rb +++ b/db/migrate/20130529032813_add_express_token_to_orders.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddExpressTokenToOrders < ActiveRecord::Migration[4.2] def change add_column :orders, :paypal_express_token, :string diff --git a/db/migrate/20130531110729_add_photos_plantings_table.rb b/db/migrate/20130531110729_add_photos_plantings_table.rb index f4a3bb7bd..cb9c4c525 100644 --- a/db/migrate/20130531110729_add_photos_plantings_table.rb +++ b/db/migrate/20130531110729_add_photos_plantings_table.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddPhotosPlantingsTable < ActiveRecord::Migration[4.2] def change create_table :photos_plantings, id: false do |t| diff --git a/db/migrate/20130601011725_change_flickr_photo_id_to_string.rb b/db/migrate/20130601011725_change_flickr_photo_id_to_string.rb index 92cfa1683..b46e4ca20 100644 --- a/db/migrate/20130601011725_change_flickr_photo_id_to_string.rb +++ b/db/migrate/20130601011725_change_flickr_photo_id_to_string.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ChangeFlickrPhotoIdToString < ActiveRecord::Migration[4.2] def up remove_column :photos, :flickr_photo_id diff --git a/db/migrate/20130606230333_change_product_description_to_text.rb b/db/migrate/20130606230333_change_product_description_to_text.rb index 3393a8ae9..7bae1e6ab 100644 --- a/db/migrate/20130606230333_change_product_description_to_text.rb +++ b/db/migrate/20130606230333_change_product_description_to_text.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ChangeProductDescriptionToText < ActiveRecord::Migration[4.2] def up change_column :products, :description, :text diff --git a/db/migrate/20130606233733_add_recommended_price_to_product.rb b/db/migrate/20130606233733_add_recommended_price_to_product.rb index d424618f5..076e20f3a 100644 --- a/db/migrate/20130606233733_add_recommended_price_to_product.rb +++ b/db/migrate/20130606233733_add_recommended_price_to_product.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddRecommendedPriceToProduct < ActiveRecord::Migration[4.2] def change add_column :products, :recommended_price, :integer diff --git a/db/migrate/20130705104238_add_planted_from_to_planting.rb b/db/migrate/20130705104238_add_planted_from_to_planting.rb index 1dd4e070d..d36ec2358 100644 --- a/db/migrate/20130705104238_add_planted_from_to_planting.rb +++ b/db/migrate/20130705104238_add_planted_from_to_planting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddPlantedFromToPlanting < ActiveRecord::Migration[4.2] def change add_column :plantings, :planted_from, :string diff --git a/db/migrate/20130715110134_create_seeds.rb b/db/migrate/20130715110134_create_seeds.rb index da8955718..8065f9ace 100644 --- a/db/migrate/20130715110134_create_seeds.rb +++ b/db/migrate/20130715110134_create_seeds.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateSeeds < ActiveRecord::Migration[4.2] def change create_table :seeds do |t| diff --git a/db/migrate/20130718005600_change_use_by_to_plant_before_on_seed.rb b/db/migrate/20130718005600_change_use_by_to_plant_before_on_seed.rb index b440c2704..c33a73988 100644 --- a/db/migrate/20130718005600_change_use_by_to_plant_before_on_seed.rb +++ b/db/migrate/20130718005600_change_use_by_to_plant_before_on_seed.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ChangeUseByToPlantBeforeOnSeed < ActiveRecord::Migration[4.2] def change rename_column :seeds, :use_by, :plant_before diff --git a/db/migrate/20130718011247_add_trading_to_seeds.rb b/db/migrate/20130718011247_add_trading_to_seeds.rb index 52add7f50..0ca32df9a 100644 --- a/db/migrate/20130718011247_add_trading_to_seeds.rb +++ b/db/migrate/20130718011247_add_trading_to_seeds.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddTradingToSeeds < ActiveRecord::Migration[4.2] def change add_column :seeds, :tradable, :boolean diff --git a/db/migrate/20130722050836_remove_tradable_from_seeds.rb b/db/migrate/20130722050836_remove_tradable_from_seeds.rb index 9bea0bd10..d668990ed 100644 --- a/db/migrate/20130722050836_remove_tradable_from_seeds.rb +++ b/db/migrate/20130722050836_remove_tradable_from_seeds.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class RemoveTradableFromSeeds < ActiveRecord::Migration[4.2] def up remove_column :seeds, :tradable diff --git a/db/migrate/20130723103128_set_default_tradable_to_on_seed.rb b/db/migrate/20130723103128_set_default_tradable_to_on_seed.rb index 56b88aadb..5cecac550 100644 --- a/db/migrate/20130723103128_set_default_tradable_to_on_seed.rb +++ b/db/migrate/20130723103128_set_default_tradable_to_on_seed.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class SetDefaultTradableToOnSeed < ActiveRecord::Migration[4.2] def up change_column_default(:seeds, :tradable_to, 'nowhere') diff --git a/db/migrate/20130723110702_add_slug_to_seed.rb b/db/migrate/20130723110702_add_slug_to_seed.rb index ec52bdad6..cb4fb7040 100644 --- a/db/migrate/20130723110702_add_slug_to_seed.rb +++ b/db/migrate/20130723110702_add_slug_to_seed.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddSlugToSeed < ActiveRecord::Migration[4.2] def change add_column :seeds, :slug, :string diff --git a/db/migrate/20130809012511_add_bio_to_members.rb b/db/migrate/20130809012511_add_bio_to_members.rb index b63d11bb4..affc7182a 100644 --- a/db/migrate/20130809012511_add_bio_to_members.rb +++ b/db/migrate/20130809012511_add_bio_to_members.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddBioToMembers < ActiveRecord::Migration[4.2] def change add_column :members, :bio, :text diff --git a/db/migrate/20130819004549_add_planting_count_to_crop.rb b/db/migrate/20130819004549_add_planting_count_to_crop.rb index b25fc4a6b..218648531 100644 --- a/db/migrate/20130819004549_add_planting_count_to_crop.rb +++ b/db/migrate/20130819004549_add_planting_count_to_crop.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddPlantingCountToCrop < ActiveRecord::Migration[4.2] def change add_column :crops, :plantings_count, :integer diff --git a/db/migrate/20130821011352_add_creator_to_crops.rb b/db/migrate/20130821011352_add_creator_to_crops.rb index 24aab3f74..9847c51af 100644 --- a/db/migrate/20130821011352_add_creator_to_crops.rb +++ b/db/migrate/20130821011352_add_creator_to_crops.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddCreatorToCrops < ActiveRecord::Migration[4.2] def change add_column :crops, :creator_id, :integer diff --git a/db/migrate/20130821073736_add_creator_to_scientific_name.rb b/db/migrate/20130821073736_add_creator_to_scientific_name.rb index e2904811f..eb6577376 100644 --- a/db/migrate/20130821073736_add_creator_to_scientific_name.rb +++ b/db/migrate/20130821073736_add_creator_to_scientific_name.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddCreatorToScientificName < ActiveRecord::Migration[4.2] def change add_column :scientific_names, :creator_id, :integer diff --git a/db/migrate/20130826012139_add_owner_to_planting.rb b/db/migrate/20130826012139_add_owner_to_planting.rb index 3399870d9..9fb48320b 100644 --- a/db/migrate/20130826012139_add_owner_to_planting.rb +++ b/db/migrate/20130826012139_add_owner_to_planting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddOwnerToPlanting < ActiveRecord::Migration[4.2] def change add_column :plantings, :owner_id, :integer diff --git a/db/migrate/20130826023159_add_plantings_count_to_member.rb b/db/migrate/20130826023159_add_plantings_count_to_member.rb index 973479981..c4ad47295 100644 --- a/db/migrate/20130826023159_add_plantings_count_to_member.rb +++ b/db/migrate/20130826023159_add_plantings_count_to_member.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddPlantingsCountToMember < ActiveRecord::Migration[4.2] def change add_column :members, :plantings_count, :integer diff --git a/db/migrate/20130827105823_add_newsletter_to_member.rb b/db/migrate/20130827105823_add_newsletter_to_member.rb index 25f16a69f..806f6ed98 100644 --- a/db/migrate/20130827105823_add_newsletter_to_member.rb +++ b/db/migrate/20130827105823_add_newsletter_to_member.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddNewsletterToMember < ActiveRecord::Migration[4.2] def change add_column :members, :newsletter, :boolean diff --git a/db/migrate/20130913015118_add_referral_code_to_order.rb b/db/migrate/20130913015118_add_referral_code_to_order.rb index ff9e5a6ff..f4cd52ea4 100644 --- a/db/migrate/20130913015118_add_referral_code_to_order.rb +++ b/db/migrate/20130913015118_add_referral_code_to_order.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddReferralCodeToOrder < ActiveRecord::Migration[4.2] def change add_column :orders, :referral_code, :string diff --git a/db/migrate/20130917053547_create_harvests.rb b/db/migrate/20130917053547_create_harvests.rb index f7e529a30..031aeb66e 100644 --- a/db/migrate/20130917053547_create_harvests.rb +++ b/db/migrate/20130917053547_create_harvests.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateHarvests < ActiveRecord::Migration[4.2] def change create_table :harvests do |t| diff --git a/db/migrate/20130917060257_change_harvest_notes_to_description.rb b/db/migrate/20130917060257_change_harvest_notes_to_description.rb index 8359c0b9c..2c09044d3 100644 --- a/db/migrate/20130917060257_change_harvest_notes_to_description.rb +++ b/db/migrate/20130917060257_change_harvest_notes_to_description.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ChangeHarvestNotesToDescription < ActiveRecord::Migration[4.2] def change rename_column :harvests, :notes, :description diff --git a/db/migrate/20130917071545_change_harvest_units_to_unit.rb b/db/migrate/20130917071545_change_harvest_units_to_unit.rb index 7f859f47d..21f96af13 100644 --- a/db/migrate/20130917071545_change_harvest_units_to_unit.rb +++ b/db/migrate/20130917071545_change_harvest_units_to_unit.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ChangeHarvestUnitsToUnit < ActiveRecord::Migration[4.2] def change rename_column :harvests, :units, :unit diff --git a/db/migrate/20130917075803_add_slug_to_harvests.rb b/db/migrate/20130917075803_add_slug_to_harvests.rb index b9bc376e0..2cad48d77 100644 --- a/db/migrate/20130917075803_add_slug_to_harvests.rb +++ b/db/migrate/20130917075803_add_slug_to_harvests.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddSlugToHarvests < ActiveRecord::Migration[4.2] def change add_column :harvests, :slug, :string diff --git a/db/migrate/20130925050304_add_weight_to_harvests.rb b/db/migrate/20130925050304_add_weight_to_harvests.rb index 1aa43df6b..a567938fc 100644 --- a/db/migrate/20130925050304_add_weight_to_harvests.rb +++ b/db/migrate/20130925050304_add_weight_to_harvests.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddWeightToHarvests < ActiveRecord::Migration[4.2] def change add_column :harvests, :weight_quantity, :decimal diff --git a/db/migrate/20131018101204_rename_system_name_to_name.rb b/db/migrate/20131018101204_rename_system_name_to_name.rb index 6124d1746..d3d3696a5 100644 --- a/db/migrate/20131018101204_rename_system_name_to_name.rb +++ b/db/migrate/20131018101204_rename_system_name_to_name.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class RenameSystemNameToName < ActiveRecord::Migration[4.2] def up # Rails is smart enough to alter the column being indexed, but not the name diff --git a/db/migrate/20131025104228_add_fields_to_gardens.rb b/db/migrate/20131025104228_add_fields_to_gardens.rb index e77a9c6c9..385493b1b 100644 --- a/db/migrate/20131025104228_add_fields_to_gardens.rb +++ b/db/migrate/20131025104228_add_fields_to_gardens.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddFieldsToGardens < ActiveRecord::Migration[4.2] def change add_column :gardens, :active, :boolean, default: true diff --git a/db/migrate/20131029053113_add_plant_part_to_harvests.rb b/db/migrate/20131029053113_add_plant_part_to_harvests.rb index fad21613f..a3e32b44b 100644 --- a/db/migrate/20131029053113_add_plant_part_to_harvests.rb +++ b/db/migrate/20131029053113_add_plant_part_to_harvests.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddPlantPartToHarvests < ActiveRecord::Migration[4.2] def change add_column :harvests, :plant_part, :string diff --git a/db/migrate/20131030230908_create_plant_parts.rb b/db/migrate/20131030230908_create_plant_parts.rb index f3454f978..6c0ac4675 100644 --- a/db/migrate/20131030230908_create_plant_parts.rb +++ b/db/migrate/20131030230908_create_plant_parts.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreatePlantParts < ActiveRecord::Migration[4.2] def change create_table :plant_parts do |t| diff --git a/db/migrate/20131030231202_change_plant_part_to_plant_part_id.rb b/db/migrate/20131030231202_change_plant_part_to_plant_part_id.rb index 134eeca97..ae9ce7838 100644 --- a/db/migrate/20131030231202_change_plant_part_to_plant_part_id.rb +++ b/db/migrate/20131030231202_change_plant_part_to_plant_part_id.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ChangePlantPartToPlantPartId < ActiveRecord::Migration[4.2] def up remove_column :harvests, :plant_part diff --git a/db/migrate/20131031000655_add_slug_to_plant_part.rb b/db/migrate/20131031000655_add_slug_to_plant_part.rb index 242c30776..1078fd4c3 100644 --- a/db/migrate/20131031000655_add_slug_to_plant_part.rb +++ b/db/migrate/20131031000655_add_slug_to_plant_part.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddSlugToPlantPart < ActiveRecord::Migration[4.2] def change add_column :plant_parts, :slug, :string diff --git a/db/migrate/20140718075753_default_plantings_count_to_zero.rb b/db/migrate/20140718075753_default_plantings_count_to_zero.rb index 15ee6df8d..472e17405 100644 --- a/db/migrate/20140718075753_default_plantings_count_to_zero.rb +++ b/db/migrate/20140718075753_default_plantings_count_to_zero.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class DefaultPlantingsCountToZero < ActiveRecord::Migration[4.2] def up change_column :crops, :plantings_count, :integer, default: 0 diff --git a/db/migrate/20140829230600_add_finished_to_planting.rb b/db/migrate/20140829230600_add_finished_to_planting.rb index 868298f6d..461f49c2b 100644 --- a/db/migrate/20140829230600_add_finished_to_planting.rb +++ b/db/migrate/20140829230600_add_finished_to_planting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddFinishedToPlanting < ActiveRecord::Migration[4.2] def change add_column :plantings, :finished, :boolean, default: false diff --git a/db/migrate/20140905001730_add_harvests_photos_table.rb b/db/migrate/20140905001730_add_harvests_photos_table.rb index f05ae0135..d83c91f8d 100644 --- a/db/migrate/20140905001730_add_harvests_photos_table.rb +++ b/db/migrate/20140905001730_add_harvests_photos_table.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddHarvestsPhotosTable < ActiveRecord::Migration[4.2] def change create_table :harvests_photos, id: false do |t| diff --git a/db/migrate/20140928044231_add_crops_posts_table.rb b/db/migrate/20140928044231_add_crops_posts_table.rb index a9e8761f9..529530fef 100644 --- a/db/migrate/20140928044231_add_crops_posts_table.rb +++ b/db/migrate/20140928044231_add_crops_posts_table.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddCropsPostsTable < ActiveRecord::Migration[4.2] def change create_table :crops_posts, id: false do |t| diff --git a/db/migrate/20140928085713_add_send_planting_reminder_to_member.rb b/db/migrate/20140928085713_add_send_planting_reminder_to_member.rb index cd464eeed..d2f5316d8 100644 --- a/db/migrate/20140928085713_add_send_planting_reminder_to_member.rb +++ b/db/migrate/20140928085713_add_send_planting_reminder_to_member.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddSendPlantingReminderToMember < ActiveRecord::Migration[4.2] def change add_column :members, :send_planting_reminder, :boolean, default: true diff --git a/db/migrate/20141002022459_create_index_harvest_photos.rb b/db/migrate/20141002022459_create_index_harvest_photos.rb index f9c8ee911..26e9f8e70 100644 --- a/db/migrate/20141002022459_create_index_harvest_photos.rb +++ b/db/migrate/20141002022459_create_index_harvest_photos.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateIndexHarvestPhotos < ActiveRecord::Migration[4.2] def change add_index(:harvests_photos, %i(harvest_id photo_id)) diff --git a/db/migrate/20141018111015_create_alternate_names.rb b/db/migrate/20141018111015_create_alternate_names.rb index 65400cc22..bd1cd496a 100644 --- a/db/migrate/20141018111015_create_alternate_names.rb +++ b/db/migrate/20141018111015_create_alternate_names.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateAlternateNames < ActiveRecord::Migration[4.2] def change create_table :alternate_names do |t| diff --git a/db/migrate/20141111130849_create_follows.rb b/db/migrate/20141111130849_create_follows.rb index 5ca3f9b12..02f585a6b 100644 --- a/db/migrate/20141111130849_create_follows.rb +++ b/db/migrate/20141111130849_create_follows.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateFollows < ActiveRecord::Migration[4.2] def change create_table :follows do |t| diff --git a/db/migrate/20141119130555_change_follows_member_id_to_follower_id.rb b/db/migrate/20141119130555_change_follows_member_id_to_follower_id.rb index a777fc79f..4d980c526 100644 --- a/db/migrate/20141119130555_change_follows_member_id_to_follower_id.rb +++ b/db/migrate/20141119130555_change_follows_member_id_to_follower_id.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ChangeFollowsMemberIdToFollowerId < ActiveRecord::Migration[4.2] def change rename_column :follows, :member_id, :follower_id diff --git a/db/migrate/20150124110540_add_properties_to_seeds.rb b/db/migrate/20150124110540_add_properties_to_seeds.rb index 0adb96600..48e4f2c33 100644 --- a/db/migrate/20150124110540_add_properties_to_seeds.rb +++ b/db/migrate/20150124110540_add_properties_to_seeds.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddPropertiesToSeeds < ActiveRecord::Migration[4.2] def change add_column :seeds, :days_until_maturity_min, :integer diff --git a/db/migrate/20150127043022_add_gardens_photos_table.rb b/db/migrate/20150127043022_add_gardens_photos_table.rb index 459174245..a2a7a990d 100644 --- a/db/migrate/20150127043022_add_gardens_photos_table.rb +++ b/db/migrate/20150127043022_add_gardens_photos_table.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddGardensPhotosTable < ActiveRecord::Migration[4.2] def change create_table :gardens_photos, id: false do |t| diff --git a/db/migrate/20150129034206_add_si_weight_to_harvest.rb b/db/migrate/20150129034206_add_si_weight_to_harvest.rb index 881d4ad01..6429ad570 100644 --- a/db/migrate/20150129034206_add_si_weight_to_harvest.rb +++ b/db/migrate/20150129034206_add_si_weight_to_harvest.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddSiWeightToHarvest < ActiveRecord::Migration[4.2] def change add_column :harvests, :si_weight, :float diff --git a/db/migrate/20150130224814_add_requester_to_crops.rb b/db/migrate/20150130224814_add_requester_to_crops.rb index 0d9f70943..9d223a5ec 100644 --- a/db/migrate/20150130224814_add_requester_to_crops.rb +++ b/db/migrate/20150130224814_add_requester_to_crops.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddRequesterToCrops < ActiveRecord::Migration[4.2] def change add_column :crops, :requester_id, :integer diff --git a/db/migrate/20150201052245_create_cms.rb b/db/migrate/20150201052245_create_cms.rb index 4dc1a5d2d..9a1937516 100644 --- a/db/migrate/20150201052245_create_cms.rb +++ b/db/migrate/20150201052245_create_cms.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateCms < ActiveRecord::Migration[4.2] def self.up # rubocop:disable Metrics/MethodLength, Metrics/AbcSize text_limit = case ActiveRecord::Base.connection.adapter_name diff --git a/db/migrate/20150201053200_add_approval_status_to_crops.rb b/db/migrate/20150201053200_add_approval_status_to_crops.rb index ff6b12cbb..48101c5db 100644 --- a/db/migrate/20150201053200_add_approval_status_to_crops.rb +++ b/db/migrate/20150201053200_add_approval_status_to_crops.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddApprovalStatusToCrops < ActiveRecord::Migration[4.2] def change add_column :crops, :approval_status, :string, default: "approved" diff --git a/db/migrate/20150201062506_add_reason_for_rejection_to_crops.rb b/db/migrate/20150201062506_add_reason_for_rejection_to_crops.rb index 001cd795b..377036769 100644 --- a/db/migrate/20150201062506_add_reason_for_rejection_to_crops.rb +++ b/db/migrate/20150201062506_add_reason_for_rejection_to_crops.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddReasonForRejectionToCrops < ActiveRecord::Migration[4.2] def change add_column :crops, :reason_for_rejection, :text diff --git a/db/migrate/20150201064502_add_request_notes_to_crops.rb b/db/migrate/20150201064502_add_request_notes_to_crops.rb index 433c5ad35..b2c21a82b 100644 --- a/db/migrate/20150201064502_add_request_notes_to_crops.rb +++ b/db/migrate/20150201064502_add_request_notes_to_crops.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddRequestNotesToCrops < ActiveRecord::Migration[4.2] def change add_column :crops, :request_notes, :text diff --git a/db/migrate/20150203080226_create_likes.rb b/db/migrate/20150203080226_create_likes.rb index b5f7d427b..e49ce9b53 100644 --- a/db/migrate/20150203080226_create_likes.rb +++ b/db/migrate/20150203080226_create_likes.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateLikes < ActiveRecord::Migration[4.2] def change create_table :likes do |t| diff --git a/db/migrate/20150209105410_add_rejection_notes_to_crops.rb b/db/migrate/20150209105410_add_rejection_notes_to_crops.rb index 44fc9fb7b..3ee48d7cf 100644 --- a/db/migrate/20150209105410_add_rejection_notes_to_crops.rb +++ b/db/migrate/20150209105410_add_rejection_notes_to_crops.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddRejectionNotesToCrops < ActiveRecord::Migration[4.2] def change add_column :crops, :rejection_notes, :text diff --git a/db/migrate/20150625224805_add_days_before_maturity_to_plantings.rb b/db/migrate/20150625224805_add_days_before_maturity_to_plantings.rb index c60e6f6a3..396303537 100644 --- a/db/migrate/20150625224805_add_days_before_maturity_to_plantings.rb +++ b/db/migrate/20150625224805_add_days_before_maturity_to_plantings.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddDaysBeforeMaturityToPlantings < ActiveRecord::Migration[4.2] def change add_column :plantings, :days_before_maturity, :integer diff --git a/db/migrate/20150824145414_add_member_preferred_image.rb b/db/migrate/20150824145414_add_member_preferred_image.rb index c3c563374..9243318da 100644 --- a/db/migrate/20150824145414_add_member_preferred_image.rb +++ b/db/migrate/20150824145414_add_member_preferred_image.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddMemberPreferredImage < ActiveRecord::Migration[4.2] def change add_column :members, :preferred_avatar_uri, :string diff --git a/db/migrate/20161129021533_rename_scientific_name.rb b/db/migrate/20161129021533_rename_scientific_name.rb index 3aac2e5d4..f5a76c5a8 100644 --- a/db/migrate/20161129021533_rename_scientific_name.rb +++ b/db/migrate/20161129021533_rename_scientific_name.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class RenameScientificName < ActiveRecord::Migration[4.2] def self.up rename_column :scientific_names, :scientific_name, :name diff --git a/db/migrate/20161201154922_add_photos_seeds_table.rb b/db/migrate/20161201154922_add_photos_seeds_table.rb index bbe7478c5..8031d2caf 100644 --- a/db/migrate/20161201154922_add_photos_seeds_table.rb +++ b/db/migrate/20161201154922_add_photos_seeds_table.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddPhotosSeedsTable < ActiveRecord::Migration[4.2] def change create_table :photos_seeds, id: false do |t| diff --git a/db/migrate/20170104035248_add_planting_ref_to_harvests.rb b/db/migrate/20170104035248_add_planting_ref_to_harvests.rb index 515ffaa83..3c197dcd7 100644 --- a/db/migrate/20170104035248_add_planting_ref_to_harvests.rb +++ b/db/migrate/20170104035248_add_planting_ref_to_harvests.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddPlantingRefToHarvests < ActiveRecord::Migration[4.2] def change add_reference :harvests, :planting, index: true, foreign_key: true diff --git a/db/migrate/20170413221549_counter_caches.rb b/db/migrate/20170413221549_counter_caches.rb index 27f4f1f6b..76e3b72cd 100644 --- a/db/migrate/20170413221549_counter_caches.rb +++ b/db/migrate/20170413221549_counter_caches.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CounterCaches < ActiveRecord::Migration[4.2] def change add_column :members, :gardens_count, :integer diff --git a/db/migrate/20170520060252_add_deleted_to_members.rb b/db/migrate/20170520060252_add_deleted_to_members.rb index 3e7059aec..4e370ff3f 100644 --- a/db/migrate/20170520060252_add_deleted_to_members.rb +++ b/db/migrate/20170520060252_add_deleted_to_members.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddDeletedToMembers < ActiveRecord::Migration[4.2] def change add_column :members, :deleted_at, :datetime diff --git a/db/migrate/20171022032108_all_the_predictions.rb b/db/migrate/20171022032108_all_the_predictions.rb index aa0f1bfde..80f18df20 100644 --- a/db/migrate/20171022032108_all_the_predictions.rb +++ b/db/migrate/20171022032108_all_the_predictions.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AllThePredictions < ActiveRecord::Migration[4.2] def change add_column :crops, :perennial, :boolean, default: false diff --git a/db/migrate/20171028230429_create_median_function.rb b/db/migrate/20171028230429_create_median_function.rb index 5e57c01d1..1b1e44e57 100644 --- a/db/migrate/20171028230429_create_median_function.rb +++ b/db/migrate/20171028230429_create_median_function.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateMedianFunction < ActiveRecord::Migration[4.2] def up ActiveMedian.create_function diff --git a/db/migrate/20171105011017_set_prediction_data.rb b/db/migrate/20171105011017_set_prediction_data.rb index 8dfd91b4f..795e6c15b 100644 --- a/db/migrate/20171105011017_set_prediction_data.rb +++ b/db/migrate/20171105011017_set_prediction_data.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class SetPredictionData < ActiveRecord::Migration[4.2] def up say "Updating all plantings time to first harvest" diff --git a/db/migrate/20171129041341_create_photographings.rb b/db/migrate/20171129041341_create_photographings.rb index a80245b54..2ae1168df 100644 --- a/db/migrate/20171129041341_create_photographings.rb +++ b/db/migrate/20171129041341_create_photographings.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreatePhotographings < ActiveRecord::Migration[4.2] def change create_table :photographings do |t| diff --git a/db/migrate/20180118112809_add_datetaken_to_photos.rb b/db/migrate/20180118112809_add_datetaken_to_photos.rb index 03fae1075..590305591 100644 --- a/db/migrate/20180118112809_add_datetaken_to_photos.rb +++ b/db/migrate/20180118112809_add_datetaken_to_photos.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddDatetakenToPhotos < ActiveRecord::Migration[4.2] def change add_column :photos, :date_taken, :datetime diff --git a/db/migrate/20180205000612_remove_shop.rb b/db/migrate/20180205000612_remove_shop.rb index 6977f127b..17248e3db 100644 --- a/db/migrate/20180205000612_remove_shop.rb +++ b/db/migrate/20180205000612_remove_shop.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class RemoveShop < ActiveRecord::Migration[4.2] def up drop_table :order_items diff --git a/db/migrate/20180213005731_seed_usage.rb b/db/migrate/20180213005731_seed_usage.rb index 8f7112e47..ddb2c2378 100644 --- a/db/migrate/20180213005731_seed_usage.rb +++ b/db/migrate/20180213005731_seed_usage.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class SeedUsage < ActiveRecord::Migration[4.2] def change # # seed can be all sown, meaning there is none left diff --git a/db/migrate/20180401220637_add_member_count_caches.rb b/db/migrate/20180401220637_add_member_count_caches.rb index 912db008f..8f10b0c66 100644 --- a/db/migrate/20180401220637_add_member_count_caches.rb +++ b/db/migrate/20180401220637_add_member_count_caches.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddMemberCountCaches < ActiveRecord::Migration[4.2] def change add_column :members, :photos_count, :integer diff --git a/db/migrate/20190130090437_add_crop_to_photographings.rb b/db/migrate/20190130090437_add_crop_to_photographings.rb index 3b4ad8788..e74f57b66 100644 --- a/db/migrate/20190130090437_add_crop_to_photographings.rb +++ b/db/migrate/20190130090437_add_crop_to_photographings.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddCropToPhotographings < ActiveRecord::Migration[5.2] def change add_column(:photographings, :crop_id, :integer) diff --git a/db/migrate/20190317023129_finished_boolean.rb b/db/migrate/20190317023129_finished_boolean.rb index ac6524316..8ba8c73e3 100644 --- a/db/migrate/20190317023129_finished_boolean.rb +++ b/db/migrate/20190317023129_finished_boolean.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class FinishedBoolean < ActiveRecord::Migration[5.2] def change Planting.unscoped.where('finished_at < now()').update_all(finished: true) diff --git a/db/migrate/20190326063855_create_garden_types.rb b/db/migrate/20190326063855_create_garden_types.rb index 0d7ca230e..d844eb787 100644 --- a/db/migrate/20190326063855_create_garden_types.rb +++ b/db/migrate/20190326063855_create_garden_types.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateGardenTypes < ActiveRecord::Migration[5.2] def change create_table :garden_types do |t| diff --git a/db/migrate/20190326224347_add_harvests_count.rb b/db/migrate/20190326224347_add_harvests_count.rb index 9557ffdae..fc5b6bdc6 100644 --- a/db/migrate/20190326224347_add_harvests_count.rb +++ b/db/migrate/20190326224347_add_harvests_count.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddHarvestsCount < ActiveRecord::Migration[5.2] def change add_column :plantings, :harvests_count, :integer, default: 0 diff --git a/db/migrate/20190712003735_add_like_counter_caches.rb b/db/migrate/20190712003735_add_like_counter_caches.rb index 92c292494..c956d6f83 100644 --- a/db/migrate/20190712003735_add_like_counter_caches.rb +++ b/db/migrate/20190712003735_add_like_counter_caches.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddLikeCounterCaches < ActiveRecord::Migration[5.2] def change change_table :photos do |t| diff --git a/db/migrate/20190712234859_rename_photographings.rb b/db/migrate/20190712234859_rename_photographings.rb index 7f9a5127e..09ea403ed 100644 --- a/db/migrate/20190712234859_rename_photographings.rb +++ b/db/migrate/20190712234859_rename_photographings.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class RenamePhotographings < ActiveRecord::Migration[5.2] def change rename_table :photographings, :photo_associations diff --git a/db/migrate/20190720000555_create_mailboxer.mailboxer_engine.rb b/db/migrate/20190720000555_create_mailboxer.mailboxer_engine.rb index 943d04e89..04ab2fd9f 100644 --- a/db/migrate/20190720000555_create_mailboxer.mailboxer_engine.rb +++ b/db/migrate/20190720000555_create_mailboxer.mailboxer_engine.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # This migration comes from mailboxer_engine (originally 20110511145103) class CreateMailboxer < ActiveRecord::Migration[4.2] def self.up diff --git a/db/migrate/20190720000556_add_conversation_optout.mailboxer_engine.rb b/db/migrate/20190720000556_add_conversation_optout.mailboxer_engine.rb index 50eeeed02..fa062c837 100644 --- a/db/migrate/20190720000556_add_conversation_optout.mailboxer_engine.rb +++ b/db/migrate/20190720000556_add_conversation_optout.mailboxer_engine.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # This migration comes from mailboxer_engine (originally 20131206080416) class AddConversationOptout < ActiveRecord::Migration[4.2] def self.up diff --git a/db/migrate/20190720000557_add_missing_indices.mailboxer_engine.rb b/db/migrate/20190720000557_add_missing_indices.mailboxer_engine.rb index 87c154832..b6e793000 100644 --- a/db/migrate/20190720000557_add_missing_indices.mailboxer_engine.rb +++ b/db/migrate/20190720000557_add_missing_indices.mailboxer_engine.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # This migration comes from mailboxer_engine (originally 20131206080417) class AddMissingIndices < ActiveRecord::Migration[4.2] def change diff --git a/db/migrate/20190720000558_add_delivery_tracking_info_to_mailboxer_receipts.mailboxer_engine.rb b/db/migrate/20190720000558_add_delivery_tracking_info_to_mailboxer_receipts.mailboxer_engine.rb index 498d152d9..547e3e44c 100644 --- a/db/migrate/20190720000558_add_delivery_tracking_info_to_mailboxer_receipts.mailboxer_engine.rb +++ b/db/migrate/20190720000558_add_delivery_tracking_info_to_mailboxer_receipts.mailboxer_engine.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # This migration comes from mailboxer_engine (originally 20151103080417) class AddDeliveryTrackingInfoToMailboxerReceipts < ActiveRecord::Migration[4.2] def change diff --git a/db/migrate/20190720000625_notifications_to_mailboxer.rb b/db/migrate/20190720000625_notifications_to_mailboxer.rb index 1dabd8925..fb488cff0 100644 --- a/db/migrate/20190720000625_notifications_to_mailboxer.rb +++ b/db/migrate/20190720000625_notifications_to_mailboxer.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class NotificationsToMailboxer < ActiveRecord::Migration[5.2] def up Mailboxer.setup do |config| diff --git a/db/migrate/20190721042146_paranoia_to_discard.rb b/db/migrate/20190721042146_paranoia_to_discard.rb index 4b8803360..bdebe321a 100644 --- a/db/migrate/20190721042146_paranoia_to_discard.rb +++ b/db/migrate/20190721042146_paranoia_to_discard.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ParanoiaToDiscard < ActiveRecord::Migration[5.2] def change rename_column :members, :deleted_at, :discarded_at diff --git a/db/migrate/20190902004225_add_openfarm_data_to_crops.rb b/db/migrate/20190902004225_add_openfarm_data_to_crops.rb index f8cc4d43d..61b3e1ee0 100644 --- a/db/migrate/20190902004225_add_openfarm_data_to_crops.rb +++ b/db/migrate/20190902004225_add_openfarm_data_to_crops.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddOpenfarmDataToCrops < ActiveRecord::Migration[5.2] def change add_column :crops, :openfarm_data, :jsonb diff --git a/db/migrate/20190910022329_add_photo_source.rb b/db/migrate/20190910022329_add_photo_source.rb index 44e9a9d7d..302cf68c8 100644 --- a/db/migrate/20190910022329_add_photo_source.rb +++ b/db/migrate/20190910022329_add_photo_source.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddPhotoSource < ActiveRecord::Migration[5.2] def change add_column :photos, :source, :string diff --git a/db/migrate/20190915065209_create_crop_companions.rb b/db/migrate/20190915065209_create_crop_companions.rb index 1b9d1b974..b50fba284 100644 --- a/db/migrate/20190915065209_create_crop_companions.rb +++ b/db/migrate/20190915065209_create_crop_companions.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateCropCompanions < ActiveRecord::Migration[5.2] def change create_table :crop_companions do |t| diff --git a/db/migrate/20190918033319_unique_urls.rb b/db/migrate/20190918033319_unique_urls.rb index 99b9caf42..ed1da03d2 100644 --- a/db/migrate/20190918033319_unique_urls.rb +++ b/db/migrate/20190918033319_unique_urls.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class UniqueUrls < ActiveRecord::Migration[5.2] def change add_index :photos, :fullsize_url, unique: true diff --git a/db/migrate/20190921211652_crop_posts.rb b/db/migrate/20190921211652_crop_posts.rb index c7f2950c5..de8b5d39c 100644 --- a/db/migrate/20190921211652_crop_posts.rb +++ b/db/migrate/20190921211652_crop_posts.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CropPosts < ActiveRecord::Migration[5.2] def change rename_table :crops_posts, :crop_posts diff --git a/db/migrate/20191029024101_add_saved_at_to_seeds.rb b/db/migrate/20191029024101_add_saved_at_to_seeds.rb index 745bdf5e4..ccbf598e8 100644 --- a/db/migrate/20191029024101_add_saved_at_to_seeds.rb +++ b/db/migrate/20191029024101_add_saved_at_to_seeds.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddSavedAtToSeeds < ActiveRecord::Migration[5.2] def change add_column :seeds, :saved_at, :date diff --git a/db/migrate/20191119020643_upgrade_cms.rb b/db/migrate/20191119020643_upgrade_cms.rb index 8b2b34f5c..8256e9103 100644 --- a/db/migrate/20191119020643_upgrade_cms.rb +++ b/db/migrate/20191119020643_upgrade_cms.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class UpgradeCms < ActiveRecord::Migration[5.2] def change rename_table :comfy_cms_blocks, :comfy_cms_fragments diff --git a/db/migrate/20191119030244_cms_tags.rb b/db/migrate/20191119030244_cms_tags.rb index fa3ef0d4c..918f6a325 100644 --- a/db/migrate/20191119030244_cms_tags.rb +++ b/db/migrate/20191119030244_cms_tags.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CmsTags < ActiveRecord::Migration[5.2] def up Comfy::Cms::Layout.all.each do |layout| diff --git a/db/seeds.rb b/db/seeds.rb index ed57b6b7e..d3ac333b3 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # This file should contain all the record creation needed to seed the database with its default values. # The data can then be loaded with the rake db:seed (or created alongside the db with db:setup). diff --git a/lib/actions/oauth_signup_action.rb b/lib/actions/oauth_signup_action.rb index de274dc35..cd1f7d768 100644 --- a/lib/actions/oauth_signup_action.rb +++ b/lib/actions/oauth_signup_action.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Growstuff::OauthSignupAction # # Inspects the omniauth information diff --git a/lib/geocodable.rb b/lib/geocodable.rb index f1bb243f6..7d3b3c8e3 100644 --- a/lib/geocodable.rb +++ b/lib/geocodable.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Geocodable def self.included(base) base.extend(self) diff --git a/lib/haml/filters/escaped_markdown.rb b/lib/haml/filters/escaped_markdown.rb index 86345b5a2..d68f0661d 100644 --- a/lib/haml/filters/escaped_markdown.rb +++ b/lib/haml/filters/escaped_markdown.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'bluecloth' require 'haml/filters/growstuff_markdown' diff --git a/lib/haml/filters/growstuff_markdown.rb b/lib/haml/filters/growstuff_markdown.rb index 52dff7098..d5869e7fb 100644 --- a/lib/haml/filters/growstuff_markdown.rb +++ b/lib/haml/filters/growstuff_markdown.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'bluecloth' module Haml::Filters diff --git a/lib/tasks/growstuff.rake b/lib/tasks/growstuff.rake index 6c185c7bc..137243f03 100644 --- a/lib/tasks/growstuff.rake +++ b/lib/tasks/growstuff.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :growstuff do desc "Add an admin user, by name" # usage: rake growstuff:admin_user name=skud diff --git a/lib/tasks/hooks.rake b/lib/tasks/hooks.rake index 67cc41cba..051902ed5 100644 --- a/lib/tasks/hooks.rake +++ b/lib/tasks/hooks.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + desc "Install git hooks" task :hooks do FileUtils.symlink '../../script/pre-commit.sh', '.git/hooks/pre-commit', diff --git a/lib/tasks/i18n.rake b/lib/tasks/i18n.rake index 04fa8001b..8a0f9d8cf 100644 --- a/lib/tasks/i18n.rake +++ b/lib/tasks/i18n.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :i18n do desc "sort all i18n locale keys" task :normalize do diff --git a/lib/tasks/openfarm.rake b/lib/tasks/openfarm.rake index b6b6ce909..92ca9cc39 100644 --- a/lib/tasks/openfarm.rake +++ b/lib/tasks/openfarm.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :openfarm do desc "Retrieve crop info from open farm" # usage: rake growstuff:admin_user name=skud diff --git a/lib/tasks/search.rake b/lib/tasks/search.rake index 71f9da6bf..d93fd601f 100644 --- a/lib/tasks/search.rake +++ b/lib/tasks/search.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :search do desc 'reindex' task reindex: :environment do diff --git a/lib/tasks/testing.rake b/lib/tasks/testing.rake index 1120f6ca9..d6a5fd5c7 100644 --- a/lib/tasks/testing.rake +++ b/lib/tasks/testing.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rake' begin require 'rspec/core/rake_task' diff --git a/script/check_contributors_md.rb b/script/check_contributors_md.rb index 9aa3fa290..d0013e78c 100755 --- a/script/check_contributors_md.rb +++ b/script/check_contributors_md.rb @@ -1,4 +1,6 @@ #!/usr/bin/env ruby +# frozen_string_literal: true + require "English" puts "Checking to see if you're in CONTRIBUTORS.md..." diff --git a/script/check_static.rb b/script/check_static.rb index e747599f8..f82932a9e 100755 --- a/script/check_static.rb +++ b/script/check_static.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby +# frozen_string_literal: true checks = [ # 'overcommit -r', diff --git a/script/heroku_maintenance.rb b/script/heroku_maintenance.rb index d2a20d67a..1c285a288 100755 --- a/script/heroku_maintenance.rb +++ b/script/heroku_maintenance.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby +# frozen_string_literal: true require 'platform-api' require 'yaml' diff --git a/spec/controllers/admin/roles_controller_spec.rb b/spec/controllers/admin/roles_controller_spec.rb index 86694a74b..cb2a193e8 100644 --- a/spec/controllers/admin/roles_controller_spec.rb +++ b/spec/controllers/admin/roles_controller_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe Admin::RolesController do diff --git a/spec/controllers/admin_controller_spec.rb b/spec/controllers/admin_controller_spec.rb index 7f0e56206..b1b222890 100644 --- a/spec/controllers/admin_controller_spec.rb +++ b/spec/controllers/admin_controller_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe AdminController do diff --git a/spec/controllers/authentications_controller_spec.rb b/spec/controllers/authentications_controller_spec.rb index 372d44c42..d4bc8ad50 100644 --- a/spec/controllers/authentications_controller_spec.rb +++ b/spec/controllers/authentications_controller_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe AuthenticationsController do diff --git a/spec/controllers/charts/crops_controller_spec.rb b/spec/controllers/charts/crops_controller_spec.rb index 3a6a40bb4..dd08302bd 100644 --- a/spec/controllers/charts/crops_controller_spec.rb +++ b/spec/controllers/charts/crops_controller_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe Charts::CropsController do diff --git a/spec/controllers/charts/gardens_controller_spec.rb b/spec/controllers/charts/gardens_controller_spec.rb index d264388f6..007e7f58c 100644 --- a/spec/controllers/charts/gardens_controller_spec.rb +++ b/spec/controllers/charts/gardens_controller_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe Charts::GardensController do diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb index 741b19ff3..4e8b64ce4 100644 --- a/spec/controllers/comments_controller_spec.rb +++ b/spec/controllers/comments_controller_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe CommentsController do diff --git a/spec/controllers/crops_controller_spec.rb b/spec/controllers/crops_controller_spec.rb index 1bb737c99..8681b4790 100644 --- a/spec/controllers/crops_controller_spec.rb +++ b/spec/controllers/crops_controller_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe CropsController do diff --git a/spec/controllers/forums_controller_spec.rb b/spec/controllers/forums_controller_spec.rb index 5c59473cb..065ff32d7 100644 --- a/spec/controllers/forums_controller_spec.rb +++ b/spec/controllers/forums_controller_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe ForumsController do diff --git a/spec/controllers/garden_types_controller_spec.rb b/spec/controllers/garden_types_controller_spec.rb index 53bc9cae8..e3c466750 100644 --- a/spec/controllers/garden_types_controller_spec.rb +++ b/spec/controllers/garden_types_controller_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' RSpec.describe GardenTypesController, type: :controller do diff --git a/spec/controllers/gardens_controller_spec.rb b/spec/controllers/gardens_controller_spec.rb index 3222829fe..c4b4de332 100644 --- a/spec/controllers/gardens_controller_spec.rb +++ b/spec/controllers/gardens_controller_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' RSpec.describe GardensController, type: :controller do diff --git a/spec/controllers/harvests_controller_spec.rb b/spec/controllers/harvests_controller_spec.rb index b77eb9b57..f4d8871f7 100644 --- a/spec/controllers/harvests_controller_spec.rb +++ b/spec/controllers/harvests_controller_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe HarvestsController do diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb index cb12b2bb4..608addc31 100644 --- a/spec/controllers/home_controller_spec.rb +++ b/spec/controllers/home_controller_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe HomeController do diff --git a/spec/controllers/likes_controller_spec.rb b/spec/controllers/likes_controller_spec.rb index 6730b0a8f..985678278 100644 --- a/spec/controllers/likes_controller_spec.rb +++ b/spec/controllers/likes_controller_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe LikesController do diff --git a/spec/controllers/member_controller_spec.rb b/spec/controllers/member_controller_spec.rb index 5ec80e344..6e6997e93 100644 --- a/spec/controllers/member_controller_spec.rb +++ b/spec/controllers/member_controller_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe MembersController do diff --git a/spec/controllers/photo_associations_controller_spec.rb b/spec/controllers/photo_associations_controller_spec.rb index 21ed0aa29..65d89e9f2 100644 --- a/spec/controllers/photo_associations_controller_spec.rb +++ b/spec/controllers/photo_associations_controller_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe PhotoAssociationsController do diff --git a/spec/controllers/places_controller_spec.rb b/spec/controllers/places_controller_spec.rb index a32d27c28..640adfcb1 100644 --- a/spec/controllers/places_controller_spec.rb +++ b/spec/controllers/places_controller_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe PlacesController do diff --git a/spec/controllers/plant_parts_controller_spec.rb b/spec/controllers/plant_parts_controller_spec.rb index c6e11f315..94e1e4c83 100644 --- a/spec/controllers/plant_parts_controller_spec.rb +++ b/spec/controllers/plant_parts_controller_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe PlantPartsController do diff --git a/spec/controllers/plantings_controller_spec.rb b/spec/controllers/plantings_controller_spec.rb index c055d7768..fb9f51b53 100644 --- a/spec/controllers/plantings_controller_spec.rb +++ b/spec/controllers/plantings_controller_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe PlantingsController do diff --git a/spec/controllers/posts_controller_spec.rb b/spec/controllers/posts_controller_spec.rb index 0842e4a5b..1bae41f14 100644 --- a/spec/controllers/posts_controller_spec.rb +++ b/spec/controllers/posts_controller_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe PostsController do diff --git a/spec/controllers/registrations_controller_spec.rb b/spec/controllers/registrations_controller_spec.rb index 82b52652d..71b628101 100644 --- a/spec/controllers/registrations_controller_spec.rb +++ b/spec/controllers/registrations_controller_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe RegistrationsController do diff --git a/spec/controllers/robots_controller_spec.rb b/spec/controllers/robots_controller_spec.rb index b45a8b235..5c94c1ff1 100644 --- a/spec/controllers/robots_controller_spec.rb +++ b/spec/controllers/robots_controller_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe RobotsController do diff --git a/spec/controllers/scientific_names_controller_spec.rb b/spec/controllers/scientific_names_controller_spec.rb index a56735454..d7b1612ae 100644 --- a/spec/controllers/scientific_names_controller_spec.rb +++ b/spec/controllers/scientific_names_controller_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe ScientificNamesController do diff --git a/spec/controllers/seeds_controller_spec.rb b/spec/controllers/seeds_controller_spec.rb index 1c6e89bb3..c8fdf27c8 100644 --- a/spec/controllers/seeds_controller_spec.rb +++ b/spec/controllers/seeds_controller_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe SeedsController do diff --git a/spec/custom_matchers.rb b/spec/custom_matchers.rb index 1cb9d61ab..972c939e6 100644 --- a/spec/custom_matchers.rb +++ b/spec/custom_matchers.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rspec/expectations' RSpec::Matchers.define :have_optional do |expected| diff --git a/spec/factories/alternate_names.rb b/spec/factories/alternate_names.rb index 44cee8a21..df991c2ba 100644 --- a/spec/factories/alternate_names.rb +++ b/spec/factories/alternate_names.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Read about factories at https://github.com/thoughtbot/factory_bot FactoryBot.define do diff --git a/spec/factories/authentications.rb b/spec/factories/authentications.rb index 97a34f6c4..d93c37bb2 100644 --- a/spec/factories/authentications.rb +++ b/spec/factories/authentications.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Read about factories at https://github.com/thoughtbot/factory_bot FactoryBot.define do diff --git a/spec/factories/comments.rb b/spec/factories/comments.rb index 5b726bd41..e030d34d6 100644 --- a/spec/factories/comments.rb +++ b/spec/factories/comments.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + FactoryBot.define do factory :comment do post diff --git a/spec/factories/crop.rb b/spec/factories/crop.rb index b1c23a95b..b2783fef0 100644 --- a/spec/factories/crop.rb +++ b/spec/factories/crop.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + FactoryBot.define do factory :crop do name { "magic bean" } diff --git a/spec/factories/crop_companions.rb b/spec/factories/crop_companions.rb index 6db4f0eb0..ea58b9e0c 100644 --- a/spec/factories/crop_companions.rb +++ b/spec/factories/crop_companions.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + FactoryBot.define do factory :crop_companion do end diff --git a/spec/factories/follows.rb b/spec/factories/follows.rb index a6c609e48..4f608067e 100644 --- a/spec/factories/follows.rb +++ b/spec/factories/follows.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + FactoryBot.define do factory :follow do follower diff --git a/spec/factories/forums.rb b/spec/factories/forums.rb index ba1e6cf82..795915796 100644 --- a/spec/factories/forums.rb +++ b/spec/factories/forums.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Read about factories at https://github.com/thoughtbot/factory_bot FactoryBot.define do diff --git a/spec/factories/garden.rb b/spec/factories/garden.rb index d11dcd0d7..b7a5edde0 100644 --- a/spec/factories/garden.rb +++ b/spec/factories/garden.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + FactoryBot.define do factory :garden do name { Faker::Vehicle.vin } diff --git a/spec/factories/garden_types.rb b/spec/factories/garden_types.rb index 942fd7932..02d5ec75f 100644 --- a/spec/factories/garden_types.rb +++ b/spec/factories/garden_types.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + FactoryBot.define do factory :garden_type do name { "homemade swamp" } diff --git a/spec/factories/harvests.rb b/spec/factories/harvests.rb index 426c3d24c..d4bd0f18d 100644 --- a/spec/factories/harvests.rb +++ b/spec/factories/harvests.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Read about factories at https://github.com/thoughtbot/factory_bot FactoryBot.define do diff --git a/spec/factories/like.rb b/spec/factories/like.rb index bf19554bb..ffb41c8d3 100644 --- a/spec/factories/like.rb +++ b/spec/factories/like.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + FactoryBot.define do factory :like do member diff --git a/spec/factories/member.rb b/spec/factories/member.rb index 87b5326f3..3a02e2c3c 100644 --- a/spec/factories/member.rb +++ b/spec/factories/member.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + FactoryBot.define do factory :member, aliases: %i(author owner sender recipient creator) do login_name { (0...8).map { rand(65..90).chr }.join } diff --git a/spec/factories/notifications.rb b/spec/factories/notifications.rb index 4d2cee82f..a143c777f 100644 --- a/spec/factories/notifications.rb +++ b/spec/factories/notifications.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Read about factories at https://github.com/thoughtbot/factory_bot FactoryBot.define do diff --git a/spec/factories/photos.rb b/spec/factories/photos.rb index 41e581d29..405edfd7c 100644 --- a/spec/factories/photos.rb +++ b/spec/factories/photos.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Read about factories at https://github.com/thoughtbot/factory_bot FactoryBot.define do diff --git a/spec/factories/plant_parts.rb b/spec/factories/plant_parts.rb index 42a30afd6..7fecd326a 100644 --- a/spec/factories/plant_parts.rb +++ b/spec/factories/plant_parts.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Read about factories at https://github.com/thoughtbot/factory_bot FactoryBot.define do diff --git a/spec/factories/planting.rb b/spec/factories/planting.rb index 8fb709d1c..cfdcd2b1c 100644 --- a/spec/factories/planting.rb +++ b/spec/factories/planting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + FactoryBot.define do factory :planting do owner diff --git a/spec/factories/post.rb b/spec/factories/post.rb index f3471042f..c035fdbe6 100644 --- a/spec/factories/post.rb +++ b/spec/factories/post.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + FactoryBot.define do factory :post do subject { Faker::Book.title } diff --git a/spec/factories/roles.rb b/spec/factories/roles.rb index 3e33d9720..c7c57f7ea 100644 --- a/spec/factories/roles.rb +++ b/spec/factories/roles.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Read about factories at https://github.com/thoughtbot/factory_bot FactoryBot.define do diff --git a/spec/factories/scientific_name.rb b/spec/factories/scientific_name.rb index 7e0e04462..ec43799ce 100644 --- a/spec/factories/scientific_name.rb +++ b/spec/factories/scientific_name.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + FactoryBot.define do factory :scientific_name do association :crop, factory: :crop diff --git a/spec/factories/seeds.rb b/spec/factories/seeds.rb index 2f5238591..deafb5302 100644 --- a/spec/factories/seeds.rb +++ b/spec/factories/seeds.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Read about factories at https://github.com/thoughtbot/factory_bot FactoryBot.define do diff --git a/spec/features/admin/admin_spec.rb b/spec/features/admin/admin_spec.rb index cbd83bf53..f5b384d59 100644 --- a/spec/features/admin/admin_spec.rb +++ b/spec/features/admin/admin_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "forums", js: true do diff --git a/spec/features/admin/forums_spec.rb b/spec/features/admin/forums_spec.rb index 7a41266c0..ab44e2ae6 100644 --- a/spec/features/admin/forums_spec.rb +++ b/spec/features/admin/forums_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "forums", js: true do diff --git a/spec/features/cms_spec.rb b/spec/features/cms_spec.rb index d13fc1b42..253750cf8 100644 --- a/spec/features/cms_spec.rb +++ b/spec/features/cms_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "cms admin" do diff --git a/spec/features/comments/commenting_a_comment_spec.rb b/spec/features/comments/commenting_a_comment_spec.rb index 6debc9d14..ded092723 100644 --- a/spec/features/comments/commenting_a_comment_spec.rb +++ b/spec/features/comments/commenting_a_comment_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'Commenting on a post' do diff --git a/spec/features/conversations/index_spec.rb b/spec/features/conversations/index_spec.rb index 969fc447c..9df3b584e 100644 --- a/spec/features/conversations/index_spec.rb +++ b/spec/features/conversations/index_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "Conversations", :js do diff --git a/spec/features/conversations/show_spec.rb b/spec/features/conversations/show_spec.rb index ccf92fb8f..1bcfb8873 100644 --- a/spec/features/conversations/show_spec.rb +++ b/spec/features/conversations/show_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "Conversations", :js do diff --git a/spec/features/crops/alternate_name_spec.rb b/spec/features/crops/alternate_name_spec.rb index adfc3b4e3..bb4843e05 100644 --- a/spec/features/crops/alternate_name_spec.rb +++ b/spec/features/crops/alternate_name_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "Alternate names", js: true do diff --git a/spec/features/crops/browse_crops_spec.rb b/spec/features/crops/browse_crops_spec.rb index d60727bbc..ae5747b40 100644 --- a/spec/features/crops/browse_crops_spec.rb +++ b/spec/features/crops/browse_crops_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "browse crops" do diff --git a/spec/features/crops/creating_a_crop_spec.rb b/spec/features/crops/creating_a_crop_spec.rb index 6240db8d5..c47829754 100644 --- a/spec/features/crops/creating_a_crop_spec.rb +++ b/spec/features/crops/creating_a_crop_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "Crop", js: true do diff --git a/spec/features/crops/crop_detail_page_spec.rb b/spec/features/crops/crop_detail_page_spec.rb index cec0579ac..ec1ff63cd 100644 --- a/spec/features/crops/crop_detail_page_spec.rb +++ b/spec/features/crops/crop_detail_page_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "crop detail page", js: true do diff --git a/spec/features/crops/crop_photos_spec.rb b/spec/features/crops/crop_photos_spec.rb index 13ecc14ac..1fc44772a 100644 --- a/spec/features/crops/crop_photos_spec.rb +++ b/spec/features/crops/crop_photos_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "crop detail page", js: true do diff --git a/spec/features/crops/crop_search_spec.rb b/spec/features/crops/crop_search_spec.rb index b87655a01..af39c1746 100644 --- a/spec/features/crops/crop_search_spec.rb +++ b/spec/features/crops/crop_search_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "crop search" do diff --git a/spec/features/crops/crop_wranglers_spec.rb b/spec/features/crops/crop_wranglers_spec.rb index 5dd8af71f..328e560cd 100644 --- a/spec/features/crops/crop_wranglers_spec.rb +++ b/spec/features/crops/crop_wranglers_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "crop wranglers", js: true do diff --git a/spec/features/crops/crop_wrangling_button_spec.rb b/spec/features/crops/crop_wrangling_button_spec.rb index 3545db9ff..a081aff74 100644 --- a/spec/features/crops/crop_wrangling_button_spec.rb +++ b/spec/features/crops/crop_wrangling_button_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "crop wrangling button" do diff --git a/spec/features/crops/delete_crop_spec.rb b/spec/features/crops/delete_crop_spec.rb index 41092c895..941496e1c 100644 --- a/spec/features/crops/delete_crop_spec.rb +++ b/spec/features/crops/delete_crop_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "Delete crop spec" do diff --git a/spec/features/crops/inflections_spec.rb b/spec/features/crops/inflections_spec.rb index c7ca5ce37..9df145940 100644 --- a/spec/features/crops/inflections_spec.rb +++ b/spec/features/crops/inflections_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "irregular crop inflections" do diff --git a/spec/features/crops/request_new_crop_spec.rb b/spec/features/crops/request_new_crop_spec.rb index da38b1ec9..3964ad6b3 100644 --- a/spec/features/crops/request_new_crop_spec.rb +++ b/spec/features/crops/request_new_crop_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "Requesting a new crop" do diff --git a/spec/features/crops/requested_crops_spec.rb b/spec/features/crops/requested_crops_spec.rb index e73292c1e..0556fb2a6 100644 --- a/spec/features/crops/requested_crops_spec.rb +++ b/spec/features/crops/requested_crops_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "Requesting Crops" do diff --git a/spec/features/crops/scientific_name_spec.rb b/spec/features/crops/scientific_name_spec.rb index 63fad9ee1..a8a523cb5 100644 --- a/spec/features/crops/scientific_name_spec.rb +++ b/spec/features/crops/scientific_name_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "Scientific names", js: true do diff --git a/spec/features/crops/show_spec.rb b/spec/features/crops/show_spec.rb index 48d083257..a219f774d 100644 --- a/spec/features/crops/show_spec.rb +++ b/spec/features/crops/show_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "browse crops" do diff --git a/spec/features/footer_spec.rb b/spec/features/footer_spec.rb index 8d6225ecb..6e5713f62 100644 --- a/spec/features/footer_spec.rb +++ b/spec/features/footer_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "footer", js: true do diff --git a/spec/features/gardens/actions_spec.rb b/spec/features/gardens/actions_spec.rb index 74fc10803..6c1fc8b49 100644 --- a/spec/features/gardens/actions_spec.rb +++ b/spec/features/gardens/actions_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' require 'custom_matchers' diff --git a/spec/features/gardens/adding_gardens_spec.rb b/spec/features/gardens/adding_gardens_spec.rb index 7320a1244..d281e9657 100644 --- a/spec/features/gardens/adding_gardens_spec.rb +++ b/spec/features/gardens/adding_gardens_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' require 'custom_matchers' diff --git a/spec/features/gardens/gardens_spec.rb b/spec/features/gardens/gardens_spec.rb index 6b845bc50..714657952 100644 --- a/spec/features/gardens/gardens_spec.rb +++ b/spec/features/gardens/gardens_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "Planting a crop", js: true do diff --git a/spec/features/gardens/index_spec.rb b/spec/features/gardens/index_spec.rb index b5eb5d3dc..00cfad3af 100644 --- a/spec/features/gardens/index_spec.rb +++ b/spec/features/gardens/index_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' require 'custom_matchers' diff --git a/spec/features/harvests/browse_harvests_spec.rb b/spec/features/harvests/browse_harvests_spec.rb index 6ead7e231..2ce14f4a1 100644 --- a/spec/features/harvests/browse_harvests_spec.rb +++ b/spec/features/harvests/browse_harvests_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "browse harvests" do diff --git a/spec/features/harvests/harvesting_a_crop_spec.rb b/spec/features/harvests/harvesting_a_crop_spec.rb index a551d4dfb..79076a6db 100644 --- a/spec/features/harvests/harvesting_a_crop_spec.rb +++ b/spec/features/harvests/harvesting_a_crop_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' require 'custom_matchers' diff --git a/spec/features/home/home_spec.rb b/spec/features/home/home_spec.rb index cbd14b4d6..aaf06b7ac 100644 --- a/spec/features/home/home_spec.rb +++ b/spec/features/home/home_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "home page" do diff --git a/spec/features/likeable_spec.rb b/spec/features/likeable_spec.rb index 95503efaf..0b44d3741 100644 --- a/spec/features/likeable_spec.rb +++ b/spec/features/likeable_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'Likeable', js: true do diff --git a/spec/features/locale_spec.rb b/spec/features/locale_spec.rb index 2dce809ad..ac4ba0818 100644 --- a/spec/features/locale_spec.rb +++ b/spec/features/locale_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "Changing locales", js: true do diff --git a/spec/features/members/ban_spec.rb b/spec/features/members/ban_spec.rb index f6f99e698..3395637c2 100644 --- a/spec/features/members/ban_spec.rb +++ b/spec/features/members/ban_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "members list" do diff --git a/spec/features/members/deletion_spec.rb b/spec/features/members/deletion_spec.rb index ce3ff7769..a8ca9fb83 100644 --- a/spec/features/members/deletion_spec.rb +++ b/spec/features/members/deletion_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "member deletion" do diff --git a/spec/features/members/following_spec.rb b/spec/features/members/following_spec.rb index 42a20df34..a48bed81c 100644 --- a/spec/features/members/following_spec.rb +++ b/spec/features/members/following_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "follows", :js do diff --git a/spec/features/members/list_spec.rb b/spec/features/members/list_spec.rb index f00b1daaf..b26ead439 100644 --- a/spec/features/members/list_spec.rb +++ b/spec/features/members/list_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "members list" do diff --git a/spec/features/members/profile_spec.rb b/spec/features/members/profile_spec.rb index 4b51b5868..08438efda 100644 --- a/spec/features/members/profile_spec.rb +++ b/spec/features/members/profile_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "member profile", js: true do diff --git a/spec/features/percy/percy_spec.rb b/spec/features/percy/percy_spec.rb index 05efb57ff..530a6b540 100644 --- a/spec/features/percy/percy_spec.rb +++ b/spec/features/percy/percy_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'Test with visual testing', type: :feature, js: true do diff --git a/spec/features/photos/new_photo_spec.rb b/spec/features/photos/new_photo_spec.rb index d52a1ef43..b500a89d5 100644 --- a/spec/features/photos/new_photo_spec.rb +++ b/spec/features/photos/new_photo_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "new photo page" do diff --git a/spec/features/photos/show_photo_spec.rb b/spec/features/photos/show_photo_spec.rb index 68bf8ea88..a2a517c15 100644 --- a/spec/features/photos/show_photo_spec.rb +++ b/spec/features/photos/show_photo_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "show photo page" do diff --git a/spec/features/places/searching_a_place_spec.rb b/spec/features/places/searching_a_place_spec.rb index 5b6985322..d31eee6b3 100644 --- a/spec/features/places/searching_a_place_spec.rb +++ b/spec/features/places/searching_a_place_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "rails_helper" describe "User searches" do diff --git a/spec/features/planting_reminder_spec.rb b/spec/features/planting_reminder_spec.rb index 5caecbc51..8ac7703a0 100644 --- a/spec/features/planting_reminder_spec.rb +++ b/spec/features/planting_reminder_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' require 'capybara/email/rspec' diff --git a/spec/features/plantings/planting_a_crop_spec.rb b/spec/features/plantings/planting_a_crop_spec.rb index 2ca3439d9..7ae4c72ad 100644 --- a/spec/features/plantings/planting_a_crop_spec.rb +++ b/spec/features/plantings/planting_a_crop_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "rails_helper" require 'custom_matchers' diff --git a/spec/features/plantings/prediction_spec.rb b/spec/features/plantings/prediction_spec.rb index 1efa4ac54..c22734a7f 100644 --- a/spec/features/plantings/prediction_spec.rb +++ b/spec/features/plantings/prediction_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "rails_helper" require 'custom_matchers' describe "Display a planting", :js do diff --git a/spec/features/plantings/show_spec.rb b/spec/features/plantings/show_spec.rb index 7207b4795..3ffcb45b3 100644 --- a/spec/features/plantings/show_spec.rb +++ b/spec/features/plantings/show_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "rails_helper" require 'custom_matchers' diff --git a/spec/features/posts/posting_a_post_spec.rb b/spec/features/posts/posting_a_post_spec.rb index f1b61bc83..cd1a4b0a4 100644 --- a/spec/features/posts/posting_a_post_spec.rb +++ b/spec/features/posts/posting_a_post_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'Post a post' do diff --git a/spec/features/rss/comments_spec.rb b/spec/features/rss/comments_spec.rb index 1b0263d6d..5b6783300 100644 --- a/spec/features/rss/comments_spec.rb +++ b/spec/features/rss/comments_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'Comments RSS feed' do diff --git a/spec/features/rss/crops_spec.rb b/spec/features/rss/crops_spec.rb index 704dd60ba..6c1e1f3c7 100644 --- a/spec/features/rss/crops_spec.rb +++ b/spec/features/rss/crops_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'Crops RSS feed' do diff --git a/spec/features/rss/members_spec.rb b/spec/features/rss/members_spec.rb index 1daefcd51..ba63a1a23 100644 --- a/spec/features/rss/members_spec.rb +++ b/spec/features/rss/members_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'Members RSS feed' do diff --git a/spec/features/rss/plantings_spec.rb b/spec/features/rss/plantings_spec.rb index 7a6e31b95..3e92b6173 100644 --- a/spec/features/rss/plantings_spec.rb +++ b/spec/features/rss/plantings_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'Plantings RSS feed' do diff --git a/spec/features/rss/posts_spec.rb b/spec/features/rss/posts_spec.rb index 0b85590c4..b07ca28cb 100644 --- a/spec/features/rss/posts_spec.rb +++ b/spec/features/rss/posts_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'Posts RSS feed' do diff --git a/spec/features/rss/seeds_spec.rb b/spec/features/rss/seeds_spec.rb index 5a50e8811..c0a2e141d 100644 --- a/spec/features/rss/seeds_spec.rb +++ b/spec/features/rss/seeds_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'Seeds RSS feed' do diff --git a/spec/features/seeds/adding_seeds_spec.rb b/spec/features/seeds/adding_seeds_spec.rb index 9ab32788f..622dad584 100644 --- a/spec/features/seeds/adding_seeds_spec.rb +++ b/spec/features/seeds/adding_seeds_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' require 'custom_matchers' diff --git a/spec/features/seeds/misc_seeds_spec.rb b/spec/features/seeds/misc_seeds_spec.rb index 0aa54f128..8de59ab41 100644 --- a/spec/features/seeds/misc_seeds_spec.rb +++ b/spec/features/seeds/misc_seeds_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "seeds", js: true do diff --git a/spec/features/seeds/seed_photos.rb b/spec/features/seeds/seed_photos.rb index 6f4d9828c..37640f127 100644 --- a/spec/features/seeds/seed_photos.rb +++ b/spec/features/seeds/seed_photos.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' require 'custom_matchers' diff --git a/spec/features/shared_examples/append_date.rb b/spec/features/shared_examples/append_date.rb index 2680dac30..3b8b6ec64 100644 --- a/spec/features/shared_examples/append_date.rb +++ b/spec/features/shared_examples/append_date.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + shared_examples "append date" do let(:this_month) { Time.zone.today.strftime("%b") } let(:this_year) { Time.zone.today.year } diff --git a/spec/features/shared_examples/crop_suggest.rb b/spec/features/shared_examples/crop_suggest.rb index b7e49dbd8..33775c744 100644 --- a/spec/features/shared_examples/crop_suggest.rb +++ b/spec/features/shared_examples/crop_suggest.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' shared_examples "crop suggest" do |resource| diff --git a/spec/features/signin_spec.rb b/spec/features/signin_spec.rb index 5d20b461f..25cf7112c 100644 --- a/spec/features/signin_spec.rb +++ b/spec/features/signin_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "signin", js: true do diff --git a/spec/features/signout_spec.rb b/spec/features/signout_spec.rb index 4a2013e5c..ca9d6455f 100644 --- a/spec/features/signout_spec.rb +++ b/spec/features/signout_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "signout" do diff --git a/spec/features/signup_spec.rb b/spec/features/signup_spec.rb index 331dedaa7..c7a136193 100644 --- a/spec/features/signup_spec.rb +++ b/spec/features/signup_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "signup", js: true do diff --git a/spec/features/timeline/index_spec.rb b/spec/features/timeline/index_spec.rb index bf0022df3..134c4a06f 100644 --- a/spec/features/timeline/index_spec.rb +++ b/spec/features/timeline/index_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "timeline", js: true do diff --git a/spec/features/unsubscribing_spec.rb b/spec/features/unsubscribing_spec.rb index 039b536b6..9fff6084b 100644 --- a/spec/features/unsubscribing_spec.rb +++ b/spec/features/unsubscribing_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' require 'capybara/email/rspec' diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index ae7230a00..c285f9c5a 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe ApplicationHelper do diff --git a/spec/helpers/buttons_helper_spec.rb b/spec/helpers/buttons_helper_spec.rb index b9bdc41a2..b55a4668a 100644 --- a/spec/helpers/buttons_helper_spec.rb +++ b/spec/helpers/buttons_helper_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' # Specs in this file have access to a helper object that includes diff --git a/spec/helpers/crops_helper_spec.rb b/spec/helpers/crops_helper_spec.rb index 532019e41..07d8bc3fe 100644 --- a/spec/helpers/crops_helper_spec.rb +++ b/spec/helpers/crops_helper_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe CropsHelper do diff --git a/spec/helpers/event_helper_spec.rb b/spec/helpers/event_helper_spec.rb index f90a04c11..634953c50 100644 --- a/spec/helpers/event_helper_spec.rb +++ b/spec/helpers/event_helper_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' RSpec.describe EventHelper, type: :helper do diff --git a/spec/helpers/gardens_helper_spec.rb b/spec/helpers/gardens_helper_spec.rb index 57db618bd..3b8094ea6 100644 --- a/spec/helpers/gardens_helper_spec.rb +++ b/spec/helpers/gardens_helper_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe GardensHelper do diff --git a/spec/helpers/harvests_helper_spec.rb b/spec/helpers/harvests_helper_spec.rb index 4286c326a..25be2d248 100644 --- a/spec/helpers/harvests_helper_spec.rb +++ b/spec/helpers/harvests_helper_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe HarvestsHelper do diff --git a/spec/helpers/photos_helper_spec.rb b/spec/helpers/photos_helper_spec.rb index b24a254c7..bbd6a32b0 100644 --- a/spec/helpers/photos_helper_spec.rb +++ b/spec/helpers/photos_helper_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe PhotosHelper do diff --git a/spec/helpers/plantings_helper_spec.rb b/spec/helpers/plantings_helper_spec.rb index d28ed90d4..14192bb14 100644 --- a/spec/helpers/plantings_helper_spec.rb +++ b/spec/helpers/plantings_helper_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe PlantingsHelper do diff --git a/spec/helpers/seeds_helper_spec.rb b/spec/helpers/seeds_helper_spec.rb index 7fa751321..593527fa2 100644 --- a/spec/helpers/seeds_helper_spec.rb +++ b/spec/helpers/seeds_helper_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe SeedsHelper do diff --git a/spec/lib/actions/oauth_signup_action_spec.rb b/spec/lib/actions/oauth_signup_action_spec.rb index dd8310d04..621b29af1 100644 --- a/spec/lib/actions/oauth_signup_action_spec.rb +++ b/spec/lib/actions/oauth_signup_action_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' require './lib/actions/oauth_signup_action' diff --git a/spec/lib/haml/filters/escaped_markdown_spec.rb b/spec/lib/haml/filters/escaped_markdown_spec.rb index 415751293..fd9b4e0b4 100644 --- a/spec/lib/haml/filters/escaped_markdown_spec.rb +++ b/spec/lib/haml/filters/escaped_markdown_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' require 'haml/filters' require 'haml/filters/escaped_markdown' diff --git a/spec/lib/haml/filters/growstuff_markdown_spec.rb b/spec/lib/haml/filters/growstuff_markdown_spec.rb index cc27bd560..5a847759a 100644 --- a/spec/lib/haml/filters/growstuff_markdown_spec.rb +++ b/spec/lib/haml/filters/growstuff_markdown_spec.rb @@ -1,3 +1,4 @@ +# rubocop:disable Style/FrozenStringLiteralComment require 'rails_helper' require 'haml/filters' require 'haml/filters/growstuff_markdown' diff --git a/spec/models/ability_spec.rb b/spec/models/ability_spec.rb index 389ae9937..c2c206a64 100644 --- a/spec/models/ability_spec.rb +++ b/spec/models/ability_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' require 'cancan/matchers' diff --git a/spec/models/alternate_name_spec.rb b/spec/models/alternate_name_spec.rb index 5881121c8..515fdaa7a 100644 --- a/spec/models/alternate_name_spec.rb +++ b/spec/models/alternate_name_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe AlternateName do diff --git a/spec/models/authentication_spec.rb b/spec/models/authentication_spec.rb index 7e02a57f0..2c91dfac2 100644 --- a/spec/models/authentication_spec.rb +++ b/spec/models/authentication_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe Authentication do diff --git a/spec/models/comment_spec.rb b/spec/models/comment_spec.rb index 75166df9f..f684697fc 100644 --- a/spec/models/comment_spec.rb +++ b/spec/models/comment_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe Comment do diff --git a/spec/models/crop_companion_spec.rb b/spec/models/crop_companion_spec.rb index 7b6223db5..e1cedbfd0 100644 --- a/spec/models/crop_companion_spec.rb +++ b/spec/models/crop_companion_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' RSpec.describe CropCompanion, type: :model do diff --git a/spec/models/crop_spec.rb b/spec/models/crop_spec.rb index 98ba51366..bb3c07b0d 100644 --- a/spec/models/crop_spec.rb +++ b/spec/models/crop_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe Crop do diff --git a/spec/models/follow_spec.rb b/spec/models/follow_spec.rb index 63e397d95..4a11208b1 100644 --- a/spec/models/follow_spec.rb +++ b/spec/models/follow_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe Follow do diff --git a/spec/models/forum_spec.rb b/spec/models/forum_spec.rb index 310c36842..cc5b34a08 100644 --- a/spec/models/forum_spec.rb +++ b/spec/models/forum_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe Forum do diff --git a/spec/models/garden_spec.rb b/spec/models/garden_spec.rb index c62fd0f1d..f154eca96 100644 --- a/spec/models/garden_spec.rb +++ b/spec/models/garden_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe Garden do diff --git a/spec/models/garden_type.rb b/spec/models/garden_type.rb index cd5862c98..9ea7ac160 100644 --- a/spec/models/garden_type.rb +++ b/spec/models/garden_type.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe GardenType do diff --git a/spec/models/harvest_spec.rb b/spec/models/harvest_spec.rb index f4b110849..5465b43e0 100644 --- a/spec/models/harvest_spec.rb +++ b/spec/models/harvest_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe Harvest do diff --git a/spec/models/like_spec.rb b/spec/models/like_spec.rb index 56f35bf1d..aeb5797e3 100644 --- a/spec/models/like_spec.rb +++ b/spec/models/like_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'like' do diff --git a/spec/models/member_spec.rb b/spec/models/member_spec.rb index 10ca3f5e6..f591bd3d5 100644 --- a/spec/models/member_spec.rb +++ b/spec/models/member_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'member' do diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb index 2a4c7e86a..2f504f864 100644 --- a/spec/models/notification_spec.rb +++ b/spec/models/notification_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe Notification do diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb index 1102253f8..b7ca51898 100644 --- a/spec/models/photo_spec.rb +++ b/spec/models/photo_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe Photo do diff --git a/spec/models/plant_part_spec.rb b/spec/models/plant_part_spec.rb index ba1e56241..7747ec4e3 100644 --- a/spec/models/plant_part_spec.rb +++ b/spec/models/plant_part_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe PlantPart do diff --git a/spec/models/planting_spec.rb b/spec/models/planting_spec.rb index fe2b5299c..34d5696a8 100644 --- a/spec/models/planting_spec.rb +++ b/spec/models/planting_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe Planting do diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb index e8bf3cf54..5fd8c8f62 100644 --- a/spec/models/post_spec.rb +++ b/spec/models/post_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe Post do diff --git a/spec/models/role_spec.rb b/spec/models/role_spec.rb index 0fc5f92b7..5893a9dc1 100644 --- a/spec/models/role_spec.rb +++ b/spec/models/role_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe Role do diff --git a/spec/models/scientific_name_spec.rb b/spec/models/scientific_name_spec.rb index 0b170812d..7433182eb 100644 --- a/spec/models/scientific_name_spec.rb +++ b/spec/models/scientific_name_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe ScientificName do diff --git a/spec/models/seed_spec.rb b/spec/models/seed_spec.rb index a2dae3155..1729f5dad 100644 --- a/spec/models/seed_spec.rb +++ b/spec/models/seed_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe Seed do diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index d780aedb2..5082ce6ab 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # This file is copied to spec/ when you run 'rails generate rspec:install' ENV["RAILS_ENV"] ||= 'test' require 'simplecov' diff --git a/spec/requests/api/v1/crop_request_spec.rb b/spec/requests/api/v1/crop_request_spec.rb index 9eaab0194..06dd0311f 100644 --- a/spec/requests/api/v1/crop_request_spec.rb +++ b/spec/requests/api/v1/crop_request_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' RSpec.describe 'Crops', type: :request do diff --git a/spec/requests/api/v1/gardens_request_spec.rb b/spec/requests/api/v1/gardens_request_spec.rb index 12a729a35..3116aa208 100644 --- a/spec/requests/api/v1/gardens_request_spec.rb +++ b/spec/requests/api/v1/gardens_request_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' RSpec.describe 'Gardens', type: :request do diff --git a/spec/requests/api/v1/harvest_request_spec.rb b/spec/requests/api/v1/harvest_request_spec.rb index b958f7938..eb6a6e483 100644 --- a/spec/requests/api/v1/harvest_request_spec.rb +++ b/spec/requests/api/v1/harvest_request_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' RSpec.describe 'Harvests', type: :request do diff --git a/spec/requests/api/v1/member_request_spec.rb b/spec/requests/api/v1/member_request_spec.rb index 0f1d78122..38021af32 100644 --- a/spec/requests/api/v1/member_request_spec.rb +++ b/spec/requests/api/v1/member_request_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' RSpec.describe 'Members', type: :request do diff --git a/spec/requests/api/v1/photos_request_spec.rb b/spec/requests/api/v1/photos_request_spec.rb index d194e237e..1db6cede7 100644 --- a/spec/requests/api/v1/photos_request_spec.rb +++ b/spec/requests/api/v1/photos_request_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' RSpec.describe 'Photos', type: :request do diff --git a/spec/requests/api/v1/plantings_request_spec.rb b/spec/requests/api/v1/plantings_request_spec.rb index 8c811f511..26781cc28 100644 --- a/spec/requests/api/v1/plantings_request_spec.rb +++ b/spec/requests/api/v1/plantings_request_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' RSpec.describe 'Plantings', type: :request do diff --git a/spec/requests/api/v1/seeds_request_spec.rb b/spec/requests/api/v1/seeds_request_spec.rb index a65243c50..b0157fbfa 100644 --- a/spec/requests/api/v1/seeds_request_spec.rb +++ b/spec/requests/api/v1/seeds_request_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' RSpec.describe 'Photos', type: :request do diff --git a/spec/requests/authentications_spec.rb b/spec/requests/authentications_spec.rb index 6cc612f44..6ed6f4ea5 100644 --- a/spec/requests/authentications_spec.rb +++ b/spec/requests/authentications_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "Authentications" do diff --git a/spec/requests/conversations_spec.rb b/spec/requests/conversations_spec.rb index 1ed996685..745a0dbd8 100644 --- a/spec/requests/conversations_spec.rb +++ b/spec/requests/conversations_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'Converstions' do diff --git a/spec/requests/forums_spec.rb b/spec/requests/forums_spec.rb index ff7cb283d..2833a2744 100644 --- a/spec/requests/forums_spec.rb +++ b/spec/requests/forums_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "Forums" do diff --git a/spec/requests/garden_types_spec.rb b/spec/requests/garden_types_spec.rb index fbacd0491..d415e5bde 100644 --- a/spec/requests/garden_types_spec.rb +++ b/spec/requests/garden_types_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' RSpec.describe "GardenTypes", type: :request do diff --git a/spec/requests/gardens_spec.rb b/spec/requests/gardens_spec.rb index 91a8dc8b7..890a6edb7 100644 --- a/spec/requests/gardens_spec.rb +++ b/spec/requests/gardens_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "Gardens" do diff --git a/spec/requests/harvests_spec.rb b/spec/requests/harvests_spec.rb index f3774b3c0..c613de081 100644 --- a/spec/requests/harvests_spec.rb +++ b/spec/requests/harvests_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "Harvests" do diff --git a/spec/requests/photos_spec.rb b/spec/requests/photos_spec.rb index b937ded3d..6ac4694a0 100644 --- a/spec/requests/photos_spec.rb +++ b/spec/requests/photos_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "Photos" do diff --git a/spec/requests/plant_parts_spec.rb b/spec/requests/plant_parts_spec.rb index 1fc2150b2..a96599cbb 100644 --- a/spec/requests/plant_parts_spec.rb +++ b/spec/requests/plant_parts_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "PlantParts" do diff --git a/spec/requests/plantings_spec.rb b/spec/requests/plantings_spec.rb index cb66922e0..90a4b5348 100644 --- a/spec/requests/plantings_spec.rb +++ b/spec/requests/plantings_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "Plantings" do diff --git a/spec/requests/post_spec.rb b/spec/requests/post_spec.rb index 3bb479aa8..51ccf416a 100644 --- a/spec/requests/post_spec.rb +++ b/spec/requests/post_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "Posts" do diff --git a/spec/requests/scientific_names_spec.rb b/spec/requests/scientific_names_spec.rb index 922f6f270..f2ce118aa 100644 --- a/spec/requests/scientific_names_spec.rb +++ b/spec/requests/scientific_names_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "ScientificNames" do diff --git a/spec/requests/seeds_spec.rb b/spec/requests/seeds_spec.rb index 8bc5aeccf..1440d638c 100644 --- a/spec/requests/seeds_spec.rb +++ b/spec/requests/seeds_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "Seeds" do diff --git a/spec/routing/admin_routing_spec.rb b/spec/routing/admin_routing_spec.rb index 66b17bc16..287bb2976 100644 --- a/spec/routing/admin_routing_spec.rb +++ b/spec/routing/admin_routing_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "rails_helper" describe AdminController do diff --git a/spec/routing/authentications_routing_spec.rb b/spec/routing/authentications_routing_spec.rb index 0601b9924..877a35395 100644 --- a/spec/routing/authentications_routing_spec.rb +++ b/spec/routing/authentications_routing_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "rails_helper" describe AuthenticationsController do diff --git a/spec/routing/comments_routing_spec.rb b/spec/routing/comments_routing_spec.rb index 5390ab066..9fbfa436a 100644 --- a/spec/routing/comments_routing_spec.rb +++ b/spec/routing/comments_routing_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "rails_helper" describe CommentsController do diff --git a/spec/routing/crops_routing_spec.rb b/spec/routing/crops_routing_spec.rb index 30f6004d3..7821db6ff 100644 --- a/spec/routing/crops_routing_spec.rb +++ b/spec/routing/crops_routing_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "rails_helper" describe CropsController do diff --git a/spec/routing/follows_routing_spec.rb b/spec/routing/follows_routing_spec.rb index ddb01e00c..e79c26610 100644 --- a/spec/routing/follows_routing_spec.rb +++ b/spec/routing/follows_routing_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "spec_helper" describe FollowsController do diff --git a/spec/routing/forums_routing_spec.rb b/spec/routing/forums_routing_spec.rb index 9ce6f427b..5c3ade545 100644 --- a/spec/routing/forums_routing_spec.rb +++ b/spec/routing/forums_routing_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "rails_helper" describe ForumsController do diff --git a/spec/routing/garden_types_routing_spec.rb b/spec/routing/garden_types_routing_spec.rb index 986af7b70..805ebdfa3 100644 --- a/spec/routing/garden_types_routing_spec.rb +++ b/spec/routing/garden_types_routing_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "rails_helper" describe GardenTypesController do diff --git a/spec/routing/gardens_routing_spec.rb b/spec/routing/gardens_routing_spec.rb index 02183eab0..ddd282551 100644 --- a/spec/routing/gardens_routing_spec.rb +++ b/spec/routing/gardens_routing_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "rails_helper" describe GardensController do diff --git a/spec/routing/harvests_routing_spec.rb b/spec/routing/harvests_routing_spec.rb index af623c3fe..4dc1aaece 100644 --- a/spec/routing/harvests_routing_spec.rb +++ b/spec/routing/harvests_routing_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "rails_helper" describe HarvestsController do diff --git a/spec/routing/photos_routing_spec.rb b/spec/routing/photos_routing_spec.rb index a645d0a60..812acf84a 100644 --- a/spec/routing/photos_routing_spec.rb +++ b/spec/routing/photos_routing_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "rails_helper" describe PhotosController do diff --git a/spec/routing/plant_parts_routing_spec.rb b/spec/routing/plant_parts_routing_spec.rb index 966047f3f..3e10372d7 100644 --- a/spec/routing/plant_parts_routing_spec.rb +++ b/spec/routing/plant_parts_routing_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "rails_helper" describe PlantPartsController do diff --git a/spec/routing/plantings_routing_spec.rb b/spec/routing/plantings_routing_spec.rb index d92d3a84f..75c37d655 100644 --- a/spec/routing/plantings_routing_spec.rb +++ b/spec/routing/plantings_routing_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "rails_helper" describe PlantingsController do diff --git a/spec/routing/roles_routing_spec.rb b/spec/routing/roles_routing_spec.rb index c601e27e3..9b61b982e 100644 --- a/spec/routing/roles_routing_spec.rb +++ b/spec/routing/roles_routing_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "rails_helper" describe Admin::RolesController do diff --git a/spec/routing/scientific_names_routing_spec.rb b/spec/routing/scientific_names_routing_spec.rb index 7bbbfa764..b52f4b43c 100644 --- a/spec/routing/scientific_names_routing_spec.rb +++ b/spec/routing/scientific_names_routing_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "rails_helper" describe ScientificNamesController do diff --git a/spec/routing/seeds_routing_spec.rb b/spec/routing/seeds_routing_spec.rb index 9ebfbdb02..0528a5b8d 100644 --- a/spec/routing/seeds_routing_spec.rb +++ b/spec/routing/seeds_routing_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "rails_helper" describe SeedsController do diff --git a/spec/routing/updates_routing_spec.rb b/spec/routing/updates_routing_spec.rb index 966647515..9c9715526 100644 --- a/spec/routing/updates_routing_spec.rb +++ b/spec/routing/updates_routing_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "rails_helper" describe PostsController do diff --git a/spec/services/timeline_service_spec.rb b/spec/services/timeline_service_spec.rb index 4ab41f719..632c8b0ad 100644 --- a/spec/services/timeline_service_spec.rb +++ b/spec/services/timeline_service_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'timeline' do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index df3b6f92b..9b30a0829 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # This file was generated by the `rails generate rspec:install` command. Conventionally, all # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`. # The generated `.rspec` file contains `--require spec_helper` which will cause this diff --git a/spec/support/controller_macros.rb b/spec/support/controller_macros.rb index b54cf0282..f2d23aaf4 100644 --- a/spec/support/controller_macros.rb +++ b/spec/support/controller_macros.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Taken unashamedly from https://github.com/plataformatec/devise/wiki/How-To%3a-Controllers-and-Views-tests-with-Rails-3-%28and-rspec%29 module ControllerMacros def login_member(member_factory = :member) diff --git a/spec/support/database_cleaner.rb b/spec/support/database_cleaner.rb index 8aa076438..0821d2198 100644 --- a/spec/support/database_cleaner.rb +++ b/spec/support/database_cleaner.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + RSpec.configure do |config| # a warning if you turn this off config.before(:suite) do diff --git a/spec/support/devise.rb b/spec/support/devise.rb index 090ffc6a8..c1f9c35fe 100644 --- a/spec/support/devise.rb +++ b/spec/support/devise.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + RSpec.configure do |config| config.include Devise::Test::ControllerHelpers, type: :controller config.include Devise::Test::ControllerHelpers, type: :view diff --git a/spec/support/feature_helpers.rb b/spec/support/feature_helpers.rb index 973718629..91b877e14 100644 --- a/spec/support/feature_helpers.rb +++ b/spec/support/feature_helpers.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module FeatureHelpers def fill_autocomplete(field, options = {}) Crop.reindex diff --git a/spec/support/is_likeable.rb b/spec/support/is_likeable.rb index c402d589c..9fbae5426 100644 --- a/spec/support/is_likeable.rb +++ b/spec/support/is_likeable.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + shared_examples "it is likeable" do before do # Possibly a horrible hack. diff --git a/spec/swagger_helper.rb b/spec/swagger_helper.rb index 327b2c804..67a935fa8 100644 --- a/spec/swagger_helper.rb +++ b/spec/swagger_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' RSpec.configure do |config| diff --git a/spec/views/admin/index_spec.rb b/spec/views/admin/index_spec.rb index 7379519cc..4e8dbba27 100644 --- a/spec/views/admin/index_spec.rb +++ b/spec/views/admin/index_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'admin/index.html.haml', type: "view" do diff --git a/spec/views/admin/newsletter_spec.rb b/spec/views/admin/newsletter_spec.rb index fbae64def..464f2d6c5 100644 --- a/spec/views/admin/newsletter_spec.rb +++ b/spec/views/admin/newsletter_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'admin/newsletter.html.haml', type: "view" do diff --git a/spec/views/admin/roles/edit.html.haml_spec.rb b/spec/views/admin/roles/edit.html.haml_spec.rb index 859ac2492..d2ffc1146 100644 --- a/spec/views/admin/roles/edit.html.haml_spec.rb +++ b/spec/views/admin/roles/edit.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "admin/roles/edit" do diff --git a/spec/views/admin/roles/index.html.haml_spec.rb b/spec/views/admin/roles/index.html.haml_spec.rb index f852dd0d0..d8d0c7bc6 100644 --- a/spec/views/admin/roles/index.html.haml_spec.rb +++ b/spec/views/admin/roles/index.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "admin/roles/index" do diff --git a/spec/views/admin/roles/new.html.haml_spec.rb b/spec/views/admin/roles/new.html.haml_spec.rb index 3ce6b0c85..b9b3dc7b7 100644 --- a/spec/views/admin/roles/new.html.haml_spec.rb +++ b/spec/views/admin/roles/new.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "admin/roles/new" do diff --git a/spec/views/comments/edit.html.haml_spec.rb b/spec/views/comments/edit.html.haml_spec.rb index b7a547f8c..b95fb9d24 100644 --- a/spec/views/comments/edit.html.haml_spec.rb +++ b/spec/views/comments/edit.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "comments/edit" do diff --git a/spec/views/comments/index.rss.haml_spec.rb b/spec/views/comments/index.rss.haml_spec.rb index d1b376cab..38b5a2386 100644 --- a/spec/views/comments/index.rss.haml_spec.rb +++ b/spec/views/comments/index.rss.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'comments/index.rss.haml' do diff --git a/spec/views/comments/new.html.haml_spec.rb b/spec/views/comments/new.html.haml_spec.rb index c2d7b7e86..5b86a3a29 100644 --- a/spec/views/comments/new.html.haml_spec.rb +++ b/spec/views/comments/new.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "comments/new" do diff --git a/spec/views/crops/_grown_for.html.haml_spec.rb b/spec/views/crops/_grown_for.html.haml_spec.rb index f3beba7a2..3cd68bfd8 100644 --- a/spec/views/crops/_grown_for.html.haml_spec.rb +++ b/spec/views/crops/_grown_for.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "crops/_grown_for" do diff --git a/spec/views/crops/_popover.html.haml_spec.rb b/spec/views/crops/_popover.html.haml_spec.rb index 577667eca..09cd2eda9 100644 --- a/spec/views/crops/_popover.html.haml_spec.rb +++ b/spec/views/crops/_popover.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "crops/_popover" do diff --git a/spec/views/crops/edit.html.haml_spec.rb b/spec/views/crops/edit.html.haml_spec.rb index ba43f645f..6791c3393 100644 --- a/spec/views/crops/edit.html.haml_spec.rb +++ b/spec/views/crops/edit.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "crops/edit" do diff --git a/spec/views/crops/hierarchy.html.haml_spec.rb b/spec/views/crops/hierarchy.html.haml_spec.rb index c1d79f0bb..8232e14f3 100644 --- a/spec/views/crops/hierarchy.html.haml_spec.rb +++ b/spec/views/crops/hierarchy.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "crops/hierarchy" do diff --git a/spec/views/crops/index.html.haml_spec.rb b/spec/views/crops/index.html.haml_spec.rb index 9c1c16805..db69f9132 100644 --- a/spec/views/crops/index.html.haml_spec.rb +++ b/spec/views/crops/index.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "crops/index" do diff --git a/spec/views/crops/index.rss.haml_spec.rb b/spec/views/crops/index.rss.haml_spec.rb index a7afbba7a..5d1bfaef4 100644 --- a/spec/views/crops/index.rss.haml_spec.rb +++ b/spec/views/crops/index.rss.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'crops/index.rss.haml' do diff --git a/spec/views/crops/new.html.haml_spec.rb b/spec/views/crops/new.html.haml_spec.rb index 0dcf43624..95dfc5db0 100644 --- a/spec/views/crops/new.html.haml_spec.rb +++ b/spec/views/crops/new.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "crops/new" do diff --git a/spec/views/crops/wrangle.html.haml_spec.rb b/spec/views/crops/wrangle.html.haml_spec.rb index 1ae400e7e..89c5d0b15 100644 --- a/spec/views/crops/wrangle.html.haml_spec.rb +++ b/spec/views/crops/wrangle.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "crops/wrangle" do diff --git a/spec/views/devise/confirmations/new_spec.rb b/spec/views/devise/confirmations/new_spec.rb index de26a4ad8..ce4290259 100644 --- a/spec/views/devise/confirmations/new_spec.rb +++ b/spec/views/devise/confirmations/new_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + describe 'devise/confirmations/new.html.haml', type: "view" do before do @view.stub(:resource).and_return(Member.new) diff --git a/spec/views/devise/mailer/confirmation_instructions_spec.rb b/spec/views/devise/mailer/confirmation_instructions_spec.rb index 08e411796..0f4b25f09 100644 --- a/spec/views/devise/mailer/confirmation_instructions_spec.rb +++ b/spec/views/devise/mailer/confirmation_instructions_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'devise/mailer/confirmation_instructions.html.haml', type: "view" do diff --git a/spec/views/devise/mailer/reset_password_instructions_spec.rb b/spec/views/devise/mailer/reset_password_instructions_spec.rb index ef90f7589..7dce3e1f7 100644 --- a/spec/views/devise/mailer/reset_password_instructions_spec.rb +++ b/spec/views/devise/mailer/reset_password_instructions_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'devise/mailer/reset_password_instructions.html.haml', type: "view" do diff --git a/spec/views/devise/mailer/unlock_instructions_spec.rb b/spec/views/devise/mailer/unlock_instructions_spec.rb index d3ac3357d..5db8a66cc 100644 --- a/spec/views/devise/mailer/unlock_instructions_spec.rb +++ b/spec/views/devise/mailer/unlock_instructions_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'devise/mailer/unlock_instructions.html.haml', type: "view" do context "logged in" do diff --git a/spec/views/devise/registrations/edit_spec.rb b/spec/views/devise/registrations/edit_spec.rb index b260d13a8..1ca0ae8ad 100644 --- a/spec/views/devise/registrations/edit_spec.rb +++ b/spec/views/devise/registrations/edit_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'devise/registrations/edit.html.haml', type: "view" do diff --git a/spec/views/devise/registrations/new_spec.rb b/spec/views/devise/registrations/new_spec.rb index 0ee95b5b0..05c690ca9 100644 --- a/spec/views/devise/registrations/new_spec.rb +++ b/spec/views/devise/registrations/new_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'devise/registrations/new.html.haml', type: "view" do diff --git a/spec/views/devise/sessions/new_spec.rb b/spec/views/devise/sessions/new_spec.rb index d8ae1c480..5537f6fd9 100644 --- a/spec/views/devise/sessions/new_spec.rb +++ b/spec/views/devise/sessions/new_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'devise/sessions/new.html.haml', type: "view" do diff --git a/spec/views/devise/shared/_links_spec.rb b/spec/views/devise/shared/_links_spec.rb index c19101593..1a0c55d54 100644 --- a/spec/views/devise/shared/_links_spec.rb +++ b/spec/views/devise/shared/_links_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + describe 'devise/shared/_links.haml', type: "view" do def devise_mapping(register, recover, confirm, lock, oauth) dm = double("mappings") diff --git a/spec/views/devise/unlocks/new_spec.rb b/spec/views/devise/unlocks/new_spec.rb index 68666532f..184b820dd 100644 --- a/spec/views/devise/unlocks/new_spec.rb +++ b/spec/views/devise/unlocks/new_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'devise/unlocks/new.html.haml', type: "view" do diff --git a/spec/views/forums/edit.html.haml_spec.rb b/spec/views/forums/edit.html.haml_spec.rb index 57747391e..08580e4e1 100644 --- a/spec/views/forums/edit.html.haml_spec.rb +++ b/spec/views/forums/edit.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "forums/edit" do diff --git a/spec/views/forums/index.html.haml_spec.rb b/spec/views/forums/index.html.haml_spec.rb index 9bfef29ea..74a0684a2 100644 --- a/spec/views/forums/index.html.haml_spec.rb +++ b/spec/views/forums/index.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "forums/index" do diff --git a/spec/views/forums/new.html.haml_spec.rb b/spec/views/forums/new.html.haml_spec.rb index 4fec098df..ebb711688 100644 --- a/spec/views/forums/new.html.haml_spec.rb +++ b/spec/views/forums/new.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "forums/new" do diff --git a/spec/views/forums/show.html.haml_spec.rb b/spec/views/forums/show.html.haml_spec.rb index c40a77a81..7fc24c464 100644 --- a/spec/views/forums/show.html.haml_spec.rb +++ b/spec/views/forums/show.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "forums/show" do diff --git a/spec/views/garden_types/edit.html.haml_spec.rb b/spec/views/garden_types/edit.html.haml_spec.rb index b5c69b95f..c328e4275 100644 --- a/spec/views/garden_types/edit.html.haml_spec.rb +++ b/spec/views/garden_types/edit.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "garden_types/edit" do diff --git a/spec/views/garden_types/new.html.haml_spec.rb b/spec/views/garden_types/new.html.haml_spec.rb index 3241666af..e48aff0dd 100644 --- a/spec/views/garden_types/new.html.haml_spec.rb +++ b/spec/views/garden_types/new.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "garden_types/new" do diff --git a/spec/views/garden_types/show.html.haml_spec.rb b/spec/views/garden_types/show.html.haml_spec.rb index 10b4d83a8..33fc283ed 100644 --- a/spec/views/garden_types/show.html.haml_spec.rb +++ b/spec/views/garden_types/show.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "garden_types/show" do diff --git a/spec/views/gardens/edit.html.haml_spec.rb b/spec/views/gardens/edit.html.haml_spec.rb index a0564bf84..fc1ec78ee 100644 --- a/spec/views/gardens/edit.html.haml_spec.rb +++ b/spec/views/gardens/edit.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "gardens/edit" do diff --git a/spec/views/gardens/new.html.haml_spec.rb b/spec/views/gardens/new.html.haml_spec.rb index d76659f73..00bcc91e7 100644 --- a/spec/views/gardens/new.html.haml_spec.rb +++ b/spec/views/gardens/new.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "gardens/new" do diff --git a/spec/views/gardens/show.html.haml_spec.rb b/spec/views/gardens/show.html.haml_spec.rb index 7535ce8de..5bb6cf0a9 100644 --- a/spec/views/gardens/show.html.haml_spec.rb +++ b/spec/views/gardens/show.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "gardens/show" do diff --git a/spec/views/harvests/edit.html.haml_spec.rb b/spec/views/harvests/edit.html.haml_spec.rb index 38307f503..2647f7961 100644 --- a/spec/views/harvests/edit.html.haml_spec.rb +++ b/spec/views/harvests/edit.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "harvests/edit" do diff --git a/spec/views/harvests/index.html.haml_spec.rb b/spec/views/harvests/index.html.haml_spec.rb index 1ce56c492..d018c9558 100644 --- a/spec/views/harvests/index.html.haml_spec.rb +++ b/spec/views/harvests/index.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "harvests/index" do diff --git a/spec/views/harvests/index.rss.haml_spec.rb b/spec/views/harvests/index.rss.haml_spec.rb index e3f1d20b2..47d28a9d6 100644 --- a/spec/views/harvests/index.rss.haml_spec.rb +++ b/spec/views/harvests/index.rss.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'harvests/index.rss.haml' do diff --git a/spec/views/harvests/new.html.haml_spec.rb b/spec/views/harvests/new.html.haml_spec.rb index abe1b547e..6c75a3853 100644 --- a/spec/views/harvests/new.html.haml_spec.rb +++ b/spec/views/harvests/new.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "harvests/new" do diff --git a/spec/views/harvests/show.html.haml_spec.rb b/spec/views/harvests/show.html.haml_spec.rb index 4a8053924..8b270ab56 100644 --- a/spec/views/harvests/show.html.haml_spec.rb +++ b/spec/views/harvests/show.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "harvests/show" do diff --git a/spec/views/home/_blurb.html.haml_spec.rb b/spec/views/home/_blurb.html.haml_spec.rb index 395ce74b0..2fc293133 100644 --- a/spec/views/home/_blurb.html.haml_spec.rb +++ b/spec/views/home/_blurb.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'home/_blurb.html.haml', type: "view" do diff --git a/spec/views/home/_members.html.haml_spec.rb b/spec/views/home/_members.html.haml_spec.rb index 332af1d22..b5be1f2b9 100644 --- a/spec/views/home/_members.html.haml_spec.rb +++ b/spec/views/home/_members.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'home/_members.html.haml', type: "view" do diff --git a/spec/views/home/_seeds.html.haml_spec.rb b/spec/views/home/_seeds.html.haml_spec.rb index e0b2c54be..346a2952d 100644 --- a/spec/views/home/_seeds.html.haml_spec.rb +++ b/spec/views/home/_seeds.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'home/_seeds.html.haml', type: "view" do diff --git a/spec/views/home/_stats.html.haml_spec.rb b/spec/views/home/_stats.html.haml_spec.rb index a9979190c..15d637fd2 100644 --- a/spec/views/home/_stats.html.haml_spec.rb +++ b/spec/views/home/_stats.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'home/_stats.html.haml', type: "view" do diff --git a/spec/views/home/index_spec.rb b/spec/views/home/index_spec.rb index 1289df4eb..83e9308d7 100644 --- a/spec/views/home/index_spec.rb +++ b/spec/views/home/index_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'home/index.html.haml', type: "view" do diff --git a/spec/views/layouts/_head_spec.rb b/spec/views/layouts/_head_spec.rb index c82355100..a516a99c1 100644 --- a/spec/views/layouts/_head_spec.rb +++ b/spec/views/layouts/_head_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'layouts/_head.html.haml', type: "view" do diff --git a/spec/views/layouts/_header_spec.rb b/spec/views/layouts/_header_spec.rb index 4a39e99b3..b87bcb4d6 100644 --- a/spec/views/layouts/_header_spec.rb +++ b/spec/views/layouts/_header_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'layouts/_header.html.haml', type: "view" do diff --git a/spec/views/layouts/application_spec.rb b/spec/views/layouts/application_spec.rb index f2b23d910..4ccb69503 100644 --- a/spec/views/layouts/application_spec.rb +++ b/spec/views/layouts/application_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'layouts/application.html.haml', type: "view" do diff --git a/spec/views/members/_location.html.haml_spec.rb b/spec/views/members/_location.html.haml_spec.rb index db1fae09c..0ab04f478 100644 --- a/spec/views/members/_location.html.haml_spec.rb +++ b/spec/views/members/_location.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "members/_location" do diff --git a/spec/views/members/index.html.haml_spec.rb b/spec/views/members/index.html.haml_spec.rb index 34fda500f..8afbb85a5 100644 --- a/spec/views/members/index.html.haml_spec.rb +++ b/spec/views/members/index.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "members/index" do diff --git a/spec/views/members/show.rss.haml_spec.rb b/spec/views/members/show.rss.haml_spec.rb index ce4dc4c52..873e9ecf2 100644 --- a/spec/views/members/show.rss.haml_spec.rb +++ b/spec/views/members/show.rss.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'members/show.rss.haml', type: "view" do diff --git a/spec/views/photos/edit.html.haml_spec.rb b/spec/views/photos/edit.html.haml_spec.rb index ba481b104..1e94fb7b3 100644 --- a/spec/views/photos/edit.html.haml_spec.rb +++ b/spec/views/photos/edit.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "photos/edit" do diff --git a/spec/views/photos/index.html.haml_spec.rb b/spec/views/photos/index.html.haml_spec.rb index ef058e822..86843ce14 100644 --- a/spec/views/photos/index.html.haml_spec.rb +++ b/spec/views/photos/index.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "photos/index" do diff --git a/spec/views/photos/new.html.haml_spec.rb b/spec/views/photos/new.html.haml_spec.rb index 9f4072ee5..d15e99e22 100644 --- a/spec/views/photos/new.html.haml_spec.rb +++ b/spec/views/photos/new.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "photos/new" do diff --git a/spec/views/photos/show.html.haml_spec.rb b/spec/views/photos/show.html.haml_spec.rb index f0f1235ef..19690e30f 100644 --- a/spec/views/photos/show.html.haml_spec.rb +++ b/spec/views/photos/show.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "photos/show" do diff --git a/spec/views/places/_map_attribution.html.haml_spec.rb b/spec/views/places/_map_attribution.html.haml_spec.rb index afe384dfe..9b869a304 100644 --- a/spec/views/places/_map_attribution.html.haml_spec.rb +++ b/spec/views/places/_map_attribution.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "places/_map_attribution.html.haml", type: :view do diff --git a/spec/views/places/index.html.haml_spec.rb b/spec/views/places/index.html.haml_spec.rb index 072eb4ca3..f49bb9238 100644 --- a/spec/views/places/index.html.haml_spec.rb +++ b/spec/views/places/index.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "places/index" do diff --git a/spec/views/places/show.html.haml_spec.rb b/spec/views/places/show.html.haml_spec.rb index 7f9aa0c9c..2ac779a1f 100644 --- a/spec/views/places/show.html.haml_spec.rb +++ b/spec/views/places/show.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "places/show" do diff --git a/spec/views/plant_parts/edit.html.haml_spec.rb b/spec/views/plant_parts/edit.html.haml_spec.rb index cc6070fb0..c21a92106 100644 --- a/spec/views/plant_parts/edit.html.haml_spec.rb +++ b/spec/views/plant_parts/edit.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "plant_parts/edit" do diff --git a/spec/views/plant_parts/index.html.haml_spec.rb b/spec/views/plant_parts/index.html.haml_spec.rb index b46c4a1a5..828f942e3 100644 --- a/spec/views/plant_parts/index.html.haml_spec.rb +++ b/spec/views/plant_parts/index.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "plant_parts/index" do diff --git a/spec/views/plant_parts/new.html.haml_spec.rb b/spec/views/plant_parts/new.html.haml_spec.rb index b0067273c..203dc128a 100644 --- a/spec/views/plant_parts/new.html.haml_spec.rb +++ b/spec/views/plant_parts/new.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "plant_parts/new" do diff --git a/spec/views/plant_parts/show.html.haml_spec.rb b/spec/views/plant_parts/show.html.haml_spec.rb index 9947cfcce..39dce332a 100644 --- a/spec/views/plant_parts/show.html.haml_spec.rb +++ b/spec/views/plant_parts/show.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "plant_parts/show" do diff --git a/spec/views/plantings/_form.html.haml_spec.rb b/spec/views/plantings/_form.html.haml_spec.rb index 0f4c6f1af..a4f110a2f 100644 --- a/spec/views/plantings/_form.html.haml_spec.rb +++ b/spec/views/plantings/_form.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "plantings/_form" do diff --git a/spec/views/plantings/edit.html.haml_spec.rb b/spec/views/plantings/edit.html.haml_spec.rb index 6baf126f1..3acb14223 100644 --- a/spec/views/plantings/edit.html.haml_spec.rb +++ b/spec/views/plantings/edit.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "plantings/edit" do diff --git a/spec/views/plantings/index.html.haml_spec.rb b/spec/views/plantings/index.html.haml_spec.rb index 4284eada6..c6a0ae446 100644 --- a/spec/views/plantings/index.html.haml_spec.rb +++ b/spec/views/plantings/index.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "plantings/index" do diff --git a/spec/views/plantings/index.rss.haml_spec.rb b/spec/views/plantings/index.rss.haml_spec.rb index 24faa046c..b0f3be6cc 100644 --- a/spec/views/plantings/index.rss.haml_spec.rb +++ b/spec/views/plantings/index.rss.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'plantings/index.rss.haml' do diff --git a/spec/views/plantings/new.html.haml_spec.rb b/spec/views/plantings/new.html.haml_spec.rb index 3376d5cc0..b0aa596f9 100644 --- a/spec/views/plantings/new.html.haml_spec.rb +++ b/spec/views/plantings/new.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "plantings/new" do diff --git a/spec/views/plantings/show.html.haml_spec.rb b/spec/views/plantings/show.html.haml_spec.rb index c774c5d48..5d7161e89 100644 --- a/spec/views/plantings/show.html.haml_spec.rb +++ b/spec/views/plantings/show.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "plantings/show" do diff --git a/spec/views/posts/_single.html.haml_spec.rb b/spec/views/posts/_single.html.haml_spec.rb index 90c15af78..403ea1198 100644 --- a/spec/views/posts/_single.html.haml_spec.rb +++ b/spec/views/posts/_single.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "posts/_single" do diff --git a/spec/views/posts/edit.html.haml_spec.rb b/spec/views/posts/edit.html.haml_spec.rb index 2119f80b5..c664f2131 100644 --- a/spec/views/posts/edit.html.haml_spec.rb +++ b/spec/views/posts/edit.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "posts/edit" do diff --git a/spec/views/posts/index.html.haml_spec.rb b/spec/views/posts/index.html.haml_spec.rb index c865b2980..613f8dc59 100644 --- a/spec/views/posts/index.html.haml_spec.rb +++ b/spec/views/posts/index.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "posts/index" do diff --git a/spec/views/posts/index.rss.haml_spec.rb b/spec/views/posts/index.rss.haml_spec.rb index 030e22c05..055de59e2 100644 --- a/spec/views/posts/index.rss.haml_spec.rb +++ b/spec/views/posts/index.rss.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'posts/index.rss.haml', type: "view" do diff --git a/spec/views/posts/new.html.haml_spec.rb b/spec/views/posts/new.html.haml_spec.rb index eaef7f5da..3e5e0efca 100644 --- a/spec/views/posts/new.html.haml_spec.rb +++ b/spec/views/posts/new.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "posts/new" do diff --git a/spec/views/posts/show.html.haml_spec.rb b/spec/views/posts/show.html.haml_spec.rb index bb59f2b47..e40918c19 100644 --- a/spec/views/posts/show.html.haml_spec.rb +++ b/spec/views/posts/show.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "posts/show" do diff --git a/spec/views/posts/show.rss.haml_spec.rb b/spec/views/posts/show.rss.haml_spec.rb index 802bebe93..effd87094 100644 --- a/spec/views/posts/show.rss.haml_spec.rb +++ b/spec/views/posts/show.rss.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'posts/show.rss.haml' do diff --git a/spec/views/scientific_names/edit.html.haml_spec.rb b/spec/views/scientific_names/edit.html.haml_spec.rb index b497b44e7..b6b3cfb79 100644 --- a/spec/views/scientific_names/edit.html.haml_spec.rb +++ b/spec/views/scientific_names/edit.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "scientific_names/edit" do diff --git a/spec/views/scientific_names/index.html.haml_spec.rb b/spec/views/scientific_names/index.html.haml_spec.rb index 9d098e58b..88401808e 100644 --- a/spec/views/scientific_names/index.html.haml_spec.rb +++ b/spec/views/scientific_names/index.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "scientific_names/index" do diff --git a/spec/views/scientific_names/new.html.haml_spec.rb b/spec/views/scientific_names/new.html.haml_spec.rb index 1f6320308..39dbedd88 100644 --- a/spec/views/scientific_names/new.html.haml_spec.rb +++ b/spec/views/scientific_names/new.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "scientific_names/new" do diff --git a/spec/views/scientific_names/show.html.haml_spec.rb b/spec/views/scientific_names/show.html.haml_spec.rb index ed815c55d..1661ae8d2 100644 --- a/spec/views/scientific_names/show.html.haml_spec.rb +++ b/spec/views/scientific_names/show.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "scientific_names/show" do diff --git a/spec/views/seeds/edit.html.haml_spec.rb b/spec/views/seeds/edit.html.haml_spec.rb index 4bc6bf815..d7d5cd873 100644 --- a/spec/views/seeds/edit.html.haml_spec.rb +++ b/spec/views/seeds/edit.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "seeds/edit" do diff --git a/spec/views/seeds/index.rss.haml_spec.rb b/spec/views/seeds/index.rss.haml_spec.rb index cfeedd904..8e074a80c 100644 --- a/spec/views/seeds/index.rss.haml_spec.rb +++ b/spec/views/seeds/index.rss.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe 'seeds/index.rss.haml' do diff --git a/spec/views/seeds/new.html.haml_spec.rb b/spec/views/seeds/new.html.haml_spec.rb index fc40236e5..407e52d72 100644 --- a/spec/views/seeds/new.html.haml_spec.rb +++ b/spec/views/seeds/new.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "seeds/new" do diff --git a/spec/views/seeds/show.html.haml_spec.rb b/spec/views/seeds/show.html.haml_spec.rb index 34525fbb6..2cc9fe146 100644 --- a/spec/views/seeds/show.html.haml_spec.rb +++ b/spec/views/seeds/show.html.haml_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails_helper' describe "seeds/show" do From f597dd0947ee10cf2d280a520238e75cc85d4e74 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Dec 2019 04:58:30 +0000 Subject: [PATCH 06/29] Bump capybara from 3.29.0 to 3.30.0 Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.29.0 to 3.30.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.29.0...3.30.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c353ed721..aa7889a7d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -91,7 +91,7 @@ GEM uniform_notifier (~> 1.11) byebug (11.0.1) cancancan (3.0.1) - capybara (3.29.0) + capybara (3.30.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) From 17f5b1c562ac9086040388c8f4728e0c8ca7f47a Mon Sep 17 00:00:00 2001 From: Brenda Date: Thu, 26 Dec 2019 15:02:30 +1300 Subject: [PATCH 07/29] Routes using slugs (instead of ids) this seems to be intended by the models having slugs (added about 7 years ago) but the routes weren't using them --- app/controllers/application_controller.rb | 3 +- app/controllers/charts/gardens_controller.rb | 2 +- app/controllers/data_controller.rb | 13 ++++++ app/controllers/gardens_controller.rb | 8 +--- app/controllers/harvests_controller.rb | 9 ++-- app/controllers/plantings_controller.rb | 11 ++--- app/controllers/seeds_controller.rb | 9 +--- config/routes.rb | 10 ++--- .../charts/gardens_controller_spec.rb | 4 +- spec/controllers/gardens_controller_spec.rb | 14 +++---- spec/controllers/harvests_controller_spec.rb | 20 ++++----- spec/routing/gardens_routing_spec.rb | 8 ++-- spec/routing/harvests_routing_spec.rb | 8 ++-- spec/routing/member_routing_spec.rb | 42 +++++++++++++++++++ spec/routing/plantings_routing_spec.rb | 8 ++-- spec/routing/seeds_routing_spec.rb | 8 ++-- 16 files changed, 107 insertions(+), 70 deletions(-) create mode 100644 app/controllers/data_controller.rb create mode 100644 spec/routing/member_routing_spec.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7e01327d6..58c3ec353 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -7,9 +7,8 @@ class ApplicationController < ActionController::Base after_action :store_location before_action :set_locale - rescue_from ActiveRecord::RecordNotFound, with: :not_found - # CanCan error handling + def store_location unless request.path.in?(["/members/sign_in", "/members/sign_up", diff --git a/app/controllers/charts/gardens_controller.rb b/app/controllers/charts/gardens_controller.rb index a7048c57f..5ca9a03b9 100644 --- a/app/controllers/charts/gardens_controller.rb +++ b/app/controllers/charts/gardens_controller.rb @@ -5,7 +5,7 @@ module Charts respond_to :json def timeline @data = [] - @garden = Garden.find(params[:garden_id]) + @garden = Garden.find(params[:garden_slug]) @garden.plantings.where.not(planted_at: nil) .order(finished_at: :desc).each do |p| # use finished_at if we have it, otherwise use predictions diff --git a/app/controllers/data_controller.rb b/app/controllers/data_controller.rb new file mode 100644 index 000000000..fece1f68c --- /dev/null +++ b/app/controllers/data_controller.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +class DataController < ApplicationController + abstract + before_action :authenticate_member!, except: %i(index show) + load_and_authorize_resource id_param: :slug + + after_action :expire_homepage, only: %i(create update destroy) + + respond_to :html, :json + respond_to :csv, :rss, only: [:index] + responders :flash +end diff --git a/app/controllers/gardens_controller.rb b/app/controllers/gardens_controller.rb index 333fa454d..5ef4be121 100644 --- a/app/controllers/gardens_controller.rb +++ b/app/controllers/gardens_controller.rb @@ -1,10 +1,6 @@ -class GardensController < ApplicationController - before_action :authenticate_member!, except: %i(index show) - after_action :expire_homepage, only: %i(create destroy) - load_and_authorize_resource - responders :flash - respond_to :html, :json +# frozen_string_literal: true +class GardensController < DataController def index @owner = Member.find_by(slug: params[:member_slug]) @show_all = params[:all] == '1' diff --git a/app/controllers/harvests_controller.rb b/app/controllers/harvests_controller.rb index c474e2679..76cb3afe5 100644 --- a/app/controllers/harvests_controller.rb +++ b/app/controllers/harvests_controller.rb @@ -1,10 +1,7 @@ -class HarvestsController < ApplicationController - before_action :authenticate_member!, except: %i(index show) +# frozen_string_literal: true + +class HarvestsController < DataController after_action :update_crop_medians, only: %i(create update destroy) - load_and_authorize_resource - respond_to :html, :json - respond_to :csv, :rss, only: :index - responders :flash def index @owner = Member.find_by(slug: params[:member_slug]) diff --git a/app/controllers/plantings_controller.rb b/app/controllers/plantings_controller.rb index ae01b499c..47919e95e 100644 --- a/app/controllers/plantings_controller.rb +++ b/app/controllers/plantings_controller.rb @@ -1,13 +1,8 @@ -class PlantingsController < ApplicationController - before_action :authenticate_member!, except: %i(index show) - after_action :expire_homepage, only: %i(create update destroy) +# frozen_string_literal: true + +class PlantingsController < DataController 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 - respond_to :csv, :rss, only: [:index] - responders :flash def index @owner = Member.find_by(slug: params[:member_slug]) if params[:member_slug] diff --git a/app/controllers/seeds_controller.rb b/app/controllers/seeds_controller.rb index b6457edbf..2294e2840 100644 --- a/app/controllers/seeds_controller.rb +++ b/app/controllers/seeds_controller.rb @@ -1,11 +1,6 @@ -class SeedsController < ApplicationController - before_action :authenticate_member!, except: %i(index show) - load_and_authorize_resource - responders :flash - respond_to :html, :json - respond_to :csv, only: :index - respond_to :rss, only: :index +# frozen_string_literal: true +class SeedsController < DataController def index @owner = Member.find_by(slug: params[:member_slug]) if params[:member_slug].present? @crop = Crop.find_by(slug: params[:crop_slug]) if params[:crop_slug].present? diff --git a/config/routes.rb b/config/routes.rb index cddfbceb8..5244ed3bc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -28,11 +28,11 @@ Rails.application.routes.draw do resources :photos, only: :index end - resources :gardens, concerns: :has_photos do + resources :gardens, concerns: :has_photos, param: :slug do get 'timeline' => 'charts/gardens#timeline', constraints: { format: 'json' } end - resources :plantings, concerns: :has_photos do + resources :plantings, concerns: :has_photos, param: :slug do resources :harvests resources :seeds collection do @@ -40,12 +40,12 @@ Rails.application.routes.draw do end end - resources :seeds, concerns: :has_photos do - resources :plantings + resources :seeds, concerns: :has_photos, param: :slug do + get 'plantings' => 'plantings#index' get 'crop/:crop' => 'seeds#index', as: 'seeds_by_crop', on: :collection end - resources :harvests, concerns: :has_photos do + resources :harvests, concerns: :has_photos, param: :slug do get 'crop/:crop' => 'harvests#index', as: 'harvests_by_crop', on: :collection end diff --git a/spec/controllers/charts/gardens_controller_spec.rb b/spec/controllers/charts/gardens_controller_spec.rb index 007e7f58c..b6a2bd1c5 100644 --- a/spec/controllers/charts/gardens_controller_spec.rb +++ b/spec/controllers/charts/gardens_controller_spec.rb @@ -9,7 +9,7 @@ describe Charts::GardensController do context "when not signed in" do describe 'GET timeline' do - before { get :timeline, params: { garden_id: garden.to_param } } + before { get :timeline, params: { garden_slug: garden.to_param } } it { expect(response).to be_successful } end @@ -21,7 +21,7 @@ describe Charts::GardensController do let!(:member) { FactoryBot.create(:member) } describe 'GET timeline' do - before { get :timeline, params: { garden_id: garden.to_param } } + before { get :timeline, params: { garden_slug: garden.to_param } } it { expect(response).to be_successful } end diff --git a/spec/controllers/gardens_controller_spec.rb b/spec/controllers/gardens_controller_spec.rb index c4b4de332..319304454 100644 --- a/spec/controllers/gardens_controller_spec.rb +++ b/spec/controllers/gardens_controller_spec.rb @@ -10,7 +10,7 @@ RSpec.describe GardensController, type: :controller do context "when not signed in" do describe 'GET new' do - before { get :new, params: { id: garden.to_param } } + before { get :new, params: { slug: garden.to_param } } it { expect(response).to redirect_to(new_member_session_path) } end @@ -32,19 +32,19 @@ RSpec.describe GardensController, type: :controller do end describe 'GET edit' do - before { get :edit, params: { id: garden.to_param } } + before { get :edit, params: { slug: garden.to_param } } it { expect(response).to redirect_to(new_member_session_path) } end describe 'POST update' do - before { post :update, params: { id: garden.to_param, garden: valid_params } } + before { post :update, params: { slug: garden.to_param, garden: valid_params } } it { expect(response).to redirect_to(new_member_session_path) } end describe 'DELETE' do - before { delete :destroy, params: { id: garden.to_param, params: { garden: valid_params } } } + before { delete :destroy, params: { slug: garden.to_param, params: { garden: valid_params } } } it { expect(response).to redirect_to(new_member_session_path) } end @@ -69,19 +69,19 @@ RSpec.describe GardensController, type: :controller do end describe 'GET edit' do - before { get :edit, params: { id: not_my_garden.to_param } } + before { get :edit, params: { slug: not_my_garden.to_param } } it { expect(response).to redirect_to(root_path) } end describe 'POST update' do - before { post :update, params: { id: not_my_garden.to_param, garden: valid_params } } + before { post :update, params: { slug: not_my_garden.to_param, garden: valid_params } } it { expect(response).to redirect_to(root_path) } end describe 'DELETE' do - before { delete :destroy, params: { id: not_my_garden.to_param, params: { garden: valid_params } } } + before { delete :destroy, params: { slug: not_my_garden.to_param, params: { garden: valid_params } } } it { expect(response).to redirect_to(root_path) } end diff --git a/spec/controllers/harvests_controller_spec.rb b/spec/controllers/harvests_controller_spec.rb index f4d8871f7..57722269f 100644 --- a/spec/controllers/harvests_controller_spec.rb +++ b/spec/controllers/harvests_controller_spec.rb @@ -53,7 +53,7 @@ describe HarvestsController do let(:harvest) { Harvest.create! valid_attributes } describe "assigns the requested harvest as @harvest" do - before { get :show, params: { id: harvest.to_param } } + before { get :show, params: { slug: harvest.to_param } } it { expect(assigns(:harvest)).to eq(harvest) } end @@ -75,7 +75,7 @@ describe HarvestsController do let(:harvest) { Harvest.create! valid_attributes } describe "assigns the requested harvest as @harvest" do - before { get :edit, params: { id: harvest.to_param } } + before { get :edit, params: { slug: harvest.to_param } } it { expect(assigns(:harvest)).to eq(harvest) } end @@ -149,19 +149,19 @@ describe HarvestsController do it "updates the requested harvest" do new_crop = FactoryBot.create :crop expect do - put :update, params: { id: harvest.to_param, harvest: { crop_id: new_crop.id } } + put :update, params: { slug: harvest.to_param, harvest: { crop_id: new_crop.id } } harvest.reload end.to change(harvest, :crop_id).to(new_crop.id) end describe "assigns the requested harvest as @harvest" do - before { put :update, params: { id: harvest.to_param, harvest: valid_attributes } } + before { put :update, params: { slug: harvest.to_param, harvest: valid_attributes } } it { expect(assigns(:harvest)).to eq(harvest) } end describe "redirects to the harvest" do - before { put :update, params: { id: harvest.to_param, harvest: valid_attributes } } + before { put :update, params: { slug: harvest.to_param, harvest: valid_attributes } } it { expect(response).to redirect_to(harvest) } end @@ -172,13 +172,13 @@ describe HarvestsController do harvest = Harvest.create! valid_attributes # Trigger the behavior that occurs when invalid params are submitted Harvest.any_instance.stub(:save).and_return(false) - put :update, params: { id: harvest.to_param, harvest: { "crop_id" => "invalid value" } } + put :update, params: { slug: harvest.to_param, harvest: { "crop_id" => "invalid value" } } expect(assigns(:harvest)).to eq(harvest) end it "re-renders the 'edit' template" do harvest = Harvest.create! valid_attributes - put :update, params: { id: harvest.to_param, harvest: { "crop_id" => "invalid value" } } + put :update, params: { slug: harvest.to_param, harvest: { "crop_id" => "invalid value" } } expect(response).to render_template("edit") end end @@ -189,7 +189,7 @@ describe HarvestsController do describe "does not save planting_id" do before do - put :update, params: { id: harvest.to_param, + put :update, params: { slug: harvest.to_param, harvest: valid_attributes.merge(planting_id: not_my_planting.id) } end @@ -202,13 +202,13 @@ describe HarvestsController do it "destroys the requested harvest" do harvest = Harvest.create! valid_attributes expect do - delete :destroy, params: { id: harvest.to_param } + delete :destroy, params: { slug: harvest.to_param } end.to change(Harvest, :count).by(-1) end it "redirects to the harvests list" do harvest = Harvest.create! valid_attributes - delete :destroy, params: { id: harvest.to_param } + delete :destroy, params: { slug: harvest.to_param } expect(response).to redirect_to(harvests_url) end end diff --git a/spec/routing/gardens_routing_spec.rb b/spec/routing/gardens_routing_spec.rb index ddd282551..365fba5e7 100644 --- a/spec/routing/gardens_routing_spec.rb +++ b/spec/routing/gardens_routing_spec.rb @@ -14,11 +14,11 @@ describe GardensController do end it "routes to #show" do - get("/gardens/1").should route_to("gardens#show", id: "1") + get("/gardens/sunny-bed").should route_to("gardens#show", slug: 'sunny-bed') end it "routes to #edit" do - get("/gardens/1/edit").should route_to("gardens#edit", id: "1") + get("/gardens/sunny-bed/edit").should route_to("gardens#edit", slug: 'sunny-bed') end it "routes to #create" do @@ -26,11 +26,11 @@ describe GardensController do end it "routes to #update" do - put("/gardens/1").should route_to("gardens#update", id: "1") + put("/gardens/sunny-bed").should route_to("gardens#update", slug: 'sunny-bed') end it "routes to #destroy" do - delete("/gardens/1").should route_to("gardens#destroy", id: "1") + delete("/gardens/sunny-bed").should route_to("gardens#destroy", slug: 'sunny-bed') end end end diff --git a/spec/routing/harvests_routing_spec.rb b/spec/routing/harvests_routing_spec.rb index 4dc1aaece..22ee305fc 100644 --- a/spec/routing/harvests_routing_spec.rb +++ b/spec/routing/harvests_routing_spec.rb @@ -14,11 +14,11 @@ describe HarvestsController do end it "routes to #show" do - get("/harvests/1").should route_to("harvests#show", id: "1") + get("/harvests/potato").should route_to("harvests#show", slug: "potato") end it "routes to #edit" do - get("/harvests/1/edit").should route_to("harvests#edit", id: "1") + get("/harvests/potato/edit").should route_to("harvests#edit", slug: "potato") end it "routes to #create" do @@ -26,11 +26,11 @@ describe HarvestsController do end it "routes to #update" do - put("/harvests/1").should route_to("harvests#update", id: "1") + put("/harvests/potato").should route_to("harvests#update", slug: "potato") end it "routes to #destroy" do - delete("/harvests/1").should route_to("harvests#destroy", id: "1") + delete("/harvests/potato").should route_to("harvests#destroy", slug: "potato") end end end diff --git a/spec/routing/member_routing_spec.rb b/spec/routing/member_routing_spec.rb new file mode 100644 index 000000000..790ff94b1 --- /dev/null +++ b/spec/routing/member_routing_spec.rb @@ -0,0 +1,42 @@ +# frozen_string_literal: true + +require "rails_helper" + +describe MembersController do + describe "routing" do + it "routes to #index" do + get("/members").should route_to("members#index") + end + + it "routes to #new" do + get("/members/new").should route_to("members#new") + end + + it "routes to #show" do + get("/members/name").should route_to("members#show", slug: "name") + end + + it "routes to #edit" do + get("/members/name/edit").should route_to("members#edit", slug: "name") + end + + # it "routes to #create" do + # post("/members").should route_to("members#create") + # end + + it "routes to #update" do + put("/members/name").should route_to("members#update", slug: "name") + end + + it "routes to #destroy" do + delete("/members/name").should route_to("members#destroy", slug: "name") + end + + it "routes to harvests#index" do + get("/members/name/harvests").should route_to("harvests#index", member_slug: 'name') + end + it "routes to plantings#index" do + get("/members/name/plantings").should route_to("plantings#index", member_slug: 'name') + end + end +end diff --git a/spec/routing/plantings_routing_spec.rb b/spec/routing/plantings_routing_spec.rb index 75c37d655..e3a8b5344 100644 --- a/spec/routing/plantings_routing_spec.rb +++ b/spec/routing/plantings_routing_spec.rb @@ -14,11 +14,11 @@ describe PlantingsController do end it "routes to #show" do - get("/plantings/1").should route_to("plantings#show", id: "1") + get("/plantings/tomato").should route_to("plantings#show", slug: "tomato") end it "routes to #edit" do - get("/plantings/1/edit").should route_to("plantings#edit", id: "1") + get("/plantings/tomato/edit").should route_to("plantings#edit", slug: "tomato") end it "routes to #create" do @@ -26,11 +26,11 @@ describe PlantingsController do end it "routes to #update" do - put("/plantings/1").should route_to("plantings#update", id: "1") + put("/plantings/tomato").should route_to("plantings#update", slug: "tomato") end it "routes to #destroy" do - delete("/plantings/1").should route_to("plantings#destroy", id: "1") + delete("/plantings/tomato").should route_to("plantings#destroy", slug: "tomato") end end end diff --git a/spec/routing/seeds_routing_spec.rb b/spec/routing/seeds_routing_spec.rb index 0528a5b8d..65710acb1 100644 --- a/spec/routing/seeds_routing_spec.rb +++ b/spec/routing/seeds_routing_spec.rb @@ -14,11 +14,11 @@ describe SeedsController do end it "routes to #show" do - get("/seeds/1").should route_to("seeds#show", id: "1") + get("/seeds/corn").should route_to("seeds#show", slug: 'corn') end it "routes to #edit" do - get("/seeds/1/edit").should route_to("seeds#edit", id: "1") + get("/seeds/corn/edit").should route_to("seeds#edit", slug: 'corn') end it "routes to #create" do @@ -26,11 +26,11 @@ describe SeedsController do end it "routes to #update" do - put("/seeds/1").should route_to("seeds#update", id: "1") + put("/seeds/corn").should route_to("seeds#update", slug: 'corn') end it "routes to #destroy" do - delete("/seeds/1").should route_to("seeds#destroy", id: "1") + delete("/seeds/corn").should route_to("seeds#destroy", slug: 'corn') end end end From aab345cf09bb856b6679561375768ce30dcbe7a5 Mon Sep 17 00:00:00 2001 From: Brenda Date: Thu, 26 Dec 2019 16:04:28 +1300 Subject: [PATCH 08/29] Adding more counter caches --- app/models/comment.rb | 2 +- app/models/harvest.rb | 4 ++-- app/models/like.rb | 2 +- app/models/photo.rb | 2 +- app/models/photo_association.rb | 4 ++-- ...191226024813_crop_harvest_counter_cache.rb | 20 ++++++++++++++++ ...20191226024957_crop_photo_counter_cache.rb | 20 ++++++++++++++++ ...025124_plant_part_harvest_counter_cache.rb | 23 +++++++++++++++++++ ...191226025225_post_comment_counter_cache.rb | 23 +++++++++++++++++++ db/schema.rb | 6 ++++- 10 files changed, 98 insertions(+), 8 deletions(-) create mode 100644 db/migrate/20191226024813_crop_harvest_counter_cache.rb create mode 100644 db/migrate/20191226024957_crop_photo_counter_cache.rb create mode 100644 db/migrate/20191226025124_plant_part_harvest_counter_cache.rb create mode 100644 db/migrate/20191226025225_post_comment_counter_cache.rb diff --git a/app/models/comment.rb b/app/models/comment.rb index 35f0c7009..7b85f4c0d 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -2,7 +2,7 @@ class Comment < ApplicationRecord belongs_to :author, class_name: 'Member', inverse_of: :comments - belongs_to :post + belongs_to :post, counter_cache: true scope :post_order, -> { reorder("created_at ASC") } # for display on post page diff --git a/app/models/harvest.rb b/app/models/harvest.rb index 6777e3c6c..a38241c4e 100644 --- a/app/models/harvest.rb +++ b/app/models/harvest.rb @@ -35,8 +35,8 @@ class Harvest < ApplicationRecord ## ## Relationships - belongs_to :crop - belongs_to :plant_part + belongs_to :crop, counter_cache: true + belongs_to :plant_part, counter_cache: true belongs_to :planting, optional: true, counter_cache: true ## diff --git a/app/models/like.rb b/app/models/like.rb index 5cf7992a0..ed16065de 100644 --- a/app/models/like.rb +++ b/app/models/like.rb @@ -2,7 +2,7 @@ class Like < ApplicationRecord belongs_to :member - belongs_to :likeable, polymorphic: true, counter_cache: true + belongs_to :likeable, polymorphic: true, counter_cache: true, touch: true validates :member, :likeable, presence: true validates :member, uniqueness: { scope: :likeable } end diff --git a/app/models/photo.rb b/app/models/photo.rb index 5f9f9169c..38359732c 100644 --- a/app/models/photo.rb +++ b/app/models/photo.rb @@ -7,7 +7,7 @@ class Photo < ApplicationRecord PHOTO_CAPABLE = %w(Garden Planting Harvest Seed Post Crop).freeze has_many :photo_associations, foreign_key: :photo_id, dependent: :delete_all, inverse_of: :photo - has_many :crops, through: :photo_associations + has_many :crops, through: :photo_associations, counter_cache: true validates :fullsize_url, url: true validates :thumbnail_url, url: true diff --git a/app/models/photo_association.rb b/app/models/photo_association.rb index 425a598c5..1fe576902 100644 --- a/app/models/photo_association.rb +++ b/app/models/photo_association.rb @@ -2,8 +2,8 @@ class PhotoAssociation < ApplicationRecord belongs_to :photo, inverse_of: :photo_associations - belongs_to :photographable, polymorphic: true - belongs_to :crop, optional: true + belongs_to :photographable, polymorphic: true, touch: true + belongs_to :crop, optional: true, counter_cache: true validate :photo_and_item_have_same_owner diff --git a/db/migrate/20191226024813_crop_harvest_counter_cache.rb b/db/migrate/20191226024813_crop_harvest_counter_cache.rb new file mode 100644 index 000000000..d0b9c2082 --- /dev/null +++ b/db/migrate/20191226024813_crop_harvest_counter_cache.rb @@ -0,0 +1,20 @@ +class CropHarvestCounterCache < ActiveRecord::Migration[5.2] + def change + change_table :crops do |t| + t.integer :harvests_count, default: 0 + end + reversible do |dir| + dir.up { set_counter_value } + end + end + def set_counter_value + execute <<-SQL.squish + UPDATE crops + SET harvests_count = ( + SELECT count(1) + FROM harvests + WHERE harvests.crop_id = crops.id + ) + SQL + end +end diff --git a/db/migrate/20191226024957_crop_photo_counter_cache.rb b/db/migrate/20191226024957_crop_photo_counter_cache.rb new file mode 100644 index 000000000..3bb4ebe68 --- /dev/null +++ b/db/migrate/20191226024957_crop_photo_counter_cache.rb @@ -0,0 +1,20 @@ +class CropPhotoCounterCache < ActiveRecord::Migration[5.2] + def change + change_table :crops do |t| + t.integer :photo_associations_count, default: 0 + end + reversible do |dir| + dir.up { set_counter_value } + end + end + def set_counter_value + execute <<-SQL.squish + UPDATE crops + SET photo_associations_count = ( + SELECT count(1) + FROM photo_associations + WHERE photo_associations.crop_id = crops.id + ) + SQL + end +end diff --git a/db/migrate/20191226025124_plant_part_harvest_counter_cache.rb b/db/migrate/20191226025124_plant_part_harvest_counter_cache.rb new file mode 100644 index 000000000..e16deaced --- /dev/null +++ b/db/migrate/20191226025124_plant_part_harvest_counter_cache.rb @@ -0,0 +1,23 @@ +# frozen_string_literal: true + +class PlantPartHarvestCounterCache < ActiveRecord::Migration[5.2] + def change + change_table :plant_parts do |t| + t.integer :harvests_count, default: 0 + end + reversible do |dir| + dir.up { set_counter_value } + end + end + + def set_counter_value + execute <<-SQL.squish + UPDATE plant_parts + SET harvests_count = ( + SELECT count(1) + FROM harvests + WHERE harvests.plant_part_id = plant_parts.id + ) + SQL + end +end diff --git a/db/migrate/20191226025225_post_comment_counter_cache.rb b/db/migrate/20191226025225_post_comment_counter_cache.rb new file mode 100644 index 000000000..df930fe0d --- /dev/null +++ b/db/migrate/20191226025225_post_comment_counter_cache.rb @@ -0,0 +1,23 @@ +# frozen_string_literal: true + +class PostCommentCounterCache < ActiveRecord::Migration[5.2] + def change + change_table :posts do |t| + t.integer :comments_count, default: 0 + end + reversible do |dir| + dir.up { set_counter_value } + end + end + + def set_counter_value + execute <<-SQL.squish + UPDATE posts + SET comments_count = ( + SELECT count(1) + FROM comments + WHERE comments.post_id = posts.id + ) + SQL + end +end diff --git a/db/schema.rb b/db/schema.rb index 06d7be216..4e6e251cd 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_11_19_030244) do +ActiveRecord::Schema.define(version: 2019_12_26_025225) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -196,6 +196,8 @@ ActiveRecord::Schema.define(version: 2019_11_19_030244) do t.integer "median_days_to_first_harvest" t.integer "median_days_to_last_harvest" t.jsonb "openfarm_data" + t.integer "harvests_count", default: 0 + t.integer "photo_associations_count", default: 0 t.index ["name"], name: "index_crops_on_name" t.index ["requester_id"], name: "index_crops_on_requester_id" t.index ["slug"], name: "index_crops_on_slug", unique: true @@ -458,6 +460,7 @@ ActiveRecord::Schema.define(version: 2019_11_19_030244) do t.datetime "created_at" t.datetime "updated_at" t.string "slug" + t.integer "harvests_count", default: 0 end create_table "plantings", id: :serial, force: :cascade do |t| @@ -491,6 +494,7 @@ ActiveRecord::Schema.define(version: 2019_11_19_030244) do t.string "slug" t.integer "forum_id" t.integer "likes_count", default: 0 + t.integer "comments_count", default: 0 t.index ["created_at", "author_id"], name: "index_posts_on_created_at_and_author_id" t.index ["slug"], name: "index_posts_on_slug", unique: true end From a595a2cd8e03415c97281abe4aa911462e53d117 Mon Sep 17 00:00:00 2001 From: codefactor-io Date: Thu, 26 Dec 2019 03:06:15 +0000 Subject: [PATCH 09/29] [CodeFactor] Apply fixes to commit 17fa995 --- db/migrate/20191226024813_crop_harvest_counter_cache.rb | 3 +++ db/migrate/20191226024957_crop_photo_counter_cache.rb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/db/migrate/20191226024813_crop_harvest_counter_cache.rb b/db/migrate/20191226024813_crop_harvest_counter_cache.rb index d0b9c2082..b942bfde3 100644 --- a/db/migrate/20191226024813_crop_harvest_counter_cache.rb +++ b/db/migrate/20191226024813_crop_harvest_counter_cache.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CropHarvestCounterCache < ActiveRecord::Migration[5.2] def change change_table :crops do |t| @@ -7,6 +9,7 @@ class CropHarvestCounterCache < ActiveRecord::Migration[5.2] dir.up { set_counter_value } end end + def set_counter_value execute <<-SQL.squish UPDATE crops diff --git a/db/migrate/20191226024957_crop_photo_counter_cache.rb b/db/migrate/20191226024957_crop_photo_counter_cache.rb index 3bb4ebe68..d4a085e24 100644 --- a/db/migrate/20191226024957_crop_photo_counter_cache.rb +++ b/db/migrate/20191226024957_crop_photo_counter_cache.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CropPhotoCounterCache < ActiveRecord::Migration[5.2] def change change_table :crops do |t| @@ -7,6 +9,7 @@ class CropPhotoCounterCache < ActiveRecord::Migration[5.2] dir.up { set_counter_value } end end + def set_counter_value execute <<-SQL.squish UPDATE crops From 4870dd02143848eddd0a6e38d7e532229f423ecf Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 27 Dec 2019 07:28:08 +0000 Subject: [PATCH 10/29] Bump chartkick from 3.3.0 to 3.3.1 Bumps [chartkick](https://github.com/ankane/chartkick) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/ankane/chartkick/releases) - [Changelog](https://github.com/ankane/chartkick/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/chartkick/compare/v3.3.0...v3.3.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index aa7889a7d..4152a9e64 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -109,7 +109,7 @@ GEM activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - chartkick (3.3.0) + chartkick (3.3.1) childprocess (3.0.0) codeclimate-test-reporter (1.0.9) simplecov (<= 0.13) From 307291975dac656ba486ee3fb0a24652e4aff38f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2019 07:43:56 +0000 Subject: [PATCH 11/29] Bump webdrivers from 4.1.3 to 4.2.0 Bumps [webdrivers](https://github.com/titusfortner/webdrivers) from 4.1.3 to 4.2.0. - [Release notes](https://github.com/titusfortner/webdrivers/releases) - [Changelog](https://github.com/titusfortner/webdrivers/blob/master/CHANGELOG.md) - [Commits](https://github.com/titusfortner/webdrivers/compare/v4.1.3...v4.2.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4152a9e64..47b562299 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -550,7 +550,7 @@ GEM public_suffix warden (1.2.8) rack (>= 2.0.6) - webdrivers (4.1.3) + webdrivers (4.2.0) nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (>= 3.0, < 4.0) From 4864cd8c5657638438d4d9b87ac0bc30c701dedf Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2019 21:56:23 +0000 Subject: [PATCH 12/29] Bump selenium-webdriver from 3.142.6 to 3.142.7 Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.142.6 to 3.142.7. - [Release notes](https://github.com/SeleniumHQ/selenium/releases) - [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES) - [Commits](https://github.com/SeleniumHQ/selenium/commits) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 47b562299..cdfa574cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -495,7 +495,7 @@ GEM activemodel (>= 5) elasticsearch (>= 6) hashie - selenium-webdriver (3.142.6) + selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) sexp_processor (4.12.1) From 5297cd17cbff3d84c0b90f82247f1a7b8073cac5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2019 22:10:00 +0000 Subject: [PATCH 13/29] Bump faker from 2.9.0 to 2.10.0 Bumps [faker](https://github.com/faker-ruby/faker) from 2.9.0 to 2.10.0. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v2.9.0...v2.10.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index cdfa574cd..3627cc6d9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -183,7 +183,7 @@ GEM factory_bot_rails (5.1.1) factory_bot (~> 5.1.0) railties (>= 4.2.0) - faker (2.9.0) + faker (2.10.0) i18n (>= 1.6, < 1.8) faraday (0.17.1) multipart-post (>= 1.2, < 3) From 9dae574de92d20c0950833c874c8e5217e90163a Mon Sep 17 00:00:00 2001 From: Martina Simicic <922964+simicic@users.noreply.github.com> Date: Wed, 1 Jan 2020 20:58:59 +0100 Subject: [PATCH 14/29] Use specific error for raise_error expectation --- spec/controllers/photos_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/controllers/photos_controller_spec.rb b/spec/controllers/photos_controller_spec.rb index 4cf8140bd..4f661a00f 100644 --- a/spec/controllers/photos_controller_spec.rb +++ b/spec/controllers/photos_controller_spec.rb @@ -138,7 +138,7 @@ describe PhotosController do post :create, params: { photo: { source_id: photo.source_id, source: 'flickr' }, type: "comment", id: comment.id } - end.to raise_error + end.to raise_error 'Photos not supported' end end From f8287a918aadd85259e49dc45fea9d719e033afe Mon Sep 17 00:00:00 2001 From: Martina Simicic <922964+simicic@users.noreply.github.com> Date: Wed, 1 Jan 2020 21:38:00 +0100 Subject: [PATCH 15/29] Add myself to CONTRIBUTORS.md --- CONTRIBUTORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 7c268fda4..0e57556cc 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -90,6 +90,7 @@ submit the change with your pull request. - Alex Darr / [apdarr](https://github.com/apdarr) - Taylor William / [bestest-mensch](https://github.com/bestest-mensch) - AndrĂ© Aubin / [lambda2](https://github.com/lambda2) +- Martina Simicic / [simicic](https://github.com/simicic) ## Bots From 103f45dd9de92b70ca2ca72c4c74453b2917f212 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2020 02:43:35 +0000 Subject: [PATCH 16/29] Bump comfortable_mexican_sofa from 2.0.18 to 2.0.19 Bumps [comfortable_mexican_sofa](https://github.com/comfy/comfortable-mexican-sofa) from 2.0.18 to 2.0.19. - [Release notes](https://github.com/comfy/comfortable-mexican-sofa/releases) - [Commits](https://github.com/comfy/comfortable-mexican-sofa/compare/v2.0.18...v2.0.19) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3627cc6d9..e0900584c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -85,7 +85,7 @@ GEM bootstrap_form (4.3.0) actionpack (>= 5.0) activemodel (>= 5.0) - builder (3.2.3) + builder (3.2.4) bullet (6.0.2) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) @@ -121,7 +121,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - comfortable_mexican_sofa (2.0.18) + comfortable_mexican_sofa (2.0.19) active_link_to (>= 1.0.0) comfy_bootstrap_form (>= 4.0.0) haml-rails (>= 1.0.0) @@ -132,7 +132,7 @@ GEM rails (>= 5.2.0) rails-i18n (>= 5.0.0) sassc-rails (>= 2.0.0) - comfy_bootstrap_form (4.0.6) + comfy_bootstrap_form (4.0.8) rails (>= 5.0.0) concord (0.1.5) adamantium (~> 0.2.0) @@ -307,7 +307,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2019.0331) mimemagic (0.3.3) - mini_magick (4.9.4) + mini_magick (4.9.5) mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.13.0) @@ -354,7 +354,7 @@ GEM moneta (~> 1.0.0) popper_js (1.14.5) procto (0.0.3) - public_suffix (4.0.1) + public_suffix (4.0.2) puma (4.3.1) nio4r (~> 2.0) query_diet (0.6.2) @@ -467,7 +467,7 @@ GEM rubocop (>= 0.68.1) ruby-progressbar (1.10.1) ruby-units (2.3.1) - ruby_parser (3.13.1) + ruby_parser (3.14.1) sexp_processor (~> 4.9) rubyzip (2.0.0) sass (3.7.4) @@ -498,7 +498,7 @@ GEM selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - sexp_processor (4.12.1) + sexp_processor (4.13.0) sidekiq (6.0.4) connection_pool (>= 2.2.2) rack (>= 2.0.0) @@ -528,7 +528,7 @@ GEM timecop (0.9.1) tins (1.21.0) trollop (1.16.2) - tzinfo (1.2.5) + tzinfo (1.2.6) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) From 088e9a9a467084d68947fef39480f745ad05cc33 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2020 02:56:42 +0000 Subject: [PATCH 17/29] Bump faraday from 0.17.1 to 0.17.3 Bumps [faraday](https://github.com/lostisland/faraday) from 0.17.1 to 0.17.3. - [Release notes](https://github.com/lostisland/faraday/releases) - [Changelog](https://github.com/lostisland/faraday/blob/master/CHANGELOG.md) - [Commits](https://github.com/lostisland/faraday/compare/v0.17.1...v0.17.3) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e0900584c..7cb3401da 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -185,7 +185,7 @@ GEM railties (>= 4.2.0) faker (2.10.0) i18n (>= 1.6, < 1.8) - faraday (0.17.1) + faraday (0.17.3) multipart-post (>= 1.2, < 3) faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) From 8acd9550f4203207aca08b3170cde4772d36dc7b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2020 03:19:20 +0000 Subject: [PATCH 18/29] Bump bullet from 6.0.2 to 6.1.0 Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.0.2 to 6.1.0. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/6.0.2...6.1.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7cb3401da..5331ffd06 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,7 +86,7 @@ GEM actionpack (>= 5.0) activemodel (>= 5.0) builder (3.2.4) - bullet (6.0.2) + bullet (6.1.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.0.1) @@ -536,7 +536,7 @@ GEM unicorn (5.5.2) kgio (~> 2.6) raindrops (~> 0.7) - uniform_notifier (1.12.1) + uniform_notifier (1.13.0) unparser (0.4.5) abstract_type (~> 0.0.7) adamantium (~> 0.2.0) From bdce7ec64dbd97b6deffb6991c7881a02e3dce0a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2020 07:35:27 +0000 Subject: [PATCH 19/29] Bump rack-protection from 2.0.7 to 2.0.8.1 Bumps [rack-protection](https://github.com/sinatra/sinatra) from 2.0.7 to 2.0.8.1. - [Release notes](https://github.com/sinatra/sinatra/releases) - [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v2.0.7...v2.0.8.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5331ffd06..238162d30 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -359,7 +359,7 @@ GEM nio4r (~> 2.0) query_diet (0.6.2) rack (2.0.8) - rack-protection (2.0.7) + rack-protection (2.0.8.1) rack rack-test (1.1.0) rack (>= 1.0, < 3) From 0f005a3c3980c4db2a8800c4aa25670ceca17b55 Mon Sep 17 00:00:00 2001 From: Martina Simicic <922964+simicic@users.noreply.github.com> Date: Fri, 3 Jan 2020 09:21:15 +0100 Subject: [PATCH 20/29] Make garden type optional when editing garden --- app/views/gardens/_form.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/gardens/_form.html.haml b/app/views/gardens/_form.html.haml index 8d61ee8c1..f55011592 100644 --- a/app/views/gardens/_form.html.haml +++ b/app/views/gardens/_form.html.haml @@ -30,7 +30,7 @@ .col-md-5.col-12= f.number_field :area, class: 'input-small' .col-md-7.col-12= f.select(:area_unit, Garden::AREA_UNITS_VALUES, { include_blank: false }) .col-12= f.select(:garden_type_id, GardenType.all.order(:name).pluck(:name, :id), - selected: @garden.garden_type_id) + selected: @garden.garden_type_id, include_blank: true) .col-12 = f.check_box :active, label: 'Active?' %p From 5895b798606d123922e18fa3b6a97210459a485e Mon Sep 17 00:00:00 2001 From: Martina Simicic <922964+simicic@users.noreply.github.com> Date: Mon, 6 Jan 2020 12:59:50 +0100 Subject: [PATCH 21/29] Show garden type for a garden --- app/views/gardens/show.html.haml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml index b1ba94c95..54f358645 100644 --- a/app/views/gardens/show.html.haml +++ b/app/views/gardens/show.html.haml @@ -81,6 +81,10 @@ %p %strong Area: = pluralize(@garden.area, @garden.area_unit) + - unless @garden.garden_type.blank? + %p + %strong Garden type: + = @garden.garden_type.name .card .card-header From 42c8e6434cb1391bdf76e0934099cf40c17680b0 Mon Sep 17 00:00:00 2001 From: Martina Simicic <922964+simicic@users.noreply.github.com> Date: Mon, 6 Jan 2020 13:29:03 +0100 Subject: [PATCH 22/29] Add spec for showing garden type for a garden --- spec/features/gardens/gardens_spec.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/spec/features/gardens/gardens_spec.rb b/spec/features/gardens/gardens_spec.rb index 714657952..c34958a36 100644 --- a/spec/features/gardens/gardens_spec.rb +++ b/spec/features/gardens/gardens_spec.rb @@ -73,6 +73,18 @@ describe "Planting a crop", js: true do end end + context 'When a garden has a garden type' do + let(:garden_type) { create :garden_type } + let(:garden_with_type) { create :garden, garden_type: garden_type } + + it "Shows a garden type for a garden" do + visit garden_path(garden_with_type) + + expect(page).to have_content "Garden type" + expect(page).to have_content garden_type.name + end + end + it "Edit garden" do visit new_garden_path fill_in "Name", with: "New garden" From fb71a46de73c84d06ed946a991e3c54d4d0490b1 Mon Sep 17 00:00:00 2001 From: Martina Simicic <922964+simicic@users.noreply.github.com> Date: Mon, 6 Jan 2020 13:29:56 +0100 Subject: [PATCH 23/29] Use positive statements --- app/views/gardens/show.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml index 54f358645..f4746ad7c 100644 --- a/app/views/gardens/show.html.haml +++ b/app/views/gardens/show.html.haml @@ -73,15 +73,15 @@ %p %strong Owner: = link_to @garden.owner, @garden.owner - - unless @garden.location.blank? + - if @garden.location.present? %p %strong Location: = @garden.location - - unless @garden.area.blank? + - if @garden.area.present? %p %strong Area: = pluralize(@garden.area, @garden.area_unit) - - unless @garden.garden_type.blank? + - if @garden.garden_type.present? %p %strong Garden type: = @garden.garden_type.name From 0c7ca5088092d72d20566a60e24ccf0880559122 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Mon, 6 Jan 2020 22:04:47 +1300 Subject: [PATCH 24/29] small file fixes --- Guardfile | 2 ++ Rakefile | 2 ++ app/controllers/crops_controller.rb | 2 +- bin/bundle | 2 ++ bin/rails | 2 ++ bin/rake | 2 ++ bin/setup | 2 ++ bin/update | 2 ++ bin/yarn | 2 ++ config.ru | 2 ++ db/migrate/20191226024957_crop_photo_counter_cache.rb | 2 ++ script/rails | 2 ++ 12 files changed, 23 insertions(+), 1 deletion(-) diff --git a/Guardfile b/Guardfile index e4197ab07..8e9e7cc88 100644 --- a/Guardfile +++ b/Guardfile @@ -1,3 +1,5 @@ +# frozen_string_literal: true + guard :rspec, cmd: 'bundle exec rspec --format documentation', failed_mode: :keep do diff --git a/Rakefile b/Rakefile index 15ae3eb68..88a812821 100755 --- a/Rakefile +++ b/Rakefile @@ -1,4 +1,6 @@ #!/usr/bin/env rake +# frozen_string_literal: true + # Add your own tasks in files placed in lib/tasks ending in .rake, # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. diff --git a/app/controllers/crops_controller.rb b/app/controllers/crops_controller.rb index bbc158da3..4c6f7c0a1 100644 --- a/app/controllers/crops_controller.rb +++ b/app/controllers/crops_controller.rb @@ -4,7 +4,7 @@ require 'will_paginate/array' class CropsController < ApplicationController before_action :authenticate_member!, except: %i(index hierarchy search show) - load_and_authorize_resource + load_and_authorize_resource id_param: :slug skip_authorize_resource only: %i(hierarchy search) respond_to :html, :json, :rss, :csv, :svg responders :flash diff --git a/bin/bundle b/bin/bundle index f19acf5b5..2dbb71769 100755 --- a/bin/bundle +++ b/bin/bundle @@ -1,3 +1,5 @@ #!/usr/bin/env ruby +# frozen_string_literal: true + ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails index 073966023..a31728ab9 100755 --- a/bin/rails +++ b/bin/rails @@ -1,4 +1,6 @@ #!/usr/bin/env ruby +# frozen_string_literal: true + APP_PATH = File.expand_path('../config/application', __dir__) require_relative '../config/boot' require 'rails/commands' diff --git a/bin/rake b/bin/rake index 17240489f..c19995500 100755 --- a/bin/rake +++ b/bin/rake @@ -1,4 +1,6 @@ #!/usr/bin/env ruby +# frozen_string_literal: true + require_relative '../config/boot' require 'rake' Rake.application.run diff --git a/bin/setup b/bin/setup index 94fd4d797..c2e43ceb2 100755 --- a/bin/setup +++ b/bin/setup @@ -1,4 +1,6 @@ #!/usr/bin/env ruby +# frozen_string_literal: true + require 'fileutils' include FileUtils diff --git a/bin/update b/bin/update index 58bfaed51..313c74b38 100755 --- a/bin/update +++ b/bin/update @@ -1,4 +1,6 @@ #!/usr/bin/env ruby +# frozen_string_literal: true + require 'fileutils' include FileUtils diff --git a/bin/yarn b/bin/yarn index b24854dce..268a9398f 100755 --- a/bin/yarn +++ b/bin/yarn @@ -1,4 +1,6 @@ #!/usr/bin/env ruby +# frozen_string_literal: true + APP_ROOT = File.expand_path('..', __dir__) Dir.chdir(APP_ROOT) do exec "yarnpkg", *ARGV diff --git a/config.ru b/config.ru index bd83b2541..61c04e13f 100644 --- a/config.ru +++ b/config.ru @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # This file is used by Rack-based servers to start the application. require ::File.expand_path('../config/environment', __FILE__) diff --git a/db/migrate/20191226024957_crop_photo_counter_cache.rb b/db/migrate/20191226024957_crop_photo_counter_cache.rb index d4a085e24..db6f6f5f9 100644 --- a/db/migrate/20191226024957_crop_photo_counter_cache.rb +++ b/db/migrate/20191226024957_crop_photo_counter_cache.rb @@ -1,5 +1,7 @@ + # frozen_string_literal: true + class CropPhotoCounterCache < ActiveRecord::Migration[5.2] def change change_table :crops do |t| diff --git a/script/rails b/script/rails index 754b05caa..bb6f9c879 100755 --- a/script/rails +++ b/script/rails @@ -1,4 +1,6 @@ #!/usr/bin/env ruby +# frozen_string_literal: true + # This command will automatically be run when you run "rails" # with Rails 3 gems installed from the root of your application. From 7645bd938db2bf20ec54df9e61ea12ee0d7fce5e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2020 07:54:32 +0000 Subject: [PATCH 25/29] Bump jsonapi-swagger from 0.7.1 to 0.8.0 Bumps [jsonapi-swagger](https://github.com/superiorlu/jsonapi-swagger) from 0.7.1 to 0.8.0. - [Release notes](https://github.com/superiorlu/jsonapi-swagger/releases) - [Commits](https://github.com/superiorlu/jsonapi-swagger/compare/v0.7.1...v0.8.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 238162d30..fe38111b5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -271,7 +271,7 @@ GEM activerecord (>= 4.1) concurrent-ruby railties (>= 4.1) - jsonapi-swagger (0.7.1) + jsonapi-swagger (0.8.0) jwt (2.2.1) kgio (2.11.2) kramdown (2.1.0) From 298a20e8cca4cfb8a9725a94d7c78f9200d59ac2 Mon Sep 17 00:00:00 2001 From: Martina Simicic <922964+simicic@users.noreply.github.com> Date: Tue, 7 Jan 2020 10:00:39 +0100 Subject: [PATCH 26/29] Add eager loading for garden owner --- app/controllers/gardens_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/gardens_controller.rb b/app/controllers/gardens_controller.rb index 5ef4be121..29fbc78ef 100644 --- a/app/controllers/gardens_controller.rb +++ b/app/controllers/gardens_controller.rb @@ -5,6 +5,7 @@ class GardensController < DataController @owner = Member.find_by(slug: params[:member_slug]) @show_all = params[:all] == '1' + @gardens = @gardens.includes(:owner) @gardens = @gardens.active unless @show_all @gardens = @gardens.where(owner: @owner) if @owner.present? @gardens = @gardens.where.not(members: { confirmed_at: nil }) From 5e300f9dcfeee98faaa0d9390a6b300a93fe824d Mon Sep 17 00:00:00 2001 From: Martina Simicic <922964+simicic@users.noreply.github.com> Date: Tue, 7 Jan 2020 11:14:47 +0100 Subject: [PATCH 27/29] Unify design for gardens index page Design of the page is now similar to index pages for plantings and crops --- app/views/gardens/index.html.haml | 115 ++++++++++++++++++------------ 1 file changed, 68 insertions(+), 47 deletions(-) diff --git a/app/views/gardens/index.html.haml b/app/views/gardens/index.html.haml index a36d5e35f..dd21d19ee 100644 --- a/app/views/gardens/index.html.haml +++ b/app/views/gardens/index.html.haml @@ -2,8 +2,6 @@ %h1= @owner ? "#{@owner}'s gardens" : "Everyone's gardens" -= render 'layouts/nav', model: Garden - - content_for :breadcrumbs do - if @owner %li.breadcrumb-item= link_to 'Gardens', gardens_path @@ -11,51 +9,74 @@ - else %li.breadcrumb-item.active= link_to 'Gardens', gardens_path -%section.border-top - = link_to show_inactive_tickbox_path('gardens', owner: @owner, show_all: @show_all), class: 'btn' do - = check_box_tag 'active', 'all', @show_all - include in-active +.row + .col-md-2 + = render 'layouts/nav', model: Garden -- if @gardens.empty? - %p There are no gardens to display. - - if can?(:create, Garden) && @owner == current_member - = link_to 'Add a garden', new_garden_path, class: 'btn btn-primary' + %section.border-top + = link_to show_inactive_tickbox_path('gardens', owner: @owner, show_all: @show_all), class: 'btn' do + = check_box_tag 'active', 'all', @show_all + include in-active -- else - = page_entries_info @gardens - = will_paginate @gardens - .jump - jump to: - - @gardens.each do |garden| - .badge.badge-primary - - if @owner.present? - = link_to garden.name, member_gardens_path(@owner, anchor: "garden-#{garden.id}") - - else - = link_to garden.name, gardens_path(anchor: "garden-#{garden.id}") - - @gardens.each do |garden| - %section.card - %h2= link_to garden.name, garden, name: "garden-#{garden.id}" - .card-header - .row - .col-12.col-md-3 - - unless @owner.present? - owner: - = render 'members/tiny', member: garden.owner - = image_tag garden_image_path(garden), alt: garden.name, class: 'img-card' - .col-12.col-md-2= render 'gardens/actions', garden: garden - .col - - if garden.plantings.active.perennial.any? - %strong Perennials: - - garden.plantings.active.perennial.each do |planting| - = link_to planting do - = crop_icon planting.crop - = planting.crop - .card-body - - if garden.plantings.active.annual.any? - = render 'plantings/progress_list', plantings: garden.plantings.active.annual - - else - No annual plantings + .col-md-10 + - if @gardens.empty? + %p There are no gardens to display. + - if can?(:create, Garden) && @owner == current_member + = link_to 'Add a garden', new_garden_path, class: 'btn btn-primary' - .row - .col-12= page_entries_info @gardens - .col-12= will_paginate @gardens + - else + %section + %h2= page_entries_info @gardens + = will_paginate @gardens + + - unless defined?(@show_all) + .jump + jump to: + - @gardens.each do |garden| + .badge.badge-primary + - if @owner.present? + = link_to garden.name, member_gardens_path(@owner, anchor: "garden-#{garden.id}") + - else + = link_to garden.name, gardens_path(anchor: "garden-#{garden.id}") + - @gardens.each do |garden| + .card + .card-header + .row + .col-12.col-md-3 + %h2= link_to garden.name, garden, name: "garden-#{garden.id}" + .row + .col-md-3 + - if @owner.blank? + owner: + = render 'members/tiny', member: garden.owner + + + = image_tag garden_image_path(garden), alt: garden.name, class: 'img-card' + + .col-md-9 + %section + = render 'gardens/actions', garden: garden + + - active_plantings = garden.plantings.active + + %section + - if active_plantings.perennial.any? + %strong Perennials: + - active_plantings.perennial.each do |planting| + = link_to planting do + = crop_icon planting.crop + = planting.crop + - else + %p No perennial plantings + + %hr + + %section + - if active_plantings.annual.any? + = render 'plantings/progress_list', plantings: garden.plantings.active.annual + - else + %p No annual plantings + + .row + .col-12= page_entries_info @gardens + .col-12= will_paginate @gardens From 4893980ff003983ff4f25083b388d851d4c86074 Mon Sep 17 00:00:00 2001 From: Martina Simicic <922964+simicic@users.noreply.github.com> Date: Tue, 7 Jan 2020 11:41:51 +0100 Subject: [PATCH 28/29] Jump to is only shown when viewing own gardens --- app/controllers/gardens_controller.rb | 1 + app/views/gardens/index.html.haml | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/controllers/gardens_controller.rb b/app/controllers/gardens_controller.rb index 29fbc78ef..977deb7d7 100644 --- a/app/controllers/gardens_controller.rb +++ b/app/controllers/gardens_controller.rb @@ -4,6 +4,7 @@ class GardensController < DataController def index @owner = Member.find_by(slug: params[:member_slug]) @show_all = params[:all] == '1' + @my_garden = params[:member_slug].present? ? true : false @gardens = @gardens.includes(:owner) @gardens = @gardens.active unless @show_all diff --git a/app/views/gardens/index.html.haml b/app/views/gardens/index.html.haml index dd21d19ee..255745497 100644 --- a/app/views/gardens/index.html.haml +++ b/app/views/gardens/index.html.haml @@ -29,15 +29,16 @@ %h2= page_entries_info @gardens = will_paginate @gardens - - unless defined?(@show_all) - .jump - jump to: - - @gardens.each do |garden| - .badge.badge-primary - - if @owner.present? - = link_to garden.name, member_gardens_path(@owner, anchor: "garden-#{garden.id}") - - else - = link_to garden.name, gardens_path(anchor: "garden-#{garden.id}") + - if @my_garden == true + %section + .jump + jump to: + - @gardens.each do |garden| + .badge.badge-primary + - if @owner.present? + = link_to garden.name, member_gardens_path(@owner, anchor: "garden-#{garden.id}") + - else + = link_to garden.name, gardens_path(anchor: "garden-#{garden.id}") - @gardens.each do |garden| .card .card-header From 2a61711c963ecaf3d5faa590968982d00351c9a4 Mon Sep 17 00:00:00 2001 From: Martina Simicic <922964+simicic@users.noreply.github.com> Date: Wed, 8 Jan 2020 08:59:50 +0100 Subject: [PATCH 29/29] Name variable to somthing more descriptive --- app/controllers/gardens_controller.rb | 2 +- app/views/gardens/index.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/gardens_controller.rb b/app/controllers/gardens_controller.rb index 977deb7d7..696377186 100644 --- a/app/controllers/gardens_controller.rb +++ b/app/controllers/gardens_controller.rb @@ -4,7 +4,7 @@ class GardensController < DataController def index @owner = Member.find_by(slug: params[:member_slug]) @show_all = params[:all] == '1' - @my_garden = params[:member_slug].present? ? true : false + @show_jump_to = params[:member_slug].present? ? true : false @gardens = @gardens.includes(:owner) @gardens = @gardens.active unless @show_all diff --git a/app/views/gardens/index.html.haml b/app/views/gardens/index.html.haml index 255745497..e69dce99e 100644 --- a/app/views/gardens/index.html.haml +++ b/app/views/gardens/index.html.haml @@ -29,7 +29,7 @@ %h2= page_entries_info @gardens = will_paginate @gardens - - if @my_garden == true + - if @show_jump_to == true %section .jump jump to: