devise_invitable 1.1.8 → 1.2.1

data/test/routes_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class RoutesTest < ActionController::TestCase
+
+  test 'map new user invitation' do
+    assert_recognizes({:controller => 'devise/invitations', :action => 'new'}, {:path => 'users/invitation/new', :method => :get})
+  end
+
+  test 'map create user invitation' do
+    assert_recognizes({:controller => 'devise/invitations', :action => 'create'}, {:path => 'users/invitation', :method => :post})
+  end
+
+  test 'map accept user invitation' do
+    assert_recognizes({:controller => 'devise/invitations', :action => 'edit'}, 'users/invitation/accept')
+  end
+
+  test 'map update user invitation' do
+    assert_recognizes({:controller => 'devise/invitations', :action => 'update'}, {:path => 'users/invitation', :method => :put})
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,24 @@
+ENV["RAILS_ENV"] = "test"
+DEVISE_ORM = (ENV["DEVISE_ORM"] || :active_record).to_sym
+
+$:.unshift File.dirname(__FILE__)
+puts "\n==> Devise.orm = #{DEVISE_ORM.inspect}"
+require "rails_app/config/environment"
+include Devise::TestHelpers
+require "orm/#{DEVISE_ORM}"
+require 'rails/test_help'
+require 'capybara/rails'
+require 'mocha/setup'
+
+ActionMailer::Base.delivery_method = :test
+ActionMailer::Base.perform_deliveries = true
+ActionMailer::Base.default_url_options[:host] = 'test.com'
+
+ActiveSupport::Deprecation.silenced = true
+
+class ActionDispatch::IntegrationTest
+  include Capybara::DSL
+end
+class ActionController::TestCase 
+  include Devise::TestHelpers 
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise_invitable
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 29
   prerelease: 
   segments: 
   - 1
+  - 2
   - 1
-  - 8
-  version: 1.1.8
+  version: 1.2.1
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-02 00:00:00 Z
+date: 2013-08-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -34,22 +34,29 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: railties
+  name: actionmailer
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 3
-        - 0
-        version: "3.0"
+        - 2
+        - 6
+        version: 3.2.6
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 5
+        version: "5"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: actionmailer
+  name: devise
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,25 +67,10 @@ dependencies:
         segments: 
         - 3
         - 0
-        version: "3.0"
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: devise
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 1
-        - 2
-        version: 2.1.2
-  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.
 email: 
 - sergio@entrecables.com
@@ -91,36 +83,82 @@ extra_rdoc_files: []
 files: 
 - app/controllers/devise/invitations_controller.rb
 - app/controllers/devise_invitable/registrations_controller.rb
-- app/controllers/devise_invitable/registrations_controller.rb~
 - app/views/devise/invitations/edit.html.erb
 - app/views/devise/invitations/new.html.erb
 - app/views/devise/mailer/invitation_instructions.html.erb
 - 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
 - lib/devise_invitable/model.rb
+- lib/devise_invitable/parameter_sanitizer.rb
 - lib/devise_invitable/rails.rb
 - lib/devise_invitable/routes.rb
 - lib/devise_invitable/version.rb
-- lib/devise_invitable/controllers/helpers.rb
-- lib/devise_invitable/controllers/url_helpers.rb
-- lib/devise_invitable/controllers/registrations.rb~
-- lib/devise_invitable/controllers/helpers.rb~
-- lib/devise_invitable/rails.rb~
-- lib/devise_invitable/inviter.rb
-- lib/devise_invitable/mapping.rb
-- lib/devise_invitable/model.rb~
 - lib/generators/active_record/devise_invitable_generator.rb
 - lib/generators/active_record/templates/migration.rb
-- lib/generators/devise_invitable/views_generator.rb
 - lib/generators/devise_invitable/devise_invitable_generator.rb
 - lib/generators/devise_invitable/install_generator.rb
 - lib/generators/devise_invitable/templates/simple_form_for/invitations/edit.html.erb
 - lib/generators/devise_invitable/templates/simple_form_for/invitations/new.html.erb
+- lib/generators/devise_invitable/views_generator.rb
 - lib/generators/mongoid/devise_invitable_generator.rb
-- lib/devise_invitable.rb~
 - LICENSE
 - README.rdoc
+- test/functional/controller_helpers_test.rb
+- test/functional/registrations_controller_test.rb
+- test/generators/views_generator_test.rb
+- test/generators_test.rb
+- test/integration/invitation_remove_test.rb
+- test/integration/invitation_test.rb
+- test/integration_tests_helper.rb
+- test/mailers/invitation_mail_test.rb
+- test/model_tests_helper.rb
+- test/models/invitable_test.rb
+- test/models_test.rb
+- test/orm/active_record.rb
+- test/orm/mongoid.rb
+- test/rails_app/Rakefile
+- test/rails_app/app/controllers/admins_controller.rb
+- test/rails_app/app/controllers/application_controller.rb
+- test/rails_app/app/controllers/free_invitations_controller.rb
+- test/rails_app/app/controllers/home_controller.rb
+- test/rails_app/app/controllers/users_controller.rb
+- test/rails_app/app/helpers/application_helper.rb
+- test/rails_app/app/models/admin.rb
+- test/rails_app/app/models/octopussy.rb
+- test/rails_app/app/models/user.rb
+- test/rails_app/app/views/admins/new.html.erb
+- test/rails_app/app/views/free_invitations/new.html.erb
+- test/rails_app/app/views/home/index.html.erb
+- test/rails_app/app/views/layouts/application.html.erb
+- test/rails_app/app/views/users/invitations/new.html.erb
+- test/rails_app/config.ru
+- test/rails_app/config/application.rb
+- test/rails_app/config/boot.rb
+- test/rails_app/config/database.yml
+- test/rails_app/config/environment.rb
+- test/rails_app/config/environments/development.rb
+- test/rails_app/config/environments/production.rb
+- test/rails_app/config/environments/test.rb
+- test/rails_app/config/initializers/backtrace_silencers.rb
+- test/rails_app/config/initializers/devise.rb
+- test/rails_app/config/initializers/inflections.rb
+- test/rails_app/config/initializers/mime_types.rb
+- test/rails_app/config/initializers/secret_token.rb
+- test/rails_app/config/initializers/session_store.rb
+- test/rails_app/config/initializers/wrap_parameters.rb
+- test/rails_app/config/locales/devise.en.yml
+- test/rails_app/config/locales/en.yml
+- test/rails_app/config/routes.rb
+- test/rails_app/db/migrate/20100401102949_create_tables.rb
+- test/rails_app/mongoid.yml
+- test/rails_app/script/rails
+- test/routes_test.rb
+- test/test_helper.rb
 homepage: https://github.com/scambra/devise_invitable
 licenses: []
 
@@ -160,6 +198,56 @@ rubygems_version: 1.8.23
 signing_key: 
 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
+- test/generators_test.rb
+- test/integration/invitation_remove_test.rb
+- test/integration/invitation_test.rb
+- test/integration_tests_helper.rb
+- test/mailers/invitation_mail_test.rb
+- test/model_tests_helper.rb
+- test/models/invitable_test.rb
+- test/models_test.rb
+- test/orm/active_record.rb
+- test/orm/mongoid.rb
+- test/rails_app/Rakefile
+- test/rails_app/app/controllers/admins_controller.rb
+- test/rails_app/app/controllers/application_controller.rb
+- test/rails_app/app/controllers/free_invitations_controller.rb
+- test/rails_app/app/controllers/home_controller.rb
+- test/rails_app/app/controllers/users_controller.rb
+- test/rails_app/app/helpers/application_helper.rb
+- test/rails_app/app/models/admin.rb
+- test/rails_app/app/models/octopussy.rb
+- test/rails_app/app/models/user.rb
+- test/rails_app/app/views/admins/new.html.erb
+- test/rails_app/app/views/free_invitations/new.html.erb
+- test/rails_app/app/views/home/index.html.erb
+- test/rails_app/app/views/layouts/application.html.erb
+- test/rails_app/app/views/users/invitations/new.html.erb
+- test/rails_app/config.ru
+- test/rails_app/config/application.rb
+- test/rails_app/config/boot.rb
+- test/rails_app/config/database.yml
+- test/rails_app/config/environment.rb
+- test/rails_app/config/environments/development.rb
+- test/rails_app/config/environments/production.rb
+- test/rails_app/config/environments/test.rb
+- test/rails_app/config/initializers/backtrace_silencers.rb
+- test/rails_app/config/initializers/devise.rb
+- test/rails_app/config/initializers/inflections.rb
+- test/rails_app/config/initializers/mime_types.rb
+- test/rails_app/config/initializers/secret_token.rb
+- test/rails_app/config/initializers/session_store.rb
+- test/rails_app/config/initializers/wrap_parameters.rb
+- test/rails_app/config/locales/devise.en.yml
+- test/rails_app/config/locales/en.yml
+- test/rails_app/config/routes.rb
+- test/rails_app/db/migrate/20100401102949_create_tables.rb
+- test/rails_app/mongoid.yml
+- test/rails_app/script/rails
+- test/routes_test.rb
+- test/test_helper.rb
 has_rdoc: 

data/app/controllers/devise_invitable/registrations_controller.rb~

@@ -1,15 +0,0 @@
-class DeviseInvitable::RegistrationsController < Devise::RegistrationsController
-  protected
-
-  def build_resource(*args)
-    hash = args.pop || resource_params || {}
-    if hash[:email]
-      self.resource = resource_class.where(:email => hash[:email], :encrypted_password => '').first
-      if self.resource
-        self.resource.attributes = hash
-        self.resource.accept_invitation!
-      end
-    end
-    self.resource ||= super(hash, *args)
-  end
-end

data/lib/devise_invitable.rb~

@@ -1,65 +0,0 @@
-module DeviseInvitable
-  autoload :Inviter, 'devise_invitable/inviter'
-  autoload :Mailer, 'devise_invitable/mailer'
-  module Controllers
-    autoload :UrlHelpers, 'devise_invitable/controllers/url_helpers'
-    autoload :Registrations, 'devise_invitable/controllers/registrations'
-    autoload :Helpers, 'devise_invitable/controllers/helpers'
-  end
-end
-
-require 'devise'
-require 'devise_invitable/routes'
-require 'devise_invitable/rails'
-
-module Devise
-  # Public: Validity period of the invitation token (default: 0). If
-  # invite_for is 0 or nil, the invitation will never expire.
-  # Set invite_for in the Devise configuration file (in config/initializers/devise.rb).
-  #
-  #   config.invite_for = 2.weeks # => The invitation token will be valid 2 weeks
-  mattr_accessor :invite_for
-  @@invite_for = 0
-
-  # Public: Flag that force a record to be valid before being actually invited
-  # (default: false).
-  #
-  # Examples (in config/initializers/devise.rb)
-  #
-  #   config.validate_on_invite = true
-  mattr_accessor :validate_on_invite
-  @@validate_on_invite = false
-
-  # Public: number of invitations the user is allowed to send
-  #
-  # Examples (in config/initializers/devise.rb)
-  #
-  #   config.invitation_limit = nil
-  mattr_accessor :invitation_limit
-  @@invitation_limit = nil
-
-  # Public: The key to be used to check existing users when sending an invitation,
-  # and the regexp used to test it when validate_on_invite is not set.
-  #
-  # Examples (in config/initializers/devise.rb)
-  #
-  #   config.invite_key = {:email => /\A[^@]+@[^@]+\z/}
-  mattr_accessor :invite_key
-  @@invite_key = {:email => Devise.email_regexp}
-
-  # Public: Resend invitation if user with invited status is invited again
-  # (default: true)
-  #
-  # Example (in config/initializers/devise.rb)
-  #
-  #   config.resend_invitation = false
-  mattr_accessor :resend_invitation
-  @@resend_invitation = true
-
-  # Public: The class name of the inviting model. If this is nil,
-  # the #invited_by association is declared to be polymorphic. (default: nil)
-  mattr_accessor :invited_by_class_name
-  @@invited_by_class_name = nil
-end
-
-Devise.add_module :invitable, :controller => :invitations, :model => 'devise_invitable/model', :route => :invitation

data/lib/devise_invitable/controllers/helpers.rb~

@@ -1,21 +0,0 @@
-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

data/lib/devise_invitable/controllers/registrations.rb~

@@ -1,21 +0,0 @@
-module DeviseInvitable::Controllers::Registrations
-  def self.included(controller)
-    controller.alias_method_chain :build_resource, :invitation
-  end
-
-  protected
-
-  def build_resource_with_invitation(*args)
-    hash = args.pop || resource_params || {}
-    if hash[:email]
-      self.resource = resource_class.where(:email => hash[:email], :encrypted_password => '').first
-      if self.resource
-        puts self.resource.inspect
-        self.resource.attributes = hash
-        self.resource.accept_invitation!
-        puts self.resource.inspect
-      end
-    end
-    self.resource ||= build_resource_without_invitation(hash, *args)
-  end
-end

data/lib/devise_invitable/model.rb~

@@ -1,224 +0,0 @@
-require 'active_support/deprecation'
-
-module Devise
-  module Models
-    # Invitable is responsible for sending invitation emails.
-    # When an invitation is sent to an email address, an account is created for it.
-    # Invitation email contains a link allowing the user to accept the invitation
-    # by setting a password (as reset password from Devise's recoverable module).
-    #
-    # Configuration:
-    #
-    #   invite_for: 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.
-    #
-    # Examples:
-    #
-    #   User.find(1).invited_to_sign_up?                    # => true/false
-    #   User.invite!(:email => 'someone@example.com')       # => send invitation
-    #   User.accept_invitation!(:invitation_token => '...') # => accept invitation with a token
-    #   User.find(1).accept_invitation!                     # => accept invitation
-    #   User.find(1).invite!                                # => reset invitation status and send invitation again
-    module Invitable
-      extend ActiveSupport::Concern
-
-      attr_accessor :skip_invitation
-      attr_accessor :completing_invite
-
-      included do
-        include ::DeviseInvitable::Inviter        
-        belongs_to :invited_by, :polymorphic => true
-        
-        include ActiveSupport::Callbacks
-        define_callbacks :invitation_accepted
-        
-        attr_writer :skip_password
-      end
-
-      # Accept an invitation by clearing invitation token and and setting invitation_accepted_at
-      # Confirms it if model is confirmable
-      def accept_invitation!
-        self.completing_invite = true
-        if self.invited_to_sign_up? && self.valid?
-          run_callbacks :invitation_accepted do
-            self.invitation_token = nil
-            self.invitation_accepted_at = Time.now.utc if respond_to? :"invitation_accepted_at="
-            self.completing_invite = false
-            self.save(:validate => false)
-          end
-        end
-      end
-
-      # Verifies whether a user has accepted an invite, was never invited, or is in the process of accepting an invitation, or not
-      def accepting_or_not_invited?
-        !!completing_invite || invited_to_sign_up?
-      end
-
-      # Verifies whether a user has been invited or not
-      def invited_to_sign_up?
-        persisted? && invitation_token.present?
-      end
-      
-      def invited?
-        invited_to_sign_up?
-      end
-      deprecate :invited?
-
-      # Reset invitation token and send invitation again
-      def invite!
-        was_invited = invited_to_sign_up?
-        self.skip_confirmation! if self.new_record? && self.respond_to?(:skip_confirmation!)
-        generate_invitation_token if self.invitation_token.nil?
-        self.invitation_sent_at = Time.now.utc
-        
-        # Call these before_validate methods since we aren't validating on save
-        self.downcase_keys if self.new_record? && self.respond_to?(:downcase_keys)
-        self.strip_whitespace if self.new_record? && self.respond_to?(:strip_whitespace)
-        
-        if save(:validate => false)
-          self.invited_by.decrement_invitation_limit! if !was_invited and self.invited_by.present?
-          deliver_invitation unless @skip_invitation
-        end
-      end
-
-      # Verify whether a invitation is active or not. If the user has been
-      # invited, we need to calculate if the invitation time has not expired
-      # for this user, in other words, if the invitation is still valid.
-      def valid_invitation?
-        invited_to_sign_up? && invitation_period_valid?
-      end
-
-      # Only verify password when is not invited
-      def valid_password?(password)
-        super unless invited_to_sign_up?
-      end
-      
-      def reset_password!(new_password, new_password_confirmation)
-        super
-        accept_invitation!
-      end
-
-      protected
-        # Overriding the method in Devise's :validatable module so password is not required on inviting
-        def password_required?
-          !@skip_password && super
-        end
-
-        # Deliver the invitation email
-        def deliver_invitation
-          ::Devise.mailer.invitation_instructions(self).deliver
-        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.
-        # Invite_for is a model configuration, must always be an integer value.
-        #
-        # Example:
-        #
-        #   # invite_for = 1.day and invitation_sent_at = today
-        #   invitation_period_valid?   # returns true
-        #
-        #   # invite_for = 5.days and invitation_sent_at = 4.days.ago
-        #   invitation_period_valid?   # returns true
-        #
-        #   # invite_for = 5.days and invitation_sent_at = 5.days.ago
-        #   invitation_period_valid?   # returns false
-        #
-        #   # invite_for = nil
-        #   invitation_period_valid?   # will always return true
-        #
-        def invitation_period_valid?
-          invitation_sent_at && (self.class.invite_for.to_i.zero? || invitation_sent_at.utc >= self.class.invite_for.ago)
-        end
-
-        # Generates a new random token for invitation, and stores the time
-        # this token is being generated
-        def generate_invitation_token
-          self.invitation_token   = self.class.invitation_token
-        end
-
-      module ClassMethods
-        # Attempt to find a user by it's email. If a record is not found, create a new
-        # user and send invitation to it. If user is found, returns the user with an
-        # email already exists error.
-        # If user is found and still have pending invitation, email is resend unless
-        # resend_invitation is set to false
-        # Attributes must contain the user email, other attributes will be set in the record
-        def _invite(attributes={}, invited_by=nil, &block)
-          invitable = find_or_initialize_with_error_by(invite_key, attributes.delete(invite_key))
-          invitable.assign_attributes(attributes, :as => inviter_role(invited_by))
-          invitable.invited_by = invited_by
-
-          invitable.skip_password = true
-          invitable.valid? if self.validate_on_invite
-          if invitable.new_record?
-            invitable.errors.clear if !self.validate_on_invite and invitable.email.try(:match, Devise.email_regexp)
-          else
-            invitable.errors.add(invite_key, :taken) unless invitable.invited_to_sign_up? && self.resend_invitation
-          end
-
-          if invitable.errors.empty?
-            yield invitable if block_given?
-            mail = invitable.invite!
-          end
-          [invitable, mail]
-        end
-        
-        # Override this method if the invitable is using Mass Assignment Security
-        # and the inviter has a non-default role.
-        def inviter_role(inviter)
-          :default
-        end
-
-        def invite!(attributes={}, invited_by=nil, &block)
-          invitable, mail = _invite(attributes, invited_by, &block)
-          invitable
-        end
-
-        def invite_mail!(attributes={}, invited_by=nil, &block)
-          invitable, mail = _invite(attributes, invited_by, &block)
-          mail
-        end
-
-        # Attempt to find a user by it's invitation_token to set it's password.
-        # If a user is found, reset it's password and automatically try saving
-        # the record. If not user is found, returns a new user containing an
-        # error in invitation_token attribute.
-        # Attributes must contain invitation_token, password and confirmation
-        def accept_invitation!(attributes={})
-          invitable = find_or_initialize_with_error_by(:invitation_token, attributes.delete(:invitation_token))
-          invitable.errors.add(:invitation_token, :invalid) if invitable.invitation_token && invitable.persisted? && !invitable.valid_invitation?
-          if invitable.errors.empty?
-            invitable.attributes = attributes
-            invitable.accept_invitation!
-          end
-          invitable
-        end
-
-        # Generate a token checking if one does not already exist in the database.
-        def invitation_token
-          generate_token(:invitation_token)
-        end
-        
-        # Callback convenience methods
-        def before_invitation_accepted(*args, &blk)
-          set_callback(:invitation_accepted, :before, *args, &blk)
-        end
-        
-        def after_invitation_accepted(*args, &blk)
-          set_callback(:invitation_accepted, :after, *args, &blk)
-        end
-        
-
-        Devise::Models.config(self, :invite_for)
-        Devise::Models.config(self, :validate_on_invite)
-        Devise::Models.config(self, :invitation_limit)
-        Devise::Models.config(self, :invite_key)
-        Devise::Models.config(self, :resend_invitation)
-      end
-    end
-  end
-end
-