Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/forage/query_builder/sort_field.ex
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ defmodule Forage.QueryBuilder.SortField do
# May not exist if the user hasn't specified it.
# By default, sort results in ascending order
direction = row[:direction] || :asc
# Will always existe becuase of how the keyword list is constructed
# Will always existe because of how the keyword list is constructed
field = row[:field]
# Return the pair
{direction, field}
Expand Down
2 changes: 1 addition & 1 deletion lib/forage/search_postgresql.ex
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ defmodule Forage.SearchPostgreSQL do

This is implemented internally as an `ILIKE` operator.
Thus function calls the special `forage_unaccent()` function,
which you should have defined somehwere in your PostgreSQL database.
which you should have defined somewhere in your PostgreSQL database.

If it makes sense for your application, you can implement
better search yourself.
Expand Down
4 changes: 2 additions & 2 deletions lib/forage_web/display.ex
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ defprotocol ForageWeb.Display do
@doc """
Displays the model as plaintext.

This is meant to be used to diplay options in a select widget and
This is meant to be used to display options in a select widget and
when you want to show the user a resource as HTML.
"""
def as_text(model)

@doc """
Displays the model as HTML.

This is meant to be used to diplay the resource as HTML
This is meant to be used to display the resource as HTML
(as opposed to plaintext)
"""
def as_html(model)
Expand Down
6 changes: 3 additions & 3 deletions lib/forage_web/forage_controller.ex
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ defmodule ForageWeb.ForageController do
This function returns a map.
The user must use the JSON encoder in the Phoenix application to generate a JSON response.

It would be more succint to return JSON directly from this function,
It would be more succinct to return JSON directly from this function,
but Forage has no way of invoking the application's JSON encoder,
so we leave that responsibility to the user.

Expand Down Expand Up @@ -41,7 +41,7 @@ defmodule ForageWeb.ForageController do
This function returns a map.
The user must use the JSON encoder in the Phoenix application to generate a JSON response.

It would be more succint to return JSON directly from this function,
It would be more succinct to return JSON directly from this function,
but Forage has no way of invoking the application's JSON encoder,
so we leave that responsibility to the user.

Expand Down Expand Up @@ -86,7 +86,7 @@ defmodule ForageWeb.ForageController do
This function returns a map.
The user must use the JSON encoder in the Phoenix application to generate a JSON response.

It would be more succint to return JSON directly from this function,
It would be more succinct to return JSON directly from this function,
but Forage has no way of invoking the application's JSON encoder,
so we leave that responsibility to the user.

Expand Down
4 changes: 2 additions & 2 deletions scripts/publish.exs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ end
defmodule Publisher.VersionUtils do
@moduledoc """
Some utilities to get and set version numbers in the `mix.exs` file
and to programatically transform version numbers.
and to programmatically transform version numbers.

Maybe the `bump_*` functions should be in the standard library?

Expand Down Expand Up @@ -188,7 +188,7 @@ defmodule Publisher do
VersionUtils.set_version(new_version)
# Commit the changes and add a new 'v*.*.*' tag
Git.add_commit_and_tag(new_version)
# Now that we have commited the changes, we can remove the release file
# Now that we have committed the changes, we can remove the release file
Changelog.remove_release_file()
end
end
Expand Down
2 changes: 1 addition & 1 deletion test/forage/codec_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ defmodule Forage.CodecTest do
]
}

# TODO: test the query somehow agains a real DB
# TODO: test the query somehow against a real DB
{_plan, _query} = Forage.QueryBuilder.build_plan_and_query(encoded, PrimarySchema)

assert Decoder.decode(encoded, PrimarySchema) == decoded
Expand Down