devise_invitable 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e72545e92c36829500f558b2a4ce744e80f0533
-  data.tar.gz: 7d510da1d72dc8ae814e5162447b9e39b3c8b021
+  metadata.gz: b83b5f1ceec909cc73063d89575fce5bcf50c473
+  data.tar.gz: f495b7eeebe7e5c70d3181747b25ea802a8f656f
 SHA512:
-  metadata.gz: 9340104f4b675e9664640f91a86596a03cba5de2755c146d53bba967d26a772c43f2e7a3e474404f4eec87346a2791a0a84fe7c72483797456bdec7883c9bee9
-  data.tar.gz: f2d38857bede06c7348f2552f7230ed1e67c5caa9ea20ec80aa5eb7d4b7352f2ffe579e3654f615c46489c13ce7db68927058487b0fb9c72df63e9cda995dbd3
+  metadata.gz: d27498b5bf7c89b29d8cb15b34df681a3aa3fdbb639ee6b73cbb93eaf61eccc5ff255b6016447d57b8b1ee54bd2fa6bd54d23c79f107d4dff21fe70b3489bcb8
+  data.tar.gz: cc70998322befe8502e6787d863e9ce0569d3c718eac7c6f7c31dcf17a0f1ad665eaf83f46ffb64719c961b20e8cfe968624d953387b04a0ed062bea42dc602d

data/CHANGELOG

@@ -1,3 +1,7 @@
+= 1.7.1
+- Allow to set invited_by_* options on model
+- created_by_invite scope and test method checks invitation_created_at, because invitation_sent_at can be nil if skip_invitation is used
+
 = 1.7.0
 
 - Drop devise < 4 support

data/README.rdoc

@@ -70,13 +70,13 @@ or for a model that already exists, define a migration to add DeviseInvitable to
       add_column :users, :invited_by_id, :integer
       add_column :users, :invited_by_type, :string
       add_index :users, :invitation_token, :unique => true
+      
+      # Allow null encrypted_password
+      change_column_null :users, :encrypted_password, :string, true
+      # Allow null password_salt (add it if you are using Devise's encryptable module)
+      change_column_null :users, :password_salt, :string, true
   end
 
-  # Allow null encrypted_password
-  change_column :users, :encrypted_password, :string, :null => true
-  # Allow null password_salt (add it if you are using Devise's encryptable module)
-  change_column :users, :password_salt, :string, :null => true
-
 If you previously used devise_invitable with a :limit on :invitation_token, remove it:
 
   def up
@@ -216,18 +216,12 @@ There are just two actions in DeviseInvitable that allows any set of parameters
 
 Here is an example of what your application controller might need to include in order to add these parameters to the invitation view:
 
-  before_filter :configure_permitted_parameters, if: :devise_controller?
+  before_action :configure_permitted_parameters, if: :devise_controller?
 
   protected
 
   def configure_permitted_parameters
-    # Only add some parameters
-    devise_parameter_sanitizer.for(:accept_invitation).concat [:first_name, :last_name, :phone]
-    # Override accepted parameters
-    devise_parameter_sanitizer.for(:accept_invitation) do |u|
-      u.permit(:first_name, :last_name, :phone, :password, :password_confirmation,
-               :invitation_token)
-    end
+    devise_parameter_sanitizer.permit(:accept_invitation, keys: [:first_name, :last_name, :phone])
   end
 
 
@@ -415,9 +409,9 @@ https://github.com/scambra/devise_invitable/wiki
 
 == Testing
 
-To test DeviseInvitable for the ActiveRecord ORM with RVM, Ruby 2.0.0:
+To test DeviseInvitable for the ActiveRecord ORM with RVM, Ruby 2.2.2:
 
-  rvm use 2.0.0
+  rvm use 2.2.2
   rvm gemset create devise_invitable
   rvm gemset use devise_invitable
   gem install bundler

data/app/controllers/devise/invitations_controller.rb

@@ -44,7 +44,7 @@ class Devise::InvitationsController < DeviseController
 
   # GET /resource/invitation/accept?invitation_token=abcdef
   def edit
-    set_minimum_password_length if respond_to? :set_minimum_password_length
+    set_minimum_password_length
     resource.invitation_token = params[:invitation_token]
     render :edit
   end

data/lib/devise_invitable/model.rb

@@ -52,11 +52,11 @@ module Devise
 
         scope :no_active_invitation, lambda { where(:invitation_token => nil) }
         if defined?(Mongoid) && defined?(Mongoid::Document) && self < Mongoid::Document
-          scope :created_by_invite, lambda { where(:invitation_sent_at.ne => nil) }
+          scope :created_by_invite, lambda { where(:invitation_created_at.ne => nil) }
           scope :invitation_not_accepted, lambda { where(:invitation_accepted_at => nil, :invitation_token.ne => nil) }
           scope :invitation_accepted, lambda { where(:invitation_accepted_at.ne => nil) }
         else
-          scope :created_by_invite, lambda { where(arel_table[:invitation_sent_at].not_eq(nil)) }
+          scope :created_by_invite, lambda { where(arel_table[:invitation_created_at].not_eq(nil)) }
           scope :invitation_not_accepted, lambda { where(arel_table[:invitation_token].not_eq(nil)).where(:invitation_accepted_at => nil) }
           scope :invitation_accepted, lambda { where(arel_table[:invitation_accepted_at].not_eq(nil)) }
 
@@ -102,7 +102,7 @@ module Devise
 
       # Verify wheather a user is created by invitation, irrespective to invitation status
       def created_by_invite?
-        invitation_sent_at.present?
+        invitation_created_at.present?
       end
 
       # Verifies whether a user has been invited or not
@@ -306,7 +306,8 @@ module Devise
         end
 
         def invite!(attributes={}, invited_by=nil, options = {}, &block)
-          _invite(attributes.with_indifferent_access, invited_by, options, &block).first
+          attr_hash = ActiveSupport::HashWithIndifferentAccess.new(attributes.to_h)
+          _invite(attr_hash, invited_by, options, &block).first
         end
 
         def invite_mail!(attributes={}, invited_by=nil, options = {}, &block)
@@ -359,6 +360,9 @@ module Devise
         Devise::Models.config(self, :invitation_limit)
         Devise::Models.config(self, :invite_key)
         Devise::Models.config(self, :resend_invitation)
+        Devise::Models.config(self, :invited_by_class_name)
+        Devise::Models.config(self, :invited_by_foreign_key)
+        Devise::Models.config(self, :invited_by_counter_cache)
         Devise::Models.config(self, :allow_insecure_sign_in_after_accept)
         Devise::Models.config(self, :require_password_on_accepting)
 

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '1.7.0'
+  VERSION = '1.7.1'
 end

data/test/models/invitable_test.rb

@@ -136,14 +136,14 @@ class InvitableTest < ActiveSupport::TestCase
     User.stubs(:invite_for).returns(nil)
     user = User.invite!(:email => "valid@email.com")
 
-    assert_equal user.invitation_due_at, nil
+    assert_nil user.invitation_due_at
   end
 
   test 'should return nil for invitation due date when invite_for is 0' do
     User.stubs(:invite_for).returns(0)
     user = User.invite!(email: 'valid@email.com')
 
-    assert_equal user.invitation_due_at, nil
+    assert_nil user.invitation_due_at
   end
 
   test 'should never generate the same invitation token for different users' do
@@ -575,7 +575,7 @@ class InvitableTest < ActiveSupport::TestCase
   test 'user.invite! should not set the invited_by attribute if not passed' do
     user = new_user
     user.invite!
-    assert_equal nil, user.invited_by
+    assert_nil user.invited_by
   end
 
   test 'user.invite! should set the invited_by attribute if passed' do
@@ -628,7 +628,12 @@ class InvitableTest < ActiveSupport::TestCase
   end
 
   def assert_callbacks_status(callback, user, fired)
-    assert_equal fired, user.send("#{callback}_callback_works".to_sym)
+    result = user.send("#{callback}_callback_works".to_sym)
+    if fired.nil?
+      assert_nil result
+    else
+      assert_equal fired, result
+    end
   end
 
   test "user.invite! should downcase the class's case_insensitive_keys" do

data/test/rails_app/config/environments/test.rb

@@ -28,7 +28,7 @@ RailsApp::Application.configure do
   # like if you have constraints or database-specific column types
   # config.active_record.schema_format = :sql
 
-  if Rails.version >= '4.2' && config.respond_to?(:active_record)
+  if Rails.version =~ /^4\.2/ && config.respond_to?(:active_record)
     config.active_record.raise_in_transactional_callbacks = true
   end
 

data/test/test_helper.rb

@@ -25,13 +25,15 @@ class ActionController::TestCase
   else
     include Devise::TestHelpers
   end
-  if Rails.version >= '5.0.0'
-    self.use_transactional_tests = true
-  else
-    begin
-      require 'test_after_commit'
-      self.use_transactional_fixtures = true
-    rescue LoadError
+  if defined? ActiveRecord
+    if Rails.version >= '5.0.0'
+      self.use_transactional_tests = true
+    else
+      begin
+        require 'test_after_commit' 
+        self.use_transactional_fixtures = true
+      rescue LoadError
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_invitable
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Sergio Cambra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-04 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.6
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="