devise-bootstrap-form 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9f4f512d9aec46299cf96863bbc67fb56c297bb78c02733535d729ed5ad53d7
-  data.tar.gz: f92f4bd410f63afd7f7b093a7ffe12218245cf63d2b7e5164960230efdee3370
+  metadata.gz: 631361b779275161c55e77746b850396713ff05146e504883ea127b15d45fcb7
+  data.tar.gz: 324b22c3e9d0467d915b1161484afd48855d8dbf25bd94102e5dfb97ca3aeed6
 SHA512:
-  metadata.gz: da59caa8cd1eb13663d70c9d6fb0f9228247778c8e55df40a12f154f23f261a19834bd3eb36a579ee759c875ca7d3fcda1e3d613c5d612a94bce760cf1ad83bb
-  data.tar.gz: bb08c554aa8bc6e918013782775feb8d2b0633ac91e29e9103d1ad8318b650e71769a988ead4b5f27adb61eca2a4d5522ffb3828f561dbe8f75149756677655c
+  metadata.gz: 1b74d4926bad575e5a966515700d3c63326e7c7010087fa4d16df695593464def4b309382fb3529ebb31d16255eeed8f48d89bd764d42dac3bd4384752ad46f4
+  data.tar.gz: 8719cf714ef87b452572ef8e33193f0c33e2a62170c98d3ce0c030a4c15e8cbecbf4c9e1bc3f1f01720a88ef0d5d7256ab1d2986425a080831a5b6d334ee47b4

data/.travis.yml

@@ -3,10 +3,12 @@ rvm:
   - 2.2.9
   - 2.3.6
   - 2.4.3
-  # - 2.5.0 The latest version is in the include clause and runs with danger.
+  - 2.5.0
 before_install:
-  - gem update --system
-  - gem install bundler --no-document
+  # https://docs.travis-ci.com/user/languages/ruby/#bundler-20
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem i rubygems-update -v '<3' && update_rubygems
+  - gem install bundler -v 1.17.3 --no-document
 
 matrix:
   include:

data/CHANGELOG.md

@@ -12,6 +12,12 @@
 
 * None.
 
+## [0.3.0]
+
+### New features
+
+* Remove `devise_error_messages!` and use `_error_messages.html.erb`.
+
 ## [0.2.0][] (2018-09-30)
 
 ### Breaking changes
@@ -41,6 +47,8 @@
 * N/A.
 
 ```
+    [Pending Release]: https://github.com/lcreid/devise-bootstrap-form/compare/.v0.3.0...HEAD
+    [0.3.0]: https://github.com/lcreid/devise-bootstrap-form/compare/v0.2.0..v0.3.0
     [0.2.0]: https://github.com/lcreid/devise-bootstrap-form/compare/v0.1.0..v0.2.0
     [0.1.0]: https://github.com/lcreid/devise-bootstrap-form/compare/...v0.2.0
 ```

data/README.md

@@ -21,6 +21,7 @@ gem 'devise-bootstrap-form'
 ```
 
 And then execute:
+
 ```bash
 bundle install
 ```
@@ -28,6 +29,12 @@ bundle install
 There are additional installation instructions for [`bootstrap_form`](https://github.com/bootstrap-ruby/bootstrap_form#installation),  [`bootstrap`](https://github.com/twbs/bootstrap-rubygem#a-ruby-on-rails), [`devise`](https://github.com/plataformatec/devise) that you must complete before using `devise-bootstrap-form`, and
 [`devise-i18n`](https://github.com/tigrish/devise-i18n).
 
+Note that as of Devise 4.6.0, `devise_error_messages!` is deprecated in favour of the `_error_messages.html.erb` partial. `devise-bootstrap-form` versions 0.3.0 and higher generate views that use the `_error_messages.html.erb` partial. If you need to use `devise_error_messages!`, use this line in your `Gemfile`:
+
+```ruby
+gem 'devise-bootstrap-form', '<= 0.2.0'
+```
+
 ## Usage
 
 Once all the gems are installed and configured, and the user model is generated, you can generate the Bootstrap Form views with:
@@ -50,7 +57,7 @@ To switch back to what Devise gives you, remove the `app/views/devise` folder. Y
 
 Each of the forms in enclosed in the following:
 
-```
+```html
 <div class="devise-bootstrap-form">
   <div class="devise-bootstrap-form-row">
     <div class="devise-bootstrap-form-col">
@@ -62,7 +69,7 @@ Each of the forms in enclosed in the following:
 
 The generator also generates `app/assets/stylesheets/devise_bootstrap_form.scss` that contains the following:
 
-```
+```css
 .devise-bootstrap-form {
   @extend .container;
 }
@@ -81,7 +88,7 @@ The generator also generates `app/assets/stylesheets/devise_bootstrap_form.scss`
 
 You may want to adjust to your own tastes. For example, if the layout used by your Devise views already wraps the view in a `.container`, you can remove the:
 
-```
+```css
 .devise-bootstrap-form {
   @extend .container;
 }
@@ -93,7 +100,7 @@ You can also modify the views to change the surrounding `div`s to your needs, or
 
 If you don't want the `devise_bootstrap_form`-generated styles at all, remove the following line from `app/asserts/application.scss`:
 
-```
+```css
 @include "devise_bootstrap_form.scss";
 ```
 

data/RELEASING.md

@@ -12,7 +12,7 @@ Follow these steps to release a new version of `devise-bootstrap-form` to `rubyg
 ## How to release
 
 1. Run `bundle install` to make sure that you have all the gems necessary for testing and releasing.
-2.  **Ensure the tests are passing** by running `rake`.
+2. **Ensure the tests are passing** by running `rake`.
 3. Determine which would be the correct next version number according to [semver](http://semver.org/).
 4. Update the version in `./lib/devise_bootstrap_form/version.rb`.
 5. Update the `CHANGELOG.md` (for an illustration of these steps, refer to the [bootstrap_form 4.0.0.alpha1 commit](https://github.com/bootstrap-ruby/devise-bootstrap-form/commit/8aac3667931a16537ab68038ec4cebce186bd596#diff-4ac32a78649ca5bdd8e0ba38b7006a1e) as an example):
@@ -25,6 +25,7 @@ Follow these steps to release a new version of `devise-bootstrap-form` to `rubyg
     [Pending Release]: https://github.com/lcreid/devise-bootstrap-form/compare/.v0.0.1...HEAD
     [0.0.1]: https://github.com/lcreid/devise-bootstrap-form/compare/...v0.0.1
 ```
+
 6. Update the installation instructions in `README.md` to use the new version.
 7. Commit the CHANGELOG and version changes in a single commit; the message should be "Preparing vX.Y.Z" where `X.Y.Z` is the version being released.
 8. Run `bundle exec rake release`; this will tag, push to GitHub, publish to `rubygems.org`, and upload the latest CHANGELOG entry to the [GitHub releases page](https://github.com/lcreid/devise-bootstrap-form/releases).

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

@@ -4,7 +4,7 @@
       <h2 class="text-center">Resend confirmation instructions</h2>
 
       <%= bootstrap_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
-        <%= devise_error_messages! %>
+        <%= render "devise/shared/error_messages", resource: resource %>
 
         <%= f.email_field :email,
                           autofocus: true,

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

@@ -4,7 +4,7 @@
       <h2><%= t 'devise.invitations.edit.header' %></h2>
 
       <%= bootstrap_form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => { :method => :put } do |f| %>
-        <%= devise_error_messages! %>
+        <%= render "devise/shared/error_messages", resource: resource %>
         <%= f.hidden_field :invitation_token, readonly: true %>
 
         <% if f.object.class.require_password_on_accepting %>

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

@@ -4,7 +4,7 @@
       <h2 class="text-center"><%= t "devise.invitations.new.header" %></h2>
 
       <%= bootstrap_form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => {:method => :post} do |f| %>
-        <%= devise_error_messages! %>
+        <%= render "devise/shared/error_messages", resource: resource %>
 
       <% resource.class.invite_key_fields.each do |field| -%>
         <%= f.text_field field %>

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

@@ -4,7 +4,7 @@
       <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! %>
+        <%= render "devise/shared/error_messages", resource: resource %>
         <%= f.hidden_field :reset_password_token %>
 
         <%= f.password_field :password,

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

@@ -4,7 +4,7 @@
       <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! %>
+        <%= render "devise/shared/error_messages", resource: resource %>
         <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" %>

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

@@ -3,7 +3,7 @@
     <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! %>
+        <%= render "devise/shared/error_messages", resource: resource %>
 
         <%= f.email_field :email %>
 

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

@@ -3,7 +3,7 @@
     <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! %>
+        <%= render "devise/shared/error_messages", resource: resource %>
 
         <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
         <%= f.password_field :password,

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/unlocks/new.html.erb

@@ -4,7 +4,7 @@
       <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! %>
+        <%= render "devise/shared/error_messages", resource: resource %>
 
         <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
         <%= f.form_group do %>

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

@@ -4,7 +4,7 @@
       <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| %>
-        <%= devise_error_messages! %>
+        <%= render "devise/shared/error_messages", resource: resource %>
 
         <%= f.email_field :email,
                           autofocus: true,

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

@@ -4,7 +4,7 @@
       <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| %>
-        <%= devise_error_messages! %>
+        <%= render "devise/shared/error_messages", resource: resource %>
         <%= f.hidden_field :reset_password_token %>
 
         <%= f.password_field :password,

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

@@ -4,7 +4,7 @@
       <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| %>
-        <%= devise_error_messages! %>
+        <%= render "devise/shared/error_messages", resource: resource %>
         <br>
         <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
         <%= f.form_group do %>

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

@@ -3,7 +3,7 @@
     <div class="devise-bootstrap-form-col">
       <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| %>
-        <%= devise_error_messages! %>
+        <%= render "devise/shared/error_messages", resource: resource %>
 
         <%= f.email_field :email %>
 

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

@@ -3,7 +3,7 @@
     <div class="devise-bootstrap-form-col">
       <h2 class="text-center"><%= t('.sign_up') %></h2>
       <%= bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
-        <%= devise_error_messages! %>
+        <%= render "devise/shared/error_messages", resource: resource %>
 
         <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
         <%= f.password_field :password,

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

@@ -4,7 +4,7 @@
       <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| %>
-        <%= devise_error_messages! %>
+        <%= render "devise/shared/error_messages", resource: resource %>
 
         <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
         <%= f.form_group do %>

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

@@ -37,9 +37,12 @@ forms will use translations.
   spec.require_paths = ["lib"]
 
   spec.add_dependency "bootstrap_form", ">= 4.0.0.alpha1"
-  spec.add_dependency "devise"
+  # 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 "chandler"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "rake"
 end

data/lib/devise_bootstrap_form/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeviseBootstrapForm
-  VERSION = "0.2.0".freeze
+  VERSION = "0.3.0".freeze
 end

data/lib/generators/devise/views/bootstrap_form_generator.rb

@@ -21,24 +21,36 @@ module Devise
       source_root File.expand_path("../../../../app", __dir__)
 
       def copy_views
+        copy_base_devise(BootstrapFormGenerator.i18n ? "i18n" : "devise")
+        # The shared error message view is already internationalized.
+        copy_file "views/devise/shared/_error_messages.html.erb",
+          "app/views/devise/shared/_error_messages.html.erb"
+        copy_invitable_devise
+      end
+
+      def copy_assets
+        directory "assets/stylesheets", "app/assets/stylesheets"
+        append_to_file "app/assets/stylesheets/application.scss" do
+          '@import "devise_bootstrap_form";'
+        end
+      end
+
+      private
+
+      def copy_base_devise(source)
         %w[confirmations passwords registrations sessions shared unlocks].each do |dir|
-          directory File.join("views/#{BootstrapFormGenerator.i18n ? 'i18n' : 'devise'}", dir),
+          directory File.join("views/#{source}", dir),
             "app/views/devise/#{dir}"
         end
+      end
 
+      def copy_invitable_devise
         if BootstrapFormGenerator.invitable # rubocop:disable Style/GuardClause
           %w[invitations mailer].each do |dir|
             directory File.join("views/devise", dir), "app/views/devise/#{dir}"
           end
         end
       end
-
-      def copy_assets
-        directory "assets/stylesheets", "app/assets/stylesheets"
-        append_to_file "app/assets/stylesheets/application.scss" do
-          '@import "devise_bootstrap_form";'
-        end
-      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise-bootstrap-form
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Larry Reid
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-02 00:00:00.000000000 Z
+date: 2019-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap_form
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.6.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 description: |
   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
@@ -133,6 +147,7 @@ files:
 - app/views/devise/registrations/edit.html.erb
 - app/views/devise/registrations/new.html.erb
 - app/views/devise/sessions/new.html.erb
+- app/views/devise/shared/_error_messages.html.erb
 - app/views/devise/shared/_links.html.erb
 - app/views/devise/unlocks/new.html.erb
 - app/views/i18n/confirmations/new.html.erb