Skip to content

Commit cfcbe3a

Browse files
Misc doc changes (#183)
* Misc doc changes Besides other documentation changes, this commit includes all relevant documents to the generated HTML doc for HexDocs.pm and leverages on latest features of ExDoc. * Add back in ignoring elixir_ls Co-authored-by: Scott Ames-Messinger <scott@commoncurriculum.com>
1 parent 3dbad63 commit cfcbe3a

File tree

8 files changed

+249
-45
lines changed

8 files changed

+249
-45
lines changed

.gitignore

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# The directory Mix downloads your dependencies sources to.
88
/deps/
99

10-
# Where 3rd-party dependencies like ExDoc output generated docs.
10+
# Where third-party dependencies like ExDoc output generated docs.
1111
/doc/
1212

1313
# Ignore .fetch files in case you like to edit your project deps locally.
@@ -19,9 +19,15 @@ erl_crash.dump
1919
# Also ignore archive artifacts (built via "mix archive.build").
2020
*.ez
2121

22+
# Ignore package tarball (built via "mix hex.build").
23+
mongodb_ecto-*.tar
24+
2225
# Ignore files created by the Elixir Language Service (ElixirLS)
2326
/.elixir_ls/
2427

28+
# Temporary files, for example, from tests.
29+
/tmp/
30+
2531
# Ignore incredibly irritating file that macOS places in indexed directories
2632
.DS_Store
2733

@@ -36,4 +42,4 @@ coverage.xml
3642
/priv/plts/*.plt.hash
3743

3844
# IEx scripts particular to individual developers
39-
.iex.exs
45+
.iex.exs

CHANGELOG.md

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
11
# Changelog
22

3+
All notable changes to this project will be documented in this file.
4+
5+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
6+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
7+
38
## Unreleased
49

510
* Introduce support for Ecto 3 (work in progress)
611
* Introduce GitHub actions, replacing Travis CI
712

813
### Possible breaking changes
914

10-
* Some upsert operations are only supported with MongoDBs 4.2 or newer.
15+
* Some upsert operations are only supported with MongoDBs 4.2 or newer.
1116

12-
## v0.1.4
17+
## v0.1.4 (2016-03-03)
1318

14-
Support MongoDB version 3.2
19+
* Support MongoDB version 3.2
1520

16-
## v0.1.3
21+
## v0.1.3 (2016-01-15)
1722

18-
This version is limited to Ecto 1.0 because of known issues with 1.1
23+
* This version is limited to Ecto 1.0 because of known issues with 1.1
1924

2025
* Additions:
2126
* Implement `count(field, :distinct)`
@@ -25,7 +30,7 @@
2530
* Implement `Ecto.Adapter.stop/2` callback
2631
* Move encoding to adapter `load` and `dump` callbacks
2732

28-
## v0.1.2
33+
## v0.1.2 (2015-10-18)
2934

3035
* Breaking changes:
3136
* Raise on `limit` and `offset` in `update_all` and `delete_all` queries,
@@ -34,11 +39,11 @@
3439
* Bug fixes:
3540
* Allow interpolation in limit and offset
3641

37-
## v0.1.1
42+
## v0.1.1 (2015-08-30)
3843

3944
* Bug fixes:
4045
* Fix logging issues on find queries
4146

42-
## v0.1.0
47+
## v0.1.0 (2015-08-25)
4348

44-
First release
49+
* First release

LICENSE

Lines changed: 177 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,177 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS

README.md

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
# Mongo.Ecto
22

3+
![CI](https://github.com/elixir-mongo/mongodb_ecto/actions/workflows/ci.yml/badge.svg)
34
[![Hex.pm](https://img.shields.io/hexpm/v/mongodb_ecto.svg)](https://hex.pm/packages/mongodb_ecto)
4-
![CI](https://github.com/avid-technology/mongodb_ecto/actions/workflows/ci.yml/badge.svg)
5+
[![Module Version](https://img.shields.io/hexpm/v/mongodb_ecto.svg)](https://hex.pm/packages/mongodb_ecto)
6+
[![Hex Docs](https://img.shields.io/badge/hex-docs-lightgreen.svg)](https://hexdocs.pm/mongodb_ecto/)
7+
[![Total Download](https://img.shields.io/hexpm/dt/mongodb_ecto.svg)](https://hex.pm/packages/mongodb_ecto)
8+
[![License](https://img.shields.io/hexpm/l/mongodb_ecto.svg)](https://github.com/elixir-mongo/mongodb_ecto/blob/master/LICENSE)
9+
[![Last Updated](https://img.shields.io/github/last-commit/elixir-mongo/mongodb_ecto.svg)](https://github.com/elixir-mongo/mongodb_ecto/commits/master)
10+
511

612
`Mongo.Ecto` is a MongoDB adapter for Ecto.
713

@@ -49,21 +55,26 @@ end
4955

5056
## Usage
5157

52-
Add Mongo.Ecto as a dependency in your `mix.exs` file.
58+
Add `:mongodb_ecto` as a dependency in your `mix.exs` file.
59+
5360
```elixir
5461
def deps do
55-
[{:mongodb_ecto, "~> 0.1"}]
62+
[
63+
{:mongodb_ecto, "~> 0.2"}
64+
]
5665
end
5766
```
5867

59-
You should also update your applications to include both projects.
68+
You should also update your applications to include both projects:
69+
6070
```elixir
6171
def application do
6272
[applications: [:logger, :mongodb_ecto, :ecto]]
6373
end
6474
```
6575

6676
To use the adapter in your repo:
77+
6778
```elixir
6879
defmodule MyApp.Repo do
6980
use Ecto.Repo,
@@ -123,15 +134,13 @@ $ cd mongodb_ecto
123134
$ mix test
124135
```
125136

126-
## License
137+
## Copyright and License
127138

128139
Copyright 2015 Michał Muskała
129140

130141
Licensed under the Apache License, Version 2.0 (the "License");
131142
you may not use this file except in compliance with the License.
132-
You may obtain a copy of the License at
133-
134-
http://www.apache.org/licenses/LICENSE-2.0
143+
You may obtain a copy of the License at [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
135144

136145
Unless required by applicable law or agreed to in writing, software
137146
distributed under the License is distributed on an "AS IS" BASIS,

lib/mongo_ecto.ex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ defmodule Mongo.Ecto do
247247
end
248248
249249
Keep in mind that Ecto associations are stored in different Mongo collections
250-
and multiple queries may be required for retriving them.
250+
and multiple queries may be required for retrieving them.
251251
252252
While `Mongo.Ecto` supports almost all association features in Ecto, keep in
253253
mind that MongoDB does not support joins as used in SQL - it's not possible to
@@ -331,7 +331,7 @@ defmodule Mongo.Ecto do
331331
* embedded documents either with `:map` type, or embedded models
332332
* partial updates using `change_map/2` and `change_array/2` from the
333333
`Mongo.Ecto.Helpers` module
334-
* queries using javascript expresssion and regexes using respectively
334+
* queries using javascript expression and regexes using respectively
335335
`javascript/2` and `regex/2` functions from `Mongo.Ecto.Helpers` module.
336336
337337
### MongoDB adapter options
@@ -821,7 +821,7 @@ defmodule Mongo.Ecto do
821821
(default: repo's database)
822822
* `:log` - should command queries be logged (default: true)
823823
824-
For list of available commands plese see: http://docs.mongodb.org/manual/reference/command/
824+
For list of available commands please see: http://docs.mongodb.org/manual/reference/command/
825825
"""
826826
@spec command(Ecto.Repo.t(), BSON.document(), Keyword.t()) :: BSON.document()
827827
def command(repo, command, opts \\ []) do

lib/mongo_ecto/normalized_query.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ defmodule Mongo.Ecto.NormalizedQuery do
255255
# which we need since we need to know the ID of the inserted or updated
256256
# document. Ecto expects updates **not** to return an ID but Mongo always
257257
# does (seems like a rare moment where Mongo has slightly clearer support
258-
# than SQL). It's expected that this discrepency is massaged out
258+
# than SQL). It's expected that this discrepancy is massaged out
259259
# elsewhere.
260260
opts = [
261261
upsert: true

0 commit comments

Comments
 (0)