devise-bootstrap-form 0.1.0 → 1.0.0.alpha.pre.1

data/app/views/devise/mailer/invitation_instructions.html.erb

@@ -5,7 +5,7 @@
 <p><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, :invitation_token => @token) %></p>
 
 <% if @resource.invitation_due_at %>
-  <p><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :'devise.mailer.invitation_instructions.accept_until_format')) %></p>
+  <p><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :"devise.mailer.invitation_instructions.accept_until_format")) %></p>
 <% end %>
 
 <p><%= t("devise.mailer.invitation_instructions.ignore") %></p>

data/app/views/devise/mailer/invitation_instructions.text.erb

@@ -5,7 +5,7 @@
 <%= accept_invitation_url(@resource, :invitation_token => @token) %>
 
 <% if @resource.invitation_due_at %>
-  <%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :'devise.mailer.invitation_instructions.accept_until_format')) %>
+  <%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :"devise.mailer.invitation_instructions.accept_until_format")) %>
 <% end %>
 
 <%= t("devise.mailer.invitation_instructions.ignore") %>

data/app/views/devise/passwords/edit.html.erb

@@ -1,29 +1,23 @@
-<div class="devise-bootstrap-form">
-  <div class="devise-bootstrap-form-row">
-    <div class="devise-bootstrap-form-col">
-      <h2 class="text-center">Change your password</h2>
+<h2 class="text-center">Change your password</h2>
 
-      <%= bootstrap_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
-        <%= devise_error_messages! %>
-        <%= f.hidden_field :reset_password_token %>
+<%= bootstrap_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
+  <%= render "devise/shared/error_messages", resource: resource %>
+  <%= f.hidden_field :reset_password_token %>
 
-        <%= f.password_field :password,
-                             autofocus: true,
-                             autocomplete: "new-password",
-                             help: "(#{@minimum_password_length} characters minimum)",
-                             label: "New password" %>
-        <%= f.password_field :password_confirmation,
-                             label: "Confirm new password",
-                             autocomplete: "off",
-                             class: "required" %>
-        <%= f.form_group do %>
-          <%= f.submit "Change my password", class: 'btn btn-primary btn-block btn-lg' %>
-        <% end %>
-      <% end %>
+  <%= f.password_field :password,
+                       autofocus: true,
+                       autocomplete: "new-password",
+                       help: "(#{@minimum_password_length} characters minimum)",
+                       label: "New password" %>
+  <%= f.password_field :password_confirmation,
+                       label: "Confirm new password",
+                       autocomplete: "off",
+                       class: "required" %>
+  <%= f.form_group class: "d-grid" do %>
+    <%= f.submit "Change my password", class: "btn btn-primary btn-lg" %>
+  <% end %>
+<% end %>
 
-      <div class="text-center">
-        <%= render "devise/shared/links" %>
-      </div>
-    </div>
-  </div>
+<div class="text-center">
+  <%= render "devise/shared/links" %>
 </div>

data/app/views/devise/passwords/new.html.erb

@@ -1,20 +1,13 @@
-<div class="devise-bootstrap-form">
-  <div class="devise-bootstrap-form-row">
-    <div class="devise-bootstrap-form-col">
-      <h2 class="text-center">Forgot your password?</h2>
+<h2 class="text-center">Forgot your password?</h2>
 
-      <%= bootstrap_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
-        <%= devise_error_messages! %>
-        <br>
-        <p class="text-left">Please enter your email address and we will send you a link to reset your password.</p>
-        <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
-        <%= f.form_group do %>
-          <%= f.submit "Send me reset password instructions", class: 'btn btn-primary btn-block btn-lg' %>
-        <% end %>
-      <% end %>
-      <div class="text-center">
-        <%= render "devise/shared/links" %>
-      </div>
-    </div>
-  </div>
+<%= bootstrap_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
+  <%= render "devise/shared/error_messages", resource: resource %>
+  <p class="text-left">Please enter your email address and we will send you a link to reset your password.</p>
+  <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+  <%= f.form_group class: "d-grid" do %>
+    <%= f.submit "Send me reset password instructions", class: "btn btn-primary btn-lg" %>
+  <% end %>
+<% end %>
+<div class="text-center">
+  <%= render "devise/shared/links" %>
 </div>

data/app/views/devise/registrations/edit.html.erb

@@ -1,33 +1,27 @@
-<div class="devise-bootstrap-form">
-  <div class="devise-bootstrap-form-row">
-    <div class="devise-bootstrap-form-col">
-      <h2 class="text-center">Edit <%= resource_name.to_s.humanize %></h2>
-      <%= bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
-        <%= devise_error_messages! %>
+<h2 class="text-center">Edit <%= resource_name.to_s.humanize %></h2>
+<%= bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
+  <%= render "devise/shared/error_messages", resource: resource %>
 
-        <%= f.email_field :email %>
+  <%= f.email_field :email %>
 
-        <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
-          <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
-        <% end %>
+  <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
+    <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
+  <% end %>
 
-        <%= f.password_field :password, autocomplete: "off", help: "leave blank if you don't want to change it" %>
-        <%= f.password_field :password_confirmation, autocomplete: "off", class: "required" %>
-        <%= f.password_field :current_password,
-                             autocomplete: "off",
-                             class: "required",
-                             help: "We need your current password to confirm your changes." %>
+  <%= f.password_field :password, autocomplete: "off", help: "leave blank if you don't want to change it" %>
+  <%= f.password_field :password_confirmation, autocomplete: "off", class: "required" %>
+  <%= f.password_field :current_password,
+                       autocomplete: "off",
+                       class: "required",
+                       help: "We need your current password to confirm your changes." %>
 
-        <%= f.form_group do %>
-          <%= f.submit "Update", class: "btn btn-lg btn-block btn-primary" %>
-        <% end %>
-      <% end %>
+  <%= f.form_group class: "d-grid" do %>
+    <%= f.submit "Update", class: "btn btn-lg btn-primary" %>
+  <% end %>
+<% end %>
 
-      <h2>Cancel my account</h2>
+<h2>Cancel my account</h2>
 
-      <p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), class: "btn btn-block btn-danger", data: { confirm: "Are you sure? You cannot undo this." }, method: :delete %></p>
+<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), class: "btn btn-danger", data: { confirm: "Are you sure? You cannot undo this." }, method: :delete %></p>
 
-      <%= link_to "Back", :back %>
-    </div>
-  </div>
-</div>
+<%= link_to "Back", :back %>

data/app/views/devise/registrations/new.html.erb

@@ -1,25 +1,19 @@
-<div class="devise-bootstrap-form">
-  <div class="devise-bootstrap-form-row">
-    <div class="devise-bootstrap-form-col">
-      <h2 class="text-center">Sign up</h2>
-      <%= bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
-        <%= devise_error_messages! %>
+<h2 class="text-center">Sign up</h2>
+<%= bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
+  <%= render "devise/shared/error_messages", resource: resource %>
 
-        <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
-        <%= f.password_field :password,
-              autocomplete: "new-password",
-              help: "(#{@minimum_password_length} characters minimum)" %>
-        <%= f.password_field :password_confirmation,
-              autocomplete: "new-password",
-              label_class: "required" %>
+  <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+  <%= f.password_field :password,
+        autocomplete: "new-password",
+        help: "(#{@minimum_password_length} characters minimum)" %>
+  <%= f.password_field :password_confirmation,
+        autocomplete: "new-password",
+        label_class: "required" %>
 
-        <%= f.form_group do %>
-          <%= f.submit "Sign up", class: "btn btn-primary btn-block btn-lg" %>
-        <% end %>
-      <% end %>
-      <div class="text-center">
-        <%= render "devise/shared/links" %>
-      </div>
-    </div>
-  </div>
+  <%= f.form_group class: "d-grid" do %>
+    <%= f.submit "Sign up", class: "btn btn-primary btn-lg" %>
+  <% end %>
+<% end %>
+<div class="text-center">
+  <%= render "devise/shared/links" %>
 </div>

data/app/views/devise/sessions/new.html.erb

@@ -1,24 +1,18 @@
-<div class="devise-bootstrap-form">
-  <div class="devise-bootstrap-form-row">
-    <div class="devise-bootstrap-form-col">
-      <h2 class="text-center">Log in</h2>
-      <%= bootstrap_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
-      <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
-      <%= f.password_field :password, autocomplete: "current-password", placeholder: 'Password' %>
+<h2 class="text-center">Log in</h2>
+<%= bootstrap_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+<%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+<%= f.password_field :password, autocomplete: "current-password", placeholder: "Password" %>
 
-      <% if devise_mapping.rememberable? -%>
-        <%= f.form_group do %>
-        <%= f.check_box :remember_me %>
-      <% end %>
-      <% end -%>
+<% if devise_mapping.rememberable? -%>
+  <%= f.form_group do %>
+  <%= f.check_box :remember_me %>
+<% end %>
+<% end -%>
 
-      <%= f.form_group do %>
-      <%= f.submit "Log in", class: "btn btn-primary btn-block btn-lg" %>
-      <% end %>
-      <% end %>
-      <div class="text-center">
-        <%= render "devise/shared/links" %>
-      </div>
-    </div>
-  </div>
+<%= f.form_group class: "d-grid" do %>
+  <%= f.submit "Log in", class: "btn btn-primary btn-lg" %>
+<% end %>
+<% end %>
+<div class="text-center">
+  <%= render "devise/shared/links" %>
 </div>

data/app/views/devise/shared/_error_messages.html.erb

@@ -0,0 +1,15 @@
+<% if resource.errors.any? %>
+  <div id="error_explanation">
+    <h2>
+      <%= I18n.t("errors.messages.not_saved",
+                 count: resource.errors.count,
+                 resource: resource.class.model_name.human.downcase)
+       %>
+    </h2>
+    <ul>
+      <% resource.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>

data/app/views/devise/shared/_links.html.erb

@@ -1,20 +1,20 @@
-<%- if controller_name != 'sessions' %>
+<%- if controller_name != "sessions" %>
   <%= link_to "Log in", new_session_path(resource_name) %><br />
 <% end -%>
 
-<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+<%- if devise_mapping.registerable? && controller_name != "registrations" %>
   <%= link_to "Sign up", new_registration_path(resource_name) %><br />
 <% end -%>
 
-<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
+<%- if devise_mapping.recoverable? && controller_name != "passwords" && controller_name != "registrations" %>
   <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
 <% end -%>
 
-<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+<%- if devise_mapping.confirmable? && controller_name != "confirmations" %>
   <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
 <% end -%>
 
-<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != "unlocks" %>
   <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
 <% end -%>
 

data/app/views/devise/unlocks/new.html.erb

@@ -1,20 +1,14 @@
-<div class="devise-bootstrap-form">
-  <div class="devise-bootstrap-form-row">
-    <div class="devise-bootstrap-form-col">
-      <h2 class="text-center">Resend unlock instructions</h2>
+<h2 class="text-center">Resend unlock instructions</h2>
 
-      <%= bootstrap_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
-        <%= devise_error_messages! %>
+<%= bootstrap_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
+  <%= render "devise/shared/error_messages", resource: resource %>
 
-        <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
-        <%= f.form_group do %>
-          <%= f.submit "Resend unlock instructions", class: "btn btn-primary btn-block btn-lg" %>
-        <% end %>
-      <% end %>
+  <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+  <%= f.form_group class: "d-grid" do %>
+    <%= f.submit "Resend unlock instructions", class: "btn btn-primary btn-lg" %>
+  <% end %>
+<% end %>
 
-      <div class="text-center">
-        <%= render "devise/shared/links" %>
-      </div>
-    </div>
-  </div>
+<div class="text-center">
+  <%= render "devise/shared/links" %>
 </div>

data/app/views/i18n/confirmations/new.html.erb

@@ -0,0 +1,17 @@
+<h2 class="text-center"><%= t(".resend_confirmation_instructions") %></h2>
+
+<%= bootstrap_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
+  <%= render "devise/shared/error_messages", resource: resource %>
+
+  <%= f.email_field :email,
+                    autofocus: true,
+                    autocomplete: "email",
+                    value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>
+  <%= f.form_group class: "d-grid" do %>
+    <%= f.submit t(".resend_confirmation_instructions"), class: "btn btn-primary btn-lg btn-block" %>
+  <% end %>
+<% end %>
+
+<div class="text-center">
+  <%= render "devise/shared/links" %>
+</div>

data/app/views/i18n/mailer/confirmation_instructions.html.erb

@@ -0,0 +1,4 @@
+<p><%= t(".greeting", recipient: @email) %></p>
+
+<p><%= t(".instruction") %></p>
+<p><%= link_to t(".action"), confirmation_url(@resource, confirmation_token: @token) %></p>

data/app/views/i18n/mailer/email_changed.html.erb

@@ -0,0 +1,7 @@
+<p><%= t(".greeting", recipient: @email) %></p>
+
+<% if @resource.try(:unconfirmed_email?) %>
+  <p><%= t(".message", email: @resource.unconfirmed_email) %></p>
+<% else %>
+  <p><%= t(".message", email: @resource.email) %></p>
+<% end %>

data/app/views/i18n/mailer/password_change.html.erb

@@ -0,0 +1,3 @@
+<p><%= t(".greeting", recipient: @resource.email) %></p>
+
+<p><%= t(".message") %></p>

data/app/views/i18n/mailer/reset_password_instructions.html.erb

@@ -0,0 +1,8 @@
+<p><%= t(".greeting", recipient: @resource.email) %></p>
+
+<p><%= t(".instruction") %></p>
+
+<p><%= link_to t(".action"), edit_password_url(@resource, reset_password_token: @token) %></p>
+
+<p><%= t(".instruction_2") %></p>
+<p><%= t(".instruction_3") %></p>

data/app/views/i18n/mailer/unlock_instructions.html.erb

@@ -0,0 +1,7 @@
+<p><%= t(".greeting", recipient: @resource.email) %></p>
+
+<p><%= t(".message") %></p>
+
+<p><%= t(".instruction") %></p>
+
+<p><%= link_to t(".action"), unlock_url(@resource, unlock_token: @token) %></p>

data/app/views/i18n/passwords/edit.html.erb

@@ -0,0 +1,23 @@
+<h2 class="text-center"><%= t(".change_your_password") %></h2>
+
+<%= bootstrap_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
+  <%= render "devise/shared/error_messages", resource: resource %>
+  <%= f.hidden_field :reset_password_token %>
+
+  <%= f.password_field :password,
+                       autofocus: true,
+                       autocomplete: "new-password",
+                       help: "t("devise.shared.minimum_password_length", count: @minimum_password_length)",
+                       label: t(".new_password") %>
+  <%= f.password_field :password_confirmation,
+                       label: t(".confirm_new_password"),
+                       autocomplete: "off",
+                       class: "required" %>
+  <%= f.form_group class: "d-grid" do %>
+    <%= f.submit t(".change_my_password"), class: "btn btn-primary btn-lg" %>
+  <% end %>
+<% end %>
+
+<div class="text-center">
+  <%= render "devise/shared/links" %>
+</div>

data/app/views/i18n/passwords/new.html.erb

@@ -0,0 +1,12 @@
+<h2 class="text-center"><%= t(".forgot_your_password") %></h2>
+
+<%= bootstrap_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
+  <%= render "devise/shared/error_messages", resource: resource %>
+  <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+  <%= f.form_group class: "d-grid" do %>
+    <%= f.submit t(".send_me_reset_password_instructions"), class: "btn btn-primary btn-lg" %>
+  <% end %>
+<% end %>
+<div class="text-center">
+  <%= render "devise/shared/links" %>
+</div>

data/app/views/i18n/registrations/edit.html.erb

@@ -0,0 +1,27 @@
+<h2 class="text-center">t(".title", resource: resource_name.to_s.humanize)</h2>
+<%= bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
+  <%= render "devise/shared/error_messages", resource: resource %>
+
+  <%= f.email_field :email %>
+
+  <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
+    <div><%= t(".currently_waiting_confirmation_for_email", email: resource.unconfirmed_email) %></div>
+  <% end %>
+
+  <%= f.password_field :password, autocomplete: "off", help: t(".leave_blank_if_you_don_t_want_to_change_it") + " " + t("devise.shared.minimum_password_length", count: @minimum_password_length) %>
+  <%= f.password_field :password_confirmation, autocomplete: "off", class: "required" %>
+  <%= f.password_field :current_password,
+                       autocomplete: "off",
+                       class: "required",
+                       help: t(".we_need_your_current_password_to_confirm_your_changes") %>
+
+  <%= f.form_group class: "d-grid" do %>
+    <%= f.submit t(".update"), class: "btn btn-lg btn-primary" %>
+  <% end %>
+<% end %>
+
+<h2><%= t(".cancel_my_account") %></h2>
+
+<p><%= t(".unhappy") %> <%= button_to t(".cancel_my_account"), registration_path(resource_name), class: "btn btn-danger", data: { confirm: t(".are_you_sure") }, method: :delete %></p>
+
+<%= link_to t("devise.shared.links.back"), :back %>

data/app/views/i18n/registrations/new.html.erb

@@ -0,0 +1,19 @@
+<h2 class="text-center"><%= t(".sign_up") %></h2>
+<%= bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
+  <%= render "devise/shared/error_messages", resource: resource %>
+
+  <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+  <%= f.password_field :password,
+        autocomplete: "new-password",
+        help: t("devise.shared.minimum_password_length", count: @minimum_password_length) %>
+  <%= f.password_field :password_confirmation,
+        autocomplete: "new-password",
+        label_class: "required" %>
+
+  <%= f.form_group class: "d-grid" do %>
+    <%= f.submit t(".sign_up"), class: "btn btn-primary btn-lg" %>
+  <% end %>
+<% end %>
+<div class="text-center">
+  <%= render "devise/shared/links" %>
+</div>

data/app/views/i18n/sessions/new.html.erb

@@ -0,0 +1,18 @@
+<h2 class="text-center"><%= t(".sign_in") %></h2>
+<%= bootstrap_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+<%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+<%= f.password_field :password, autocomplete: "current-password", placeholder: "Password" %>
+
+<% if devise_mapping.rememberable? -%>
+  <%= f.form_group do %>
+  <%= f.check_box :remember_me %>
+<% end %>
+<% end -%>
+
+<%= f.form_group class: "d-grid" do %>
+  <%= f.submit t(".sign_in"), class: "btn btn-primary btn-lg" %>
+<% end %>
+<% end %>
+<div class="text-center">
+  <%= render "devise/shared/links" %>
+</div>

data/app/views/i18n/shared/_links.html.erb

@@ -0,0 +1,25 @@
+<%- if controller_name != "sessions" %>
+  <%= link_to t(".sign_in"), new_session_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.registerable? && controller_name != "registrations" %>
+  <%= link_to t(".sign_up"), new_registration_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.recoverable? && controller_name != "passwords" && controller_name != "registrations" %>
+  <%= link_to t(".forgot_your_password"), new_password_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.confirmable? && controller_name != "confirmations" %>
+  <%= link_to t(".didn_t_receive_confirmation_instructions"), new_confirmation_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != "unlocks" %>
+  <%= link_to t(".didn_t_receive_unlock_instructions"), new_unlock_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.omniauthable? %>
+  <%- resource_class.omniauth_providers.each do |provider| %>
+    <%= link_to t(".sign_in_with_provider", provider: OmniAuth::Utils.camelize(provider)), omniauth_authorize_path(resource_name, provider) %><br />
+  <% end -%>
+<% end -%>

data/app/views/i18n/unlocks/new.html.erb

@@ -0,0 +1,14 @@
+<h2 class="text-center"><%= t(".resend_unlock_instructions") %></h2>
+
+<%= bootstrap_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
+  <%= render "devise/shared/error_messages", resource: resource %>
+
+  <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+  <%= f.form_group class: "d-grid" do %>
+    <%= f.submit t(".resend_unlock_instructions"), class: "btn btn-primary btn-lg" %>
+  <% end %>
+<% end %>
+
+<div class="text-center">
+  <%= render "devise/shared/links" %>
+</div>

data/bin/console

@@ -2,14 +2,14 @@
 # frozen_string_literal: true
 
 require "bundler/setup"
-require "devise/bootstrap-form"
+require "devise_bootstrap_form"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
+require "pry"
+Pry.start
 
-require "irb"
-IRB.start
+# require "irb"
+# IRB.start

data/devise-bootstrap-form.gemspec

@@ -2,22 +2,23 @@
 
 lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "devise/bootstrap_form/version"
+require "devise_bootstrap_form/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "devise-bootstrap-form"
-  spec.version       = Devise::BootstrapForm::VERSION
-  spec.authors       = ["Andrew Fomera", "Larry Reid"]
+  spec.version       = DeviseBootstrapForm::VERSION
+  spec.authors       = ["Larry Reid"]
   spec.email         = ["larry.reid@jadesystems.ca"]
 
   spec.summary       = "Generates nicer views for Devise that use Bootstrap via the `bootstrap_form` gem."
-  spec.description   = <<-DESC
-This gem generates Devise views styled with Bootstrap via the `bootstrap_form`
-gem. If you plan to use, or are using, `bootstrap_form` in your app, your Devise
-forms will be consistent with the rest of your forms.
+  spec.description   = <<~DESC
+    This gem generates Devise views styled with Bootstrap via the `bootstrap_form`
+    gem. If you plan to use, or are using, `bootstrap_form` in your app, your Devise
+    forms will be consistent with the rest of your forms.
 
-The generator will detect if you're using `devise_invitable`, and will generate
-`bootstrap_form` forms for its views as well.
+    The generator will detect if you're using `devise_invitable`, and will generate
+    `bootstrap_form` forms for its views as well. If you're using `devise-i18n`, the
+    forms will use translations.
   DESC
   spec.homepage      = "https://github.com/lcreid/devise-bootstrap-form"
   spec.license       = "MIT"
@@ -30,15 +31,23 @@ The generator will detect if you're using `devise_invitable`, and will generate
     raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
   end
 
+  spec.required_ruby_version = ">= 2.6"
+
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "bootstrap_form", ">= 4.0.0.alpha1"
-  spec.add_dependency "devise"
+  spec.add_dependency "bootstrap_form", "~> 5.0"
+  # Devise deprecated devise_error_messages! at 4.6.0, so for later versions
+  # we add a new partial.
+  spec.add_dependency "devise", ">= 4.6.0"
   spec.add_dependency "rails", ">= 5.0.0"
-  spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "chandler"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "rake"
+  spec.metadata = {
+    "rubygems_mfa_required" => "true"
+  }
 end

data/gemfiles/5.2.gemfile

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in devise-bootstrap-form.gemspec
+gemspec path: ".."
+
+# Set a Rails version compatible with a Ruby version
+gem "rails", "~> 5.2.0"
+
+group :development do
+  gem "rubocop", require: false
+  gem "rubocop-rake", require: false
+end