devise_invitable 1.3.6 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  data.tar.gz: 9282d045f4e6fc42c754615dbcc9a95fac696ede
-  metadata.gz: 8579c7e08fb78e773bcbfe81d3623c83e7828987
-SHA512: 
-  data.tar.gz: 5042ceb001b324f6ff4e0651bd504e076c67dabd535cae0735fbe1037823da44c30754a1a09b720625f2593c81b976c44376558f83b7664f864814fb8139342f
-  metadata.gz: 30ec1b5af69268d5480d919726b4c6a154a120efa076c47e792fd6c2fbc688486eb740c7a7776da56955ebf3cf1c4284df6985dc418ccf21e31dd7679f9ef9ae
+---
+SHA1:
+  metadata.gz: 49059f27df2618f9c0491fd1b7578b33619f2ef5
+  data.tar.gz: da0b1ff3962cba2784b8c082c013fb483ee0517e
+SHA512:
+  metadata.gz: 56e5cc31bd011a67887ea3338ee66682dc398008f4a18f094fec9084b0635efc8684d5251aca72a9d7daecf228ea06aeec84bca49a8dd24bd3750c063f7b2e56
+  data.tar.gz: 162bc6c70f81f0b65ca73233a5ebb5ac53895b5e6c57f4085d522807592feccb29ce93c113e1d67d974fa95ebf026054d137a6a5c01c1af3913bf84df14d2f7a

data/CHANGELOG

@@ -1,3 +1,7 @@
+= 1.4.0
+Override active_for_authentication? and inactive_message instead of valid_password?
+To use counter_cache, invited_by_counter_cache must be set, no more checking of invitations_count to enable counter cache
+
 = 1.3.0
 Now devise 3.1 compatible, @token must be used instead of @resource.invitation_token in mail views
 

data/README.rdoc

@@ -233,11 +233,16 @@ To send an invitation to a user, use the <tt>invite!</tt> class method. <tt>:ema
 
 If you want to create the invitation but not send it, you can set <tt>skip_invitation</tt> to true.
 
-  User.invite!(:email => "new_user@example.com", :name => "John Doe") do |u|
+  user = User.invite!(:email => "new_user@example.com", :name => "John Doe") do |u|
     u.skip_invitation = true
   end
   # => the record will be created, but the invitation email will not be sent
 
+When generating the <tt>accept_user_invitation_url</tt> yourself, you must use the <tt>raw_invitation_token</tt>
+the value is temporarily available when you invite a user and will be decrypted when recieved.
+
+  accept_user_invitation_url(:invitation_token => user.raw_invitation_token)
+
 When skip_invitation is used, you must also then set the invitation_sent_at field when the user is sent their
 token. Failure to do so will yield "Invalid invitation token" errors when the user attempts to accept the invite.
 You can set it like so:
@@ -252,6 +257,11 @@ You can add :skip_invitation to attributes hash if skip_invitation is added to a
 Skip_invitation skips sending the email, but sets invitation_token, so invited_to_sign_up? on the
 resulting user returns true.
 
+**Warning**
+
+When using skip_invitation you must send the email with the user object instance that generated the tokens, as 
+user.raw_invitation_token is available only to the instance and is not persisted in the database.
+
 You can send an invitation to an existing user if your workflow creates them separately:
 
   user = User.find(42)
@@ -261,6 +271,8 @@ You can also set <tt>invited_by</tt> when using the <tt>invite!</tt> class metho
 
   User.invite!({:email => "new_user@example.com"}, current_user) # current_user will be set as invited_by
 
+
+
 === Accept an invitation
 
 To accept an invitation with a token use the <tt>accept_invitation!</tt> class method. <tt>:invitation_token</tt> must be present in the parameters hash. You can also include other attributes in the hash.
@@ -369,6 +381,12 @@ Take a look at the generated locale file (in <tt>config/locales/devise_invitable
 
 DeviseInvitable supports ActiveRecord and Mongoid, like Devise.
 
+== Wiki
+
+It's possible to find additional information about DeviseInvitable on the Wiki:
+
+https://github.com/scambra/devise_invitable/wiki
+
 == Testing
 
 To test DeviseInvitable for the ActiveRecord ORM with RVM, Ruby 1.9.2, and Rubygems 1.8.17:

data/app/controllers/devise/invitations_controller.rb

@@ -18,7 +18,9 @@ class Devise::InvitationsController < DeviseController
 
     if resource.errors.empty?
       yield resource if block_given?
-      set_flash_message :notice, :send_instructions, :email => self.resource.email if self.resource.invitation_sent_at
+      if is_flashing_format? && self.resource.invitation_sent_at
+        set_flash_message :notice, :send_instructions, :email => self.resource.email
+      end
       respond_with resource, :location => after_invite_path_for(resource)
     else
       respond_with_navigational(resource) { render :new }
@@ -37,19 +39,19 @@ class Devise::InvitationsController < DeviseController
 
     if resource.errors.empty?
       yield resource if block_given?
-      flash_message = resource.active_for_authentication? ? :updated : :updated_not_active                                                                                        
-      set_flash_message :notice, flash_message
+      flash_message = resource.active_for_authentication? ? :updated : :updated_not_active
+      set_flash_message :notice, flash_message if is_flashing_format?
       sign_in(resource_name, resource)
       respond_with resource, :location => after_accept_path_for(resource)
     else
       respond_with_navigational(resource){ render :edit }
     end
   end
-  
+
   # GET /resource/invitation/remove?invitation_token=abcdef
   def destroy
     resource.destroy
-    set_flash_message :notice, :invitation_removed
+    set_flash_message :notice, :invitation_removed if is_flashing_format?
     redirect_to after_sign_out_path_for(resource_name)
   end
 
@@ -58,7 +60,7 @@ class Devise::InvitationsController < DeviseController
   def invite_resource(&block)
     resource_class.invite!(invite_params, current_inviter, &block)
   end
-  
+
   def accept_resource
     resource_class.accept_invitation!(update_resource_params)
   end
@@ -70,14 +72,14 @@ class Devise::InvitationsController < DeviseController
   def has_invitations_left?
     unless current_inviter.nil? || current_inviter.has_invitations_left?
       self.resource = resource_class.new
-      set_flash_message :alert, :no_invitations_remaining
+      set_flash_message :alert, :no_invitations_remaining if is_flashing_format?
       respond_with_navigational(resource) { render :new }
     end
   end
-  
+
   def resource_from_invitation_token
     unless params[:invitation_token] && self.resource = resource_class.find_by_invitation_token(params[:invitation_token], true)
-      set_flash_message(:alert, :invitation_token_invalid)
+      set_flash_message(:alert, :invitation_token_invalid) if is_flashing_format?
       redirect_to after_sign_out_path_for(resource_name)
     end
   end
@@ -89,6 +91,6 @@ class Devise::InvitationsController < DeviseController
   def update_resource_params
     devise_parameter_sanitizer.sanitize(:accept_invitation)
   end
-  
+
 end
 

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

@@ -1,7 +1,7 @@
-<p><%= I18n.t("devise.mailer.invitation_instructions.hello", email: @resource.email) %></p>
+<p><%= t("devise.mailer.invitation_instructions.hello", email: @resource.email) %></p>
 
-<p><%= I18n.t("devise.mailer.invitation_instructions.someone_invited_you", url: root_url) %></p>
+<p><%= t("devise.mailer.invitation_instructions.someone_invited_you", url: root_url) %></p>
 
-<p><%= link_to I18n.t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, :invitation_token => @token) %></p>
+<p><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, :invitation_token => @token) %></p>
 
-<p><%= I18n.t("devise.mailer.invitation_instructions.ignore").html_safe %></p>
+<p><%= t("devise.mailer.invitation_instructions.ignore").html_safe %></p>

data/config/locales/en.yml

@@ -1,5 +1,7 @@
 en:
   devise:
+    failure:
+      invited: 'You have a pending invitation, accept it to finish creating your account.'
     invitations:
       send_instructions: 'An invitation email has been sent to %{email}.'
       invitation_token_invalid: 'The invitation token provided is not valid!'

data/lib/devise_invitable/model.rb

@@ -34,12 +34,8 @@ module Devise
         else
           {:polymorphic => true}
         end
-        if defined?(ActiveRecord) && self < ActiveRecord::Base
+        if defined?(ActiveRecord) && defined?(ActiveRecord::Base) && self < ActiveRecord::Base
           counter_cache = Devise.invited_by_counter_cache
-          if !counter_cache && Devise.invited_by_class_name
-            klass = Devise.invited_by_class_name.constantize
-            counter_cache = klass.table_exists? && klass.columns_hash['invitations_count'].try('name')
-          end
           belongs_to_options.merge! :counter_cache => counter_cache if counter_cache
         end
         belongs_to :invited_by, belongs_to_options
@@ -138,10 +134,14 @@ module Devise
       end
 
       # Only verify password when is not invited
-      def valid_password?(password)
+      def active_for_authentication?
         super unless invited_to_sign_up?
       end
 
+      def inactive_message
+        invited_to_sign_up? ? :invited : super
+      end
+
       def after_password_reset
         super
         accept_invitation! if invited_to_sign_up?

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '1.3.6'
+  VERSION = '1.4.0'
 end

data/lib/generators/devise_invitable/templates/simple_form_for/invitations/edit.html.erb

@@ -7,5 +7,5 @@
   <%= f.input :password %>
   <%= f.input :password_confirmation %>
 
-  <%= f.submit t("devise.invitations.edit.submit_button") %>
+  <%= f.button :submit, t("devise.invitations.edit.submit_button") %>
 <% end %>

data/lib/generators/devise_invitable/templates/simple_form_for/invitations/new.html.erb

@@ -7,5 +7,5 @@
   <%= f.input field %>
 <% end -%>
 
-<%= f.submit t("devise.invitations.new.submit_button") %>
+<%= f.button :submit, t("devise.invitations.new.submit_button") %>
 <% end %>

data/test/integration_tests_helper.rb

@@ -24,7 +24,7 @@ class ActionDispatch::IntegrationTest
     visit send("new_#{resource_name}_session_path")
     fill_in "#{resource_name}_email", :with => user.email
     fill_in "#{resource_name}_password", :with => user.password
-    click_button 'Sign in'
+    click_button 'Log in'
   end
 
   # Fix assert_redirect_to in integration sessions because they don't take into

metadata

@@ -1,59 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: devise_invitable
-version: !ruby/object:Gem::Version 
-  version: 1.3.6
+version: !ruby/object:Gem::Version
+  version: 1.4.0
 platform: ruby
-authors: 
+authors:
 - Sergio Cambra
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-07-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-10-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: actionmailer
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: actionmailer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 3.2.6
     - - <
-      - !ruby/object:Gem::Version 
-        version: "5"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: devise
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.6
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
-  version_requirements: *id003
-description: It adds support for send invitations by email (it requires to be authenticated) and accept the invitation by setting a password.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+description: It adds support for send invitations by email (it requires to be authenticated)
+  and accept the invitation by setting a password.
+email:
 - sergio@entrecables.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - app/controllers/devise/invitations_controller.rb
 - app/controllers/devise_invitable/registrations_controller.rb
 - app/views/devise/invitations/edit.html.erb
@@ -133,35 +145,33 @@ files:
 - test/routes_test.rb
 - test/test_helper.rb
 homepage: https://github.com/scambra/devise_invitable
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: An invitation strategy for Devise
-test_files: 
+test_files:
 - test/functional/controller_helpers_test.rb
 - test/functional/registrations_controller_test.rb
 - test/generators/views_generator_test.rb
@@ -213,4 +223,3 @@ test_files:
 - test/rails_app/script/rails
 - test/routes_test.rb
 - test/test_helper.rb
-has_rdoc: