tonkapark-clearance 0.6.9.3 → 0.7.0

data/lib/clearance.rb

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

data/shoulda_macros/clearance.rb

@@ -132,6 +132,12 @@ module Clearance
       end
     end
 
+    def should_redirect_to_url_already_confirmed
+      should_redirect_to("the already confirmed url") do
+        @controller.send(:url_already_confirmed)
+      end
+    end
+
     # VALIDATIONS
 
     def should_validate_confirmation_of(attribute, opts = {})

metadata

@@ -1,34 +1,19 @@
 --- !ruby/object:Gem::Specification 
 name: tonkapark-clearance
 version: !ruby/object:Gem::Version 
-  version: 0.6.9.3
+  version: 0.7.0
 platform: ruby
 authors: 
-- Dan Croak
-- Mike Burns
-- Jason Morrison
-- Joe Ferris
-- Eugene Bolshakov
-- Nick Quaranto
-- Josh Nichols
-- Mike Breen
-- "Marcel G\xC3\xB6rner"
-- Bence Nagy
-- Ben Mabey
-- Eloy Duran
-- Tim Pope
-- Mihai Anca
-- Mark Cornick
-- Shay Arnett
+- Matt Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-07-15 22:00:00 -07:00
+date: 2009-08-26 22:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: Rails authentication with email & password and invitations.
+description: Rails authentication with email & password.
 email: matt@tonkapark.com
 executables: []
 
@@ -53,7 +38,6 @@ 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
@@ -63,7 +47,6 @@ 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
@@ -71,10 +54,7 @@ files:
 - app/views/sessions/new.html.erb
 - app/views/users
 - app/views/users/new.html.erb
-- app/views/users/_user.html.erb
-- app/views/invitations
-- app/views/invitations/new.html.erb
-- app/views/invitations/index.html.erb
+- app/views/users/_form.html.erb
 - config/clearance_routes.rb
 - generators/clearance
 - generators/clearance/clearance_generator.rb
@@ -86,11 +66,8 @@ 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
@@ -106,19 +83,33 @@ files:
 - generators/clearance_features/templates/features/support
 - generators/clearance_features/templates/features/support/paths.rb
 - generators/clearance_features/USAGE
+- generators/clearance_views
+- generators/clearance_views/clearance_views_generator.rb
+- generators/clearance_views/templates
+- generators/clearance_views/templates/formtastic
+- generators/clearance_views/templates/formtastic/passwords
+- generators/clearance_views/templates/formtastic/passwords/edit.html.erb
+- generators/clearance_views/templates/formtastic/passwords/new.html.erb
+- generators/clearance_views/templates/formtastic/sessions
+- generators/clearance_views/templates/formtastic/sessions/new.html.erb
+- generators/clearance_views/templates/formtastic/users
+- generators/clearance_views/templates/formtastic/users/new.html.erb
+- generators/clearance_views/templates/formtastic/users/_inputs.html.erb
+- generators/clearance_views/USAGE
 - lib/clearance
 - lib/clearance/authentication.rb
 - lib/clearance/extensions
 - 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
 - rails/init.rb
 has_rdoc: true
-homepage: http://github.com/tonkapark/clearance
+homepage: http://github.com/thoughtbot/clearance
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -139,9 +130,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Rails authentication with email & password.
+summary: Forked thoughbot/clearance. Rails authentication with email & password.
 test_files: []
 

data/app/controllers/clearance/invitations_controller.rb

@@ -1,40 +0,0 @@
-class Clearance::InvitationsController < ApplicationController
-  unloadable
-  
-  before_filter :redirect_to_root, :only => [:new, :create], :if => :signed_in?
-  before_filter :admin_only, :only => [:index]
-  
-  def index
-    @invitations = ::Invitation.all
-    render :template => 'invitations/index'
-  end
-  
-  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
-  
-  private
-    def admin_only
-      unless current_user.admin?
-        redirect_to root_url
-      end
-    end
-end

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

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

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

@@ -1,19 +0,0 @@
-<h2>Invitations</h2>
-
-<table>
-  <tr>
-    <th>Recipient</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

@@ -1,15 +0,0 @@
-<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/users/_user.html.erb

@@ -1,28 +0,0 @@
-
-<% 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/generators/clearance/templates/invitation.rb

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

@@ -1,20 +0,0 @@
-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/update_invitations.rb

@@ -1,40 +0,0 @@
-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/lib/clearance/invitation.rb

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