From c5bfc9420f04593360a0b9d8601d159465147fa6 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 28 Jul 2015 18:31:53 +0200 Subject: [PATCH 01/13] adds recaptcha validation to registration controller [#45] [#45] --- app/controllers/registrations_controller.rb | 11 +++++++++++ app/views/devise/registrations/new.html.erb | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 4ccafe235..07b347cdc 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -1,5 +1,16 @@ class RegistrationsController < Devise::RegistrationsController + def create + if verify_recaptcha + super + else + build_resource(sign_up_params) + flash.now[:alert] = t('recaptcha.errors.verification_failed') + render :new + end + end + + private def sign_up_params diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 021836277..9ea13093c 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -32,7 +32,9 @@ <%= f.password_field :password_confirmation, autocomplete: "off" %> -
+ <%= render 'shared/captcha', resource: resource %> + +
<%= f.submit "Registrarse", class: 'button radius' %>
<% end %> From 81a5ddb580c02a0b3ff0322b54d2a2d4c4338960 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 28 Jul 2015 18:32:45 +0200 Subject: [PATCH 02/13] refactors recaptchable helper [#45] --- app/helpers/recaptcha_helper.rb | 4 ++-- app/views/debates/_form.html.erb | 2 +- app/views/shared/_captcha.html.erb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/helpers/recaptcha_helper.rb b/app/helpers/recaptcha_helper.rb index 2e2a9a757..fb4cceb20 100644 --- a/app/helpers/recaptcha_helper.rb +++ b/app/helpers/recaptcha_helper.rb @@ -1,7 +1,7 @@ module RecaptchaHelper - def recaptchable? - @debate.new_record? + def recaptchable?(resource) + resource.new_record? end def recaptcha_keys? diff --git a/app/views/debates/_form.html.erb b/app/views/debates/_form.html.erb index cc4101c90..30585be00 100644 --- a/app/views/debates/_form.html.erb +++ b/app/views/debates/_form.html.erb @@ -30,7 +30,7 @@ <%= t("debates.form.accept_terms") %> <% end %> - <%= render 'shared/captcha' %> + <%= render 'shared/captcha', resource: @debate %>
<%= f.submit %> diff --git a/app/views/shared/_captcha.html.erb b/app/views/shared/_captcha.html.erb index 676cc0444..42ccb5936 100644 --- a/app/views/shared/_captcha.html.erb +++ b/app/views/shared/_captcha.html.erb @@ -1,3 +1,3 @@ -<% if recaptchable? and recaptcha_keys? %> +<% if recaptchable?(resource) and recaptcha_keys? %> <%= recaptcha_tags ajax: true, hl: I18n.locale %> <% end %> \ No newline at end of file From 416693fb015fcec0049227ca46c061a2c340021d Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 28 Jul 2015 18:32:51 +0200 Subject: [PATCH 03/13] fixes specs [#45] --- spec/helpers/recaptcha_helper_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/helpers/recaptcha_helper_spec.rb b/spec/helpers/recaptcha_helper_spec.rb index f2fe651e5..7d44e2f08 100644 --- a/spec/helpers/recaptcha_helper_spec.rb +++ b/spec/helpers/recaptcha_helper_spec.rb @@ -5,13 +5,13 @@ describe RecaptchaHelper do describe '#recaptchable?' do it 'should be true if new record' do - assign(:debate, build(:debate)) - expect(helper.recaptchable?).to be true + debate = build(:debate) + expect(helper.recaptchable?(debate)).to be true end it 'should be false if existing record' do - assign(:debate, create(:debate)) - expect(helper.recaptchable?).to be false + debate = create(:debate) + expect(helper.recaptchable?(debate)).to be false end end From 7a53055db1dcc9230eeee79748793e27f7cb0834 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 28 Jul 2015 18:33:09 +0200 Subject: [PATCH 04/13] updates alert styling [#45] --- app/views/layouts/application.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 00da7e8f8..cb502dce6 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -20,7 +20,7 @@ <% end %> <% if alert %> -

<%= alert %>

+

<%= alert %>

<% end %>
From efc1b71dbf3cc68e8d1068813531a9d14532b410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Tue, 28 Jul 2015 18:49:41 +0200 Subject: [PATCH 05/13] adds i18n to header ref: #38 --- app/views/layouts/_header.html.erb | 14 +++++++------- config/locales/en.yml | 11 +++++++++++ config/locales/es.yml | 11 +++++++++++ 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 890954e80..5098996ae 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -3,7 +3,7 @@
- Portal de Transparencia | Datos abiertos + <%= t("layouts.header.external_link_transparency") %> | <%= t("layouts.header.external_link_opendata") %>
@@ -12,13 +12,13 @@