From 50dcbcdf9bd47571028b3f699b0dc9d7a5c7e76a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Sat, 29 Aug 2015 12:07:43 +0200 Subject: [PATCH 1/6] moves Letter to Verification namespace --- app/controllers/verification/letter_controller.rb | 4 ++-- app/models/{ => verification}/letter.rb | 2 +- spec/factories.rb | 2 +- spec/models/letter_spec.rb | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) rename app/models/{ => verification}/letter.rb (97%) diff --git a/app/controllers/verification/letter_controller.rb b/app/controllers/verification/letter_controller.rb index eb91ebe6f..401ae0ed2 100644 --- a/app/controllers/verification/letter_controller.rb +++ b/app/controllers/verification/letter_controller.rb @@ -5,11 +5,11 @@ class Verification::LetterController < ApplicationController skip_authorization_check def new - @letter = Letter.new(user: current_user) + @letter = Verification::Letter.new(user: current_user) end def create - @letter = Letter.new(user: current_user) + @letter = Verification::Letter.new(user: current_user) if @letter.save redirect_to account_path, notice: t('verification.letter.create.flash.success') else diff --git a/app/models/letter.rb b/app/models/verification/letter.rb similarity index 97% rename from app/models/letter.rb rename to app/models/verification/letter.rb index 75b5a5437..566fe1fd7 100644 --- a/app/models/letter.rb +++ b/app/models/verification/letter.rb @@ -1,4 +1,4 @@ -class Letter +class Verification::Letter include ActiveModel::Model attr_accessor :user, :address diff --git a/spec/factories.rb b/spec/factories.rb index a9bff4ac1..1745c0427 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -31,7 +31,7 @@ FactoryGirl.define do phone "699999999" end - factory :letter do + factory :verification_letter, class: Verification::Letter do user address end diff --git a/spec/models/letter_spec.rb b/spec/models/letter_spec.rb index e5e871d7c..13175320e 100644 --- a/spec/models/letter_spec.rb +++ b/spec/models/letter_spec.rb @@ -1,12 +1,12 @@ require 'rails_helper' -describe 'Letter' do +describe 'Verification::Letter' do let(:user) { create(:user) } describe "validations" do - let(:letter) { build(:letter) } + let(:letter) { build(:verification_letter) } it "should be valid" do expect(letter).to be_valid @@ -27,7 +27,7 @@ describe 'Letter' do describe "save" do before(:each) do - letter = Letter.new(user: user) + letter = Verification::Letter.new(user: user) letter.save user.reload end From e6fd62189b45ec4ca08ad242d19398a4f5667beb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Sat, 29 Aug 2015 12:17:27 +0200 Subject: [PATCH 2/6] moves Sms model to Verification namespace --- app/controllers/verification/sms_controller.rb | 8 ++++---- app/models/{ => verification}/sms.rb | 2 +- app/views/verification/sms/_form.html.erb | 2 +- app/views/verification/sms/edit.html.erb | 2 +- app/views/verification/sms/new.html.erb | 2 +- app/views/verification/verified_user/show.html.erb | 2 +- spec/factories.rb | 2 +- spec/models/sms_spec.rb | 6 +++--- 8 files changed, 13 insertions(+), 13 deletions(-) rename app/models/{ => verification}/sms.rb (97%) diff --git a/app/controllers/verification/sms_controller.rb b/app/controllers/verification/sms_controller.rb index e0080753e..9e18453ad 100644 --- a/app/controllers/verification/sms_controller.rb +++ b/app/controllers/verification/sms_controller.rb @@ -6,11 +6,11 @@ class Verification::SmsController < ApplicationController skip_authorization_check def new - @sms = Sms.new(phone: params[:phone]) + @sms = Verification::Sms.new(phone: params[:phone]) end def create - @sms = Sms.new(sms_params.merge(user: current_user)) + @sms = Verification::Sms.new(sms_params.merge(user: current_user)) if @sms.save redirect_to edit_sms_path, notice: t('verification.sms.create.flash.success') else @@ -19,11 +19,11 @@ class Verification::SmsController < ApplicationController end def edit - @sms = Sms.new + @sms = Verification::Sms.new end def update - @sms = Sms.new(sms_params.merge(user: current_user)) + @sms = Verification::Sms.new(sms_params.merge(user: current_user)) if @sms.verify? current_user.update(confirmed_phone: current_user.unconfirmed_phone) diff --git a/app/models/sms.rb b/app/models/verification/sms.rb similarity index 97% rename from app/models/sms.rb rename to app/models/verification/sms.rb index 61b06a091..f280f115e 100644 --- a/app/models/sms.rb +++ b/app/models/verification/sms.rb @@ -1,4 +1,4 @@ -class Sms +class Verification::Sms include ActiveModel::Model attr_accessor :user, :phone, :confirmation_code diff --git a/app/views/verification/sms/_form.html.erb b/app/views/verification/sms/_form.html.erb index efa0f74b8..9aaaa1495 100644 --- a/app/views/verification/sms/_form.html.erb +++ b/app/views/verification/sms/_form.html.erb @@ -1,4 +1,4 @@ -<%= form_for sms, url: sms_path do |f| %> +<%= form_for sms, as: "sms", url: sms_path do |f| %> <%= render 'shared/errors', resource: sms %> <%= f.hidden_field :phone %> <%= f.submit t('verification.sms.form.submit_button') %> diff --git a/app/views/verification/sms/edit.html.erb b/app/views/verification/sms/edit.html.erb index 89fbef5ff..7432af7eb 100644 --- a/app/views/verification/sms/edit.html.erb +++ b/app/views/verification/sms/edit.html.erb @@ -3,7 +3,7 @@

<%= t('verification.sms.edit.title') %>

- <%= form_for @sms, url: sms_path, method: :put do |f| %> + <%= form_for @sms, as: "sms", url: sms_path, method: :put do |f| %>

<%= @error %>

<%= f.text_field :confirmation_code %> diff --git a/app/views/verification/sms/new.html.erb b/app/views/verification/sms/new.html.erb index eec63f6c6..8050c0f90 100644 --- a/app/views/verification/sms/new.html.erb +++ b/app/views/verification/sms/new.html.erb @@ -3,7 +3,7 @@

<%= t('verification.sms.new.title') %>

- <%= form_for @sms, url: sms_path do |f| %> + <%= form_for @sms, as: "sms", url: sms_path do |f| %> <%= render 'shared/errors', resource: @sms %> <%= f.text_field :phone %> diff --git a/app/views/verification/verified_user/show.html.erb b/app/views/verification/verified_user/show.html.erb index bb61e8546..53f871c76 100644 --- a/app/views/verification/verified_user/show.html.erb +++ b/app/views/verification/verified_user/show.html.erb @@ -32,7 +32,7 @@ <%= verified_user.phone %> - <%= render '/verification/sms/form', sms: Sms.new(phone: verified_user.phone) %> + <%= render '/verification/sms/form', sms: Verification::Sms.new(phone: verified_user.phone) %>


diff --git a/spec/factories.rb b/spec/factories.rb index 1745c0427..578d7b250 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -27,7 +27,7 @@ FactoryGirl.define do postal_code "28013" end - factory :sms do + factory :verification_sms, class: Verification::Sms do phone "699999999" end diff --git a/spec/models/sms_spec.rb b/spec/models/sms_spec.rb index bdcd2d739..f52ff3c6e 100644 --- a/spec/models/sms_spec.rb +++ b/spec/models/sms_spec.rb @@ -1,14 +1,14 @@ require 'rails_helper' -describe Sms do +describe Verification::Sms do it "should be valid" do - sms = build(:sms) + sms = build(:verification_sms) expect(sms).to be_valid end it "should validate uniqness of phone" do user = create(:user, confirmed_phone: "699999999") - sms = Sms.new(phone: "699999999") + sms = Verification::Sms.new(phone: "699999999") expect(sms).to_not be_valid end From 52f57c5b3948492ba68951881c0ff14468fd7232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Sat, 29 Aug 2015 12:21:55 +0200 Subject: [PATCH 3/6] fixes letter new form --- app/views/verification/letter/new.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/verification/letter/new.html.erb b/app/views/verification/letter/new.html.erb index ab1d3070e..31a82be63 100644 --- a/app/views/verification/letter/new.html.erb +++ b/app/views/verification/letter/new.html.erb @@ -7,7 +7,7 @@ <%= t('verification.letter.new.explanation') %> - <%= form_for @letter, url: letter_path do |f| %> + <%= form_for @letter, as: "letter", url: letter_path do |f| %> <%= render 'shared/errors', resource: @letter %> <%= f.submit t('verification.letter.new.submit_button') %> <% end %> From e33723635ba3a2657fb5a53eb7a656422720f138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Sat, 29 Aug 2015 12:26:20 +0200 Subject: [PATCH 4/6] moves Email model to Verification namespace --- app/controllers/verification/email_controller.rb | 4 ++-- app/models/{ => verification}/email.rb | 2 +- app/views/verification/email/_form.html.erb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename app/models/{ => verification}/email.rb (97%) diff --git a/app/controllers/verification/email_controller.rb b/app/controllers/verification/email_controller.rb index ebcbf68ab..2fe232576 100644 --- a/app/controllers/verification/email_controller.rb +++ b/app/controllers/verification/email_controller.rb @@ -4,7 +4,7 @@ class Verification::EmailController < ApplicationController skip_authorization_check def show - if Email.find(current_user, params[:email_verification_token]) + if Verification::Email.find(current_user, params[:email_verification_token]) current_user.update(verified_at: Time.now) redirect_to account_path, notice: t('verification.email.show.flash.success') else @@ -13,7 +13,7 @@ class Verification::EmailController < ApplicationController end def create - @email = Email.new(@verified_user) + @email = Verification::Email.new(@verified_user) if @email.save current_user.reload Mailer.email_verification(current_user, @email.recipient, @email.encrypted_token).deliver_now diff --git a/app/models/email.rb b/app/models/verification/email.rb similarity index 97% rename from app/models/email.rb rename to app/models/verification/email.rb index e5e15c49f..dad706b52 100644 --- a/app/models/email.rb +++ b/app/models/verification/email.rb @@ -1,4 +1,4 @@ -class Email +class Verification::Email include ActiveModel::Model attr_accessor :verified_user, :recipient, :plain_token, :encrypted_token diff --git a/app/views/verification/email/_form.html.erb b/app/views/verification/email/_form.html.erb index 94039e5e2..7314e568c 100644 --- a/app/views/verification/email/_form.html.erb +++ b/app/views/verification/email/_form.html.erb @@ -1,4 +1,4 @@ -<%= form_for Email.new(verified_user), url: email_path, method: :post do |f| %> +<%= form_for Verification::Email.new(verified_user), as: "email", url: email_path, method: :post do |f| %> <%= hidden_field_tag :recipient, verified_user.email %> <%= f.submit t('verification.email.form.submit_button') %> <% end %> \ No newline at end of file From e8463d13724b002a587ba702ff71932cac3a0f56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Sat, 29 Aug 2015 12:38:07 +0200 Subject: [PATCH 5/6] moves Residence model to Verification namespace --- app/controllers/verification/residence_controller.rb | 4 ++-- app/models/{ => verification}/residence.rb | 2 +- app/views/verification/residence/new.html.erb | 2 +- spec/factories.rb | 2 +- spec/models/residence_spec.rb | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-) rename app/models/{ => verification}/residence.rb (97%) diff --git a/app/controllers/verification/residence_controller.rb b/app/controllers/verification/residence_controller.rb index 107e0a1e0..b9951502e 100644 --- a/app/controllers/verification/residence_controller.rb +++ b/app/controllers/verification/residence_controller.rb @@ -4,11 +4,11 @@ class Verification::ResidenceController < ApplicationController skip_authorization_check def new - @residence = Residence.new + @residence = Verification::Residence.new end def create - @residence = Residence.new(residence_params.merge(user: current_user)) + @residence = Verification::Residence.new(residence_params.merge(user: current_user)) if @residence.save redirect_to verified_user_path, notice: t('verification.residence.create.flash.success') else diff --git a/app/models/residence.rb b/app/models/verification/residence.rb similarity index 97% rename from app/models/residence.rb rename to app/models/verification/residence.rb index 511f1cb0c..ec8deda2b 100644 --- a/app/models/residence.rb +++ b/app/models/verification/residence.rb @@ -1,4 +1,4 @@ -class Residence +class Verification::Residence include ActiveModel::Model include ActiveModel::Dates diff --git a/app/views/verification/residence/new.html.erb b/app/views/verification/residence/new.html.erb index 83e1b6f73..c61df2f27 100644 --- a/app/views/verification/residence/new.html.erb +++ b/app/views/verification/residence/new.html.erb @@ -3,7 +3,7 @@

<%= t('verification.residence.new.title') %>

- <%= form_for @residence, url: residence_path do |f| %> + <%= form_for @residence, as: "residence", url: residence_path do |f| %> <%= render 'errors' %> <%= f.select :document_type, document_types, prompt: "" %> diff --git a/spec/factories.rb b/spec/factories.rb index 578d7b250..336ef8452 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -20,7 +20,7 @@ FactoryGirl.define do uid "MyString" end - factory :residence do + factory :verification_residence, class: Verification::Residence do document_number '12345678Z' document_type 1 date_of_birth Date.new(1980, 12, 31) diff --git a/spec/models/residence_spec.rb b/spec/models/residence_spec.rb index 66eb34951..189132c1f 100644 --- a/spec/models/residence_spec.rb +++ b/spec/models/residence_spec.rb @@ -1,8 +1,8 @@ require 'rails_helper' -describe Residence do +describe Verification::Residence do - let(:residence) { build(:residence) } + let(:residence) { build(:verification_residence) } describe "validations" do @@ -12,12 +12,12 @@ describe Residence do describe "dates" do it "should be valid with a valid date of birth" do - residence = Residence.new({"date_of_birth(3i)"=>"1", "date_of_birth(2i)"=>"1", "date_of_birth(1i)"=>"1980"}) + residence = Verification::Residence.new({"date_of_birth(3i)"=>"1", "date_of_birth(2i)"=>"1", "date_of_birth(1i)"=>"1980"}) expect(residence.errors[:date_of_birth].size).to eq(0) end it "should not be valid without a date of birth" do - residence = Residence.new({"date_of_birth(3i)"=>"", "date_of_birth(2i)"=>"", "date_of_birth(1i)"=>""}) + residence = Verification::Residence.new({"date_of_birth(3i)"=>"", "date_of_birth(2i)"=>"", "date_of_birth(1i)"=>""}) residence.valid? expect(residence.errors[:date_of_birth]).to include("can't be blank") end @@ -28,7 +28,7 @@ describe Residence do residence.user = user residence.save - residence2 = build(:residence) + residence2 = build(:verification_residence) residence.valid? expect(residence.errors[:document_number]).to include("Already in use") From b6926b02131ae1224d3d50829e598e4f676aa4d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Sat, 29 Aug 2015 12:41:13 +0200 Subject: [PATCH 6/6] configures active model i18n keys --- config/i18n-tasks.yml | 1 + config/locales/activemodel.en.yml | 26 ++++++++++++++------------ config/locales/activemodel.es.yml | 26 ++++++++++++++------------ config/locales/activerecord.en.yml | 1 - 4 files changed, 29 insertions(+), 25 deletions(-) diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index c1991cd64..626a4b8cb 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -97,6 +97,7 @@ ignore_missing: ## Consider these keys used: ignore_unused: - 'activerecord.*' + - 'activemodel.*' - 'admin.organizations.index.filter.*' - 'unauthorized.*' - 'simple_captcha.*' diff --git a/config/locales/activemodel.en.yml b/config/locales/activemodel.en.yml index edf91fdc4..ad43d1516 100644 --- a/config/locales/activemodel.en.yml +++ b/config/locales/activemodel.en.yml @@ -1,16 +1,18 @@ en: activemodel: models: - residence: Residence - sms: SMS + verification: + residence: Residence + sms: SMS attributes: - residence: - document_type: Document type - document_number: Document number(including letter) - date_of_birth: Date of birth - postal_code: Postal code - sms: - phone: 'Phone' - confirmation_code: 'Confirmation code' - email: - recipient: 'Email' \ No newline at end of file + verification: + residence: + document_type: Document type + document_number: Document number(including letter) + date_of_birth: Date of birth + postal_code: Postal code + sms: + phone: 'Phone' + confirmation_code: 'Confirmation code' + email: + recipient: 'Email' \ No newline at end of file diff --git a/config/locales/activemodel.es.yml b/config/locales/activemodel.es.yml index f72fdd385..9bda561cf 100644 --- a/config/locales/activemodel.es.yml +++ b/config/locales/activemodel.es.yml @@ -1,16 +1,18 @@ es: activemodel: models: - residence: Residencia - sms: SMS + verification: + residence: Residencia + sms: SMS attributes: - residence: - document_type: Tipo documento - document_number: Numero de documento (incluida letra) - date_of_birth: Fecha de nacimiento - postal_code: 'Código postal' - sms: - phone: 'Teléfono' - confirmation_code: 'Código de confirmación' - email: - recipient: 'Email' \ No newline at end of file + verification: + residence: + document_type: Tipo documento + document_number: Numero de documento (incluida letra) + date_of_birth: Fecha de nacimiento + postal_code: 'Código postal' + sms: + phone: 'Teléfono' + confirmation_code: 'Código de confirmación' + email: + recipient: 'Email' \ No newline at end of file diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml index e78d86512..94b1fa0c9 100644 --- a/config/locales/activerecord.en.yml +++ b/config/locales/activerecord.en.yml @@ -7,7 +7,6 @@ en: user: User vote: Vote organization: Organization - residence: Residencia attributes: comment: body: Comment