Skip to content

Commit b640cba

Browse files
authored
Fix typos (#246)
1 parent 12bf67c commit b640cba

13 files changed

Lines changed: 66 additions & 67 deletions

slides/api.markdown

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Let's take a look at some of the things that Rails provides out of the box that
4545

4646
# Versioning
4747

48-
If you are writing a consistent API which will be consumed by multiple clients then it is the best practise to separate out the API under a namespace.
48+
If you are writing a consistent API which will be consumed by multiple clients then it is the best practice to separate out the API under a namespace.
4949

5050
API versioning lets your API to be backwards compatible.
5151

@@ -167,7 +167,7 @@ end
167167

168168
Serialization is the process of translating data structures or object state into a format that can be stored
169169

170-
Rails serializes the object passed into the required format. What if you want to customise the JSON output? Like Remove the root element, Add custom attributes or Adding `has_many` relations? How do you acheive this?
170+
Rails serializes the object passed into the required format. What if you want to customize the JSON output? Like Remove the root element, Add custom attributes or Adding `has_many` relations? How do you achieve this?
171171

172172
--
173173

@@ -255,7 +255,7 @@ rails g resource comment content:text user:references post:references
255255

256256
When we try to render out a model in a JSON format active model serializers automatically look for a serializer with the same name which is used to fetch data.
257257

258-
So render `ruby json: Post.find(params[:id])` will automatically look for a serialzer named `PostSerializer`
258+
So render `ruby json: Post.find(params[:id])` will automatically look for a serializer named `PostSerializer`
259259

260260
```ruby
261261
class PostSerializer < ActiveModel::Serializer
@@ -273,7 +273,7 @@ render json: @post, serializer: MyAwesomeSerializer
273273

274274
## Customizing the format
275275

276-
Since Active Model Serailizers follow an object oriented approach customising the output is a piece of cake!
276+
Since Active Model Serailizers follow an object oriented approach customizing the output is a piece of cake!
277277

278278
```ruby
279279
class PostSerializer < ActiveModel::Serializer

slides/bdd.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ describe UsersController do
494494
expect(response).to redirect_to root_url
495495
end
496496

497-
it 'assings a success flash message' do
497+
it 'assigns a success flash message' do
498498
expect(flash[:notice]).not_to be_nil
499499
end
500500

slides/cancancan.markdown

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ spec/models/ability_spec.rb <!-- .element: class="filename" -->
271271
require 'cancan/matchers'
272272

273273
describe Ability do
274-
describe "abilities of loggined user" do
274+
describe "abilities of logged in user" do
275275
subject { ability }
276276

277277
let(:ability){ Ability.new(user) }
@@ -318,7 +318,7 @@ describe PostsController do
318318
end
319319

320320
context '#new' do
321-
context 'cancan doesnt allow :new' do
321+
context 'cancan does not allow :new' do
322322
before do
323323
@ability.cannot :create, Post
324324
get :new
@@ -328,7 +328,7 @@ describe PostsController do
328328
end
329329

330330
context '#show' do
331-
context 'cancan doesnt allow :show' do
331+
context 'cancan does not allow :show' do
332332
before do
333333
@ability.cannot :show, Post
334334
get :show, {id: @post.id}
@@ -338,7 +338,7 @@ describe PostsController do
338338
end
339339

340340
context '#create' do
341-
context 'cancan doesnt allow :create' do
341+
context 'cancan does not allow :create' do
342342
before do
343343
@ability.cannot :create, Post
344344
post :create, {post: @post_attributes}
@@ -348,7 +348,7 @@ describe PostsController do
348348
end
349349

350350
context '#update' do
351-
context 'cancan doesnt allow :update' do
351+
context 'cancan does not allow :update' do
352352
before do
353353
@ability.cannot :update, @post
354354
put :update, @post_attributes.merge(id: @post.id)
@@ -358,7 +358,7 @@ describe PostsController do
358358
end
359359

360360
context '#destroy' do
361-
context 'cancan doesnt allow :destroy' do
361+
context 'cancan does not allow :destroy' do
362362
before do
363363
@ability.cannot :destroy, @post
364364
delete :destroy, id: @post.id

slides/circleci.markdown

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ The list of buil-in variables you can see [here](https://circleci.com/docs/2.0/e
126126

127127
--
128128

129-
## **Remember!**
129+
## **Remember!**
130130

131-
Do not add secrets or keys inside the `.circleci/config.yml` file.
131+
Do not add secrets or keys inside the `.circleci/config.yml` file.
132132

133133
The full text of `config.yml` is visible to developers with access to your project on CircleCI.
134134

@@ -145,7 +145,7 @@ Store secrets or keys in [project](https://github.com/rubygarage/circledge/blob/
145145

146146
**Caching** is one of the most effective ways to make jobs faster on CircleCI by reusing the data from expensive fetch operations from previous jobs.
147147

148-
A good example is package dependency managers such as Yarn, Bundler, or Pip. With dependencies restored from a cache, commands like yarn install will only need to download new dependencies, if any, and not redownload everything on every build.
148+
A good example is package dependency managers such as Yarn, Bundler, or Pip. With dependencies restored from a cache, commands like yarn install will only need to download new dependencies, if any, and not re-download everything on every build.
149149

150150

151151
--
@@ -174,7 +174,7 @@ A good example is package dependency managers such as Yarn, Bundler, or Pip. Wit
174174

175175
In order to clear the cache, you need to change the name of the key under which it is stored for example:
176176
```yml
177-
- v1-npm-deps-{{ checksum "package-lock.json" }}
177+
- v1-npm-deps-{{ checksum "package-lock.json" }}
178178
```
179179
change to
180180
```yml
@@ -192,7 +192,7 @@ change to
192192
- Use `cache` key for define names of you cache. example:
193193

194194
```yml
195-
caches:
195+
caches:
196196
- &bundle_cache v1-repo-{{ checksum "Gemfile.lock" }}
197197
198198
commands:
@@ -211,7 +211,7 @@ commands:
211211

212212
![](/assets/images/circleci/steps.png)
213213

214-
`Steps` are a collection of executable commands which are run during a job/command.
214+
`Steps` are a collection of executable commands which are run during a job/command.
215215

216216
If one step exit with code 1(failed), then the next ones will not be executed.
217217

@@ -366,10 +366,10 @@ Currently, `store_artifacts` has two keys:
366366
.circleci/config.yml<!-- .element: class="filename" -->
367367
```yml
368368
steps:
369-
- run:
369+
- run:
370370
name: run specs
371371
command: |
372-
bundle exec rspec
372+
bundle exec rspec
373373
- store_artifacts:
374374
path: ~/repo/coverage
375375
destination: coverage
@@ -389,17 +389,17 @@ After the completion of the job, you can see the artifacts in the tab 'Artifacts
389389

390390
## Overview
391391

392-
To support the open source community, projects that are public on GitHub or Bitbucket receive three free build containers, for a total of four containers.
392+
To support the open source community, projects that are public on GitHub or Bitbucket receive three free build containers, for a total of four containers.
393393

394394
Only one container is available for private repositories
395395

396396
--
397397

398398
## Only Build Pull Requests
399399

400-
By default, CircleCI builds every commit from every branch.
400+
By default, CircleCI builds every commit from every branch.
401401

402-
This behavior may be too aggressive for open source projects, which often have significantly more commits than private projects.
402+
This behavior may be too aggressive for open source projects, which often have significantly more commits than private projects.
403403

404404
To change this setting, go to the Advanced Settings of your project and set the Only build pull requests option to On.
405405

@@ -437,9 +437,9 @@ Often the best way to troubleshoot problems is to SSH into a job and inspect thi
437437

438438
--
439439

440-
If your project has a large number of tests, it will need more time to run them on one machine.
440+
If your project has a large number of tests, it will need more time to run them on one machine.
441441

442-
To reduce this time, you can run tests in parallel by spreading them across multiple machines.
442+
To reduce this time, you can run tests in parallel by spreading them across multiple machines.
443443

444444
![](/assets/images/circleci/test_splitting.png)
445445

@@ -468,9 +468,9 @@ jobs:
468468

469469
--
470470

471-
**CircleCI Orbs** are shareable packages of configuration elements, including jobs, commands, and executors.
471+
**CircleCI Orbs** are shareable packages of configuration elements, including jobs, commands, and executors.
472472

473-
CircleCI provides certified orbs, along with 3rd-party orbs authored by CircleCI partners.
473+
CircleCI provides certified orbs, along with 3rd-party orbs authored by CircleCI partners.
474474

475475
It is best practice to first evaluate whether any of these existing orbs will help you in your configuration workflow.
476476

@@ -494,7 +494,7 @@ You can read about each of this features [here](https://github.com/rubygarage/ci
494494

495495
Before using the orb, you need to read the documentation for use which can be found on the main page of the orb
496496

497-
example of usage:
497+
example of usage:
498498

499499
.circleci/config.yml<!-- .element: class="filename" -->
500500
```yml
@@ -566,29 +566,29 @@ executors:
566566
POSTGRES_USER: postgres
567567
POSTGRES_PASSWORD: postgres
568568
569-
caches:
569+
caches:
570570
- &bundle_cache v1-repo-{{ checksum "Gemfile.lock" }}
571571
572572
commands:
573573
run_linters:
574574
description: command to start linters
575575
steps:
576-
- run:
576+
- run:
577577
name: rubocop
578578
command: bundle exec rubocop
579-
- run:
579+
- run:
580580
name: brakeman
581581
command: bundle exec brakeman -q
582-
- run:
582+
- run:
583583
name: lol_dba
584584
command: bundle exec lol_dba db:find_indexes
585-
- run:
586-
name: rails best prctices
585+
- run:
586+
name: rails best practices
587587
command: bundle exec rails_best_practices .
588588
589589
run_specs:
590590
steps:
591-
- run:
591+
- run:
592592
name: run specs
593593
command: |
594594
mkdir /tmp/test-results

slides/general/code_review.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Code review ...
6767

6868
## Initiating
6969

70-
- `Developer A` right after finishing his task pushes his code to VCS provider(Github, Github, e.t.c)
70+
- `Developer A` right after finishing his task pushes his code to VCS provider(Github, Gitlab, e.t.c)
7171
- `Developer A` knows all the GitFlow standards of his project/company and know how to name the branch and commits well
7272
- `Developer A` prepare the PR (correct title, description, milestones, labels, e.t.c, assignee)
7373
- `Developer A` check all the source code before setting reviewers

slides/graphql.markdown

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ This architecture will be the most common for new projects. In the setup, you ha
189189

190190
--
191191

192-
### 2. GraphQL server that is a ** thin layer in front of a number of third party or legacy systems**
192+
### 2. GraphQL server that is a ** thin layer in front of a number of third party or legacy systems**
193193

194194
GraphQL is used to **unify** these existing systems and hide their complexity. This way, new client applications can be developed that simply talk to the GraphQL server to fetch the data they need.
195195

@@ -391,7 +391,7 @@ And response:
391391

392392
### Types
393393

394-
#### Types describs data units in the system. There are such types as:
394+
#### Types describes data units in the system. There are such types as:
395395

396396
- Default scalar types
397397
- Object types
@@ -1114,7 +1114,7 @@ GraphQL uses JSON format, which represents as text format, not as binary.
11141114
You can send a file as base64 string or send a download link.
11151115

11161116
### - Incoming Webhooks
1117-
You will need to add the REST endpoints to listen for events from services like Stripe.
1117+
You will need to add the REST endpoints to listen for events from services like Stripe.
11181118

11191119
---
11201120

@@ -1614,7 +1614,7 @@ query {
16141614

16151615
--
16161616

1617-
#### and we will recieve
1617+
#### and we will receive
16181618

16191619
```json
16201620
{
@@ -1657,7 +1657,7 @@ query {
16571657
#### Expose **node** and **cursor** fields
16581658

16591659
### Node
1660-
#### Nodes are items in a list. A node is usually an object in your schema.
1660+
#### Nodes are items in a list. A node is usually an object in your schema.
16611661

16621662
--
16631663

@@ -2104,7 +2104,7 @@ https://github.com/rubygarage/graphql_meetup
21042104

21052105
---
21062106

2107-
## Usefull links
2107+
## Useful links
21082108

21092109
https://www.howtographql.com/ - good graphql guides - different languages, frontend/backend
21102110

slides/models.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1594,7 +1594,7 @@ end
15941594

15951595
---
15961596

1597-
## Validates Assosiated
1597+
## Validates Associated
15981598

15991599
```ruby
16001600
class User < ApplicationRecord

slides/rails.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ do it, rather than requiring you to specify every little thing through endless c
1818

1919
---
2020

21-
## Instaling Rails
21+
## Installing Rails
2222

2323
### Preparing environment
2424

slides/refactoring-rails.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ class UsersController < ApplicationController
560560

561561
respond_to do |format|
562562
if @user.save
563-
format.html { redirect_to @user, notice: 'Signup successfull.' }
563+
format.html { redirect_to @user, notice: 'Signup successful.' }
564564
else
565565
format.html { render new_signup_path }
566566
end
@@ -605,7 +605,7 @@ class UsersController < ApplicationController
605605

606606
respond_to do |format|
607607
if @signup.save
608-
format.html { redirect_to @signup.user, notice: 'Signup successfull.' }
608+
format.html { redirect_to @signup.user, notice: 'Signup successful.' }
609609
else
610610
format.html { render new_signup_path }
611611
end

slides/refactoring-ruby.markdown

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ Refactoring is a systematic process of improving the quality of code without cha
2222

2323
---
2424

25-
## Refactoring vs Optimisation vs Bugfixing
25+
## Refactoring vs Optimization vs Bugfixing
2626

27-
| | Refactoring | Optimisation | Bugfixing |
27+
| | Refactoring | Optimization | Bugfixing |
2828
|-------------|-------------|-------------|-------------|
2929
| Making code clean | `true` | false | false |
30-
| Optimising performance | false | `true` | false |
30+
| Optimizing performance | false | `true` | false |
3131
| Changing code functionality | false | false | `true` |
3232

3333
---
@@ -67,7 +67,7 @@ When the development team has:
6767

6868
1. Find code smells and document them
6969
2. Prioritize according to the following standards:
70-
* importancy for business
70+
* importance for business
7171
* frequency of usage of that piece of code
7272
* size of a code smell
7373
* coverage of specs and tests quality

0 commit comments

Comments
 (0)