devise_invitable 0.6.1 → 1.0.0

data/README.rdoc

@@ -12,8 +12,8 @@ Install DeviseInvitable gem, it will also install dependencies (such as devise a
 
 Add DeviseInvitable to your Gemfile (and Devise if you weren't using them):
 
-  gem 'devise',           '~> 1.2.0'
-  gem 'devise_invitable', '~> 0.4.0'
+  gem 'devise',           '~> 2.0.0'
+  gem 'devise_invitable', '~> 0.7.0'
 
 === Automatic installation
 
@@ -41,7 +41,13 @@ Add t.invitable to your Devise model migration:
 
   create_table :users do
     ...
-    t.invitable
+      ## Invitable
+      t.string   :invitation_token, :limit => 60
+      t.datetime :invitation_sent_at
+      t.datetime :invitation_accepted_at
+      t.integer  :invitation_limit
+      t.integer  :invited_by_id
+      t.string   :invited_by_type
     ...
   end
   add_index :users, :invitation_token
@@ -49,10 +55,13 @@ Add t.invitable to your Devise model migration:
 or for a model that already exists, define a migration to add DeviseInvitable to your model:
 
   change_table :users do |t|
-    t.string   :invitation_token, :limit => 60
-    t.datetime :invitation_sent_at
-    t.datetime :invitation_accepted_at
-    t.index    :invitation_token
+      t.string   :invitation_token, :limit => 60
+      t.datetime :invitation_sent_at
+      t.datetime :invitation_accepted_at
+      t.integer  :invitation_limit
+      t.integer  :invited_by_id
+      t.string   :invited_by_type
+
   end
 
   # Allow null encrypted_password

data/app/controllers/devise/invitations_controller.rb

@@ -1,5 +1,4 @@
-class Devise::InvitationsController < ApplicationController
-  include Devise::Controllers::InternalHelpers
+class Devise::InvitationsController < DeviseController
 
   before_filter :authenticate_inviter!, :only => [:new, :create]
   before_filter :has_invitations_left?, :only => [:create]
@@ -9,7 +8,7 @@ class Devise::InvitationsController < ApplicationController
   # GET /resource/invitation/new
   def new
     build_resource
-    render_with_scope :new
+    render :new
   end
 
   # POST /resource/invitation
@@ -20,14 +19,14 @@ class Devise::InvitationsController < ApplicationController
       set_flash_message :notice, :send_instructions, :email => self.resource.email
       respond_with resource, :location => after_invite_path_for(resource)
     else
-      respond_with_navigational(resource) { render_with_scope :new }
+      respond_with_navigational(resource) { render :new }
     end
   end
 
   # GET /resource/invitation/accept?invitation_token=abcdef
   def edit
     if params[:invitation_token] && self.resource = resource_class.to_adapter.find_first( :invitation_token => params[:invitation_token] )
-      render_with_scope :edit
+      render :edit
     else
       set_flash_message(:alert, :invitation_token_invalid)
       redirect_to after_sign_out_path_for(resource_name)
@@ -43,7 +42,7 @@ class Devise::InvitationsController < ApplicationController
       sign_in(resource_name, resource)
       respond_with resource, :location => after_accept_path_for(resource)
     else
-      respond_with_navigational(resource){ render_with_scope :edit }
+      respond_with_navigational(resource){ render :edit }
     end
   end
 
@@ -56,7 +55,7 @@ class Devise::InvitationsController < ApplicationController
     unless current_inviter.nil? || current_inviter.has_invitations_left?
       build_resource
       set_flash_message :alert, :no_invitations_remaining
-      respond_with_navigational(resource) { render_with_scope :new }
+      respond_with_navigational(resource) { render :new }
     end
   end
 

data/lib/devise_invitable.rb

@@ -6,7 +6,6 @@ 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/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '0.6.1'
+  VERSION = '1.0.0'
 end

data/lib/generators/active_record/templates/migration.rb

@@ -1,5 +1,5 @@
 class DeviseInvitableAddTo<%= table_name.camelize %> < ActiveRecord::Migration
-  def self.up
+  def up
     change_table :<%= table_name %> do |t|
       t.string     :invitation_token, :limit => 60
       t.datetime   :invitation_sent_at
@@ -9,15 +9,15 @@ class DeviseInvitableAddTo<%= table_name.camelize %> < ActiveRecord::Migration
       t.index      :invitation_token # for invitable
       t.index      :invited_by_id
     end
-    
+
     # And allow null encrypted_password and password_salt:
     change_column_null :<%= table_name %>, :encrypted_password, true
 <% if class_name.constantize.columns_hash['password_salt'] -%>
     change_column_null :<%= table_name %>, :password_salt,      true
 <% end -%>
   end
-  
-  def self.down
+
+  def down
     change_table :<%= table_name %> do |t|
       t.remove_references :invited_by, :polymorphic => true
       t.remove :invitation_limit, :invitation_sent_at, :invitation_accepted_at, :invitation_token

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise_invitable
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 23
   prerelease: 
   segments: 
-  - 0
-  - 6
   - 1
-  version: 0.6.1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-27 00:00:00 Z
+date: 2012-01-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -41,12 +41,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
         - 3
-        - 1
         - 0
-        version: 3.1.0
+        version: "3.0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -55,21 +54,14 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 4
-        - 6
-        version: 1.4.6
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
-        - 1
-        - 6
-        version: "1.6"
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
   type: :runtime
   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.
@@ -92,7 +84,6 @@ files:
 - lib/devise_invitable/model.rb
 - lib/devise_invitable/rails.rb
 - lib/devise_invitable/routes.rb
-- lib/devise_invitable/schema.rb
 - lib/devise_invitable/controllers/helpers.rb
 - lib/devise_invitable/controllers/url_helpers.rb
 - lib/devise_invitable/version.rb

data/lib/devise_invitable/schema.rb

@@ -1,38 +0,0 @@
-module DeviseInvitable
-  module Schema
-    # Add invitation_token and invitation_sent_at columns in the resource's database table.
-    #
-    # Examples
-    #
-    #   # For a new resource migration:
-    #   create_table :the_resources do
-    #     t.database_authenticatable :null => false # you need at least this
-    #     t.invitable
-    #     ...
-    #   end
-    #   add_index :the_resources, :invitation_token # for invitable
-    #
-    #   # or if the resource's table already exists, define a migration and put this in:
-    #   change_table :the_resources do |t|
-    #     t.string   :invitation_token, :limit => 60
-    #     t.datetime :invitation_sent_at
-    #     t.datetime :invitation_accepted_at
-    #     t.index    :invitation_token # for invitable
-    #   end
-    #
-    #   # And allow encrypted_password to be null:
-    #   change_column :the_resources, :encrypted_password, :string, :null => true
-    #   # the following line is only if you use Devise's encryptable module!
-    #   change_column :the_resources, :password_salt,      :string, :null => true
-    def invitable
-      apply_devise_schema :invitation_token,   String, :limit => 60
-      apply_devise_schema :invitation_sent_at, DateTime
-      apply_devise_schema :invitation_accepted_at, DateTime
-      apply_devise_schema :invitation_limit, Integer
-      apply_devise_schema :invited_by_id, Integer
-      apply_devise_schema :invited_by_type, String
-    end
-  end
-end
-
-Devise::Schema.send :include, DeviseInvitable::Schema