happy_seed 0.0.19 → 0.0.21

data/lib/generators/happy_seed/devise/devise_generator.rb

@@ -1,5 +1,6 @@
 require 'generators/happy_seed/happy_seed_generator'
 require 'generators/happy_seed/bootstrap/bootstrap_generator'
+require 'generators/happy_seed/html_email/html_email_generator'
 
 module HappySeed
   module Generators
@@ -14,8 +15,9 @@ module HappySeed
         return if already_installed
 
         require_generator BootstrapGenerator
+        require_generator HtmlEmailGenerator
 
-        gem 'devise', '~> 3.4'
+        gem 'devise', '~> 4.2'
 
         Bundler.with_clean_env do
           run "bundle install --without production"
@@ -23,14 +25,12 @@ module HappySeed
 
         run 'bin/spring stop'
 
-        puts "Devise: #{self.class.fingerprint}"
-
         Bundler.with_clean_env do
           run 'rails generate devise:install'
           run 'rails generate devise User'
           run 'rails generate devise:views'
         end
-                
+
         if gem_available?( "haml-rails" )
           remove_file 'app/views/devise/registrations/new.html.erb'
           remove_file 'app/views/devise/registrations/edit.html.erb'
@@ -39,31 +39,20 @@ module HappySeed
           remove_file 'app/views/devise/passwords/new.html.erb'
         end
 
+        remove_file 'app/views/devise/mailer/reset_password_instructions.html.erb'
+        remove_file 'app/views/devise/mailer/confirmation_instructions.html.erb'
+        
         remove_file "spec/factories/users.rb"
         
         begin
           prepend_to_file 'spec/spec_helper.rb', "require 'devise'\n"
-          prepend_to_file 'spec/spec_helper.rb', "require_relative 'support/controller_helpers'\n"
-          inject_into_file 'spec/spec_helper.rb', "\n  config.include Devise::TestHelpers, type: :controller\n", :before => "\nend\n"
-          inject_into_file 'spec/spec_helper.rb', "\n  config.include Warden::Test::Helpers, type: :feature\n  config.include ControllerHelpers, type: :controller\n  Warden.test_mode!\n", :before => "\nend\n"
         rescue
           say_status :spec, "Unable to add devise helpers to spec_helper.rb", :red
         end
 
-        begin
-          inject_into_file 'spec/rails_helper.rb', "\n  config.include Devise::TestHelpers, type: :controller\n  config.include Warden::Test::Helpers, type: :feature\n", :after => "FactoryGirl::Syntax::Methods\n"
-        rescue
-          say_status :spec, "Unable to add devise helpers to rails_helper.rb", :red
-        end
-
-        append_to_file "features/support/env.rb", "
-Warden.test_mode! 
-World(Warden::Test::Helpers)
-After{ Warden.test_reset! }"
-
         directory 'app'
         directory 'docs'
-        directory 'test'
+        # directory 'test'
         directory 'spec'
 
         application(nil, env: "development") do
@@ -79,6 +68,10 @@ After{ Warden.test_reset! }"
         else
           say_status :gsub_file, "Can't find application/_header.html.haml, skipping"
         end
+
+        gsub_file "config/initializers/devise.rb", "# config.parent_mailer = 'ActionMailer::Base'", "config.parent_mailer = 'ApplicationMailer'"
+
+        gsub_file 'config/routes.rb', "devise_for :users", "devise_for :users, :controllers => { }"
       end
 
       private

data/lib/generators/happy_seed/devise/templates/app/views/devise/confirmations/new.html.haml

@@ -0,0 +1,17 @@
+.container
+  .row
+    .profile.center
+      = panel title: 'Resend confirmation instructions', context: :primary do
+        = simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post, class: 'form-horizontal' }, wrapper: :horizontal_form, wrapper_mappings: { check_boxes: :horizontal_radio_and_checkboxes, boolean: :horizontal_boolean } ) do |f|
+          .panel-body
+            = f.error_notification
+            = f.full_error :confirmation_token
+
+            .form-inputs
+              = f.input :email, required: true, autofocus: true
+          .panel-footer
+            .buttons
+              = f.button :submit, "Resend confirmation instructions", class: "btn-primary"
+
+            .links
+              = render "devise/shared/links"

data/lib/generators/happy_seed/devise/templates/app/views/devise/mailer/confirmation_instructions.html.erb

@@ -0,0 +1,14 @@
+<p class="center">Welcome <%= @resource.email %>!</p>
+
+<p>You can confirm your account email through the link below:</p>
+
+<!-- button -->
+<table class="btn-primary center" cellpadding="0" cellspacing="0" border="0">
+  <tr>
+    <td>
+      <a href="<%= confirmation_url(@resource, confirmation_token: @token) %>">Confirm my account</a>
+    </td>
+  </tr>
+</table>
+<!-- /button -->
+<p>Thanks, have a lovely day.</p>

data/lib/generators/happy_seed/devise/templates/app/views/devise/mailer/confirmation_instructions.text.rhtml

@@ -0,0 +1,7 @@
+Welcome <%= @email %>!
+
+You can confirm your account email through the link below:
+
+<%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %>
+
+Thanks!

data/lib/generators/happy_seed/devise/templates/app/views/devise/mailer/password_change.html.erb

@@ -0,0 +1,3 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>We're contacting you to notify you that your password has been changed.</p>

data/lib/generators/happy_seed/devise/templates/app/views/devise/mailer/reset_password_instructions.html.erb

@@ -0,0 +1,15 @@
+<p class="center">Hello <%= @resource.email %>!</p>
+
+<p>Someone has requested a link to change your password. You can do this
+through the link below:</p>
+
+<!-- button -->
+<table class="btn-primary center" cellpadding="0" cellspacing="0" border="0">
+  <tr>
+    <td>
+      <a href="<%= edit_password_url(@resource, reset_password_token: @token) %>">Click here to reset your password</a>
+    </td>
+  </tr>
+</table>
+<!-- /button -->
+<p>Thanks, have a lovely day.</p>

data/lib/generators/happy_seed/devise/templates/app/views/devise/mailer/reset_password_instructions.text.erb

@@ -0,0 +1,11 @@
+Hello <%= @resource.email %>!
+
+Someone has requested a link to change your password. You can do this
+through the link below:
+
+<%= edit_password_url(@resource, reset_password_token: @token) %>
+
+If you didn't request this, please ignore this email.
+
+Your password won't change until you access the link above and 
+create a new one.

data/lib/generators/happy_seed/devise/templates/app/views/devise/mailer/unlock_instructions.html.erb

@@ -0,0 +1,7 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
+
+<p>Click the link below to unlock your account:</p>
+
+<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p>

data/lib/generators/happy_seed/devise/templates/app/views/devise/passwords/edit.html.haml

@@ -1,19 +1,20 @@
 .container
   .row
-    .center_panel
-      .panel.panel-default.only
+    .profile.center
+      = panel title: 'Change your password', context: :primary do
+        = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, class: 'form-horizontal' }, wrapper: :horizontal_form, wrapper_mappings: { check_boxes: :horizontal_radio_and_checkboxes, boolean: :horizontal_boolean } ) do |f|
+          .panel-body
+            = f.error_notification
 
-        .panel-heading
-          Change your password
+            = f.input :reset_password_token, as: :hidden
+            = f.full_error :reset_password_token
 
-        .panel-body
+            = f.input :password, label: "New password", required: true, autofocus: true, hint: ("#{@minimum_password_length} characters minimum" if @minimum_password_length)
+            = f.input :password_confirmation, label: "Confirm your new password", required: true
 
-          = form_for(resource, as: resource_name, url: password_path(resource_name), layout: :horizontal, method: 'put') do |f|
+          .panel-footer
+            .buttons
+              = f.button :submit, "Change my password", class: "btn-primary"
 
-            / = devise_error_messages!
-            = f.hidden_field :reset_password_token
-
-            = f.password_field :password, autocomplete: "off", autofocus: true
-            = f.password_field :password_confirmation, autocomplete: "off"
-
-            = f.submit "Change my password", :class=>'btn btn-primary form-control'
+            .links
+              = render "devise/shared/links"

data/lib/generators/happy_seed/devise/templates/app/views/devise/passwords/new.html.haml

@@ -1,20 +1,16 @@
 .container
   .row
-    .center_panel
-      .panel.panel-default.only
+    .profile.center
+      = panel title: 'Forgot your password?', context: :primary do
+        = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post, class: 'form-horizontal' }, wrapper: :horizontal_form, wrapper_mappings: { check_boxes: :horizontal_radio_and_checkboxes, boolean: :horizontal_boolean } ) do |f|
+          .panel-body
+            = f.error_notification
 
-        .panel-heading
-          Forgot your password?
+            .form-inputs
+              = f.input :email, required: true, autofocus: true
+          .panel-footer
+            .buttons
+              = f.button :submit, "Send me reset password instructions", class: "btn-primary"
 
-        .panel-body
-
-          = form_for(resource, as: resource_name, url: password_path(resource_name), layout: :horizontal) do |f|
-
-            / = devise_error_messages!
-
-            = f.email_field :email, autofocus: true
-
-            = f.submit "Send me reset password instructions"
-
-          %p.text-right
-            = render partial: "devise/shared/links"
+            .links
+              = render "devise/shared/links"

data/lib/generators/happy_seed/devise/templates/app/views/devise/registrations/edit.html.haml

@@ -1,50 +1,38 @@
-- @title = "Edit #{resource_name.to_s.humanize}"
 .container
   .row
-    .center_panel
-      .panel.panel-default.only
-
-        .panel-heading
-          = @title
-
-        .panel-body
-
-          = form_for resource, as: resource_name, url: registration_path(resource_name), layout: :horizontal do |f|
-
-            / = devise_error_messages!
-
-            = f.email_field :email, autofocus: true
+    .profile.large_panel
+      = panel title: 'Edit Profile', context: :primary do
+        = simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
+          .panel-body
+            = f.error_notification
 
-            - if devise_mapping.confirmable? && resource.pending_reconfirmation?
-              %p
-                Currently waiting confirmation for: 
-                = resource.unconfirmed_email
+            .form-inputs
+              = f.input :email, required: true, autofocus: true
 
-            = f.password_field :current_password
-            = f.password_field :password, autocomplete: "off"
-            = f.password_field :password_confirmation, autocomplete: "off"
+              = if devise_mapping.confirmable? && resource.pending_reconfirmation?
+                %p
+                  Currently waiting confirmation for:
+                  = resource.unconfirmed_email
 
-            = f.submit "Update"
+              = f.input :password, autocomplete: "off", hint: "leave it blank if you don't want to change it", required: false
+              = f.input :password_confirmation, required: false
+              = f.input :current_password, hint: "we need your current password to confirm your changes", required: true
+          .panel-footer
+            .form-actions
+              = f.button :submit, "Update", class: "btn-primary"
 
       - if devise_mapping.omniauthable?
-        .panel.panel-default.only
-          .panel-heading
-            Connect your accounts
-
+        = panel title: 'Connect your accounts', context: :primary do
           .panel-body
-            %ul
-              - resource_class.omniauth_providers.each do |provider|
-                - if resource.identities.where( :provider => provider ).first
-                  %li= link_to "Reconnect with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), class: "btn btn-primary"
-                - else
-                  %li= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), class: "btn btn-primary"
-
-      .panel.panel-default.only
-
-        .panel-heading
-          Cancel my account
-
+            - resource_class.omniauth_providers.each do |provider|
+              - if resource.identities.where( :provider => provider ).first
+                %p= link_to "Reconnect with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), class: "btn btn-default"
+              - else
+                %p= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), class: "btn btn-default"
+
+    .profile.sidebar
+      = panel title: "Cancel my Account", context: :danger do
         .panel-body
           %p
-            Unhappy? 
-            = button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete, class: "btn btn-danger"
+            Unhappy?
+            = link_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete, class: "btn btn-danger"

data/lib/generators/happy_seed/devise/templates/app/views/devise/registrations/new.html.haml

@@ -1,26 +1,18 @@
-- @title = "Sign Up"
 .container
   .row
-    .center_panel
-      .panel.panel-default.only
-
-        .panel-heading
-          Sign up
-
-        .panel-body
-
-          = form_for resource, as: resource_name, url: registration_path(resource_name), layout: :horizontal do |f|
-
-            / = devise_error_messages!
-
-            = f.email_field :email, autofocus: true
-            = f.password_field :password, autocomplete: "off"
-            = f.password_field :password_confirmation, autocomplete: "off"
-
-            - if devise_mapping.rememberable?
-              = f.check_box :remember_me
-
-            = f.submit "Sign Up"
-
-          %p.text-right
-            = render partial: "devise/shared/links"
+    .profile.center
+      = panel title: 'Signup', context: :primary do
+        = simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: 'form-horizontal' }, wrapper: :horizontal_form, wrapper_mappings: { check_boxes: :horizontal_radio_and_checkboxes, boolean: :horizontal_boolean } ) do |f|
+          .panel-body
+            = f.error_notification
+
+            .form-inputs
+              = f.input :email, required: true, autofocus: true
+              = f.input :password, required: true, hint: ("#{@minimum_password_length} characters minimum" if @minimum_password_length)
+              = f.input :password_confirmation, required: true
+          .panel-footer
+            .buttons
+              = f.button :submit, "Sign up", class: "btn-primary"
+
+            .links
+              = render "devise/shared/links"

data/lib/generators/happy_seed/devise/templates/app/views/devise/sessions/new.html.haml

@@ -1,22 +1,17 @@
-- @title = "Sign In"
 .container
   .row
-    .center_panel
-      .panel.panel-default.only
-        .panel-heading
-          Sign in
+    .profile.center
+      = panel title: 'Log in', context: :primary do
+        = simple_form_for(resource, as: resource_name, url: session_path(resource_name), html: { class: 'form-horizontal' }, wrapper: :horizontal_form, wrapper_mappings: { check_boxes: :horizontal_radio_and_checkboxes, boolean: :horizontal_boolean } ) do |f|
+          .panel-body
+            = f.error_notification
 
-        .panel-body
+            = f.input :email, required: true, autofocus: true
+            = f.input :password, required: true, hint: ("#{@minimum_password_length} characters minimum" if @minimum_password_length)
+            = f.input :remember_me, as: :boolean if devise_mapping.rememberable?
+          .panel-footer
+            .buttons
+              = f.button :submit, "Log in", class: "btn-primary"
 
-          = form_for resource, as: resource_name, url: session_path(resource_name), layout: :horizontal do |f|
-
-            = f.email_field :email, autofocus: true
-            = f.password_field :password, autocomplete: "off"
-
-            - if devise_mapping.rememberable?
-              = f.check_box :remember_me
-
-            = f.submit "Sign in", :class=>'btn btn-primary form-control'
-
-          %p.text-right
-            = render partial: "devise/shared/links"
+            .links
+              = render "devise/shared/links"

data/lib/generators/happy_seed/devise/templates/app/views/devise/shared/_links.html.erb

@@ -0,0 +1,25 @@
+<%- if controller_name != 'sessions' %>
+  <%= link_to "Log in", new_session_path(resource_name) %><br />
+<% end -%>
+
+<%- 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' %>
+  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+<% end -%>
+
+<%- 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' %>
+  <%= link_to "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 "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider) %><br />
+  <% end -%>
+<% end -%>

data/lib/generators/happy_seed/devise/templates/app/views/devise/unlocks/new.html.erb

@@ -0,0 +1,16 @@
+<h2>Resend unlock instructions</h2>
+
+<%= simple_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
+  <%= f.error_notification %>
+  <%= f.full_error :unlock_token %>
+
+  <div class="form-inputs">
+    <%= f.input :email, required: true, autofocus: true %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit, "Resend unlock instructions" %>
+  </div>
+<% end %>
+
+<%= render "devise/shared/links" %>

data/lib/generators/happy_seed/devise/templates/docs/README.03.devise.rdoc

@@ -10,6 +10,7 @@ The happy_seed:devise generator
 * Copies over devise views
 * Gives them bootstrap views
 * Installs MailPreview for the device mailer.
+* HTML Emails
 
 ### Why do you want this?
 
@@ -25,5 +26,4 @@ Take a look at the user model to see if you want to configure any other features
 
 Once you feel good about it run "rake db:migrate" and you should be good to go.
 
-## Writing tests
-
+For more information on devise please consult the docs [here.](https://github.com/plataformatec/devise)