devise_invitable 1.3.2 → 1.3.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b829731496401b7e957dc0da6fb5c314104be6b1
+  data.tar.gz: 39abb9f0a58cc51c5a6f45e50189f4f2275d0743
+SHA512:
+  metadata.gz: ce39f924778f62589d7eb7ad004074fe2d32cf7c5ac3efd5d0b1a9e8d39e36921dc79954932787e461b9dad121d9528520df869b34433f1f772cd1864f3250a3
+  data.tar.gz: 5c4f8c5eddc26ea113001257d6b4c33c4283807404a4d7aeb82cab7ed57cf21754b464debd404c549c41d84f299edaed7dad6aaf7ddcf6346b57d698a577f1e0

data/app/controllers/devise/invitations_controller.rb

@@ -32,7 +32,7 @@ class Devise::InvitationsController < DeviseController
 
   # PUT /resource/invitation
   def update
-    self.resource = resource_class.accept_invitation!(update_resource_params)
+    self.resource = accept_resource
 
     if resource.errors.empty?
       flash_message = resource.active_for_authentication? ? :updated : :updated_not_active                                                                                        
@@ -56,6 +56,10 @@ class Devise::InvitationsController < DeviseController
   def invite_resource
     resource_class.invite!(invite_params, current_inviter)
   end
+  
+  def accept_resource
+    resource_class.accept_invitation!(update_resource_params)
+  end
 
   def current_inviter
     @current_inviter ||= authenticate_inviter!

data/lib/devise_invitable/model.rb

@@ -29,11 +29,15 @@ module Devise
 
       included do
         include ::DeviseInvitable::Inviter
-        if Devise.invited_by_class_name
-          belongs_to :invited_by, :class_name => Devise.invited_by_class_name
+        belongs_to_options = if Devise.invited_by_class_name
+          {:class_name => Devise.invited_by_class_name}
         else
-          belongs_to :invited_by, :polymorphic => true
+          {:polymorphic => true}
+        end
+        if defined?(ActiveRecord) && self < ActiveRecord::Base
+          belongs_to_options.merge! :counter_cache => :invitations_count
         end
+        belongs_to :invited_by, belongs_to_options
 
         include ActiveSupport::Callbacks
         define_callbacks :invitation_accepted
@@ -81,12 +85,6 @@ module Devise
         end
       end
 
-      # Verifies whether a user has accepted an invitation (or is accepting it), or was never invited
-      def accepting_or_not_invited?
-        ActiveSupport::Deprecation.warn "accepting_or_not_invited? is deprecated and will be removed from DeviseInvitable 1.1.0 (use accepted_or_not_invited? instead)"
-        accepted_or_not_invited?
-      end
-
       # Verifies whether a user has been invited or not
       def invited_to_sign_up?
         persisted? && invitation_token.present?
@@ -279,9 +277,6 @@ module Devise
           invitation_token = Devise.token_generator.digest(self, :invitation_token, original_token)
 
           invitable = find_or_initialize_with_error_by(:invitation_token, invitation_token)
-          if !invitable.persisted? && Devise.allow_insecure_token_lookup
-            invitable = find_or_initialize_with_error_by(:invitation_token, original_token)
-          end
           invitable.errors.add(:invitation_token, :invalid) if invitable.invitation_token && invitable.persisted? && !invitable.valid_invitation?
           invitable.invitation_token = original_token
           invitable unless only_valid && invitable.errors.present?

data/lib/devise_invitable/version.rb

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

data/lib/generators/active_record/templates/migration.rb

@@ -7,6 +7,8 @@ class DeviseInvitableAddTo<%= table_name.camelize %> < ActiveRecord::Migration
       t.datetime   :invitation_accepted_at
       t.integer    :invitation_limit
       t.references :invited_by, :polymorphic => true
+      t.integer    :invitations_count, default: 0
+      t.index      :invitations_count
       t.index      :invitation_token, :unique => true # for invitable
       t.index      :invited_by_id
     end

data/test/models/invitable_test.rb

@@ -11,6 +11,16 @@ class InvitableTest < ActiveSupport::TestCase
     assert_nil new_user.invitation_token
   end
 
+  test 'should update the invitations count counter cache' do
+    if defined?(ActiveRecord)
+      current_user = new_user
+      2.times do |index|
+        User.invite!({:email => "valid#{index}@email.com"}, current_user)
+      end
+      assert_equal current_user.reload.invitations_count, 2
+    end
+  end
+
   test 'should not generate the raw invitation token after creating a record' do
     assert_nil new_user.raw_invitation_token
   end

data/test/rails_app/db/migrate/20100401102949_create_tables.rb

@@ -27,15 +27,20 @@ class CreateTables < ActiveRecord::Migration
       t.integer  :invitation_limit
       t.integer  :invited_by_id
       t.string   :invited_by_type
+      t.integer :invitations_count, :default => 0
 
       t.timestamps
     end
     add_index :users, :invitation_token, :unique => true
+    add_index :users, :invitations_count
 
     create_table :admins do |t|
       ## Database authenticatable
       t.string :email,              :null => true, :default => ""
       t.string :encrypted_password, :null => true, :default => ""
+
+      t.integer :invitations_count, :default => 0
     end
+    add_index :admins, :invitations_count
   end
 end

metadata

@@ -1,38 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: devise_invitable
 version: !ruby/object:Gem::Version
-  version: 1.3.2
-  prerelease: 
+  version: 1.3.3
 platform: ruby
 authors:
 - Sergio Cambra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-04 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
   prerelease: false
   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
     - - <
@@ -41,9 +37,8 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.6
     - - <
@@ -52,19 +47,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        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:
@@ -154,6 +147,7 @@ files:
 homepage: https://github.com/scambra/devise_invitable
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -162,22 +156,20 @@ rdoc_options:
 require_paths:
 - lib
 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
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An invitation strategy for Devise
 test_files:
 - test/functional/controller_helpers_test.rb