consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33 from AyuntamientoMadrid/captcha

Browse Source 
adds ReCaptcha to debates creation form
This commit is contained in:
Juanjo Bazán
2015-07-27 18:51:52 +02:00
parent b515340dc7 b436331ce5
commit 018389ecda
14 changed files with 88 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@@ -35,6 +35,7 @@ gem 'acts-as-taggable-on'
gem "responders" gem "responders"
gem 'foundation-rails' gem 'foundation-rails'
gem 'acts_as_votable' gem 'acts_as_votable'
gem "recaptcha", :require => "recaptcha/rails"
group :development, :test do group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console # Call 'byebug' anywhere in the code to stop execution and get a debugger console

2
Gemfile.lock
View File

@@ -137,6 +137,7 @@ GEM
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (10.4.2) rake (10.4.2)
rdoc (4.2.0) rdoc (4.2.0)
recaptcha (0.4.0)
responders (2.1.0) responders (2.1.0)
railties (>= 4.2.0, < 5) railties (>= 4.2.0, < 5)
rspec-core (3.3.1) rspec-core (3.3.1)
@@ -210,6 +211,7 @@ DEPENDENCIES
jquery-rails jquery-rails
pg pg
rails (= 4.2.3) rails (= 4.2.3)
recaptcha
responders responders
rspec-rails (~> 3.0) rspec-rails (~> 3.0)
sass-rails (~> 5.0) sass-rails (~> 5.0)

13
app/controllers/debates_controller.rb
View File

@@ -1,4 +1,5 @@
class DebatesController < ApplicationController class DebatesController < ApplicationController
include RecaptchaHelper
before_action :set_debate, only: [:show, :edit, :update] before_action :set_debate, only: [:show, :edit, :update]
before_action :authenticate_user!, except: [:show, :index] before_action :authenticate_user!, except: [:show, :index]
before_action :validate_ownership, only: [:edit, :update] before_action :validate_ownership, only: [:edit, :update]
@@ -24,8 +25,11 @@ class DebatesController < ApplicationController
def create def create
@debate = Debate.new(debate_params) @debate = Debate.new(debate_params)
@debate.author = current_user @debate.author = current_user
@debate.save if verify_captcha? and @debate.save
respond_with @debate redirect_to @debate, notice: t('flash.actions.create.notice', resource_name: 'Debate')
else
render :new
end
end end
def update def update
@@ -47,4 +51,9 @@ class DebatesController < ApplicationController
raise ActiveRecord::RecordNotFound unless @debate.editable_by?(current_user) raise ActiveRecord::RecordNotFound unless @debate.editable_by?(current_user)
end end
def verify_captcha?
return true unless recaptcha_keys?
verify_recaptcha(model: @debate)
end
end end

8
app/helpers/recaptcha_helper.rb Normal file
View File

@@ -0,0 +1,8 @@
module RecaptchaHelper
def recaptcha_keys?
Recaptcha.configuration.public_key.present? &&
Recaptcha.configuration.private_key.present?
end
end

2
app/views/debates/_form.html.erb
View File

@@ -30,6 +30,8 @@
Acepto la política de privacidad y el aviso legal Acepto la política de privacidad y el aviso legal
<% end %> <% end %>
<%= render 'shared/captcha' %>
<div class="actions"> <div class="actions">
<%= f.submit %> <%= f.submit %>
</div> </div>

14
app/views/layouts/application.html.erb
View File

@@ -5,16 +5,16 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title><%= content_for?(:title) ? yield(:title) : "Participación" %></title> <title><%= content_for?(:title) ? yield(:title) : "Participación" %></title>
<%= stylesheet_link_tag "application" %> <%= stylesheet_link_tag "application" %>
<%= javascript_include_tag "vendor/modernizr" %> <%= javascript_include_tag "vendor/modernizr" %>
<%= javascript_include_tag "application", 'data-turbolinks-track' => true %> <%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
<%= csrf_meta_tags %> <%= csrf_meta_tags %>
<script src="https://www.google.com/recaptcha/api.js?hl=<%= I18n.locale %>"></script>
</head> </head>
<body> <body>
<%= render 'layouts/header' %> <%= render 'layouts/header' %>
<% if notice %> <% if notice %>
<p class="alert-box success"><%= notice %></p> <p class="alert-box success"><%= notice %></p>
<% end %> <% end %>
@@ -22,11 +22,11 @@
<% if alert %> <% if alert %>
<p class="alert-box success"><%= alert %></p> <p class="alert-box success"><%= alert %></p>
<% end %> <% end %>
<div class="row"> <div class="row">
<div class="small-12 column"> <div class="small-12 column">
<%= yield %> <%= yield %>
</div> </div>
</div> </div>
</body> </body>
</html> </html>

3
app/views/shared/_captcha.html.erb Normal file
View File

@@ -0,0 +1,3 @@
<% if recaptcha_keys? %>
<%= recaptcha_tags ajax: true, hl: I18n.locale %>
<% end %>

4
app/views/shared/_tags.html.erb
View File

@@ -1,3 +1,5 @@
<% if debate.tags.any? %> <% if debate.tags.any? %>
Temas: <%= tags(debate) %> <div id='tags'>
Temas: <%= tags(debate) %>
</div>
<% end %> <% end %>

5
config/initializers/recaptcha.rb Normal file
View File

@@ -0,0 +1,5 @@
Recaptcha.configure do |config|
config.public_key = Rails.application.secrets.recaptcha_public_key
config.private_key = Rails.application.secrets.recaptcha_private_key
config.api_version = 'v2'
end

5
config/locales/en.yml
View File

@@ -20,4 +20,7 @@
# available at http://guides.rubyonrails.org/i18n.html. # available at http://guides.rubyonrails.org/i18n.html.
en: en:
hello: "Hello world" recaptcha:
errors:
verification_failed: "Incorrect Captcha"
recaptcha_unreachable: "Internet connecion error. Could not load Captcha"

6
config/locales/es.yml
View File

@@ -195,4 +195,8 @@ es:
default: "%A, %d de %B de %Y %H:%M:%S %z" default: "%A, %d de %B de %Y %H:%M:%S %z"
long: "%d de %B de %Y %H:%M" long: "%d de %B de %Y %H:%M"
short: "%d de %b %H:%M" short: "%d de %b %H:%M"
pm: pm pm: pm
recaptcha:
errors:
verification_failed: "El Captcha no es correcto"
recaptcha_unreachable: "Fallo de conexión a Internet. No se ha podido cargar el Captcha"

10
config/secrets.yml.example
View File

@@ -10,8 +10,18 @@
# Make sure the secrets in this file are kept private # Make sure the secrets in this file are kept private
# if you're sharing your code publicly. # if you're sharing your code publicly.
default: &default
recaptcha_public_key: <%= ENV["MADRID_RECAPTCHA_PUBLIC_KEY"] %>
recaptcha_private_key: <%= ENV["MADRID_RECAPTCHA_PRIVATE_KEY"] %>
development: development:
secret_key_base: 56792feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4 secret_key_base: 56792feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4
<<: *default
test: test:
secret_key_base: 4d5adf961ddd27aef19622d6c0b3234d555f9ee003f022b1f829c92bbe33aaee907be7feb67bd54c14a1a32512fa968565ad405971fbc41bd0797af73c26a796 secret_key_base: 4d5adf961ddd27aef19622d6c0b3234d555f9ee003f022b1f829c92bbe33aaee907be7feb67bd54c14a1a32512fa968565ad405971fbc41bd0797af73c26a796
<<: *default
production:
secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
<<: *default

6
spec/features/tags_spec.rb
View File

@@ -80,7 +80,11 @@ feature 'Tags' do
click_button 'Actualizar Debate' click_button 'Actualizar Debate'
expect(page).to have_content 'Debate actualizado correctamente' expect(page).to have_content 'Debate actualizado correctamente'
expect(page).to have_content 'Temas: Economía, Hacienda' within('#tags') do
expect(page).to have_content 'Temas:'
expect(page).to have_css('a', text: 'Economía')
expect(page).to have_css('a', text: 'Hacienda')
end
end end
scenario 'Delete' do scenario 'Delete' do

22
spec/helpers/recaptcha_helper_spec.rb Normal file
View File

@@ -0,0 +1,22 @@
require 'rails_helper'
describe RecaptchaHelper do
describe "#recaptcha_keys?" do
it "should be true if Recaptcha keys are configured" do
allow(Recaptcha.configuration).to receive(:public_key).and_return("akjasf")
allow(Recaptcha.configuration).to receive(:private_key).and_return("akjasf4532")
expect(helper.recaptcha_keys?).to be true
end
it "should be false if Recaptcha keys are not configured" do
allow(Recaptcha.configuration).to receive(:public_key).and_return(nil)
allow(Recaptcha.configuration).to receive(:private_key).and_return(nil)
expect(helper.recaptcha_keys?).to be false
end
end
end