tonkapark-clearance 0.6.9.1 → 0.6.9.2

data/CHANGELOG.textile

@@ -1,3 +1,7 @@
+h2. 0.6.9.2 (7/21/09)
+
+* forked and added invitations and clearance.yml (Matt Anderson[http://tonkapark.com])
+
 h2. 0.6.9 (07/04/2009)
 
 * Added timestamps to create users migration. (Dan Croak)

data/README.textile

@@ -1,6 +1,6 @@
 h1. Clearance
 
-Rails authentication with email & password.
+Rails authentication with email & password, *and invitations*.
 
 "We have clearance, Clarence.":http://www.youtube.com/v/mNRXJEE3Nz8
 
@@ -15,10 +15,10 @@ Clearance is a Rails engine. It works with versions of Rails greater than 2.3.
 In config/environment.rb:
 
 <pre>
-config.gem "thoughtbot-clearance", 
+config.gem "tonkapark-clearance", 
   :lib     => 'clearance', 
   :source  => 'http://gems.github.com', 
-  :version => '0.6.9'
+  :version => '0.6.9.2'
 </pre>
 
 Vendor the gem:
@@ -41,17 +41,16 @@ Run the migration:
 @rake db:migrate@
 
 Define a HOST constant in your environment files.
-In config/environments/test.rb and config/environments/development.rb it can be:
-
-@HOST = "localhost"@
-
-In production.rb it must be the actual host your application is deployed to.
-The constant is used by mailers to generate URLs in emails.
-
-In config/environment.rb:
-
-@DO_NOT_REPLY = "donotreply@example.com"@
+In config/clearance.yml:
 
+<pre>
+production:
+  host: you_production_host.com
+  do_not_reply: do_not_reply@you_production_host.com
+  invitation_subject_line: An Invitation
+  invitation_from_email: invitation@you_production_host.com
+</pre>  
+  
 Define root_url to *something* in your config/routes.rb:
 
 @map.root :controller => 'home'@

data/Rakefile

@@ -53,11 +53,11 @@ task :default => ['test:all', 'test:features']
 
 gem_spec = Gem::Specification.new do |gem_spec|
   gem_spec.name        = "clearance"
-  gem_spec.version     = "0.6.9.1"
-  gem_spec.summary     = "Rails authentication with email & password."
+  gem_spec.version     = "0.6.9.2"
+  gem_spec.summary     = "Rails authentication with email & password and invitations."
   gem_spec.email       = "matt@tonkapark.com"
   gem_spec.homepage    = "http://github.com/tonkapark/clearance"
-  gem_spec.description = "Rails authentication with email & password."
+  gem_spec.description = "Rails authentication with email & password and invitations."
   gem_spec.authors     = ["Dan Croak", "Mike Burns", "Jason Morrison",
                           "Joe Ferris", "Eugene Bolshakov", "Nick Quaranto",
                           "Josh Nichols", "Mike Breen", "Marcel Görner",

data/app/controllers/clearance/invitations_controller.rb

@@ -0,0 +1,28 @@
+class Clearance::InvitationsController < ApplicationController
+  unloadable
+  
+  before_filter :redirect_to_root, :only => [:new, :create], :if => :signed_in?
+  
+  def new
+    @invitation = ::Invitation.new(params[:invitation])
+    render :template => 'invitations/new'
+  end
+  
+  def create
+    @invitation = ::Invitation.new(params[:invitation])
+    @invitation.sender = current_user
+    if @invitation.save
+      if signed_in?
+      ::ClearanceMailer.deliver_invitation(@invitation, signup_url(@invitation.token))
+      flash[:notice] = "Thank you, an invitation has been sent."
+      redirect_to root_url
+      else
+        flash[:notice] = "Thank you for your interest, your invitation has been received."
+        redirect_to root_url
+      end
+    else
+      render :action => 'new'
+    end
+  end
+  
+end

data/app/controllers/clearance/passwords_controller.rb

@@ -68,7 +68,7 @@ class Clearance::PasswordsController < ApplicationController
   end
 
   def url_after_create
-    new_session_url
+    signin_url
   end
 
   def flash_success_after_update

data/app/controllers/clearance/sessions_controller.rb

@@ -62,6 +62,6 @@ class Clearance::SessionsController < ApplicationController
   end
 
   def url_after_destroy
-    new_session_url
+    signin_url
   end
 end

data/app/controllers/clearance/users_controller.rb

@@ -4,8 +4,9 @@ class Clearance::UsersController < ApplicationController
   before_filter :redirect_to_root, :only => [:new, :create], :if => :signed_in?
   filter_parameter_logging :password
 
-  def new
-    @user = ::User.new(params[:user])
+  def new    
+    @user = ::User.new(:invitation_token => params[:invitation_token])
+    @user.email = @user.invitation.recipient_email if @user.invitation
     render :template => 'users/new'
   end
 
@@ -30,6 +31,6 @@ class Clearance::UsersController < ApplicationController
   end
 
   def url_after_create
-    new_session_url
+    signin_url
   end
 end

data/app/models/clearance_mailer.rb

@@ -1,9 +1,22 @@
 class ClearanceMailer < ActionMailer::Base
 
-  default_url_options[:host] = HOST
+  def self.config_file
+    File.join(RAILS_ROOT, 'config', 'clearance.yml')
+  end
+  
+  def self.config
+    YAML.load(File.read(config_file)).with_indifferent_access[RAILS_ENV]
+  end
+
+  def config
+    self.class.config
+  end
+
+  default_url_options[:host] = config[:host]
+
 
   def change_password(user)
-    from       DO_NOT_REPLY
+    from        config[:do_not_reply]
     recipients user.email
     subject    I18n.t(:change_password,
                       :scope   => [:clearance, :models, :clearance_mailer],
@@ -12,12 +25,21 @@ class ClearanceMailer < ActionMailer::Base
   end
 
   def confirmation(user)
-    from       DO_NOT_REPLY
+    from        config[:do_not_reply]
     recipients user.email
     subject    I18n.t(:confirmation,
                       :scope   => [:clearance, :models, :clearance_mailer],
                       :default => "Account confirmation")
     body      :user => user
   end
+  
+  def invitation(invitation, url)
+    subject    config[:invitation_subject_line]
+    recipients invitation.recipient_email
+    from        config[:invitation_from_email]        
+    body       :invitation => invitation, :signup_url => url
+    invitation.update_attribute(:invited_at, Time.now)
+  end
+
 
 end

data/app/views/clearance_mailer/invitation.html.erb

@@ -0,0 +1,3 @@
+You have been invited to join our website.
+
+<%= @signup_url %>

data/app/views/invitations/index.html.erb

@@ -0,0 +1,20 @@
+<h2>Invitations</h2>
+
+<table>
+  <tr>
+    <th>Recipient</th>
+    <th>Invited By</th>
+    <th>Invited At</th>
+    <th>Redeemed At</th>
+    <th></th>
+  </tr>
+  
+<% @invitations.each do |invite| %>
+<tr>
+  <td><%= invite.recipient_email %></td>
+  <td><%= invite.invited_at %></td>
+  <td><%= invite.redeemed_at %></td>
+  <td><%= link_to "Redeem Link", signup_url(invite.token) %></td>
+</tr>
+<% end %>
+</table>

data/app/views/invitations/new.html.erb

@@ -0,0 +1,15 @@
+<h2>Request Invitation</h2>
+
+<% form_for @invitation do |f| %>
+  <%= f.error_messages %>
+  <ul>
+    <li>
+      <%= f.label :recipient_email, "Your Email" %><br />
+      <p class="instructions">This email will be used for your account.</p>
+      <%= f.text_field :recipient_email, {:class => "big"} %>
+    </li>
+  </ul>
+  <p><%= f.submit "Submit" %></p>
+<% end %>
+
+

data/app/views/passwords/edit.html.erb

@@ -9,15 +9,17 @@
 <% form_for(:user,
             :url => user_password_path(@user, :token    => @user.token),
             :html => { :method => :put }) do |form| %>
-  <div class="password_field">
-    <%= form.label :password, "Choose password" %>
-    <%= form.password_field :password %>
-  </div>
-  <div class="password_field">
-    <%= form.label :password_confirmation, "Confirm password" %>
-    <%= form.password_field :password_confirmation %>
-  </div>
-  <div class="submit_field">
-    <%= form.submit "Save this password", :disable_with => "Please wait..." %>
-  </div>
-<% end %>
+  <ul>
+    <li>
+      <%= form.label :password, "Choose password" %>
+      <%= form.password_field :password, {:class => "big"} %>
+    </li>
+    <li>
+      <%= form.label :password_confirmation, "Confirm password" %>
+      <%= form.password_field :password_confirmation, {:class => "big"} %>
+    </li>
+    <li class="submit">
+      <%= form.submit "Save this password", :disable_with => "Please wait..." %>
+    </li>
+  </ul>
+<% end %>

data/app/views/passwords/new.html.erb

@@ -1,15 +1,16 @@
 <h2>Change your password</h2>
-
 <p>
   We will email you a link to change your password.
 </p>
 
 <% form_for :password, :url => passwords_path do |form| %>
-  <div class="text_field">
-    <%= form.label :email, "Email address" %>
-    <%= form.text_field :email %>
-  </div>
-  <div class="submit_field">
-    <%= form.submit "Reset password", :disable_with => "Please wait..." %>
-  </div>
-<% end %>
+  <ul>
+    <li>
+      <%= form.label :email, "Email address" %>
+      <%= form.text_field :email, {:class => "big"} %>
+    </li>
+    <li class="submit">
+      <%= form.submit "Reset password", :disable_with => "Please wait..." %>
+    </li>
+  </ul>
+<% end %>

data/app/views/sessions/new.html.erb

@@ -1,28 +1,3 @@
 <h2>Sign in</h2>
 
-<% form_for :session, :url => session_path do |form| %>
-  <div class="text_field">
-    <%= form.label :email %>
-    <%= form.text_field :email %>  
-  </div>
-  <div class="text_field">
-    <%= form.label :password %>
-    <%= form.password_field :password %>
-  </div>
-  <div class="text_field">
-    <%= form.check_box :remember_me %>
-    <%= form.label :remember_me %>
-  </div>
-  <div class="submit_field">
-    <%= form.submit "Sign in", :disable_with => "Please wait..." %>
-  </div>
-<% end %>
-
-<ul>
-  <li>
-    <%= link_to "Sign up", new_user_path %>
-  </li>
-  <li>
-    <%= link_to "Forgot password?", new_password_path %>
-  </li>
-</ul>
+<%= render :partial => 'sessions/form' %>

data/app/views/users/_user.html.erb

@@ -0,0 +1,28 @@
+
+<% form_for(@user, :html => {:id => "user_form"}) do |form| %>
+
+  <%= form.error_messages %>
+  
+  <ul>
+    <li>
+      <label for="user_email">Email <small>We'll keep it a secret.</small></label>
+      <%= form.text_field :email, {:class => "big"} %>
+    </li>
+    
+    <li>
+      <%= form.label :password %>
+      <%= form.password_field :password, {:class => "big"} %>
+    </li>
+    
+    <li>
+      <%= form.label :password_confirmation, "Confirm password" %>
+      <%= form.password_field :password_confirmation, {:class => "big"} %>
+    </li>
+      
+    <% if @user.new_record? %>
+    <%= form.hidden_field :invitation_token %>
+    <% end %>
+
+    <li class="submit"><%= form.submit button_name, :disable_with => 'Please wait...' %> | <% if @user.new_record? %><%= link_to 'Cancel', root_url %><% else %><%= link_to 'Sign In', signin_path %><% end %></li>
+  </ul>
+<% end %>

data/app/views/users/new.html.erb

@@ -1,6 +1,4 @@
-<h2>Sign up</h2>
+<h2>Signup</h2>
+
+<%= render :partial => 'users/user', :locals => {:button_name => "Create my account"} %>
 
-<% form_for @user do |form| %>
-  <%= render :partial => '/users/form', :object => form %>
-  <%= form.submit 'Sign up', :disable_with => 'Please wait...' %>
-<% end %>

data/clearance.gemspec

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: clearance
 version: !ruby/object:Gem::Version 
-  version: 0.6.9.1
+  version: 0.6.9.2
 platform: ruby
 authors: 
 - Dan Croak
@@ -28,7 +28,7 @@ date: 2009-07-16 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: Rails authentication with email & password.
+description: Rails authentication with email & password and invitations.
 email: matt@tonkapark.com
 executables: []
 
@@ -53,6 +53,7 @@ files:
 - app/controllers
 - app/controllers/clearance
 - app/controllers/clearance/confirmations_controller.rb
+- app/controllers/clearance/invitations_controller.rb
 - app/controllers/clearance/passwords_controller.rb
 - app/controllers/clearance/sessions_controller.rb
 - app/controllers/clearance/users_controller.rb
@@ -62,6 +63,7 @@ files:
 - app/views/clearance_mailer
 - app/views/clearance_mailer/change_password.html.erb
 - app/views/clearance_mailer/confirmation.html.erb
+- app/views/clearance_mailer/invitation.html.erb
 - app/views/passwords
 - app/views/passwords/edit.html.erb
 - app/views/passwords/new.html.erb
@@ -69,7 +71,10 @@ files:
 - app/views/sessions/new.html.erb
 - app/views/users
 - app/views/users/new.html.erb
-- app/views/users/_form.html.erb
+- app/views/users/_user.html.erb
+- app/views/invitations
+- app/views/invitations/new.html.erb
+- app/views/invitations/index.html.erb
 - config/clearance_routes.rb
 - generators/clearance
 - generators/clearance/clearance_generator.rb
@@ -81,8 +86,11 @@ files:
 - generators/clearance/templates/migrations
 - generators/clearance/templates/migrations/create_users.rb
 - generators/clearance/templates/migrations/update_users.rb
+- generators/clearance/templates/migrations/create_invitations.rb
+- generators/clearance/templates/migrations/update_invitations.rb
 - generators/clearance/templates/README
 - generators/clearance/templates/user.rb
+- generators/clearance/templates/invitation.rb
 - generators/clearance/USAGE
 - generators/clearance_features
 - generators/clearance_features/clearance_features_generator.rb
@@ -104,6 +112,7 @@ files:
 - lib/clearance/extensions/errors.rb
 - lib/clearance/extensions/rescue.rb
 - lib/clearance/extensions/routes.rb
+- lib/clearance/invitation.rb
 - lib/clearance/user.rb
 - lib/clearance.rb
 - shoulda_macros/clearance.rb

data/config/clearance_routes.rb

@@ -1,7 +1,7 @@
 ActionController::Routing::Routes.draw do |map|
   map.resources :passwords,
     :controller => 'clearance/passwords',
-    :only       => [:new, :create]
+    :only       => [:create]
 
   map.resource  :session,
     :controller => 'clearance/sessions',
@@ -17,13 +17,19 @@ ActionController::Routing::Routes.draw do |map|
       :only       => [:new, :create]
   end
 
-  map.sign_up  'sign_up',
+  map.resources :invitations,
+    :controller => 'clearance/invitations',
+    :only       => [:new, :create]
+
+  map.recover_password '/recover_password', :controller =>'clearance/passwords', :action => 'new'
+
+  map.signup  '/signup/:invitation_token',
     :controller => 'clearance/users',
     :action     => 'new'
-  map.sign_in  'sign_in',
+  map.signin  'login',
     :controller => 'clearance/sessions',
     :action     => 'new'
-  map.sign_out 'sign_out',
+  map.logout 'logout',
     :controller => 'clearance/sessions',
     :action     => 'destroy',
     :method     => :delete

data/generators/clearance/clearance_generator.rb

@@ -12,6 +12,7 @@ class ClearanceGenerator < Rails::Generator::Base
       user_model = "app/models/user.rb"
       if File.exists?(user_model)
         m.insert_into user_model, "include Clearance::User"
+        m.insert_into user_model, "belongs_to :invitation"
       else
         m.directory File.join("app", "models")
         m.file "user.rb", user_model
@@ -20,17 +21,35 @@ class ClearanceGenerator < Rails::Generator::Base
       m.directory File.join("test", "factories")
       m.file "factories.rb", "test/factories/clearance.rb"
 
-      m.migration_template "migrations/#{migration_name}.rb",
+      m.migration_template "migrations/#{user_migration_name}.rb",
                            'db/migrate',
-                           :migration_file_name => "clearance_#{migration_name}"
+                           :migration_file_name => "clearance_#{user_migration_name}"
 
+      m.directory File.join("config")
+      m.file "clearance.yml", 'config/clearance.yml'
+
+      invitation_model = "app/models/invitation.rb"
+      if File.exists?(invitation_model)
+        m.insert_into invitation_model, "include Clearance::Invitation"
+        m.insert_into invitation_model, "belongs_to :sender, :class_name => 'User', :foreign_key => :sender_id"
+      else
+        m.directory File.join("app", "models")
+        m.file "invitation.rb", invitation_model
+      end
+
+      m.migration_template "migrations/#{invitation_migration_name}.rb",
+                           'db/migrate',
+                           :migration_file_name => "clearance_#{invitation_migration_name}"
+                           
+
+                           
       m.readme "README"
     end
   end
 
   private
 
-  def migration_name
+  def user_migration_name
     if ActiveRecord::Base.connection.table_exists?(:users)
       'update_users'
     else
@@ -38,4 +57,12 @@ class ClearanceGenerator < Rails::Generator::Base
     end
   end
 
+  def invitation_migration_name
+    if ActiveRecord::Base.connection.table_exists?(:invitations)
+      'update_invitations'
+    else
+      'create_invitations'
+    end
+  end
+
 end

data/generators/clearance/templates/README

@@ -1,22 +1,22 @@
 
 *******************************************************************************
-
+ 
 Ok, enough fancy automatic stuff. Time for some old school monkey copy-pasting.
-
-1. Define a HOST constant in your environments files.
-In config/environments/test.rb and config/environments/development.rb it can be:
-
-    HOST = "localhost"
-
-In production.rb it must be the actual host your application is deployed to.
-The constant is used by mailers to generate URLs in emails.
-
-2. In config/environment.rb:
-
-    DO_NOT_REPLY = "donotreply@example.com"
-
-3. Define root_url to *something* in your config/routes.rb:
-
+ 
+1. A a clearance.yml config file has been created in your config/ directory.
+ 
+Use it to configure the host name and sender of clearance generated emails.
+In production it must be the actual host your application is deployed to.
+The config is used by mailers to generate URLs in emails.
+ 
+It can look like this:
+ 
+production:
+  host: you_production_host.com
+  do_not_reply: do_not_reply@you_production_host.com
+ 
+2. Define root_url to *something* in your config/routes.rb:
+ 
     map.root :controller => 'home'
-
+ 
 *******************************************************************************

data/generators/clearance/templates/invitation.rb

@@ -0,0 +1,4 @@
+class Invitation < ActiveRecord::Base
+  include Clearance::Invitation
+  belongs_to :sender, :class_name => 'User', :foreign_key => :sender_id
+end

data/generators/clearance/templates/migrations/create_invitations.rb

@@ -0,0 +1,20 @@
+class ClearanceCreateInvitations < ActiveRecord::Migration
+  def self.up
+    create_table(:invitations) do |t|
+      t.integer :sender_id
+      t.string :recipient_email
+      t.string :token
+      t.datetime :invited_at
+      t.datetime :redeemed_at
+      t.timestamps
+    end
+
+    add_index :invitations, [:id, :token]
+    add_index :invitations, :recipient_email
+    add_index :invitations, :token
+  end
+
+  def self.down
+    drop_table :invitations
+  end
+end

data/generators/clearance/templates/migrations/create_users.rb

@@ -7,6 +7,8 @@ class ClearanceCreateUsers < ActiveRecord::Migration
       t.string   :token,              :limit => 128
       t.datetime :token_expires_at
       t.boolean  :email_confirmed, :default => false, :null => false
+      t.integer :invitation_id
+      t.integer :invitation_limit
       t.timestamps
     end
 

data/generators/clearance/templates/migrations/update_invitations.rb

@@ -0,0 +1,40 @@
+class ClearanceUpdateUsers < ActiveRecord::Migration
+  def self.up
+<% 
+      existing_columns = ActiveRecord::Base.connection.columns(:users).collect { |each| each.name }
+      columns = [
+        [:sender_id,              't.integer :sender_id'],
+        [:recipient_email, 't.string :recipient_email, :limit => 128'],
+        [:token,              't.string :token, :limit => 128'],
+        [:invited_at,    't.datetime :invited_at'],
+        [:redeemed_at,    't.datetime :redeemed_at']
+      ].delete_if {|c| existing_columns.include?(c.first.to_s)} 
+-%>
+    change_table(:users) do |t|
+<% columns.each do |c| -%>
+      <%= c.last %>
+<% end -%>
+    end
+    
+<%
+    existing_indexes = ActiveRecord::Base.connection.indexes(:users)
+    index_names = existing_indexes.collect { |each| each.name }
+    new_indexes = [
+      [:index_invitations_on_id_and_token, 'add_index :invitations, [:id, :token]'],
+      [:index_invitations_on_email,        'add_index :invitations, :recipient_email'],
+      [:index_invitations_on_token,        'add_index :invitations, :token']
+    ].delete_if { |each| index_names.include?(each.first.to_s) }
+-%>
+<% new_indexes.each do |each| -%>
+    <%= each.last %>
+<% end -%>
+  end
+  
+  def self.down
+    change_table(:invitations) do |t|
+<% unless columns.empty? -%>
+      t.remove <%= columns.collect { |each| ":#{each.first}" }.join(',') %>
+<% end -%>
+    end
+  end
+end

data/generators/clearance/templates/migrations/update_users.rb

@@ -8,7 +8,9 @@ class ClearanceUpdateUsers < ActiveRecord::Migration
         [:salt,               't.string :salt, :limit => 128'],
         [:token,              't.string :token, :limit => 128'],
         [:token_expires_at,   't.datetime :token_expires_at'],
-        [:email_confirmed,    't.boolean :email_confirmed, :default => false, :null => false']
+        [:email_confirmed,    't.boolean :email_confirmed, :default => false, :null => false'],
+        [:invitation_id,    't.integer :invitation_id'],
+        [:invitation_limit,    't.integer :invitation_limit']
       ].delete_if {|c| existing_columns.include?(c.first.to_s)} 
 -%>
     change_table(:users) do |t|

data/generators/clearance/templates/user.rb

@@ -1,3 +1,4 @@
 class User < ActiveRecord::Base
   include Clearance::User
+  belongs_to :invitation
 end

data/lib/clearance/authentication.rb

@@ -92,7 +92,7 @@ module Clearance
       def deny_access(flash_message = nil, opts = {})
         store_location
         flash[:failure] = flash_message if flash_message
-        redirect_to(new_session_url)
+        redirect_to(signin_url)
       end
     end
 

data/lib/clearance/invitation.rb

@@ -0,0 +1,87 @@
+module Clearance
+  module Invitation
+
+    def self.included(model)
+      model.extend(ClassMethods)
+
+      model.send(:include, InstanceMethods)
+      model.send(:include, AttrAccessible)
+      model.send(:include, AttrAccessor)
+      model.send(:include, Validations)
+      model.send(:include, Callbacks)
+    end
+
+    module AttrAccessible
+      def self.included(model)
+        model.class_eval do
+          attr_accessible :recipient_email
+        end
+      end
+    end
+
+    module AttrAccessor
+      def self.included(model)
+        model.class_eval do
+          
+        end
+      end
+    end
+
+    module Validations
+      def self.included(model)
+        model.class_eval do
+          validates_presence_of     :recipient_email
+          validates_format_of       :recipient_email, :with => %r{.+@.+\..+}
+          
+          validate :recipient_is_not_registered
+          validate :sender_has_invitations, :if => :sender
+        end
+      end
+    end
+
+    module Callbacks
+      def self.included(model)
+        model.class_eval do
+          before_create :generate_token
+          before_create :decrement_sender_count, :if => :sender
+        end
+      end
+    end
+
+    module InstanceMethods
+
+      def redeemed!
+        self.redeemed_at = Time.now.utc
+        self.save!
+      end
+      
+      def self.find_redeemable(invitation_code)
+        self.find(:first, :conditions => {:redeemed_at => nil, :token => invitation_code})
+      end
+
+      protected
+      
+      def recipient_is_not_registered
+        errors.add :recipient_email, 'is already registered' if ::User.find_by_email(recipient_email)
+      end
+
+      def sender_has_invitations
+        unless sender.invitation_limit > 0
+          errors.add_to_base 'You have reached your limit of invitations to send.'
+        end
+      end
+
+      def generate_token
+        self.token = Digest::SHA1.hexdigest([Time.now, rand].join)
+      end
+
+      def decrement_sender_count
+        sender.decrement! :invitation_limit
+      end
+    end
+
+    module ClassMethods
+    end
+
+  end
+end

data/lib/clearance/user.rb

@@ -16,7 +16,7 @@ module Clearance
     module AttrAccessible
       def self.included(model)
         model.class_eval do
-          attr_accessible :email, :password, :password_confirmation
+          attr_accessible :email, :password, :password_confirmation, :invitation_token
         end
       end
     end
@@ -38,6 +38,9 @@ module Clearance
 
           validates_presence_of     :password, :if => :password_required?
           validates_confirmation_of :password, :if => :password_required?
+          
+          validates_presence_of :invitation_id, :message => 'is required', :if => Proc.new { |u| u.new_record?}
+          validates_uniqueness_of :invitation_id, :if => Proc.new { |u| u.new_record?}
         end
       end
     end
@@ -45,7 +48,8 @@ module Clearance
     module Callbacks
       def self.included(model)
         model.class_eval do
-          before_save :initialize_salt, :encrypt_password, :initialize_token
+          before_save :initialize_salt, :encrypt_password, :initialize_token, :downcase_email
+          before_create :set_invitation_limit, :redeemed
         end
       end
     end
@@ -89,6 +93,14 @@ module Clearance
         clear_token if valid?
         save
       end
+      
+      def invitation_token
+        invitation.token if invitation
+      end
+
+      def invitation_token=(token)
+        self.invitation = ::Invitation.find_by_token(token)
+      end
 
       protected
 
@@ -130,6 +142,18 @@ module Clearance
         self.token = encrypt("--#{token_expires_at}--#{password}--")
         save(false)
       end
+      
+      def downcase_email
+        self.email = email.to_s.downcase
+      end
+      
+      def set_invitation_limit
+          self.invitation_limit = 5
+      end
+      
+      def redeemed
+        invitation.redeemed! if invitation
+      end
     end
 
     module ClassMethods

data/lib/clearance.rb

@@ -4,3 +4,4 @@ require 'clearance/extensions/routes'
 
 require 'clearance/authentication'
 require 'clearance/user'
+require 'clearance/invitation'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tonkapark-clearance
 version: !ruby/object:Gem::Version 
-  version: 0.6.9.1
+  version: 0.6.9.2
 platform: ruby
 authors: 
 - Dan Croak
@@ -28,7 +28,7 @@ date: 2009-07-15 22:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: Rails authentication with email & password.
+description: Rails authentication with email & password and invitations.
 email: matt@tonkapark.com
 executables: []
 
@@ -53,6 +53,7 @@ files:
 - app/controllers
 - app/controllers/clearance
 - app/controllers/clearance/confirmations_controller.rb
+- app/controllers/clearance/invitations_controller.rb
 - app/controllers/clearance/passwords_controller.rb
 - app/controllers/clearance/sessions_controller.rb
 - app/controllers/clearance/users_controller.rb
@@ -62,6 +63,7 @@ files:
 - app/views/clearance_mailer
 - app/views/clearance_mailer/change_password.html.erb
 - app/views/clearance_mailer/confirmation.html.erb
+- app/views/clearance_mailer/invitation.html.erb
 - app/views/passwords
 - app/views/passwords/edit.html.erb
 - app/views/passwords/new.html.erb
@@ -69,7 +71,10 @@ files:
 - app/views/sessions/new.html.erb
 - app/views/users
 - app/views/users/new.html.erb
-- app/views/users/_form.html.erb
+- app/views/users/_user.html.erb
+- app/views/invitations
+- app/views/invitations/new.html.erb
+- app/views/invitations/index.html.erb
 - config/clearance_routes.rb
 - generators/clearance
 - generators/clearance/clearance_generator.rb
@@ -81,8 +86,11 @@ files:
 - generators/clearance/templates/migrations
 - generators/clearance/templates/migrations/create_users.rb
 - generators/clearance/templates/migrations/update_users.rb
+- generators/clearance/templates/migrations/create_invitations.rb
+- generators/clearance/templates/migrations/update_invitations.rb
 - generators/clearance/templates/README
 - generators/clearance/templates/user.rb
+- generators/clearance/templates/invitation.rb
 - generators/clearance/USAGE
 - generators/clearance_features
 - generators/clearance_features/clearance_features_generator.rb
@@ -104,6 +112,7 @@ files:
 - lib/clearance/extensions/errors.rb
 - lib/clearance/extensions/rescue.rb
 - lib/clearance/extensions/routes.rb
+- lib/clearance/invitation.rb
 - lib/clearance/user.rb
 - lib/clearance.rb
 - shoulda_macros/clearance.rb

data/app/views/users/_form.html.erb

@@ -1,13 +0,0 @@
-<%= form.error_messages %>
-<div class="text_field">
-  <%= form.label :email %>
-  <%= form.text_field :email %>
-</div>
-<div class="password_field">
-  <%= form.label :password %>
-  <%= form.password_field :password %>
-</div>
-<div class="password_field">
-  <%= form.label :password_confirmation, "Confirm password" %>
-  <%= form.password_field :password_confirmation %>
-</div>