devise_invitable 1.1.8 → 1.3.0

data/test/rails_app/config/locales/devise.en.yml

@@ -0,0 +1,57 @@
+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+
+en:
+  errors:
+    messages:
+      expired: "has expired, please request a new one"
+      not_found: "not found"
+      already_confirmed: "was already confirmed, please try signing in"
+      not_locked: "was not locked"
+      not_saved:
+        one: "1 error prohibited this %{resource} from being saved:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"
+
+  devise:
+    failure:
+      already_authenticated: 'You are already signed in.'
+      unauthenticated: 'You need to sign in or sign up before continuing.'
+      unconfirmed: 'You have to confirm your account before continuing.'
+      locked: 'Your account is locked.'
+      invalid: 'Invalid email or password.'
+      invalid_token: 'Invalid authentication token.'
+      timeout: 'Your session expired, please sign in again to continue.'
+      inactive: 'Your account was not activated yet.'
+    sessions:
+      signed_in: 'Signed in successfully.'
+      signed_out: 'Signed out successfully.'
+    passwords:
+      send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
+      updated: 'Your password was changed successfully. You are now signed in.'
+      updated_not_active: 'Your password was changed successfully.'
+      send_paranoid_instructions: "If your e-mail exists on our database, you will receive a password recovery link on your e-mail"
+    confirmations:
+      send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
+      send_paranoid_instructions: 'If your e-mail exists on our database, you will receive an email with instructions about how to confirm your account in a few minutes.'
+      confirmed: 'Your account was successfully confirmed. You are now signed in.'
+    registrations:
+      signed_up: 'Welcome! You have signed up successfully.'
+      signed_up_but_unconfirmed: 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.'
+      signed_up_but_inactive: 'You have signed up successfully. However, we could not sign you in because your account is not yet activated.'
+      signed_up_but_locked: 'You have signed up successfully. However, we could not sign you in because your account is locked.'
+      updated: 'You updated your account successfully.'
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
+      destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
+    unlocks:
+      send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
+      unlocked: 'Your account has been unlocked successfully. Please sign in to continue.'
+      send_paranoid_instructions: 'If your account exists, you will receive an email with instructions about how to unlock it in a few minutes.'
+    omniauth_callbacks:
+      success: 'Successfully authorized from %{kind} account.'
+      failure: 'Could not authorize you from %{kind} because "%{reason}".'
+    mailer:
+      confirmation_instructions:
+        subject: 'Confirmation instructions'
+      reset_password_instructions:
+        subject: 'Reset password instructions'
+      unlock_instructions:
+        subject: 'Unlock Instructions'

data/test/rails_app/config/locales/en.yml

@@ -0,0 +1,14 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  hello: "Hello world"
+  devise:
+    free_invitations:
+      send_instructions: 'An invitation email has been sent to %{email}.'
+    admins:
+      send_instructions: 'An invitation email has been sent to %{email}.'
+  mongoid:
+    errors:
+      messages:
+        taken: "has already been taken"

data/test/rails_app/config/routes.rb

@@ -0,0 +1,9 @@
+RailsApp::Application.routes.draw do
+  devise_for :users
+  devise_scope :user do
+    resource :free_invitation, :only => [:new, :create]
+    resource :admin, :only => [:new, :create]
+  end
+  devise_for :admins
+  root :to => 'home#index'
+end

data/test/rails_app/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run TestApp::Application

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

@@ -0,0 +1,39 @@
+class CreateTables < ActiveRecord::Migration
+  def change
+    create_table :users do |t|
+      ## Database authenticatable
+      t.string :email,              :null => true, :default => ""
+      t.string :encrypted_password, :null => true, :default => ""
+
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      ## Confirmable
+      t.string   :confirmation_token
+      t.datetime :confirmed_at
+      t.datetime :confirmation_sent_at
+      t.string   :unconfirmed_email # Only if using reconfirmable
+
+      t.string :username
+
+      ## Invitable
+      t.string   :invitation_token, :limit => 60
+      t.datetime :invitation_created_at
+      t.datetime :invitation_sent_at
+      t.datetime :invitation_accepted_at
+      t.integer  :invitation_limit
+      t.integer  :invited_by_id
+      t.string   :invited_by_type
+
+      t.timestamps
+    end
+    add_index :users, :invitation_token, :unique => true
+
+    create_table :admins do |t|
+      ## Database authenticatable
+      t.string :email,              :null => true, :default => ""
+      t.string :encrypted_password, :null => true, :default => ""
+    end
+  end
+end

data/test/rails_app/mongoid.yml

@@ -0,0 +1,10 @@
+defaults: &defaults
+  host: localhost
+  allow_dynamic_fields: true
+  parameterize_keys: true
+  persist_in_safe_mode: true
+  raise_not_found_error: true
+ 
+test:
+  <<: *defaults
+  database: devise_invitable-test-suite

data/test/rails_app/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'

data/test/routes_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class RoutesTest < ActionController::TestCase
+
+  test 'map new user invitation' do
+    assert_recognizes({:controller => 'devise/invitations', :action => 'new'}, {:path => 'users/invitation/new', :method => :get})
+  end
+
+  test 'map create user invitation' do
+    assert_recognizes({:controller => 'devise/invitations', :action => 'create'}, {:path => 'users/invitation', :method => :post})
+  end
+
+  test 'map accept user invitation' do
+    assert_recognizes({:controller => 'devise/invitations', :action => 'edit'}, 'users/invitation/accept')
+  end
+
+  test 'map update user invitation' do
+    assert_recognizes({:controller => 'devise/invitations', :action => 'update'}, {:path => 'users/invitation', :method => :put})
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,24 @@
+ENV["RAILS_ENV"] = "test"
+DEVISE_ORM = (ENV["DEVISE_ORM"] || :active_record).to_sym
+
+$:.unshift File.dirname(__FILE__)
+puts "\n==> Devise.orm = #{DEVISE_ORM.inspect}"
+require "rails_app/config/environment"
+include Devise::TestHelpers
+require "orm/#{DEVISE_ORM}"
+require 'rails/test_help'
+require 'capybara/rails'
+require 'mocha/setup'
+
+ActionMailer::Base.delivery_method = :test
+ActionMailer::Base.perform_deliveries = true
+ActionMailer::Base.default_url_options[:host] = 'test.com'
+
+ActiveSupport::Deprecation.silenced = true
+
+class ActionDispatch::IntegrationTest
+  include Capybara::DSL
+end
+class ActionController::TestCase 
+  include Devise::TestHelpers 
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise_invitable
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 1
-  - 8
-  version: 1.1.8
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-02 00:00:00 Z
+date: 2013-10-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -34,51 +34,43 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: railties
+  name: actionmailer
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 3
-        - 0
-        version: "3.0"
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: actionmailer
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
+        - 2
+        - 6
+        version: 3.2.6
+    - - <
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 9
         segments: 
-        - 3
-        - 0
-        version: "3.0"
+        - 5
+        version: "5"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: devise
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 2
+        - 3
         - 1
-        - 2
-        version: 2.1.2
+        - 0
+        version: 3.1.0
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 description: It adds support for send invitations by email (it requires to be authenticated) and accept the invitation by setting a password.
 email: 
 - sergio@entrecables.com
@@ -91,39 +83,86 @@ extra_rdoc_files: []
 files: 
 - app/controllers/devise/invitations_controller.rb
 - app/controllers/devise_invitable/registrations_controller.rb
-- app/controllers/devise_invitable/registrations_controller.rb~
 - app/views/devise/invitations/edit.html.erb
 - app/views/devise/invitations/new.html.erb
 - app/views/devise/mailer/invitation_instructions.html.erb
 - config/locales/en.yml
 - lib/devise_invitable.rb
+- lib/devise_invitable/controllers/helpers.rb
+- lib/devise_invitable/controllers/url_helpers.rb
+- lib/devise_invitable/inviter.rb
 - lib/devise_invitable/mailer.rb
+- lib/devise_invitable/mapping.rb
 - lib/devise_invitable/model.rb
+- lib/devise_invitable/parameter_sanitizer.rb
 - lib/devise_invitable/rails.rb
 - lib/devise_invitable/routes.rb
 - lib/devise_invitable/version.rb
-- lib/devise_invitable/controllers/helpers.rb
-- lib/devise_invitable/controllers/url_helpers.rb
-- lib/devise_invitable/controllers/registrations.rb~
-- lib/devise_invitable/controllers/helpers.rb~
-- lib/devise_invitable/rails.rb~
-- lib/devise_invitable/inviter.rb
-- lib/devise_invitable/mapping.rb
-- lib/devise_invitable/model.rb~
 - lib/generators/active_record/devise_invitable_generator.rb
 - lib/generators/active_record/templates/migration.rb
-- lib/generators/devise_invitable/views_generator.rb
 - lib/generators/devise_invitable/devise_invitable_generator.rb
 - lib/generators/devise_invitable/install_generator.rb
 - lib/generators/devise_invitable/templates/simple_form_for/invitations/edit.html.erb
 - lib/generators/devise_invitable/templates/simple_form_for/invitations/new.html.erb
+- lib/generators/devise_invitable/views_generator.rb
 - lib/generators/mongoid/devise_invitable_generator.rb
-- lib/devise_invitable.rb~
 - LICENSE
 - README.rdoc
+- CHANGELOG
+- test/functional/controller_helpers_test.rb
+- test/functional/registrations_controller_test.rb
+- test/generators/views_generator_test.rb
+- test/generators_test.rb
+- test/integration/invitation_remove_test.rb
+- test/integration/invitation_test.rb
+- test/integration_tests_helper.rb
+- test/mailers/invitation_mail_test.rb
+- test/model_tests_helper.rb
+- test/models/invitable_test.rb
+- test/models_test.rb
+- test/orm/active_record.rb
+- test/orm/mongoid.rb
+- test/rails_app/Rakefile
+- test/rails_app/app/controllers/admins_controller.rb
+- test/rails_app/app/controllers/application_controller.rb
+- test/rails_app/app/controllers/free_invitations_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/admin.rb
+- test/rails_app/app/models/octopussy.rb
+- test/rails_app/app/models/user.rb
+- test/rails_app/app/views/admins/new.html.erb
+- test/rails_app/app/views/free_invitations/new.html.erb
+- test/rails_app/app/views/home/index.html.erb
+- test/rails_app/app/views/layouts/application.html.erb
+- test/rails_app/app/views/users/invitations/new.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
+- 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/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/wrap_parameters.rb
+- test/rails_app/config/locales/devise.en.yml
+- test/rails_app/config/locales/en.yml
+- test/rails_app/config/routes.rb
+- test/rails_app/db/migrate/20100401102949_create_tables.rb
+- test/rails_app/mongoid.yml
+- test/rails_app/script/rails
+- test/routes_test.rb
+- test/test_helper.rb
 homepage: https://github.com/scambra/devise_invitable
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: 
 - --main
@@ -156,10 +195,59 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: An invitation strategy for Devise
-test_files: []
-
-has_rdoc: 
+test_files: 
+- test/functional/controller_helpers_test.rb
+- test/functional/registrations_controller_test.rb
+- test/generators/views_generator_test.rb
+- test/generators_test.rb
+- test/integration/invitation_remove_test.rb
+- test/integration/invitation_test.rb
+- test/integration_tests_helper.rb
+- test/mailers/invitation_mail_test.rb
+- test/model_tests_helper.rb
+- test/models/invitable_test.rb
+- test/models_test.rb
+- test/orm/active_record.rb
+- test/orm/mongoid.rb
+- test/rails_app/Rakefile
+- test/rails_app/app/controllers/admins_controller.rb
+- test/rails_app/app/controllers/application_controller.rb
+- test/rails_app/app/controllers/free_invitations_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/admin.rb
+- test/rails_app/app/models/octopussy.rb
+- test/rails_app/app/models/user.rb
+- test/rails_app/app/views/admins/new.html.erb
+- test/rails_app/app/views/free_invitations/new.html.erb
+- test/rails_app/app/views/home/index.html.erb
+- test/rails_app/app/views/layouts/application.html.erb
+- test/rails_app/app/views/users/invitations/new.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
+- 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/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/wrap_parameters.rb
+- test/rails_app/config/locales/devise.en.yml
+- test/rails_app/config/locales/en.yml
+- test/rails_app/config/routes.rb
+- test/rails_app/db/migrate/20100401102949_create_tables.rb
+- test/rails_app/mongoid.yml
+- test/rails_app/script/rails
+- test/routes_test.rb
+- test/test_helper.rb

data/app/controllers/devise_invitable/registrations_controller.rb~

@@ -1,15 +0,0 @@
-class DeviseInvitable::RegistrationsController < Devise::RegistrationsController
-  protected
-
-  def build_resource(*args)
-    hash = args.pop || resource_params || {}
-    if hash[:email]
-      self.resource = resource_class.where(:email => hash[:email], :encrypted_password => '').first
-      if self.resource
-        self.resource.attributes = hash
-        self.resource.accept_invitation!
-      end
-    end
-    self.resource ||= super(hash, *args)
-  end
-end

data/lib/devise_invitable/controllers/helpers.rb~

@@ -1,21 +0,0 @@
-module DeviseInvitable::Controllers::Helpers
-  extend ActiveSupport::Concern
-
-  included do
-    hide_action :after_invite_path_for, :after_accept_path_for
-  end
-  
-  def after_invite_path_for(resource)
-    after_sign_in_path_for(resource)
-  end
-  
-  def after_accept_path_for(resource)
-    after_sign_in_path_for(resource)
-  end
-  
-  protected
-  def authenticate_inviter!
-    send(:"authenticate_#{resource_name}!", :force => true)
-  end
-  
-end

data/lib/devise_invitable/controllers/registrations.rb~

@@ -1,21 +0,0 @@
-module DeviseInvitable::Controllers::Registrations
-  def self.included(controller)
-    controller.alias_method_chain :build_resource, :invitation
-  end
-
-  protected
-
-  def build_resource_with_invitation(*args)
-    hash = args.pop || resource_params || {}
-    if hash[:email]
-      self.resource = resource_class.where(:email => hash[:email], :encrypted_password => '').first
-      if self.resource
-        puts self.resource.inspect
-        self.resource.attributes = hash
-        self.resource.accept_invitation!
-        puts self.resource.inspect
-      end
-    end
-    self.resource ||= build_resource_without_invitation(hash, *args)
-  end
-end