muck-invites 0.1.3 → 0.1.4

data/README.rdoc

@@ -1,6 +1,39 @@
 = Muck Invites
-
+Make it easy to let users invite other users.
 
 == Setup
 
-Copyright (c) 2009 Muck Your App, released under the MIT license
+=== Inviter model
+Add 'acts_as_muck_inviter' to the class that you wish to have do the inviting.  This is commonly the user model, but
+might also be another model - for example Event.
+
+  class User < ActiveRecord::Base
+    acts_as_authentic do |c|
+      c.crypto_provider = Authlogic::CryptoProviders::BCrypt
+    end
+    acts_as_muck_user
+    acts_as_muck_inviter
+  end
+
+or
+  
+  class Event < ActiveRecord::Base
+    acts_as_muck_inviter
+  end
+
+=== Other models
+These models are required for the invite system to function and must be named as specified.  Addition functionality
+can be added to each model as needed.
+
+Create an Invitee model:
+  class Invitee < ActiveRecord::Base
+    acts_as_muck_invitee
+  end
+
+Create an Invite model:
+  class Invite < ActiveRecord::Base
+    acts_as_muck_invite
+  end
+
+
+Copyright (c) 2009 Tatemae.com, released under the MIT license

data/Rakefile

@@ -16,7 +16,7 @@ end
 begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |t|
-    #t.libs << 'lib'
+    t.libs << 'lib'
     t.libs << 'test/rails_root/lib'
     t.pattern = 'test/rails_root/test/**/*_test.rb'
     t.verbose = true

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/app/controllers/muck/invites_controller.rb

@@ -38,10 +38,17 @@ class Muck::InvitesController < ApplicationController
 
   def create
     if params[:emails]
-      current_user.invite(params[:emails])
-      flash[:notice] = t('muck.invites.create_success', :emails => params[:emails].join(', '), :app_name => GlobalConfig.application_name)
-    end  
-    redirect_to('/')
+      current_user.invite(params[:emails], current_user)
+      message = t('muck.invites.create_success', :emails => params[:emails].join(', '), :app_name => GlobalConfig.application_name)
+    end
+    respond_to do |format|
+      format.html do
+        flash[:notice] = message
+        redirect_to('/')
+      end
+      format.pjs { render :text => message }
+    end 
+    
   rescue ActiveRecord::RecordInvalid => ex
     if @invite
       errors = @invite.errors.full_messages.to_sentence
@@ -49,6 +56,10 @@ class Muck::InvitesController < ApplicationController
       errors = ex
     end
     flash[:error] = t('muck.invites.create_error', :errors => errors)
+    respond_to do |format|
+      format.html { render :template => 'invites/new' }
+      format.pjs { render :template => 'invites/new', :layout => false }
+    end
   end
 
   protected

data/db/migrate/20091128170318_make_invites_polymorphic.rb

@@ -0,0 +1,27 @@
+class MakeInvitesPolymorphic < ActiveRecord::Migration
+  
+  def self.up
+    drop_table :user_invites
+    rename_table :invites, :invitees
+    create_table :invites, :force => true do |t|
+      t.integer  :user_id
+      t.integer  :invitee_id, :null => false
+      t.integer  :inviter_id, :null => false
+      t.string   :inviter_type
+      t.timestamps
+    end
+    add_index :invites, ["inviter_id", "inviter_type"]
+  end
+
+  def self.down
+    drop_table :invites
+    rename_table :invitees, :invites
+    create_table :user_invites, :force => true do |t|
+      t.integer  :user_id, :null => false
+      t.integer  :invite_id, :null => false
+      t.timestamp :created_at, :null => false
+    end
+    add_index :user_invites, ["user_id"]
+  end
+  
+end

data/lib/active_record/acts/muck_invite.rb

@@ -8,21 +8,17 @@ module ActiveRecord
       module ClassMethods
 
         def acts_as_muck_invite(options = {})
-
-          has_many :user_invites
-          has_many :users, :through => :user_invites
-          validates_presence_of :email
-
+          belongs_to :invitee
+          belongs_to :inviter, :polymorphic => true
+          # User and inviter might be the same.  For example, if a user invites their friends then user == inviter.  
+          # However if inviter is something else for example an Event then having a user field let's us quickly
+          # discover who created the invite.  (Used by who_invited?)
+          belongs_to :user
+          
           named_scope :by_newest, :order => "created_at DESC"
           named_scope :by_oldest, :order => "created_at ASC"
           named_scope :recent, lambda { { :conditions => ['created_at > ?', 1.week.ago] } }
 
-          email_name_regex  = '[\w\.%\+\-]+'.freeze
-          domain_head_regex = '(?:[A-Z0-9\-]+\.)+'.freeze
-          domain_tld_regex  = '(?:[A-Z]{2}|com|org|net|edu|gov|mil|biz|info|mobi|name|aero|jobs|museum)'.freeze
-          email_regex       = /\A#{email_name_regex}@#{domain_head_regex}#{domain_tld_regex}\z/i
-
-          validates_format_of :email, :with => email_regex, :message => 'does not look like a valid email address.'
 
           include ActiveRecord::Acts::MuckInvite::InstanceMethods
           extend ActiveRecord::Acts::MuckInvite::SingletonMethods
@@ -32,25 +28,10 @@ module ActiveRecord
 
       # class methods
       module SingletonMethods
-
-        def who_invited?(email, id = nil)
-          users = []
-
-          if !id.nil?
-            invite = Invite.find(id)
-            users |= invite.users if !invite.nil?
-          end
-
-          invite = Invite.find_by_email(email)
-          users |= invite.users if !invite.nil?
-
-          users
-        end
       end
       
       # All the methods available to a record that has had <tt>acts_as_muck_invite</tt> specified.
       module InstanceMethods
-
       end
     end
   end

data/lib/active_record/acts/muck_invitee.rb

@@ -0,0 +1,57 @@
+module ActiveRecord
+  module Acts #:nodoc:
+    module MuckInvitee #:nodoc:
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+
+        def acts_as_muck_invitee(options = {})
+
+          has_many :invites
+          has_many :users, :through => :invites
+          validates_presence_of :email
+                                  
+          named_scope :by_newest, :order => "created_at DESC"
+          named_scope :by_oldest, :order => "created_at ASC"
+          named_scope :recent, lambda { { :conditions => ['created_at > ?', 1.week.ago] } }
+
+          email_name_regex  = '[\w\.%\+\-]+'.freeze
+          domain_head_regex = '(?:[A-Z0-9\-]+\.)+'.freeze
+          domain_tld_regex  = '(?:[A-Z]{2}|com|org|net|edu|gov|mil|biz|info|mobi|name|aero|jobs|museum)'.freeze
+          email_regex       = /\A#{email_name_regex}@#{domain_head_regex}#{domain_tld_regex}\z/i
+
+          validates_format_of :email, :with => email_regex, :message => 'does not look like a valid email address.'
+
+          include ActiveRecord::Acts::MuckInvitee::InstanceMethods
+          extend ActiveRecord::Acts::MuckInvitee::SingletonMethods
+          
+        end
+      end
+
+      # class methods
+      module SingletonMethods
+
+        def who_invited?(email, invitee_id = nil)
+          users = []
+
+          if !invitee_id.nil?
+            invite = Invitee.find(invitee_id)
+            users |= invite.users if !invite.nil?
+          end
+
+          invite = Invitee.find_by_email(email)
+          users |= invite.users if !invite.nil?
+
+          users
+        end
+      end
+      
+      # All the methods available to a record that has had <tt>acts_as_muck_invitee</tt> specified.
+      module InstanceMethods
+
+      end
+    end
+  end
+end

data/lib/active_record/acts/muck_inviter.rb

@@ -8,10 +8,8 @@ module ActiveRecord
       module ClassMethods
 
         def acts_as_muck_inviter(options = {})
-
-          has_many :user_invites
-          has_many :invites, :through => :user_invites
-
+          has_many :invites, :as => :inviter
+          has_many :invitees, :through => :invites
           named_scope :by_newest, :order => "created_at DESC"
           named_scope :by_oldest, :order => "created_at ASC"
           named_scope :recent, lambda { { :conditions => ['created_at > ?', 1.week.ago] } }
@@ -34,8 +32,14 @@ module ActiveRecord
       # All the methods available to a record that has had <tt>acts_as_muck_inviter</tt> specified.
       module InstanceMethods
 
+        # Gets all emails have been invited
+        def invitee_emails
+          invitees.map(&:email)
+        end
+
+        # Sends out notification email and adds an activity to each of the inviters activity feeds
         def notify_inviters(invite_id = nil)
-          inviters = Invite.who_invited?(self.email, invite_id)
+          inviters = Invitee.who_invited?(self.email, invite_id)
           if inviters.size > 0
             content = I18n.t('muck.activities.joined_status', :name => self.full_name, :application_name => GlobalConfig.application_name)
             inviters.each do |inviter|
@@ -49,13 +53,18 @@ module ActiveRecord
           
         end
 
-        def invite(emails)
+        def invite(emails, user)
           emails = emails.split(/[, ]/) if !emails.is_a?(Array)
-          emails = emails.find_all { |email| !email.blank?}
+          emails = emails.find_all { |email| !email.blank? }
+          emails = emails.flatten.collect { |email| email.strip }
           raise I18n.t('muck.invites.no_email_error') if emails.blank?
+          check_emails = invitee_emails
           emails.each do |email|
-            invite = Invite.find_by_email(email) || Invite.create(:email => email)
-            invites << invite if !invites.include?(invite)
+            if !check_emails.include?(email)
+              check_emails << email
+              invitee = Invitee.find_by_email(email) || Invitee.create!(:email => email)
+              Invite.create!(:inviter => self, :invitee => invitee, :user => user)
+            end
           end 
         end
 

data/lib/muck_invites.rb

@@ -1,3 +1,4 @@
+ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckInvitee }
 ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckInvite }
 ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckInviter }
 I18n.load_path += Dir[ File.join(File.dirname(__FILE__), '..', 'locales', '*.{rb,yml}') ]

data/muck-invites.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-invites}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball, Joel Duffin"]
-  s.date = %q{2009-11-13}
+  s.date = %q{2009-11-30}
   s.description = %q{The invite engine for the muck system.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
      "VERSION",
      "app/controllers/muck/invites_controller.rb",
      "app/models/invite_mailer.rb",
-     "app/models/user_invite.rb",
      "app/views/invite_mailer/invite_notification.text.html.erb",
      "app/views/invite_mailer/invite_notification.text.plain.erb",
      "app/views/invite_mailer/invited_joined_notification.text.html.erb",
@@ -32,8 +31,10 @@ Gem::Specification.new do |s|
      "app/views/invites/new.html.erb",
      "config/muck_invites_routes.rb",
      "db/migrate/20090928213532_create_invites.rb",
+     "db/migrate/20091128170318_make_invites_polymorphic.rb",
      "install.rb",
      "lib/active_record/acts/muck_invite.rb",
+     "lib/active_record/acts/muck_invitee.rb",
      "lib/active_record/acts/muck_inviter.rb",
      "lib/muck_invites.rb",
      "lib/muck_invites/initialize_routes.rb",
@@ -96,6 +97,7 @@ Gem::Specification.new do |s|
      "test/rails_root/app/models/.keep",
      "test/rails_root/app/models/activity.rb",
      "test/rails_root/app/models/invite.rb",
+     "test/rails_root/app/models/invitee.rb",
      "test/rails_root/app/models/user.rb",
      "test/rails_root/app/models/user_session.rb",
      "test/rails_root/app/views/default/index.html.erb",
@@ -124,6 +126,7 @@ Gem::Specification.new do |s|
      "test/rails_root/db/migrate/20090703055724_add_contents.rb",
      "test/rails_root/db/migrate/20090704220055_create_slugs.rb",
      "test/rails_root/db/migrate/20090928213532_create_invites.rb",
+     "test/rails_root/db/migrate/20091128170318_make_invites_polymorphic.rb",
      "test/rails_root/features/comments.feature",
      "test/rails_root/features/step_definitions/comment_steps.rb",
      "test/rails_root/features/step_definitions/common_steps.rb",
@@ -331,6 +334,7 @@ Gem::Specification.new do |s|
      "test/rails_root/test/unit/contacts_test.rb",
      "test/rails_root/test/unit/invite_mailer_test.rb",
      "test/rails_root/test/unit/invite_test.rb",
+     "test/rails_root/test/unit/invitee_test.rb",
      "test/rails_root/test/unit/user_test.rb",
      "test/rails_root/vendor/plugins/jrails/CHANGELOG",
      "test/rails_root/vendor/plugins/jrails/LICENSE",
@@ -365,6 +369,7 @@ Gem::Specification.new do |s|
      "test/rails_root/app/helpers/application_helper.rb",
      "test/rails_root/app/models/activity.rb",
      "test/rails_root/app/models/invite.rb",
+     "test/rails_root/app/models/invitee.rb",
      "test/rails_root/app/models/user.rb",
      "test/rails_root/app/models/user_session.rb",
      "test/rails_root/config/boot.rb",
@@ -388,6 +393,7 @@ Gem::Specification.new do |s|
      "test/rails_root/db/migrate/20090703055724_add_contents.rb",
      "test/rails_root/db/migrate/20090704220055_create_slugs.rb",
      "test/rails_root/db/migrate/20090928213532_create_invites.rb",
+     "test/rails_root/db/migrate/20091128170318_make_invites_polymorphic.rb",
      "test/rails_root/features/step_definitions/comment_steps.rb",
      "test/rails_root/features/step_definitions/common_steps.rb",
      "test/rails_root/features/step_definitions/webrat_steps.rb",
@@ -400,6 +406,7 @@ Gem::Specification.new do |s|
      "test/rails_root/test/unit/contacts_test.rb",
      "test/rails_root/test/unit/invite_mailer_test.rb",
      "test/rails_root/test/unit/invite_test.rb",
+     "test/rails_root/test/unit/invitee_test.rb",
      "test/rails_root/test/unit/user_test.rb",
      "test/rails_root/vendor/plugins/jrails/init.rb",
      "test/rails_root/vendor/plugins/jrails/install.rb",

data/test/rails_root/app/models/invite.rb

@@ -1,4 +1,3 @@
 class Invite < ActiveRecord::Base
   acts_as_muck_invite
-end
-
+end

data/test/rails_root/app/models/invitee.rb

@@ -0,0 +1,4 @@
+class Invitee < ActiveRecord::Base
+  acts_as_muck_invitee
+end
+

data/test/rails_root/config/database.yml

@@ -1,23 +1,16 @@
 development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  timeout: 5000
-
-test: &TEST
-  adapter: sqlite3
-  database: db/test.sqlite3
-  timeout: 5000
-
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  timeout: 5000
-
+  adapter: mysql
+  database: muck_invites_development
+  username: root
+  password:
+  host: localhost
+  encoding: utf8
+test:
+  adapter: mysql
+  database: muck_invites_test
+  username: root
+  password:
+  host: localhost
+  encoding: utf8
 cucumber:
   <<: *TEST
-cucumber:
-  <<: *TEST
-cucumber:
-  <<: *TEST
-cucumber:
-  <<: *TEST

data/test/rails_root/db/migrate/20091128170318_make_invites_polymorphic.rb

@@ -0,0 +1,27 @@
+class MakeInvitesPolymorphic < ActiveRecord::Migration
+  
+  def self.up
+    drop_table :user_invites
+    rename_table :invites, :invitees
+    create_table :invites, :force => true do |t|
+      t.integer  :user_id
+      t.integer  :invitee_id, :null => false
+      t.integer  :inviter_id, :null => false
+      t.string   :inviter_type
+      t.timestamps
+    end
+    add_index :invites, ["inviter_id", "inviter_type"]
+  end
+
+  def self.down
+    drop_table :invites
+    rename_table :invitees, :invites
+    create_table :user_invites, :force => true do |t|
+      t.integer  :user_id, :null => false
+      t.integer  :invite_id, :null => false
+      t.timestamp :created_at, :null => false
+    end
+    add_index :user_invites, ["user_id"]
+  end
+  
+end

data/test/rails_root/test/functional/invites_controller_test.rb

@@ -53,13 +53,19 @@ class Muck::InvitesControllerTest < ActionController::TestCase
         should_render_template :get_contacts
       end
 
-      context "create invite" do
-        should " be able to create a invite" do
-          assert_difference "Invite.count" do
-            post :create,  :emails => [[Factory.next(:name),Factory.next(:email)]]
+      context "POST to create" do
+        should "create a invite s" do
+          assert_difference "Invite.count", 2 do
+            post :create,  :emails => [[Factory.next(:email),Factory.next(:email)]]
+          end
+        end
+        should "create a invitee" do
+          assert_difference "Invite.count", 2 do
+            post :create,  :emails => [[Factory.next(:email),Factory.next(:email)]]
           end
         end
       end
+      
     end
     
   end

data/test/rails_root/test/unit/invite_test.rb

@@ -5,136 +5,15 @@ class InviteTest < ActiveSupport::TestCase
   context "Invite" do
     setup do
       @user = Factory(:user)
-      @invite = Factory(:invite)
-      @user.invites << @invite
+      @invitee = Factory(:invitee)
+      @invite = Invite.create(:inviter => @user, :invitee => @invitee, :user => @user)
     end
 
     subject { @invite }
-    should_validate_presence_of :email
-    should_have_many :users
 
-    should_allow_values_for :email, 'a@x.com', 'de.veloper@example.com'
-    should_not_allow_values_for :email, 'example.com', '@example.com', 'developer@example', 'developer', :message => 'does not look like a valid email address.'
-
-    should "require email" do
-      assert_no_difference 'Invite.count' do
-        u = Factory.build(:invite, :email => nil)
-        assert !u.valid?
-        assert u.errors.on(:email)
-      end
-    end
-
-    should "not create new invites when more than one person invites the same email address" do
-      assert_no_difference 'Invite.count' do
-        u = Factory(:user)
-        u.invites << @invite
-        u.save!
-      end
-    end
-
-    should "be able to see how many inviters it has" do
-      assert_equal 1, @invite.users.size
-    end
-
-  end
-
-  context "User" do
-    setup do
-      @user = Factory(:user)
-    end
-
-    subject { @user }
-
-    should "be able to call invite with a single email address" do
-      @user.invite(Factory.next(:email))
-      assert_equal 1, @user.invites.size
-    end
-
-    should "be able to call invite with a string specifying a space delimited list of email addresses" do
-      @user.invite(Factory.next(:email) + ' ' + Factory.next(:email))
-      assert_equal 2, @user.invites.size
-    end
-
-    should "be able to call invite with a string specifying a comma delimited list of email addresses" do
-      @user.invite(Factory.next(:email) + ',  ' + Factory.next(:email) + ',' + Factory.next(:email) + ',')
-      assert_equal 3, @user.invites.size
-    end
-
-    should "be able to call invite with an array of email addresses" do
-      @user.invite([Factory.next(:email),Factory.next(:email)])
-      assert_equal 2, @user.invites.size
-    end
-
-    should "be able to look up who invited them by email" do
-      inviter = Factory(:user)
-      inviter.invites << Factory.build(:invite, :email => @user.email)
-      assert_equal Invite.who_invited?(@user.email).first, inviter
-    end
-
-    should "be able to look up who invited them by id" do
-      invite = Factory.build(:invite, :email => @user.email)
-
-      inviter = Factory(:user)
-      inviter.invites << Factory.build(:invite, :email => @user.email)
-      assert_equal Invite.who_invited?(@user.email).first, inviter
-    end
-
-    should "look up multiple inviters by email" do
-      invite = Factory.build(:invite, :email => @user.email)
-
-      inviter1 = Factory(:user)
-      inviter1.invites << invite
-
-      inviter2 = Factory(:user)
-      inviter2.invites << invite
-
-      inviters = Invite.who_invited?(@user.email)
-      assert_equal 2, inviters.count
-      assert inviters.include?(inviter1)
-      assert inviters.include?(inviter2)
-    end
-
-    should "not create new user invites if the user has invited them before" do
-      user = Factory(:user)
-      email = Factory.next(:email)
-      user.invite(email)
-      user.invite(email)
-      assert_equal 1, Invite.all.size
-      assert_equal 1, user.invites.size
-    end
+    should_belong_to :user
+    should_belong_to :inviter
+    should_belong_to :invitee
+    
   end
-
-  context "Always" do
-    should "be able to look up who invited them by id and by email" do
-      user1 = Factory(:user)
-      invite1 = Factory(:invite)
-      user1.invites << invite1
-
-      user2 = Factory(:user)
-      invite2 = Factory(:invite)
-      user2.invites << invite2
-
-      inviters = Invite.who_invited?(invite1.email, invite2.id)
-      assert_equal 2, inviters.size
-      assert inviters.include?(user1)
-      assert inviters.include?(user2)
-    end
-
-    should "notify inviters when a new user joins" do
-      user1 = Factory(:user)
-      invite1 = Factory(:invite)
-      user1.invites << invite1
-
-      user2 = Factory(:user)
-      invite2 = Factory(:invite)
-      user2.invites << invite2
-
-      user3 = Factory.build(:user, :email => invite1.email)
-
-      assert_nothing_raised do
-        user3.notify_inviters(invite2.id)
-      end 
-    end
-  end
-
 end

data/test/rails_root/test/unit/invitee_test.rb

@@ -0,0 +1,146 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class InviteeTest < ActiveSupport::TestCase
+  
+  context "Invitee" do
+    setup do
+      @user = Factory(:user)
+      @invitee = Factory(:invitee)
+      @invite = Invite.create(:inviter => @user, :invitee => @invitee, :user => @user)
+      @user.reload
+    end
+
+    subject { @invitee }
+    should_validate_presence_of :email
+    should_have_many :users
+
+    should_allow_values_for :email, 'a@x.com', 'de.veloper@example.com'
+    should_not_allow_values_for :email, 'example.com', '@example.com', 'developer@example', 'developer', :message => 'does not look like a valid email address.'
+
+    should "require email" do
+      assert_no_difference 'Invite.count' do
+        u = Factory.build(:invitee, :email => nil)
+        assert !u.valid?
+        assert u.errors.on(:email)
+      end
+    end
+
+    should "not create new invites when more than one person invites the same email address" do
+      assert_no_difference 'Invite.count' do
+        u = Factory(:user)
+        u.invites << @invite
+        u.save!
+      end
+    end
+
+    should "be able to see how many inviters it has" do
+      assert_equal 1, @invitee.users.size
+    end
+
+  end
+
+  context "User" do
+    setup do
+      @user = Factory(:user)
+    end
+
+    subject { @user }
+
+    should "be able to call invite with a single email address" do
+      @user.invite(Factory.next(:email), @user)
+      assert_equal 1, @user.invites.size
+    end
+
+    should "be able to call invite with a string specifying a space delimited list of email addresses" do
+      @user.invite(Factory.next(:email) + ' ' + Factory.next(:email), @user)
+      assert_equal 2, @user.invites.size
+    end
+
+    should "be able to call invite with a string specifying a comma delimited list of email addresses" do
+      @user.invite(Factory.next(:email) + ',  ' + Factory.next(:email) + ',' + Factory.next(:email) + ',', @user)
+      assert_equal 3, @user.invites.size
+    end
+
+    should "be able to call invite with an array of email addresses" do
+      @user.invite([Factory.next(:email),Factory.next(:email)], @user)
+      assert_equal 2, @user.invites.size
+    end
+
+    should "be able to look up who invited them by email" do
+      inviter = Factory(:user)
+      invitee = Factory.build(:invitee, :email => @user.email)
+      inviter.invites << Invite.create!(:inviter => inviter, :user => inviter, :invitee => invitee)
+      assert_equal Invitee.who_invited?(@user.email).first, inviter
+    end
+
+    should "be able to look up who invited them by id" do
+      invite = Factory.build(:invitee, :email => @user.email)
+
+      inviter = Factory(:user)
+      invitee = Factory.build(:invitee, :email => @user.email)
+      inviter.invites << Invite.create!(:inviter => inviter, :user => inviter, :invitee => invitee) 
+      assert_equal Invitee.who_invited?(@user.email).first, inviter
+    end
+
+    should "look up multiple inviters by email" do
+      invitee = Factory.build(:invitee, :email => @user.email)
+
+      inviter1 = Factory(:user)
+      inviter1.invites << Invite.create!(:inviter => inviter1, :user => inviter1, :invitee => invitee)
+
+      inviter2 = Factory(:user)
+      inviter2.invites << Invite.create!(:inviter => inviter2, :user => inviter2, :invitee => invitee)
+
+      inviters = Invitee.who_invited?(@user.email)
+      assert_equal 2, inviters.count
+      assert inviters.include?(inviter1)
+      assert inviters.include?(inviter2)
+    end
+
+    should "not create new user invites if the user has invited them before" do
+      user = Factory(:user)
+      email = Factory.next(:email)
+      assert_difference "Invite.count" do
+        user.invite(email, user)
+      end
+      user.reload # if you don't reload the invite just created won't show up.
+      assert_no_difference "Invite.count" do
+        user.invite(email, user)
+      end
+    end
+  end
+
+  context "Always" do
+    should "be able to look up who invited them by id and by email" do
+      user1 = Factory(:user)
+      invitee1 = Factory(:invitee)
+      user1.invites << Invite.create!(:inviter => user1, :user => user1, :invitee => invitee1)
+
+      user2 = Factory(:user)
+      invitee2 = Factory(:invitee)
+      user2.invites << Invite.create!(:inviter => user2, :user => user2, :invitee => invitee2)
+
+      inviters = Invitee.who_invited?(invitee1.email, invitee2.id)
+      assert_equal 2, inviters.size
+      assert inviters.include?(user1)
+      assert inviters.include?(user2)
+    end
+
+    should "notify inviters when a new user joins" do
+      user1 = Factory(:user)
+      invitee1 = Factory(:invitee)
+      user1.invites << Invite.create!(:inviter => user1, :user => user1, :invitee => invitee1)
+
+      user2 = Factory(:user)
+      invitee2 = Factory(:invitee)
+      user2.invites << Invite.create!(:inviter => user2, :user => user2, :invitee => invitee2)
+
+      user3 = Factory.build(:user, :email => invitee1.email)
+
+      assert_nothing_raised do
+        user3.notify_inviters(invitee2.id)
+      end 
+    end
+  end
+
+end

data/test/rails_root/test/unit/user_test.rb

@@ -5,9 +5,9 @@ class UserTest < ActiveSupport::TestCase
   context "A class that is inviteable" do
     setup do
       @user = Factory(:user)
-      email = Factory.next(:email)
-      @invite = @user.invites.build(:email => email)
-      @user.save!
+      @invitee = Factory(:invitee)      
+      Invite.create!(:inviter => @user, :invitee => @invitee, :user => @user)
+      @user.reload
     end
     
     should "have invites" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-invites
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Justin Ball, Joel Duffin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 -07:00
+date: 2009-11-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,7 +48,6 @@ files:
 - VERSION
 - app/controllers/muck/invites_controller.rb
 - app/models/invite_mailer.rb
-- app/models/user_invite.rb
 - app/views/invite_mailer/invite_notification.text.html.erb
 - app/views/invite_mailer/invite_notification.text.plain.erb
 - app/views/invite_mailer/invited_joined_notification.text.html.erb
@@ -57,8 +56,10 @@ files:
 - app/views/invites/new.html.erb
 - config/muck_invites_routes.rb
 - db/migrate/20090928213532_create_invites.rb
+- db/migrate/20091128170318_make_invites_polymorphic.rb
 - install.rb
 - lib/active_record/acts/muck_invite.rb
+- lib/active_record/acts/muck_invitee.rb
 - lib/active_record/acts/muck_inviter.rb
 - lib/muck_invites.rb
 - lib/muck_invites/initialize_routes.rb
@@ -121,6 +122,7 @@ files:
 - test/rails_root/app/models/.keep
 - test/rails_root/app/models/activity.rb
 - test/rails_root/app/models/invite.rb
+- test/rails_root/app/models/invitee.rb
 - test/rails_root/app/models/user.rb
 - test/rails_root/app/models/user_session.rb
 - test/rails_root/app/views/default/index.html.erb
@@ -149,6 +151,7 @@ files:
 - test/rails_root/db/migrate/20090703055724_add_contents.rb
 - test/rails_root/db/migrate/20090704220055_create_slugs.rb
 - test/rails_root/db/migrate/20090928213532_create_invites.rb
+- test/rails_root/db/migrate/20091128170318_make_invites_polymorphic.rb
 - test/rails_root/features/comments.feature
 - test/rails_root/features/step_definitions/comment_steps.rb
 - test/rails_root/features/step_definitions/common_steps.rb
@@ -356,6 +359,7 @@ files:
 - test/rails_root/test/unit/contacts_test.rb
 - test/rails_root/test/unit/invite_mailer_test.rb
 - test/rails_root/test/unit/invite_test.rb
+- test/rails_root/test/unit/invitee_test.rb
 - test/rails_root/test/unit/user_test.rb
 - test/rails_root/vendor/plugins/jrails/CHANGELOG
 - test/rails_root/vendor/plugins/jrails/LICENSE
@@ -411,6 +415,7 @@ test_files:
 - test/rails_root/app/helpers/application_helper.rb
 - test/rails_root/app/models/activity.rb
 - test/rails_root/app/models/invite.rb
+- test/rails_root/app/models/invitee.rb
 - test/rails_root/app/models/user.rb
 - test/rails_root/app/models/user_session.rb
 - test/rails_root/config/boot.rb
@@ -434,6 +439,7 @@ test_files:
 - test/rails_root/db/migrate/20090703055724_add_contents.rb
 - test/rails_root/db/migrate/20090704220055_create_slugs.rb
 - test/rails_root/db/migrate/20090928213532_create_invites.rb
+- test/rails_root/db/migrate/20091128170318_make_invites_polymorphic.rb
 - test/rails_root/features/step_definitions/comment_steps.rb
 - test/rails_root/features/step_definitions/common_steps.rb
 - test/rails_root/features/step_definitions/webrat_steps.rb
@@ -446,6 +452,7 @@ test_files:
 - test/rails_root/test/unit/contacts_test.rb
 - test/rails_root/test/unit/invite_mailer_test.rb
 - test/rails_root/test/unit/invite_test.rb
+- test/rails_root/test/unit/invitee_test.rb
 - test/rails_root/test/unit/user_test.rb
 - test/rails_root/vendor/plugins/jrails/init.rb
 - test/rails_root/vendor/plugins/jrails/install.rb

data/app/models/user_invite.rb

@@ -1,6 +0,0 @@
-class UserInvite < ActiveRecord::Base
-  unloadable
-
-  belongs_to :user
-  belongs_to :invite
-end