devise_invitable 0.3.0 → 0.3.1

data/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,108 @@
+PATH
+  remote: .
+  specs:
+    devise_invitable (0.3.0)
+      devise (~> 1.1.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.0)
+      actionpack (= 3.0.0)
+      mail (~> 2.2.5)
+    actionpack (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4.1)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.12)
+      rack-test (~> 0.5.4)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.0)
+      activesupport (= 3.0.0)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activerecord (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+      arel (~> 1.0.0)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+    activesupport (3.0.0)
+    arel (1.0.1)
+      activesupport (~> 3.0.0)
+    bcrypt-ruby (2.1.2)
+    builder (2.1.2)
+    capybara (0.3.9)
+      culerity (>= 0.2.4)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (>= 0.0.3)
+    culerity (0.2.12)
+    devise (1.1.2)
+      bcrypt-ruby (~> 2.1.2)
+      warden (~> 0.10.7)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
+    i18n (0.4.1)
+    json_pure (1.4.6)
+    mail (2.2.6)
+      activesupport (>= 2.3.6)
+      mime-types
+      treetop (>= 1.4.5)
+    mime-types (1.16)
+    mocha (0.9.8)
+      rake
+    nokogiri (1.4.3.1)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.4)
+      rack (>= 1.0)
+    rails (3.0.0)
+      actionmailer (= 3.0.0)
+      actionpack (= 3.0.0)
+      activerecord (= 3.0.0)
+      activeresource (= 3.0.0)
+      activesupport (= 3.0.0)
+      bundler (~> 1.0.0)
+      railties (= 3.0.0)
+    railties (3.0.0)
+      actionpack (= 3.0.0)
+      activesupport (= 3.0.0)
+      rake (>= 0.8.4)
+      thor (~> 0.14.0)
+    rake (0.8.7)
+    rubyzip (0.9.4)
+    selenium-webdriver (0.0.28)
+      ffi (>= 0.6.1)
+      json_pure
+      rubyzip
+    sqlite3-ruby (1.3.1)
+    thor (0.14.0)
+    treetop (1.4.8)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.23)
+    warden (0.10.7)
+      rack (>= 1.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  capybara (>= 0.3.9)
+  devise (~> 1.1.0)
+  devise_invitable!
+  mocha (>= 0.9.8)
+  rails (~> 3.0.0)
+  sqlite3-ruby

data/README.rdoc

@@ -58,6 +58,18 @@ You have to configure mailer as it's required for confirmable and recoverable.
 
 It uses two flash messages, :send_invitation and :updated, which are translated as other flash messages from devise.
 
+== Sending an invitation
+
+To send an invitation to a user use send_invitation class model. You must set email in the attributes hash:
+
+  User.send_invitation(:email => 'new_user@example.com')
+
+To accept an invitation with a token use accept_invitation! class model. You must set invitiation_token attribute, and you can include other attriutes in the hash, which will be updated in the record.
+
+  User.accept_invitation!(:invitation_token => params[:invitation_token])
+
+Invitations controller implement this. You can go to /users/invitation/new to send an invitation and an email will be sent with a link to accept in invitiation with a URL like /users/invitation/accept?invitation_token=...
+
 == Adding Invitable to a running application
 
 Define a migration to add invitable to your model:
@@ -74,7 +86,7 @@ Define a migration to add invitable to your model:
 
 Add :invitable to the devise line of your model, or to config.all in devise initializer if your model uses devise :all.
 
-Override authenticate_resource! filter if you need to customize who can send invitations.
+Override authenticate_resource! filter if you need to customize who can send invitations as it's explained in controller filters section.
 
 == Note on Patches/Pull Requests
  

data/Rakefile

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'rake'
 
 begin
@@ -10,8 +9,10 @@ begin
     gem.email = "sergio@entrecables.com"
     gem.homepage = "http://github.com/scambra/devise_invitable"
     gem.authors = ["Sergio Cambra"]
-    gem.add_development_dependency 'mocha'
-    gem.add_development_dependency 'webrat'
+    gem.add_development_dependency 'mocha', '>= 0.9.8'
+    gem.add_development_dependency 'capybara', '>= 0.3.9'
+    gem.add_development_dependency 'rails', '~> 3.0.0'
+    gem.add_development_dependency 'sqlite3-ruby'
     gem.add_dependency 'devise', '~> 1.1.0'
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/app/controllers/{invitations_controller.rb → devise/invitations_controller.rb}

@@ -1,4 +1,4 @@
-class InvitationsController < ApplicationController
+class Devise::InvitationsController < ApplicationController
   include Devise::Controllers::InternalHelpers
 
   before_filter :authenticate_resource!, :only => [:new, :create]

data/app/views/devise/invitations/edit.html.erb

@@ -0,0 +1,14 @@
+<h2>Set your password</h2>
+
+<%= form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => { :method => :put } do |f| %>
+  <%= devise_error_messages! %>
+  <%= f.hidden_field :invitation_token %>
+
+  <p><%= f.label :password %><br />
+  <%= f.password_field :password %></p>
+
+  <p><%= f.label :password_confirmation %><br />
+  <%= f.password_field :password_confirmation %></p>
+
+  <p><%= f.submit "Set my password" %></p>
+<% end %>

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

@@ -0,0 +1,12 @@
+<h2>Send invitation</h2>
+
+<%= form_for resource, :as => resource_name, :url => invitation_path(resource_name) do |f| %>
+  <%= devise_error_messages! %>
+
+  <p><%= f.label :email %><br />
+  <%= f.text_field :email %></p>
+
+  <p><%= f.submit "Send an invitation" %></p>
+<% end %>
+
+<%= link_to "Home", after_sign_in_path_for(resource_name) %><br />

data/{lib/devise_invitable → config}/locales/en.yml

@@ -3,3 +3,6 @@ en:
     invitations:
       send_instructions: 'An email with instructions about how to set the password has been sent.'
       updated: 'Your password was set successfully. You are now signed in.'
+    mailer:
+      invitiation:
+        subject: 'Invitation'

data/devise_invitable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{devise_invitable}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergio Cambra"]
-  s.date = %q{2010-05-17}
+  s.date = %q{2010-09-13}
   s.description = %q{It adds support for send invitations by email (it requires to be authenticated) and accept the invitation setting the password}
   s.email = %q{sergio@entrecables.com}
   s.extra_rdoc_files = [
@@ -19,20 +19,22 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "Gemfile",
+     "Gemfile.lock",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
      "VERSION",
-     "app/controllers/invitations_controller.rb",
-     "app/views/devise_mailer/invitation.html.erb",
-     "app/views/invitations/edit.html.erb",
-     "app/views/invitations/new.html.erb",
+     "app/controllers/devise/invitations_controller.rb",
+     "app/views/devise/invitations/edit.html.erb",
+     "app/views/devise/invitations/new.html.erb",
+     "app/views/devise/mailer/invitation.html.erb",
+     "config/locales/en.yml",
      "devise_invitable.gemspec",
      "init.rb",
      "lib/devise_invitable.rb",
      "lib/devise_invitable/controllers/helpers.rb",
      "lib/devise_invitable/controllers/url_helpers.rb",
-     "lib/devise_invitable/locales/en.yml",
      "lib/devise_invitable/mailer.rb",
      "lib/devise_invitable/model.rb",
      "lib/devise_invitable/rails.rb",
@@ -51,6 +53,9 @@ Gem::Specification.new do |s|
      "test/rails_app/app/helpers/application_helper.rb",
      "test/rails_app/app/models/user.rb",
      "test/rails_app/app/views/home/index.html.erb",
+     "test/rails_app/app/views/layouts/application.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",
@@ -60,63 +65,71 @@ Gem::Specification.new do |s|
      "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/new_rails_defaults.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/locales/en.yml",
      "test/rails_app/config/routes.rb",
-     "test/rails_app/vendor/plugins/devise_invitable/init.rb",
      "test/routes_test.rb",
      "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/scambra/devise_invitable}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{An invitation strategy for devise}
   s.test_files = [
-    "test/integration/invitable_test.rb",
-     "test/integration_tests_helper.rb",
-     "test/mailers/invitation_test.rb",
-     "test/model_tests_helper.rb",
-     "test/models/invitable_test.rb",
-     "test/models_test.rb",
+    "test/test_helper.rb",
+     "test/integration/invitable_test.rb",
+     "test/routes_test.rb",
+     "test/rails_app/app/helpers/application_helper.rb",
+     "test/rails_app/app/models/user.rb",
      "test/rails_app/app/controllers/admins_controller.rb",
      "test/rails_app/app/controllers/application_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/user.rb",
-     "test/rails_app/config/boot.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/backtrace_silencers.rb",
      "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/inflections.rb",
-     "test/rails_app/config/initializers/new_rails_defaults.rb",
-     "test/rails_app/config/initializers/session_store.rb",
-     "test/rails_app/config/initializers/devise.rb",
+     "test/rails_app/config/environments/development.rb",
      "test/rails_app/config/routes.rb",
-     "test/rails_app/vendor/plugins/devise_invitable/init.rb",
-     "test/routes_test.rb",
-     "test/test_helper.rb"
+     "test/rails_app/config/application.rb",
+     "test/rails_app/config/boot.rb",
+     "test/integration_tests_helper.rb",
+     "test/model_tests_helper.rb",
+     "test/models_test.rb",
+     "test/mailers/invitation_test.rb",
+     "test/models/invitable_test.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<mocha>, [">= 0"])
-      s.add_development_dependency(%q<webrat>, [">= 0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
+      s.add_development_dependency(%q<capybara>, [">= 0.3.9"])
+      s.add_development_dependency(%q<rails>, ["~> 3.0.0"])
+      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_runtime_dependency(%q<devise>, ["~> 1.1.0"])
     else
-      s.add_dependency(%q<mocha>, [">= 0"])
-      s.add_dependency(%q<webrat>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0.9.8"])
+      s.add_dependency(%q<capybara>, [">= 0.3.9"])
+      s.add_dependency(%q<rails>, ["~> 3.0.0"])
+      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_dependency(%q<devise>, ["~> 1.1.0"])
     end
   else
-    s.add_dependency(%q<mocha>, [">= 0"])
-    s.add_dependency(%q<webrat>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0.9.8"])
+    s.add_dependency(%q<capybara>, [">= 0.3.9"])
+    s.add_dependency(%q<rails>, ["~> 3.0.0"])
+    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     s.add_dependency(%q<devise>, ["~> 1.1.0"])
   end
 end

data/lib/devise_invitable.rb

@@ -7,11 +7,14 @@ Devise.module_eval do
   mattr_accessor :invite_for
   @@invite_for = 0
 end
-Devise.add_module :invitable, :controller => :invitations, :model => 'devise_invitable/model'
+
+Devise.add_module :invitable, :controller => :invitations, :model => 'devise_invitable/model', :route => :invitation
 
 module DeviseInvitable; end
 
 require 'devise_invitable/mailer'
 require 'devise_invitable/routes'
 require 'devise_invitable/schema'
+require 'devise_invitable/controllers/url_helpers'
+require 'devise_invitable/controllers/helpers'
 require 'devise_invitable/rails'

data/lib/devise_invitable/controllers/helpers.rb

@@ -1,6 +1,7 @@
-DeviseInvitable::Controllers::Helpers.module_eval do
+module DeviseInvitable::Controllers::Helpers
   protected
   def authenticate_resource!
-    authenticate!(resource_name)
+    send(:"authenticate_#{resource_name}!")
   end
 end
+ActionController::Base.send :include, DeviseInvitable::Controllers::Helpers

data/lib/devise_invitable/controllers/url_helpers.rb

@@ -1,20 +1,24 @@
-Devise::Controllers::UrlHelpers.module_eval do
-  [:path, :url].each do |path_or_url|
-    [nil, :new_, :accept_].each do |action|
-      class_eval <<-URL_HELPERS
-        def #{action}invitation_#{path_or_url}(resource, *args)
-          resource = case resource
-            when Symbol, String
-              resource
-            when Class
-              resource.name.underscore
-            else
-              resource.class.name.underscore
-          end
-
-          send("#{action}\#{resource}_invitation_#{path_or_url}", *args)
+module DeviseInvitable
+  module Controllers
+    module UrlHelpers
+      [:path, :url].each do |path_or_url|
+        [nil, :new_, :accept_].each do |action|
+          class_eval <<-URL_HELPERS, __FILE__, __LINE__ + 1
+            def #{action}invitation_#{path_or_url}(resource, *args)
+              resource = case resource
+                when Symbol, String
+                  resource
+                when Class
+                  resource.name.underscore
+                else
+                  resource.class.name.underscore
+              end
+              
+              send("#{action}\#{resource}_invitation_#{path_or_url}", *args)
+            end
+          URL_HELPERS
         end
-      URL_HELPERS
+      end
     end
   end
-end
+end

data/lib/devise_invitable/mailer.rb

@@ -1,9 +1,7 @@
-module DeviseInvitable
-  module Mailer
-    # Deliver an invitation when is requested
-    def invitation(record)
-      setup_mail(record, :invitation)
-    end
+module DeviseInvitable::Mailer
+
+  # Deliver an invitation when is requested
+  def invitation(record)
+    setup_mail(record, :invitation)
   end
 end
-Devise::Mailer.send :include, DeviseInvitable::Mailer