devise_invitable 1.3.1 → 1.3.2

data/README.rdoc

@@ -63,7 +63,7 @@ or for a model that already exists, define a migration to add DeviseInvitable to
   def change
       add_column :users, :invitation_token, :string
       add_column :users, :invitation_created_at, :datetime
-      add_column :users, :invitation_sent_at, :datetime 
+      add_column :users, :invitation_sent_at, :datetime
       add_column :users, :invitation_accepted_at, :datetime
       add_column :users, :invitation_limit, :integer
       add_column :users, :invited_by_id, :integer
@@ -81,7 +81,7 @@ If you previously used devise_invitable with a :limit on :invitation_token, remo
   def up
     change_column :users, :invitation_token, :string, :limit => nil
   end
-  
+
   def down
     change_column :users, :invitation_token, :string, :limit => 60
   end
@@ -196,8 +196,8 @@ Here is an example of what your application controller might need to include in
                :invitation_token)
     end
   end
-  
-  
+
+
 == Usage
 
 === Send an invitation
@@ -214,7 +214,7 @@ If you want to create the invitation but not send it, you can set <tt>skip_invit
   end
   # => the record will be created, but the invitation email will not be sent
 
-When skip_invitation is used, you must also then set the invitation_sent_at field when the user is sent their 
+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:
 
@@ -374,4 +374,4 @@ Special thanks to rymai[http://github.com/rymai] for the Rails 3 support, his fo
 
 == Copyright
 
-Copyright (c) 2012 Sergio Cambra. See LICENSE for details.
+Copyright (c) 2014 Sergio Cambra. See LICENSE for details.

data/app/controllers/devise_invitable/registrations_controller.rb

@@ -7,6 +7,7 @@ class DeviseInvitable::RegistrationsController < Devise::RegistrationsController
       self.resource = resource_class.where(:email => hash[:email], :encrypted_password => '').first
       if self.resource
         self.resource.attributes = hash
+        self.resource.send_confirmation_instructions if self.resource.confirmation_required_for_invited?
         self.resource.accept_invitation
       end
     end

data/lib/devise_invitable.rb

@@ -4,7 +4,6 @@ module DeviseInvitable
   autoload :Mapping, 'devise_invitable/mapping'
   autoload :ParameterSanitizer, 'devise_invitable/parameter_sanitizer'
   module Controllers
-    autoload :UrlHelpers, 'devise_invitable/controllers/url_helpers'
     autoload :Registrations, 'devise_invitable/controllers/registrations'
     autoload :Helpers, 'devise_invitable/controllers/helpers'
   end
@@ -64,4 +63,4 @@ module Devise
   @@invited_by_class_name = nil
 end
 
-Devise.add_module :invitable, :controller => :invitations, :model => 'devise_invitable/model', :route => :invitation
+Devise.add_module :invitable, :controller => :invitations, :model => 'devise_invitable/model', :route => {:invitation => [nil, :new, :accept]}

data/lib/devise_invitable/model.rb

@@ -37,8 +37,6 @@ module Devise
 
         include ActiveSupport::Callbacks
         define_callbacks :invitation_accepted
-        before_update :generate_confirmation_token, :if => :confirmation_required_for_invited?
-        after_update :send_on_create_confirmation_instructions, :if => :confirmation_required_for_invited?
 
         attr_writer :skip_password
 
@@ -164,16 +162,17 @@ module Devise
         self.invitation_token
       end
 
+      def confirmation_required_for_invited?
+        respond_to?(:confirmation_required?, true) && confirmation_required?
+      end
+
       protected
         # Overriding the method in Devise's :validatable module so password is not required on inviting
         def password_required?
           !@skip_password && super
         end
 
-        def confirmation_required_for_invited?
-          respond_to?(:confirmation_required?, true) && confirmation_required? && invitation_accepted?
-        end
-
+        
         # Checks if the invitation for the user is within the limit time.
         # We do this by calculating if the difference between today and the
         # invitation sent date does not exceed the invite for time configured.

data/lib/devise_invitable/parameter_sanitizer.rb

@@ -1,11 +1,11 @@
 module DeviseInvitable
   module ParameterSanitizer
     def invite
-      default_params.permit self.for(:invite)
+      permit self.for(:invite)
     end
 
     def accept_invitation
-      default_params.permit self.for(:accept_invitation)
+      permit self.for(:accept_invitation)
     end
 
     def self.included(base)
@@ -13,6 +13,10 @@ module DeviseInvitable
     end
 
     private
+    def permit(keys)
+      default_params.permit(*Array(keys))
+    end
+
     def attributes_for_with_invitable(kind)
       case kind
       when :invite

data/lib/devise_invitable/rails.rb

@@ -2,10 +2,8 @@ module DeviseInvitable
   class Engine < ::Rails::Engine
 
     ActiveSupport.on_load(:action_controller) do
-      include DeviseInvitable::Controllers::UrlHelpers
       include DeviseInvitable::Controllers::Helpers
     end
-    ActiveSupport.on_load(:action_view)       { include DeviseInvitable::Controllers::UrlHelpers }
 
     # We use to_prepare instead of after_initialize here because Devise is a Rails engine; its
     # mailer is reloaded like the rest of the user's app.  Got to make sure that our mailer methods

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

data/test/functional/registrations_controller_test.rb

@@ -33,6 +33,15 @@ class DeviseInvitable::RegistrationsControllerTest < ActionController::TestCase
     end
 
     @invitee = User.where(:email => invitee_email).first
+
+    # do not send emails on model changes
+    assert_difference('ActionMailer::Base.deliveries.size', 0) do
+      @invitee.bio = "I am a robot"
+      @invitee.save!
+      @invitee.bio = "I am a human"
+      @invitee.save!
+    end
+
     assert_present @invitee.encrypted_password
     assert_not_nil @invitee.invitation_accepted_at
     assert_nil @invitee.invitation_token

metadata

@@ -1,59 +1,78 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: devise_invitable
-version: !ruby/object:Gem::Version 
-  version: 1.3.1
+version: !ruby/object:Gem::Version
+  version: 1.3.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Sergio Cambra
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-11-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-01-04 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
+    none: false
+    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
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: actionmailer
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    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
+    none: false
+    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
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.1.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
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.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
@@ -62,7 +81,6 @@ files:
 - config/locales/en.yml
 - lib/devise_invitable.rb
 - lib/devise_invitable/controllers/helpers.rb
-- lib/devise_invitable/controllers/url_helpers.rb
 - lib/devise_invitable/inviter.rb
 - lib/devise_invitable/mailer.rb
 - lib/devise_invitable/mapping.rb
@@ -134,35 +152,34 @@ 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
+  none: false
+  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
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 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
@@ -214,4 +231,3 @@ test_files:
 - test/rails_app/script/rails
 - test/routes_test.rb
 - test/test_helper.rb
-has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
---- 
-SHA512: 
-  metadata.gz: f63e9220602bf9934658384637404fdf89b2dfcd4f7b2b7ed77c31cddfbab70e6ca7fa89a2fa2dccf489db7b2e80ff6634cfadf320ee366769b42000da4e9ac5
-  data.tar.gz: d54dfb69ad95bf58f8a69c5c358ba64e9cfdf569536682f6e8614cc2f10550984657cb74353ab64a9fd59e1fed16991b9e8e4e5d120ec3583ad01f36b961bd1c
-SHA1: 
-  metadata.gz: 861482f2cb8845f6335441e94c3da04912511e1b
-  data.tar.gz: 54799f3b072ffc7dcd3080d5f394fa2c62e64990

data/lib/devise_invitable/controllers/url_helpers.rb

@@ -1,24 +0,0 @@
-module DeviseInvitable
-  module Controllers
-    module UrlHelpers
-      [:path, :url].each do |path_or_url|
-        [nil, :new_, :accept_].each do |action|
-          class_eval <<-URL_HELPERS, __FILE__, __LINE__ + 1
-            def #{action}invitation_#{path_or_url}(resource, *args)
-              resource = case resource
-                when Symbol, String
-                  resource
-                when Class
-                  resource.name.underscore
-                else
-                  resource.class.name.underscore
-              end
-
-              send("#{action}\#{resource}_invitation_#{path_or_url}", *args)
-            end
-          URL_HELPERS
-        end
-      end
-    end
-  end
-end