devise_invitable 1.1.0 → 1.1.1

data/README.rdoc

@@ -90,7 +90,7 @@ or directly as parameters to the <tt>devise</tt> method:
 
 * invitation_limit: The number of invitations users can send.  The default value of nil means users can send as many invites as they want.  A setting of 0 means they can't send invitations.  A setting n > 0 means they can send n invitations.
 
-* invite_key: The key to be used to check existing users when sending an invitation. You can use multiple keys. This value must be a hash with the invite key as hash keys, and regexp to validate format as values. If you don't to validate the key you can set nil as validation format. The default value is looking for users by email and validating with Devise.email_regexp {:email => Devise.email_regexp}.
+* invite_key: The key to be used to check existing users when sending an invitation. You can use multiple keys. This value must be a hash with the invite key as hash keys, and regexp to validate format as values. If you don't want to validate the key you can set nil as validation format. The default value is looking for users by email and validating with Devise.email_regexp {:email => Devise.email_regexp}.
 
 * validate_on_invite: force a record to be valid before being actually invited.
 

data/app/controllers/devise/invitations_controller.rb

@@ -58,13 +58,5 @@ class Devise::InvitationsController < DeviseController
       respond_with_navigational(resource) { render :new }
     end
   end
-
-  def after_invite_path_for(resource)
-    after_sign_in_path_for(resource)
-  end
-
-  def after_accept_path_for(resource)
-    after_sign_in_path_for(resource)
-  end
 end
 

data/config/locales/es.yml

@@ -0,0 +1,16 @@
+es:
+  devise:
+    invitations:
+      send_instructions: "Una invitación de correo se ha enviado para %{email}."
+      invitation_token_invalid: "El token de invitación no es valido!"
+      updated: "Tu contraseña se ha captura con éxito, ya te encuentras dentro del sistema."
+      no_invitations_remaining: "No quedan más invitaciones"
+      new:
+        header: "Enviar Invitación"
+        submit_button: "Envia una invitación"
+      edit:
+        header: "Establecer contraseña"
+        submit_button: "Guardar mi contraseña"
+    mailer:
+      invitation_instructions:
+        subject: "Instruciones de la invitación"

data/lib/devise_invitable/controllers/helpers.rb

@@ -1,7 +1,22 @@
 module DeviseInvitable::Controllers::Helpers
+  extend ActiveSupport::Concern
+
+  included do
+    hide_action :after_invite_path_for, :after_accept_path_for
+  end
+  
+  def after_invite_path_for(resource)
+    after_sign_in_path_for(resource)
+  end
+  
+  def after_accept_path_for(resource)
+    after_sign_in_path_for(resource)
+  end
+  
   protected
   def authenticate_inviter!
     send(:"authenticate_#{resource_name}!", :force => true)
   end
+  
 end
 ActionController::Base.send :include, DeviseInvitable::Controllers::Helpers

data/lib/devise_invitable/controllers/registrations.rb

@@ -11,7 +11,7 @@ module DeviseInvitable::Controllers::Registrations
       resource = resource_class.where(:email => hash[:email], :encrypted_password => '').first
       if resource
         @invitation_info = Hash[resource.invitation_fields.map {|field|
-          [field, resource[field]]
+          [field, resource.send(field)]
         }]
         resource.destroy
       end
@@ -31,7 +31,7 @@ module DeviseInvitable::Controllers::Registrations
     resource = resource_class.where(:email => params[resource_name][:email], :invited_by_id => nil).first
     if resource && @invitation_info
       resource.invitation_fields.each do |field|
-        resource[field] = @invitation_info[field]
+        resource.send("#{field}=", @invitation_info[field])
       end
       resource.save!
     end

data/lib/devise_invitable/model.rb

@@ -39,11 +39,11 @@ module Devise
 
         attr_writer :skip_password
 
-        scope :invitation_not_accepted, where(:invitation_accepted_at => nil)
+        scope :invitation_not_accepted, lambda { where(:invitation_accepted_at => nil) }
         if defined?(Mongoid) && self < Mongoid::Document
-          scope :invitation_accepted, where(:invitation_accepted_at.ne => nil)
+          scope :invitation_accepted, lambda { where(:invitation_accepted_at.ne => nil) }
         else
-          scope :invitation_accepted, where(arel_table[:invitation_accepted_at].not_eq(nil))
+          scope :invitation_accepted, lambda { where(arel_table[:invitation_accepted_at].not_eq(nil)) }
 
           [:before_invitation_accepted, :after_invitation_accepted].each do |callback_method|
             send callback_method do
@@ -57,7 +57,7 @@ module Devise
         fields = [:invitation_token, :invitation_sent_at, :invitation_accepted_at,
          :invitation_limit, :invited_by_id, :invited_by_type]
         if Devise.invited_by_class_name
-          fields -= :invited_by_type
+          fields -= [:invited_by_type]
         end
         fields
       end
@@ -65,7 +65,7 @@ module Devise
       def invitation_fields
         fields = [:invitation_sent_at, :invited_by_id, :invited_by_type]
         if Devise.invited_by_class_name
-          fields -= :invited_by_type
+          fields -= [:invited_by_type]
         end
         fields
       end
@@ -77,6 +77,7 @@ module Devise
         if self.invited_to_sign_up? && self.valid?
           run_callbacks :invitation_accepted do
             self.invitation_token = nil
+            self.confirmed_at = self.invitation_accepted_at if self.respond_to?(:confirmed_at)
             self.save(:validate => false)
           end
         end
@@ -111,7 +112,13 @@ module Devise
       # Reset invitation token and send invitation again
       def invite!(invited_by = nil)
         was_invited = invited_to_sign_up?
-        self.skip_confirmation! if self.new_record? && self.respond_to?(:skip_confirmation!)
+
+        # Required to workaround confirmable model's confirmation_required? method
+        # being implemented to check for non-nil value of confirmed_at
+        if self.new_record? && self.respond_to?(:confirmation_required?)
+          def self.confirmation_required?; false; end
+        end
+
         generate_invitation_token if self.invitation_token.nil?
         self.invitation_sent_at = Time.now.utc
         self.invited_by = invited_by if invited_by

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise_invitable
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-20 00:00:00 Z
+date: 2012-10-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -34,7 +34,7 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: railties
+  name: actionmailer
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -49,34 +49,34 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: actionmailer
+  name: devise
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 11
         segments: 
-        - 3
+        - 2
+        - 1
         - 0
-        version: "3.0"
+        version: 2.1.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: devise
+  name: railties
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 7
         segments: 
-        - 2
-        - 1
+        - 3
         - 0
-        version: 2.1.0
+        version: "3.0"
   type: :runtime
   version_requirements: *id004
 description: It adds support for send invitations by email (it requires to be authenticated) and accept the invitation by setting a password.
@@ -94,6 +94,7 @@ files:
 - app/views/devise/invitations/new.html.erb
 - app/views/devise/mailer/invitation_instructions.html.erb
 - config/locales/en.yml
+- config/locales/es.yml
 - lib/devise_invitable.rb
 - lib/devise_invitable/mailer.rb
 - lib/devise_invitable/model.rb