From 7504005b7ca5ea6196e340ac32f7bebf22093b87 Mon Sep 17 00:00:00 2001
From: Franklin Ticona <franklinjosmell@gmail.com>
Date: Thu, 31 Oct 2019 00:19:20 -0500
Subject: [PATCH 1/2] Syntax error in Chapter 02. Update a route and adds a
 missing commit in Chapter 04.

---
 .DS_Store                                 | Bin 0 -> 6148 bytes
 rails6/en/chapter02-api.adoc              |   2 +-
 rails6/en/chapter03-presenting-users.adoc |   6 +++---
 rails6/en/chapter04-athentification.adoc  |   7 ++++---
 4 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..3f6f414740a13aa639b1c31f7e6b7c8adc3a9427
GIT binary patch
literal 6148
zcmeHK%Wl&^6ur|X!7dRB51}IQu*8B*Dmh3k3pOF7tUw@AT2;^l8=J(EV@HnDETTve
zJ6P}muwcVu!=?g0fX4^G2G}6+32eIO&ZCVd4^`>{p=z!)bH;P;ojE=e&tw3AlsZlU
zAO`>%7K*7ktR@)s(=ui=qUR(cVPiOUx81V+&>o9b9ZCVE!2hQJ{dUt}LkB$YA^H7o
z+b!Q~$ENv{%*>|JnM0aBr)Tvey1r3qgxyMP#hrG^ifXyj70+>PD_ZlMxUu2}%f7qm
z1~;SYR_sQ1Y4A!I`WV35mc8n^-CFL%)i8)HFK{C^9v|c0nin`>w-j~)r_JKU;H-Vi
ziW@kNe!l1$OiNwUYq|MeZ^6tP3uZrW^a=&@V%{j2i<kO+UDr-sxOThRdGz$z^Ovt)
zzxni;uK>aAirG<tJMaY?2|4_Fq4FSXwwOEKdLnz9VYw_eJ8k{N)}M3lK3*A(aQ293
zHIg%Yr4uFQ->gJ|9|m>orHs??5JCtbhPK2k`=Km*lg!-uog2H%cJrIzklEx2iCOkH
zP5>E*z+yj?HY`dEj$QsW>Q8dmc)Ys9K^h~;Vp@#E<G4A>V@cxi{oDHy9!p6c)%EHm
z9vCxJV_J;F;|E)*46Z~2TxepER|L*(Gad<llE<01^&t-_X2@e&jKl*Bs>eP}d<5Fz
zeden)rGQf4;3`1(2LlVmqQC)1wsl~|t^kNB>}H1T9Bm*P0*e9%9MOYDcq$@KCE|)f
zcslkQBCaTKz>%i|5tk1lW+vi>LfGs$zQMwQ6gjF|DWDXP6`19ZIePvtPrv`mN$N={
zpcFVz3XoK}QZC^uiL-U=<>*;!V7ZTl8jTxpWGPsQ<Crz*Q9O@@8Tt&`Kr9LzaKs)o
P^+$lopem)nKULr_^qu;}

literal 0
HcmV?d00001

diff --git a/rails6/en/chapter02-api.adoc b/rails6/en/chapter02-api.adoc
index a2f79da..c61f7f3 100644
--- a/rails6/en/chapter02-api.adoc
+++ b/rails6/en/chapter02-api.adoc
@@ -171,7 +171,7 @@ This way we can namespace our api into different versions very easily, now we ju
 Rails.application.routes.draw do
   # Api definition
   namespace :api, defaults: { format: :json }  do
-    namespace: :v1 do
+    namespace :v1 do
       # We are going to list our resources here
     end
   end
diff --git a/rails6/en/chapter03-presenting-users.adoc b/rails6/en/chapter03-presenting-users.adoc
index 7f719be..7bdd435 100644
--- a/rails6/en/chapter03-presenting-users.adoc
+++ b/rails6/en/chapter03-presenting-users.adoc
@@ -264,7 +264,7 @@ end
 
 * The password must be present when creating.
 * The password length must be less than or equal to 72 bytes.
-* the confirmation of the password using the attribute `password_confirmation` (if sent)
+* The confirmation of the password using the attribute `password_confirmation` (if sent)
 
 In addition, this method will add a `User#password` attribute that will be automatically hashed and saved in the `User#password_digest` attribute.
 
@@ -354,7 +354,7 @@ end
 Then simply add the action to our controller. It is extremely simple:
 
 [source,ruby]
-.app/controllers/api/v1/users\_controller.rb
+.app/controllers/api/v1/users_controller.rb
 ----
 class  Api::V1::UsersController < ApplicationController
   # GET /users/1
@@ -404,7 +404,7 @@ As usual, after adding one of the features we are satisfied with, we make a _com
 
 [source,bash]
 ----
-$ git add . && git commit -m "Adds show action the users controller"
+$ git add . && git commit -m "Adds show action to the users controller"
 ----
 
 === Test our resource with cURL
diff --git a/rails6/en/chapter04-athentification.adoc b/rails6/en/chapter04-athentification.adoc
index 34f8902..36b642a 100644
--- a/rails6/en/chapter04-athentification.adoc
+++ b/rails6/en/chapter04-athentification.adoc
@@ -129,7 +129,7 @@ I know that's a lot of code but we're going to review it together.
 
 There you go. In order to load the file into our application, you must specify the `lib` folder in the list of Ruby on Rails _autoload_s. To do this, add the following configuration to the `application.rb` file:
 
-.lib/json_web_token.rb
+.config/application.rb
 [source,ruby]
 ----
 # ...
@@ -450,7 +450,7 @@ We have a route to update the user but there is a problem: anyone can update any
 
 It is now time to update our `users_controller.rb` file to refuse access to certain actions. We will also implement the `current_user` method on the `update` and `destroy` action to ensure that the user who is logged in will only be able to update his data and can only delete (and only) his account.
 
-We will therefore split our test _should update user_ and _should destroy user_ into two tests
+We will therefore split our test _should update user_ and _should destroy user_ into two tests.
 
 Let's start by updating the _should update user_ test.
 
@@ -475,7 +475,7 @@ class Api::V1::UsersControllerTest < ActionDispatch::IntegrationTest
 end
 ----
 
-You can see now we have to add a header _Authorization_ for the user's modification action. We want to receive a _forbidden_ response if we don't .
+You can see now we have to add a header _Authorization_ for the user's modification action. We want to receive a _forbidden_ response if we don't.
 
 We can imagine about the same thing for the test _should forbid destroy user_:
 
@@ -543,6 +543,7 @@ There you go! The implementation is really simple. It is therefore time to _comm
 
 [source,bash]
 ----
+$ git commit -am "Restrict actions for unauthorized users"
 $ git checkout master
 $ git merge chapter04
 ----

From 748a199f78b05f8abfbc1250b00984786525d2b1 Mon Sep 17 00:00:00 2001
From: Franklin Ticona <franklinjosmell@gmail.com>
Date: Thu, 31 Oct 2019 13:39:39 -0500
Subject: [PATCH 2/2] Remove .DS_Store and add it to .gitignore

---
 .DS_Store  | Bin 6148 -> 0 bytes
 .gitignore |   1 +
 2 files changed, 1 insertion(+)
 delete mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 3f6f414740a13aa639b1c31f7e6b7c8adc3a9427..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%Wl&^6ur|X!7dRB51}IQu*8B*Dmh3k3pOF7tUw@AT2;^l8=J(EV@HnDETTve
zJ6P}muwcVu!=?g0fX4^G2G}6+32eIO&ZCVd4^`>{p=z!)bH;P;ojE=e&tw3AlsZlU
zAO`>%7K*7ktR@)s(=ui=qUR(cVPiOUx81V+&>o9b9ZCVE!2hQJ{dUt}LkB$YA^H7o
z+b!Q~$ENv{%*>|JnM0aBr)Tvey1r3qgxyMP#hrG^ifXyj70+>PD_ZlMxUu2}%f7qm
z1~;SYR_sQ1Y4A!I`WV35mc8n^-CFL%)i8)HFK{C^9v|c0nin`>w-j~)r_JKU;H-Vi
ziW@kNe!l1$OiNwUYq|MeZ^6tP3uZrW^a=&@V%{j2i<kO+UDr-sxOThRdGz$z^Ovt)
zzxni;uK>aAirG<tJMaY?2|4_Fq4FSXwwOEKdLnz9VYw_eJ8k{N)}M3lK3*A(aQ293
zHIg%Yr4uFQ->gJ|9|m>orHs??5JCtbhPK2k`=Km*lg!-uog2H%cJrIzklEx2iCOkH
zP5>E*z+yj?HY`dEj$QsW>Q8dmc)Ys9K^h~;Vp@#E<G4A>V@cxi{oDHy9!p6c)%EHm
z9vCxJV_J;F;|E)*46Z~2TxepER|L*(Gad<llE<01^&t-_X2@e&jKl*Bs>eP}d<5Fz
zeden)rGQf4;3`1(2LlVmqQC)1wsl~|t^kNB>}H1T9Bm*P0*e9%9MOYDcq$@KCE|)f
zcslkQBCaTKz>%i|5tk1lW+vi>LfGs$zQMwQ6gjF|DWDXP6`19ZIePvtPrv`mN$N={
zpcFVz3XoK}QZC^uiL-U=<>*;!V7ZTl8jTxpWGPsQ<Crz*Q9O@@8Tt&`Kr9LzaKs)o
P^+$lopem)nKULr_^qu;}

diff --git a/.gitignore b/.gitignore
index bd1cbdb..59c8d4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 *.toc
 _minted-api-on-rails
 build
+.DS_Store