wip

Author: madeindjs

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "rails6/code"]
 	path = rails6/code
-	url = https://github.com/madeindjs/market_place_api_6.git
+	url = git@github.com:madeindjs/market_place_api_6.git
 [submodule "rails5/code"]
 	path = rails5/code
-	url = https://github.com/madeindjs/market_place_api.git
+	url = git@github.com:madeindjs/market_place_api.git

rails5/fr/chapter01-introduction.adoc

@@ -276,7 +276,7 @@ end
 # ...
 ----
 
-Ceci, comme vous vous en souvenez peut-être, empêchera l'installation ou l'utilisation de Sqlite lorsque vous déployez votre application chez un fournisseur de serveurs comme Herokufootnote:[Heroku facilite le déploiement de votre application en installant les dépendances sur un serveur en analysant votre _Gemfile_].
+Ceci, comme vous vous en souvenez peut-être, empêchera l'installation ou l'utilisation de Sqlite lorsque vous déployez votre application chez un fournisseur de serveurs comme Herokufootnote:[Heroku facilite le déploiement de votre application en installant les dépendances sur un serveur en analysant votre `Gemfile`].
 
 Une fois cette configuration effectuée, il est temps d'exécuter la commande d'installation du paquet pour intégrer les dépendances correspondantes:
 

rails6/code

@@ -242,3 +242,54 @@ As we move forward with the tutorial, I'll be using the practices I follow daily
 == Conclusion
 
 It's been a long way through this chapter. If you reach here, let me congratulate you and be sure that things will get better from this point. So let's get our hands dirty and start typing some code!
+
+=== Quiz
+
+To make sure that you understood this chapter, try to answer these questions:
+
+Which one is not an editor?::
+  . iTerm
+  . VSCode
+  . VIM
+
+Why we choose SQLite database?::
+  . for performances, it is the best one
+  . for simplicity, it only require a library
+  . for his beautiful name
+
+How to setup Git author informations?::
+  . `git commit -m "John Doe"`
+  . `git push -u john doe`
+  . `git config --global user.name "John Doe"`
+
+How ignore versioning file with Git?::
+  . with a `.gitignore` file
+  . `git ignore <file>`
+  . `git commit -m <file>`
+
+Take your time to answer. Once you resolved these questions, go to the next page to get responses.
+
+<<<
+
+==== Responses
+
+Which one is not an editor?:: iTerm, this is a terminal emulator for MacOS.
+
+Why we choose SQLite database?:: for simplicity, it only require a library. We could choose PostgreSQL but this require more configuration to make it work with Ruby on Rails.
+
+How to setup Git author informations?:: `git config --global user.name "John Doe"`. You can also omit `--global` to set configuration only for your current projet.
+
+How ignore versioning file with Git?:: with a `.gitignore` file. This is a plain text file with one path or file to ignore per line.
+
+=== Go further
+
+If you understood well this chapter and you want to go further I recommend you to try to set up PostgreSQL database and regenerate a brand new project using a new Database:
+
+[source,bash]
+----
+$ rails new market_place_api --api --database=postgresql
+----
+
+This may be a good idea because on production environment you may prefer to have a database server instead of a single file. If you use PostgreSQL in your development workflow, this will allow you to have a more similar environment than your production.
+
+Also, https://guides.rubyonrails.org/active_record_postgresql.html#datatypes[PostgreSQL offers a number of specific datatypes] who may be fit you better.

rails6/en/chapter01-introduction.adoc

@@ -91,7 +91,7 @@ We are going to isolate the API controllers under a namespace. With Rails, this
 $ mkdir app/controllers/api
 ----
 
-Then we add that namespace into our _routes.rb_ file:
+Then we add that namespace into our `routes.rb` file:
 
 [source,ruby]
 .config/routes.rb
@@ -216,3 +216,51 @@ I know it's been a long way, but you made it, don't give up this is just our sma
 
 I'm not covering those in this book since we are trying to learn how to implement this kind of functionality, but it is good to know. By the way, the code up to this point is https://github.com/madeindjs/market_place_api_6/releases/tag/checkpoint_chapter03[here].
 
+
+=== Quiz
+
+To make sure that you understood this chapter, try to answer these questions:
+
+Which guideline do you must follow in a RESTfull API::
+  . Follows the standard HTTP Methods such as GET, POST, PUT, DELETE.
+  . Buy a specific domain which is compliant with RESTFull API
+  . Use JSON format
+
+Which file correspond to routes in a Rails application::
+  . `config/routes.rb`
+  . `app/controller`
+  . `config/application.rb`
+
+Which Rails feature we used to build our API versioning::
+  . a namespace like `namespace :v1`
+  . a new controller
+
+Which HTTP method allow you to updates a collection or member of the resources::
+  . `POST`
+  . `GET`
+  . `PUT`
+
+How did you merge your branch at the end of this chapter::
+  . I `checkout` on `master` branch then I `merge` branch `chapter02`
+  . I `merge` branch `master` into `chapter02`
+  . `git config --global user.name "John Doe"`
+
+Take your time to answer. Once you resolved these questions, go to the next page to get responses.
+
+<<<
+
+==== Responses
+
+Which guideline do you must follow in a RESTfull API:: Follows the standard HTTP methods such as GET, POST, PUT, DELETE. If you forgot what these methods mean, go
+
+Which file correspond to routes in a Rails application:: `config/routes.rb`. This file contains all application's route.
+
+Which Rails feature we used to build our API versioning:: a namespace like `namespace :v1`. Keep in mind that a namespace is a sort of route prefix which allows you to order some endpoint in the same "folder".
+
+Which HTTP method allows you to updates a collection or member of the resources:: `PUT`. `GET` allow you to access a resource and `POST` to create a new resource.
+
+How did you merge your branch at the end of this chapter:: I `checkout` on `master` branch then I `merge` branch `chapter02`.
+
+=== Go further
+
+To go further, I recommend you to use Github or Gitlab to open a Pull Request with your `chapter02` branch. This will allow you to keep a clean history of what you did and modification. You can add a pretty description of why you did these modifications and how you organized your code. Once the pull request seems good, you can merge it.

rails6/en/chapter02-api.adoc

@@ -37,7 +37,7 @@ We will start by generating our `User` model. This model will be really simple a
 - `email` which will be unique and will allow it to connect to the application
 - `password_digest` which will contain the *hashed* version of the password (we will discuss this later in this chapter)
 
-We generate our `User` model using the _generate model_ command provided by Ruby on Rails. It is very easy to use:
+We generate our `User` model using the `generate model` command provided by Ruby on Rails. It is very easy to use:
 
 [source,bash]
 ----
@@ -227,7 +227,7 @@ So we will use the bcrypt gem to *hash* the password.
 
 NOTE: Hash is the process of transforming a character string into _Hash_. This _Hash_ does not allow you to find the original character string. However, we can easily use it to determine if a given character string matches the _hash_ we have stored.
 
-We must first add the Bcrypt gem to the _Gemfile_. We can use the `bundle add` command. This one will:
+We must first add the Bcrypt gem to the `Gemfile`. We can use the `bundle add` command. This one will:
 
 1. add the gem to the Gemfile by retrieving the current version
 2. launch the command `bundle install` which will install the gem and update the file _Gemfile.lock_ which "locks" the current version of the gem
@@ -239,7 +239,7 @@ Therefore, issue the following command:
 $ bundle add bcrypt
 ----
 
-Once the command is executed, the following line is added at the end of the _Gemfile_:
+Once the command is executed, the following line is added at the end of the `Gemfile`:
 
 [source,ruby]
 .Gemfile
@@ -284,7 +284,7 @@ You can see that when you call the `User#create!` method, the `password` attribu
 ActiveRecord::RecordInvalid (Validation failed: Password confirmation doesn t match Password)
 ----
 
-Everything is working as planned! Let's now make a _committe_ to keep the history concise:
+Everything is working as planned! Let's now make a _commit_ to keep the history concise:
 
 [source,bash]
 ----
@@ -697,3 +697,40 @@ $ git merge chapter03
 == Conclusion
 
 Oh, there you are! Well done! I know it was probably a long time, but don't give up! Make sure you understand each piece of code, things will improve. In the next chapter, we will redesign our tests to make the code more readable and maintainable. Then stay with me!
+
+=== Quiz
+
+To make sure that you understood this chapter, try to answer these questions:
+
+Which code allow you to set an unique constraint on `User#email` in a migration file::
+  . `t.string :email, null: false`
+  . `t.string :email, unique: true`
+  . `t.index :email, unique: true`
+
+How do we create an user in a unit test?::
+  . add a record in `test/fixtures/users.yml`
+  . use `Use.create email: 'toto@toto.fr'` inside test
+
+Which statement is not valid?::
+  . Hash is the process of transforming a character string into _Hash_.
+  . Hash allow you to find the original character string
+  . Hash allow you to determine if a given character string matches
+
+Which feature `has_secure_password` no implement:
+  . The password must be present when creating.
+  . The password length must be less than or equal to 72 bytes.
+  . The password must contains at least on letter and one digit
+
+TODO
+
+[source,ruby]
+.config/routes.rb
+----
+Rails.application.routes.draw do
+  namespace :api, defaults: { format: :json } do
+    namespace :v1 do
+      resources :users, only: [:show]
+    end
+  end
+end
+----

rails6/en/chapter03-presenting-users.adoc

@@ -84,7 +84,7 @@ So let's start by installing it:
 $ bundle add jwt
 ----
 
-Once completed the following line is added to your _Gemfile_:
+Once completed the following line is added to your `Gemfile`:
 
 [source,ruby]
 ----

rails6/en/chapter04-authentication.adoc

@@ -580,7 +580,7 @@ Processing by Api::V1::ProductsController#index as JSON
 
 It is, therefore, unfortunately **very easy** to create an N+1 query. Fortunately, a gem allows us to **alert** when this kind of situation occurs: https://github.com/flyerhzm/bullet[Bullet]. Bullet will notify us (by email, http://growl.info/[growl notification], https://slack.com[Slack], console, etc...) when it finds an N+1 request.
 
-To install it, we add the _gem_ to the _GemFile_
+To install it, we add the _gem_ to the `Gemfile`
 
 [source,bash]
 ----

rails6/en/chapter09-optimization.adoc

@@ -228,7 +228,7 @@ Así que vamos a usar la gema bcrypt para *hashear* la contraseña.
 
 NOTE: Hashear es el proceso de transformar un arreglo de caracteres en un _Hash_. Este _Hash_ no te permite encontrar el arreglo de caracteres original. Pero como sea, podemos fácilmente usarlo para encontrar si un arreglo de caracteres dado coincide con el _hash_ que almacenamos.
 
-Primero debemos agregar la gema Bcrypt al _Gemfile_. Podemos usar el comando `bundle add`. Que hará:
+Primero debemos agregar la gema Bcrypt al `Gemfile`. Podemos usar el comando `bundle add`. Que hará:
 
 1. añadir la gema al Gemfile recuperando la versión más reciente
 2. ejecutar el comando `bundle install` el cual instalará la gema y actualizará el archivo _Gemfile.lock_ "bloqueando" la versión actual de la gema
@@ -240,7 +240,7 @@ Por lo tanto, ejecutamos el siguiente comando:
 $ bundle add bcrypt
 ----
 
-Una vez que el comando es ejecutado, la siguiente línea es añadida al final del _Gemfile_:
+Una vez que el comando es ejecutado, la siguiente línea es añadida al final del `Gemfile`:
 
 [source,ruby]
 .Gemfile
@@ -575,7 +575,7 @@ Entonces implementamos la acción update en el controlador del usuario y corremo
 ----
 class Api::V1::UsersController < ApplicationController
   before_action :set_user, only: %i[show update]
-  
+
   # GET /users/1
   def show
     render json: @user

rails6/es/chapter03-presenting-users.adoc

@@ -84,7 +84,7 @@ Asi que vamos a comenzar instalándola:
 $ bundle add jwt
 ----
 
-Una vez completada la siguiente línea es añadida a tu _Gemfile_:
+Una vez completada la siguiente línea es añadida a tu `Gemfile`:
 
 [source,ruby]
 ----