Skip to content

Commit 30f2658

Browse files
authored
Merge pull request #1 from boydm/master
Update to latest master from boyd
2 parents 4b61c49 + d6b8798 commit 30f2658

File tree

181 files changed

+12604
-2272
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

181 files changed

+12604
-2272
lines changed

.editorconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
root = true
2+
3+
[*]
4+
indent_style = space
5+
indent_size = 2
6+
end_of_line = lf
7+
charset = utf-8
8+
trim_trailing_whitespace = true
9+
insert_final_newline = true
10+
11+
[Makefile]
12+
indent_style = tab

.formatter.exs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# Used by "mix format"
21
[
32
inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"]
43
]

.github/CODE_OF_CONDUCT.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Contributor Code of Conduct
2+
3+
As contributors and maintainers of this project, and in the interest of
4+
fostering an open and welcoming community, we pledge to respect all people who
5+
contribute through reporting issues, posting feature requests, updating
6+
documentation, submitting pull requests or patches, and other activities.
7+
8+
We are committed to making participation in this project a harassment-free
9+
experience for everyone, regardless of the level of experience, gender, gender
10+
identity and expression, sexual orientation, disability, personal appearance,
11+
body size, race, ethnicity, age, religion, or nationality.
12+
13+
Examples of unacceptable behavior by participants include:
14+
15+
* The use of sexualized language or imagery
16+
* Personal attacks
17+
* Trolling or insulting/derogatory comments
18+
* Public or private harassment
19+
* Publishing other's private information, such as physical or electronic
20+
addresses, without explicit permission
21+
* Other unethical or unprofessional conduct.
22+
23+
Project maintainers have the right and responsibility to remove, edit, or reject
24+
comments, commits, code, wiki edits, issues, and other contributions that are
25+
not aligned to this Code of Conduct. By adopting this Code of Conduct, project
26+
maintainers commit themselves to fairly and consistently applying these
27+
principles to every aspect of managing this project. Project maintainers who do
28+
not follow or enforce the Code of Conduct may be permanently removed from the
29+
project team.
30+
31+
This code of conduct applies both within project spaces and in public spaces
32+
when an individual is representing the project or its community.
33+
34+
Instances of abusive, harassing or otherwise unacceptable behavior may be
35+
reported by opening an issue or contacting one or more of the project
36+
maintainers.
37+
38+
This Code of Conduct is adapted from the [Contributor
39+
Covenant](http://contributor-covenant.org), version 1.2.0, available at
40+
[http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)
Lines changed: 84 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,39 @@
11
# Contributing to Scenic
22

33
Please take a moment to review this document in order to make the contribution
4-
process easy and effective for everyone involved!
5-
Also make sure you read our [Code of Conduct](CODE_OF_CONDUCT.md) that outlines our commitment towards an open and welcoming environment.
4+
process easy and effective for everyone involved! Also, make sure you read our
5+
[Code of Conduct](CODE_OF_CONDUCT.md) that outlines our commitment towards an
6+
open and welcoming environment.
67

78
## Components
89

9-
There are many components that could be written and shared with the community. Only a few really core ones should be in the Scenic package itself. If you have ideas for components, I would love the see the community supply optional packages of them for developers to use.
10+
There are many components that could be written and shared with the community.
11+
Only a few really core ones should be in the Scenic package itself. If you have
12+
ideas for components, I would love the see the community supply optional
13+
packages of them for developers to use.
1014

11-
Each component package should have the component modles themselves, and a "Components" module that contains helper functions to make adding the new components very simple.
12-
13-
See the code for Scenic.Components for example helper functions.
15+
Each component package should have the component models themselves, and a
16+
"Components" module that contains helper functions to make adding the new
17+
components very simple.
1418

19+
See the code for `Scenic.Components` for example helper functions.
1520

1621
## Using the issue tracker
1722

1823
Use the issues tracker for:
1924

20-
* [bug reports](#bug-reports)
21-
* [submitting pull requests](#pull-requests)
22-
23-
Please **do not** use the issue tracker for personal support requests nor feature requests. Support requests should be sent to:
25+
* [Bug Reports](#bug-reports)
26+
* [Submitting Pull Requests](#pull-requests)
2427

28+
Please **do not** use the issue tracker for personal support requests nor
29+
feature requests. Support requests should be sent to:
2530

2631
Still working on this bit...
2732

28-
For now, please play around with it. I would gladly accept help documenting it.
33+
For now, please play around with it. I would gladly accept help documenting it.
2934

30-
Over the coming weeks, I'll set up discussion mailing lists and whatever. Simply haven't gotten there yet.
35+
Over the coming weeks, I'll set up discussion mailing lists and whatever. Simply
36+
haven't gotten there yet.
3137

3238

3339
We do our best to keep the issue tracker tidy and organized, making it useful
@@ -36,9 +42,9 @@ making it easier for developers to [contribute to Scenic](#pull-requests).
3642

3743
## Bug reports
3844

39-
A bug is either a _demonstrable problem_ that is caused by the code in the repository,
40-
or indicate missing, unclear, or misleading documentation. Good bug reports are extremely
41-
helpful - thank you!
45+
A bug is either a _demonstrable problem_ that is caused by the code in the
46+
repository or indicate missing, unclear, or misleading documentation. Good bug
47+
reports are extremely helpful - thank you!
4248

4349
Guidelines for bug reports:
4450

@@ -48,45 +54,50 @@ Guidelines for bug reports:
4854
2. **Check if the issue has been fixed** — try to reproduce it using the
4955
`master` branch in the repository.
5056

51-
3. **Isolate and report the problem** — ideally create a reduced test
57+
3. **Isolate and report the problem** — ideally, create a reduced test
5258
case.
5359

54-
Please try to be as detailed as possible in your report. Include information about
55-
your Operating System, as well as your Erlang, Elixir and Scenic versions. Please provide steps to
56-
reproduce the issue as well as the outcome you were expecting! All these details
57-
will help developers to fix any potential bugs.
60+
Please try to be as detailed as possible in your report. Include information
61+
about your Operating System, as well as your Erlang, Elixir and Scenic versions.
62+
Please provide steps to reproduce the issue as well as the outcome you were
63+
expecting! All these details will help developers to fix any potential bugs.
5864

5965
Example:
6066

61-
> Short and descriptive example bug report title
62-
>
63-
> A summary of the issue and the environment in which it occurs. If suitable,
64-
> include the steps required to reproduce the bug.
65-
>
66-
> 1. This is the first step
67-
> 2. This is the second step
68-
> 3. Further steps, etc.
69-
>
70-
> `<url>` - a link to the reduced test case (e.g. a GitHub Gist)
71-
>
72-
> Any other information you want to share that is relevant to the issue being
73-
> reported. This might include the lines of code that you have identified as
74-
> causing the bug, and potential solutions (and your opinions on their
75-
> merits).
67+
```md
68+
Short and descriptive example bug report title
69+
70+
A summary of the issue and the environment in which it occurs. If suitable,
71+
include the steps required to reproduce the bug.
72+
73+
1. This is the first step
74+
2. This is the second step
75+
3. Further steps, etc.
76+
77+
`<url>` - a link to the reduced test case (e.g. a GitHub Gist)
78+
79+
Any other information you want to share that is relevant to the issue being
80+
reported. This might include the lines of code that you have identified as
81+
causing the bug, and potential solutions (and your opinions on their merits).
82+
```
7683

7784
## Feature requests
7885

79-
Feature requests are welcome and should be discussed on [the phoenix-core mailing list](http://groups.google.com/group/phoenix-core). But take a moment to find
80-
out whether your idea fits with the scope and aims of the project. It's up to *you*
81-
to make a strong case to convince the community of the merits of this feature.
82-
Please provide as much detail and context as possible.
86+
87+
Feature requests are welcome and should be currently be discussed as an issue
88+
in github. This will change to either a topic in Elixir forum or a mail-list soon.
89+
90+
Before you make a request however, pleaes take a moment to
91+
find out whether your idea fits with the scope and aims of the project. It's up
92+
to *you* to make a strong case to convince the community of the merits of this
93+
feature. Please provide as much detail and context as possible.
8394

8495
## Contributing Documentation
8596

8697
Code documentation (`@doc`, `@moduledoc`, `@typedoc`) has a special convention:
8798
the first paragraph is considered to be a short summary.
8899

89-
For functions, macros and callbacks say what it will do. For example write
100+
For functions, macros and callbacks say what it will do. For example write,
90101
something like:
91102

92103
```elixir
@@ -96,19 +107,19 @@ Marks the given value as HTML safe.
96107
def safe({:safe, value}), do: {:safe, value}
97108
```
98109

99-
For modules, protocols and types say what it is. For example write
100-
something like:
110+
For modules, protocols and types say what it is. For example, write something
111+
like:
101112

102113
```elixir
103-
defmodule Phoenix.HTML do
114+
defmodule MyModule.HTML do
104115
@moduledoc """
105116
Conveniences for working HTML strings and templates.
106117
...
107118
"""
108119
```
109120

110121
Keep in mind that the first paragraph might show up in a summary somewhere, long
111-
texts in the first paragraph create very ugly summaries. As a rule of thumb
122+
texts in the first paragraph create very ugly summaries. As a rule of thumb,
112123
anything longer than 80 characters is too long.
113124

114125
Try to keep unnecessary details out of the first paragraph, it's only there to
@@ -122,36 +133,36 @@ are often a great help in explaining what a function does.
122133

123134
## Pull requests
124135

125-
Good pull requests - patches, improvements, new features - are a fantastic
126-
help. They should remain focused in scope and avoid containing unrelated
127-
commits.
136+
Good pull requests - patches, improvements, new features - are a fantastic help.
137+
They should remain focused in scope and avoid containing unrelated commits.
128138

129-
**IMPORTANT**: By submitting a patch, you agree that your work will be
130-
licensed under the license used by the project.
139+
> **IMPORTANT**: By submitting a patch, you agree that your work will be licensed
140+
under the license used by the project.
131141

132142
If you have any large pull request in mind (e.g. implementing features,
133-
refactoring code, etc), **please ask first** otherwise you risk spending
134-
a lot of time working on something that the project's developers might
135-
not want to merge into the project.
143+
refactoring code, etc), **please ask first** otherwise you risk spending a lot
144+
of time working on something that the project's developers might not want to
145+
merge into the project.
136146

137-
Please adhere to the coding conventions in the project (indentation,
138-
accurate comments, etc.) and don't forget to add your own tests and
139-
documentation. When working with git, we recommend the following process
140-
in order to craft an excellent pull request:
147+
Please adhere to the coding conventions in the project (indentation, accurate
148+
comments, etc.) and don't forget to add your own tests and documentation. When
149+
working with git, we recommend the following process in order to craft an
150+
excellent pull request:
141151

142-
1. [Fork](https://help.github.com/articles/fork-a-repo/) the project, clone your fork,
143-
and configure the remotes:
152+
1. [Fork](https://help.github.com/articles/fork-a-repo/) the project, clone your
153+
fork, and configure the remotes:
144154

145155
```bash
146156
# Clone your fork of the repo into the current directory
147-
git clone https://github.com/<your-username>/phoenix
157+
git clone https://github.com/<your-username>/scenic
148158
# Navigate to the newly cloned directory
149-
cd phoenix
159+
cd scenic
150160
# Assign the original repo to a remote called "upstream"
151-
git remote add upstream https://github.com/phoenixframework/phoenix
161+
git remote add upstream https://github.com/boydm/scenic
152162
```
153163

154-
2. If you cloned a while ago, get the latest changes from upstream, and update your fork:
164+
2. If you cloned a while ago, get the latest changes from upstream, and update
165+
your fork:
155166

156167
```bash
157168
git checkout master
@@ -172,9 +183,9 @@ in order to craft an excellent pull request:
172183

173184
4. Commit your changes in logical chunks. Keep your commit messages organized,
174185
with a short description in the first line and more detailed information on
175-
the following lines. Feel free to use Git's
176-
[interactive rebase](https://help.github.com/articles/about-git-rebase/)
177-
feature to tidy up your commits before making them public.
186+
the following lines. Feel free to use Git's [interactive
187+
rebase](https://help.github.com/articles/about-git-rebase/) feature to tidy
188+
up your commits before making them public.
178189

179190
5. Make sure all the tests are still passing.
180191

@@ -212,24 +223,25 @@ Thank you for your contributions!
212223
These Guides aim to be inclusive. We use "we" and "our" instead of "you" and
213224
"your" to foster this sense of inclusion.
214225

215-
Ideally there is something for everybody in each guide, from beginner to expert.
226+
Ideally, there is something for everybody in each guide, from beginner to expert.
216227
This is hard, maybe impossible. When we need to compromise, we do so on behalf
217228
of beginning users because expert users have more tools at their disposal to
218229
help themselves.
219230

220231
The general pattern we use for presenting information is to first introduce a
221232
small, discreet topic, then write a small amount of code to demonstrate the
222-
concept, then verify that the code worked.
233+
concept, then verifies that the code worked.
223234

224235
In this way, we build from small, easily digestible concepts into more complex
225236
ones. The shorter this cycle is, as long as the information is still clear and
226237
complete, the better.
227238

228239
For formatting the guides:
229240

230-
- We use the "elixir" code fence for all module code.
231-
- We use the "console" code fence for iex and shell commands.
232-
- We use backticks for filenames and directory paths.
233-
- We use backticks for module names, function names, and variable names.
241+
* We use the "elixir" code fence for all module code.
242+
* We use the "console" code fence for iex and shell commands.
243+
* We use backticks for filenames and directory paths.
244+
* We use backticks for module names, function names, and variable names.
234245

235-
This contribution guide is adapted from the [Phoenix contribution guide](https://github.com/phoenixframework/phoenix/blob/master/CONTRIBUTING.md).
246+
This contribution guide is adapted from the [Phoenix contribution
247+
guide](https://github.com/phoenixframework/phoenix/blob/master/CONTRIBUTING.md).

0 commit comments

Comments
 (0)