devise_invitable 1.7.4 → 2.0.3

data/test/models_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class Invitable < User
-  devise :invitable, :invite_for => 5.days, :validate_on_invite => true
+  devise :invitable, invite_for: 5.days, validate_on_invite: true
 end
 
 class ModelsTest < ActiveSupport::TestCase
@@ -47,9 +47,9 @@ class ModelsTest < ActiveSupport::TestCase
 
   test 'set a custom value for invite_key' do
     old_invite_key = User.invite_key
-    User.invite_key = {:username => /\A.+\z/}
+    User.invite_key = { username: /\A.+\z/}
 
-    assert_equal({:username => /\A.+\z/}, User.invite_key)
+    assert_equal({ username: /\A.+\z/ }, User.invite_key)
 
     User.invite_key = old_invite_key
   end

data/test/orm/active_record.rb

@@ -1,4 +1,8 @@
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Base.logger = Logger.new(nil)
 
-ActiveRecord::Migrator.migrate(File.expand_path("../../rails_app/db/migrate/", __FILE__))
+if defined? ActiveRecord::MigrationContext # rails >= 5.2
+  ActiveRecord::MigrationContext.new(File.expand_path('../../rails_app/db/migrate/', __FILE__)).migrate
+else
+  ActiveRecord::Migrator.migrate(File.expand_path('../../rails_app/db/migrate/', __FILE__))
+end

data/test/orm/mongoid.rb

@@ -1,8 +1,8 @@
 Mongoid.configure do |config|
   if Mongoid::VERSION < '3.0.0'
-    config.master = Mongo::Connection.new('127.0.0.1', 27017).db("devise_invitable-test-suite")
+    config.master = Mongo::Connection.new('127.0.0.1', 27017).db('devise_invitable-test-suite')
   else
-    config.connect_to("devise_invitable-test-suite")
+    config.connect_to('devise_invitable-test-suite')
     config.use_utc = true
     config.include_root_in_json = true
   end

data/test/rails_app/app/controllers/admins_controller.rb

@@ -1,6 +1,7 @@
 class AdminsController < Devise::InvitationsController
   protected
-  def authenticate_inviter!
-    authenticate_admin!(:force => true)
-  end
+
+    def authenticate_inviter!
+      authenticate_admin!(force: true)
+    end
 end

data/test/rails_app/app/controllers/application_controller.rb

@@ -1,17 +1,18 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  before_action :configure_permitted_parameters, :if => :devise_controller?
+  before_action :configure_permitted_parameters, if: :devise_controller?
 
   protected
-  def after_sign_in_path_for(resource)
-    if resource.is_a? Admin
-      edit_admin_registration_path(resource)
-    else
-      super
+
+    def after_sign_in_path_for(resource)
+      if resource.is_a? Admin
+        edit_admin_registration_path(resource)
+      else
+        super
+      end
     end
-  end
 
-  def configure_permitted_parameters
-    devise_parameter_sanitizer.permit(:sign_up, keys: [:email, :password, :bio])
-  end
+    def configure_permitted_parameters
+      devise_parameter_sanitizer.permit(:sign_up, keys: [:email, :password, :bio])
+    end
 end

data/test/rails_app/app/controllers/free_invitations_controller.rb

@@ -1,12 +1,15 @@
 class FreeInvitationsController < Devise::InvitationsController
   protected
-  def authenticate_inviter!
-  # everyone can invite
-  end
-  def current_inviter
-    current_admin || current_user
-  end
-  def after_invite_path_for(resource)
-    resource ? super : root_path
-  end
+
+    def authenticate_inviter!
+    # everyone can invite
+    end
+
+    def current_inviter
+      current_admin || current_user
+    end
+
+    def after_invite_path_for(resource)
+      resource ? super : root_path
+    end
 end

data/test/rails_app/app/controllers/users_controller.rb

@@ -2,11 +2,11 @@ class UsersController < ApplicationController
   before_action :authenticate_user!
 
   def index
-    user_session[:cart] = "Cart"
+    user_session[:cart] = 'Cart'
   end
 
   def expire
     user_session['last_request_at'] = 31.minutes.ago.utc
-    render :text => 'User will be expired on next request'
+    render text: 'User will be expired on next request'
   end
 end

data/test/rails_app/app/models/admin.rb

@@ -3,21 +3,18 @@ class Admin < PARENT_MODEL_CLASS
     include Mongoid::Document
     include Mongoid::Attributes::Dynamic if defined?(Mongoid::Attributes::Dynamic)
     ## Database authenticatable
-    field :email,              :type => String, :default => ""
-    field :encrypted_password, :type => String, :default => ""
+    field :email,              type: String, default: ""
+    field :encrypted_password, type: String, default: ""
     validates_presence_of :email
-    validates_presence_of :encrypted_password, :if => :password_required?
+    validates_presence_of :encrypted_password, if: :password_required?
 
     ## Confirmable
-    field :confirmation_token,   :type => String
-    field :confirmed_at,         :type => Time
-    field :confirmation_sent_at, :type => Time
-    field :unconfirmed_email,    :type => String # Only if using reconfirmable
-
+    field :confirmation_token,   type: String
+    field :confirmed_at,         type: Time
+    field :confirmation_sent_at, type: Time
+    field :unconfirmed_email,    type: String # Only if using reconfirmable
   end
 
-
-
   devise :database_authenticatable, :validatable, :registerable
   include DeviseInvitable::Inviter
 end

data/test/rails_app/app/models/octopussy.rb

@@ -5,11 +5,11 @@ class Octopussy < PARENT_MODEL_CLASS
     include Mongoid::Attributes::Dynamic if defined?(Mongoid::Attributes::Dynamic)
 
     ## Database authenticatable
-    field :email,              :type => String, :default => ""
-    field :encrypted_password, :type => String, :default => ""
+    field :email,              type: String, default: ""
+    field :encrypted_password, type: String, default: ""
     validates_presence_of :email
-    validates_presence_of :encrypted_password, :if => :password_required?
-
+    validates_presence_of :encrypted_password, if: :password_required?
   end
+
   devise :database_authenticatable, :validatable, :confirmable
 end

data/test/rails_app/app/models/user.rb

@@ -4,45 +4,45 @@ class User < PARENT_MODEL_CLASS
     include Mongoid::Attributes::Dynamic if defined?(Mongoid::Attributes::Dynamic)
 
     ## Database authenticatable
-    field :email,              :type => String, :default => ""
-    field :encrypted_password, :type => String, :default => ""
+    field :email,              type: String, default: ""
+    field :encrypted_password, type: String, default: ""
 
     ## Recoverable
-    field :reset_password_token,   :type => String
-    field :reset_password_sent_at, :type => Time
+    field :reset_password_token,   type: String
+    field :reset_password_sent_at, type: Time
 
     ## Confirmable
-    field :confirmation_token,   :type => String
-    field :confirmed_at,         :type => Time
-    field :confirmation_sent_at, :type => Time
-    field :unconfirmed_email,    :type => String # Only if using reconfirmable
+    field :confirmation_token,   type: String
+    field :confirmed_at,         type: Time
+    field :confirmation_sent_at, type: Time
+    field :unconfirmed_email,    type: String # Only if using reconfirmable
 
     ## Invitable
-    field :invitation_token,       :type => String
-    field :invitation_created_at,  :type => Time
-    field :invitation_sent_at,     :type => Time
-    field :invitation_accepted_at, :type => Time
-    field :invitation_limit,       :type => Integer
-    field :invited_by_id,          :type => Integer
-    field :invited_by_type,        :type => String
+    field :invitation_token,       type: String
+    field :invitation_created_at,  type: Time
+    field :invitation_sent_at,     type: Time
+    field :invitation_accepted_at, type: Time
+    field :invitation_limit,       type: Integer
+    field :invited_by_id,          type: Integer
+    field :invited_by_type,        type: String
 
     field :username
     field :profile_id
     field :active
 
     validates_presence_of :email
-    validates_presence_of :encrypted_password, :if => :password_required?
+    validates_presence_of :encrypted_password, if: :password_required?
   end
 
   devise :database_authenticatable, :registerable, :validatable, :confirmable, :invitable, :recoverable
 
   attr_accessor :after_invitation_created_callback_works, :after_invitation_accepted_callback_works, :bio, :token
-  validates :username, :length => { :maximum => 20 }
+  validates :username, length: { maximum: 20 }
 
   attr_accessor :testing_accepted_or_not_invited
 
-  validates :username, :presence => true, :if => :testing_accepted_or_not_invited_validator?
-  validates :bio, :presence => true, :if => :invitation_accepted?
+  validates :username, presence: true, if: :testing_accepted_or_not_invited_validator?
+  validates :bio, presence: true, if: :invitation_accepted?
 
   def testing_accepted_or_not_invited_validator?
     testing_accepted_or_not_invited && accepted_or_not_invited?
@@ -56,7 +56,7 @@ class User < PARENT_MODEL_CLASS
     object.after_invitation_accepted_callback_works = true
   end
 
-  def send_devise_notification(method, raw=nil, *args)
+  def send_devise_notification(method, raw = nil, *args)
     Thread.current[:token] = raw
     super
   end

data/test/rails_app/app/views/admins/new.html.erb

@@ -1,12 +1,16 @@
 <h2>Send invitation</h2>
 
-<%= form_for resource, :as => resource_name, :url => admin_path do |f| %>
-  <%= devise_error_messages! %>
+<%= form_for(resource, as: resource_name, url: admin_path) do |f| %>
+  <%= render "devise/shared/error_messages", resource: resource %>
 
-  <p><%= f.label :email %><br />
-  <%= f.text_field :email %></p>
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.text_field :email %>
+  </div>
 
-  <p><%= f.submit "Send an invitation" %></p>
+  <div class="actions">
+    <%= f.submit "Send an invitation" %>
+  </div>
 <% end %>
 
 <%= link_to "Home", after_sign_in_path_for(resource_name) %><br />

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

@@ -1,17 +1,25 @@
 <h2>Log in</h2>
 
 <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
-  <div><%= f.label :email %><br />
-  <%= f.email_field :email, autofocus: true %></div>
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true %>
+  </div>
 
-  <div><%= f.label :password %><br />
-    <%= f.password_field :password, autocomplete: "off" %></div>
+  <div class="field">
+    <%= f.label :password %><br />
+    <%= f.password_field :password, autocomplete: "off" %>
+  </div>
 
   <% if devise_mapping.rememberable? -%>
-    <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
+    <div class="field">
+      <%= f.check_box :remember_me %> <%= f.label :remember_me %>
+    </div>
   <% end -%>
 
-  <div><%= f.submit "Log in" %></div>
+  <div class="actions">
+    <%= f.submit "Log in" %>
+  </div>
 <% end %>
 
 <%= render "devise/shared/links" %>

data/test/rails_app/app/views/free_invitations/new.html.erb

@@ -1,12 +1,16 @@
 <h2>Send invitation</h2>
 
-<%= form_for resource, :as => resource_name, :url => free_invitation_path do |f| %>
-  <%= devise_error_messages! %>
+<%= form_for(resource, as: resource_name, url: free_invitation_path) do |f| %>
+  <%= render "devise/shared/error_messages", resource: resource %>
 
-  <p><%= f.label :email %><br />
-  <%= f.text_field :email %></p>
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.text_field :email %>
+  </div>
 
-  <p><%= f.submit "Send an invitation" %></p>
+  <div class="actions">
+    <%= f.submit "Send an invitation" %>
+  </div>
 <% end %>
 
 <%= link_to "Home", after_sign_in_path_for(resource_name) %><br />

data/test/rails_app/app/views/layouts/application.html.erb

@@ -7,10 +7,9 @@
   <%= csrf_meta_tag %>
 </head>
 <body>
+  <%= content_tag :p, flash[:notice], id: 'notice' unless flash[:notice].blank? %>
+  <%= content_tag :p, flash[:alert], id: 'alert' unless flash[:alert].blank? %>
 
-<%= content_tag :p, flash[:notice], :id => 'notice' unless flash[:notice].blank? %>
-<%= content_tag :p, flash[:alert], :id => 'alert' unless flash[:alert].blank? %>
-<%= yield %>
-
+  <%= yield %>
 </body>
 </html>

data/test/rails_app/app/views/users/invitations/new.html.erb

@@ -1,15 +1,21 @@
 <h2>Send an invitation</h2>
 
-<%= form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => { :method => :post } do |f| %>
-  <%= devise_error_messages! %>
+<%= form_for(resource, as: resource_name, url: invitation_path(resource_name), html: { method: :post }) do |f| %>
+  <%= render "devise/shared/error_messages", resource: resource %>
   
-  <p><%= f.label :username %></p>
-  <p><%= f.text_field :username %></p>
-  
-  <p><%= f.label :email %></p>
-  <p><%= f.text_field :email %></p>
-  
-  <p><%= f.submit "Send an invitation" %></p>
+  <div class="field">
+    <%= f.label :username %>
+    <%= f.text_field :username %>
+  </div>
+
+  <div class="field">
+    <%= f.label :email %>
+    <%= f.text_field :email %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit "Send an invitation" %>
+  </div>
 <% end %>
 
 <%= link_to "Home", after_sign_in_path_for(resource_name) %><br />

data/test/rails_app/config/application.rb

@@ -1,8 +1,8 @@
 require File.expand_path('../boot', __FILE__)
 
-require "action_controller/railtie"
-require "action_mailer/railtie"
-require "rails/test_unit/railtie"
+require 'action_controller/railtie'
+require 'action_mailer/railtie'
+require 'rails/test_unit/railtie'
 
 Bundler.require(:default, DEVISE_ORM) if defined?(Bundler)
 
@@ -14,15 +14,16 @@ end
 PARENT_MODEL_CLASS = DEVISE_ORM == :active_record ? ActiveRecord::Base : Object
 Mongoid.load!(File.expand_path('../../mongoid.yml', __FILE__)) if DEVISE_ORM == :mongoid && Mongoid::VERSION < '3.0.0'
 
-require "devise"
-require "devise_invitable"
+require 'devise'
+require 'devise_invitable'
 
 module RailsApp
   class Application < Rails::Application
     config.filter_parameters << :password
-    config.action_mailer.default_url_options = { :host => "localhost:3000" }
+    config.action_mailer.default_url_options = { host: 'localhost:3000' }
     if DEVISE_ORM == :active_record && Rails.version.start_with?('5')
       config.active_record.maintain_test_schema = false
+      config.active_record.sqlite3.represent_boolean_as_integer = true if config.active_record.sqlite3
     end
   end
 end

data/test/rails_app/config/boot.rb

@@ -1,9 +1,9 @@
 unless defined?(DEVISE_ORM)
-  DEVISE_ORM = (ENV["DEVISE_ORM"] || :active_record).to_sym
+  DEVISE_ORM = (ENV['DEVISE_ORM'] || :active_record).to_sym
 end
 
 begin
-  require File.expand_path("../../../../.bundle/environment", __FILE__)
+  require File.expand_path('../../../../.bundle/environment', __FILE__)
 rescue LoadError
   require 'rubygems'
   require 'bundler'

data/test/rails_app/config/credentials.yml.enc

@@ -0,0 +1 @@
+d19hQaf4kv/ajU/ABKNej/dqmAPNDfiZSBnGbsfBAs3oLxNVvuJm8TJ1bUMaZ2s2hcDSZRQKHtJqcDfBMrN0egkVPYaoGvYOZ7XzU2v9O1xhEwI9wFO+0yWDDTDxC8UJr60s+Gh++jQMCxTZ+Yhl5Od8d2rqoMcuhZrGhKOuvPBARyyDSN2/Q0rvIYO+OGFFkwTK+HD2ccRzYWBNH8DBMSeh8ja83BykLE0fNL9tPmYKK1gnEsME7AN8UN/AmFqFPLOX9otfQ0imwLhnsWMYPxqfJoqvgEpuAywPW3n3nIpzX1/dwpDrHnm5tbsIwgctlq4Q2DFu6dc7H3Pzjx6INWCB5pr97zH84+gHjYuoLafUxGEN8zbxFyrPe0Pm8jPi5qfJP3HlaweFR/XhNI1s+pl2WZQqAEkjMp0h--z4CX57AIHm+gPVBc--UBpBryKnypoqwmbLDIqa8Q==

data/test/rails_app/config/initializers/devise.rb

@@ -91,8 +91,8 @@ Devise.setup do |config|
   # config.pepper = "e31589192aeea8807cb7d8686b0f8484d6cbfaaa65443d45144519ed1d4ffbc6ccb73b21a69ece276d94f2cac95d83990d824f36f301d6f585ededd1bf90d67d"
 
   # ==> Configuration for :invitable
-  # The period the generated invitation token is valid, after
-  # this period, the invited resource won't be able to accept the invitation.
+  # The period the generated invitation token is valid.
+  # After this period, the invited resource won't be able to accept the invitation.
   # When invite_for is 0 (the default), the invitation won't expire.
   # config.invite_for = 2.weeks
 
@@ -111,7 +111,8 @@ Devise.setup do |config|
   # config.invite_key = {:email => /\\A[^@]+@[^@]+\\z/}
   # config.invite_key = {:email => /\\A[^@]+@[^@]+\\z/, :username => nil}
 
-  # Flag that force a record to be valid before being actually invited
+  # Ensure that invited record is valid.
+  # The invitation won't be sent if this check fails.
   # Default: false
   # config.validate_on_invite = true
 

data/test/rails_app/config/initializers/secret_token.rb

@@ -4,4 +4,6 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-RailsApp::Application.config.secret_token = 'e997edf9d7eba5cf89a76a046fa53f5d66261d22cfcf29e3f538c75ad2d175b106bd5d099f44f6ce34ad3b3162d71cfaa37d2d4f4b38645288331427b4c2a607'
+if Rails.version < '5.2.0'
+  RailsApp::Application.config.secret_token = 'e997edf9d7eba5cf89a76a046fa53f5d66261d22cfcf29e3f538c75ad2d175b106bd5d099f44f6ce34ad3b3162d71cfaa37d2d4f4b38645288331427b4c2a607'
+end