Add pluralization to ingredient displays #595
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lortza
commented
Nov 3, 2022
| @@ -6,6 +6,5 @@ | |||
| sequence(:name) { |n| "ingredient name #{n}" } | |||
| quantity { 1.5 } | |||
| measurement_unit { Ingredient::UNITS[1..-1].sample } | |||
| preparation_style { Ingredient::STYLES[1..-1].sample } | |||
There was a problem hiding this comment.
preparation_style is not a required field, so it should not be in the factory default.
lortza
commented
Nov 3, 2022
| @@ -43,6 +43,7 @@ | |||
| <% details.each do |detail| %> | |||
| <li> | |||
| <%= detail_display(detail) %> | |||
| (<%= link_to detail.recipe.title, detail.recipe %>) | |||
There was a problem hiding this comment.
isolates the link to the recipe page to only the recipe title text and effectively moves the html out of the helper method.
lortza
commented
Nov 3, 2022
| ].join(' ') | ||
|
|
||
| link_to ingredient, recipe_path(detail.recipe) | ||
| pluralized = if Ingredient::DESCRIPTIVE_UNITS.include?(detail.measurement_unit) |
There was a problem hiding this comment.
Used in the Meal Plan show page to pluralize like:
- 6 whole, chopped
- 3 cloves, minced
lortza
commented
Nov 3, 2022
|
|
||
| if ingredient.preparation_style.present? | ||
| "#{display_name}: #{ingredient.preparation_style}" | ||
| display_name = if Ingredient::DESCRIPTIVE_UNITS.include?(ingredient.measurement_unit) |
There was a problem hiding this comment.
Used in the Recipe show page to pluralize like:
- 6 whole carrots, chopped
- 3 cloves garlic, minced
lortza
commented
Nov 3, 2022
Comment on lines
+44
to
+47
| UNITS = [ | ||
| STANDARD_UNITS, | ||
| DESCRIPTIVE_UNITS, | ||
| ].flatten.sort |
There was a problem hiding this comment.
Breaks measurement units into groups based on pluralization needs, then ensures wherever UNITS is used that all items appear in alpha order.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I thought it was time to make the ingredient display look smarter with pluralization. The tricky part is that sometimes we pluralize the measurement unit, like "3 cups water" but other times we pluralize the food name, like "3 medium carrots". This PR handles that logic for the recipe show page and the meal plan show page.
Screenshots
Before
The recipe show page does not pluralize any part of the ingredient listing.
The meal plan show page does not pluralize any part of the ingredient listing.
After
The recipe show page pluralizes ingredients when there is a descriptive measurement unit, like "large" or "whole" and pluralizes the measurement unit for normal units like "cup" or "tablespoon".
The meal plan show page pluralizes in the same pattern as the recipe show page. Also, the link to the recipe is now from only the recipe title text.
Things Learned
Due Diligence Checks