devise_invitable 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: ec084ea3f59520fb7b2cfb978cd79d53ec5c1488
-  data.tar.gz: 257a48340805f6bfe02bc4fd1279a8694ab24c5c
-SHA512:
-  metadata.gz: 51c1385e5d2235ef7d3004208e489ecd241e99ade5afd8d7f5a1289e48cc7e9af6ba599b058862b82c5eb9c64ee02dc63d1be1526d692ccd86c33099bda8c8a8
-  data.tar.gz: 86ff8fa5e4f3990ca8c5dee25acc0e663204b671337e479fc19cfc0c5d2145d79f85f5a68c1ac53790b8a4c967050e13b0a070cf8943c6c4d639684ad68898b7
+--- 
+SHA512: 
+  metadata.gz: 47b3e5072420f492fdb25c04d955860feae08b9cc8f58b06f67d2cfc00405f46b101f7111c1d7bd40231bf3d5d8db398f9ee4f05d9498014b49be2bea9138c6b
+  data.tar.gz: ee0e6d336eb94aa339bf1396017c599940749826c97482f552a3b43cc83c7aad55394d739f1925b7dbd0759f3f5ac664695d87f35deb15e5ea370812b316ab24
+SHA1: 
+  metadata.gz: c94dba7594aa55c76ed2b4790ebe224c4d63c0c5
+  data.tar.gz: 6938c9b1a965c2937762d70606998a6a9cb60a04

data/README.rdoc

@@ -16,7 +16,7 @@ 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',           '>= 2.0.0'
-  gem 'devise_invitable', '~> 1.1.0'
+  gem 'devise_invitable', '~> 1.3.4'
 
 === Automatic installation
 

data/app/controllers/devise/invitations_controller.rb

@@ -55,8 +55,8 @@ class Devise::InvitationsController < DeviseController
 
   protected
 
-  def invite_resource
-    resource_class.invite!(invite_params, current_inviter)
+  def invite_resource(&block)
+    resource_class.invite!(invite_params, current_inviter, &block)
   end
   
   def accept_resource
@@ -64,7 +64,7 @@ class Devise::InvitationsController < DeviseController
   end
 
   def current_inviter
-    @current_inviter ||= authenticate_inviter!
+    authenticate_inviter!
   end
 
   def has_invitations_left?

data/app/views/devise/mailer/invitation_instructions.html.erb

@@ -1,8 +1,7 @@
-<p>Hello <%= @resource.email %>!</p>
+<p><%= I18n.t("devise.mailer.invitation_instructions.hello", email: @resource.email) %></p>
 
-<p>Someone has invited you to <%= root_url %>, you can accept it through the link below.</p>
+<p><%= I18n.t("devise.mailer.invitation_instructions.someone_invited_you", url: root_url) %></p>
 
-<p><%= link_to 'Accept invitation', accept_invitation_url(@resource, :invitation_token => @token) %></p>
+<p><%= link_to I18n.t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, :invitation_token => @token) %></p>
 
-<p>If you don't want to accept the invitation, please ignore this email.<br />
-Your account won't be created until you access the link above and set your password.</p>
+<p><%= I18n.t("devise.mailer.invitation_instructions.ignore").html_safe %></p>

data/config/locales/en.yml

@@ -15,3 +15,7 @@ en:
     mailer:
       invitation_instructions:
         subject: 'Invitation instructions'
+        hello: 'Hello %{email}'
+        someone_invited_you: 'Someone has invited you to %{url}, you can accept it through the link below.'
+        accept: 'Accept invitation'
+        ignore: "If you don't want to accept the invitation, please ignore this email.<br />Your account won't be created until you access the link above and set your password."

data/lib/devise_invitable/model.rb

@@ -49,7 +49,7 @@ module Devise
 
         attr_writer :skip_password
 
-        scope :active, lambda { where(:invitation_token => nil) }
+        scope :no_active_invitation, lambda { where(:invitation_token => nil) }
         if defined?(Mongoid) && defined?(Mongoid::Document) && self < Mongoid::Document
           scope :invitation_not_accepted, lambda { where(:invitation_accepted_at => nil, :invitation_token.ne => nil) }
           scope :invitation_accepted, lambda { where(:invitation_accepted_at.ne => nil) }

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '1.3.4'
+  VERSION = '1.3.5'
 end

data/lib/generators/active_record/devise_invitable_generator.rb

@@ -6,7 +6,7 @@ module ActiveRecord
       source_root File.expand_path("../templates", __FILE__)
 
       def copy_devise_migration
-        migration_template "migration.rb", "db/migrate/devise_invitable_add_to_#{table_name}"
+        migration_template "migration.rb", "db/migrate/devise_invitable_add_to_#{table_name}.rb"
       end
     end
   end

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

@@ -25,5 +25,9 @@ class DeviseInvitableAddTo<%= table_name.camelize %> < ActiveRecord::Migration
       t.remove_references :invited_by, :polymorphic => true
       t.remove :invitations_count, :invitation_limit, :invitation_sent_at, :invitation_accepted_at, :invitation_token, :invitation_created_at
     end
+    change_column_null    :users, :encrypted_password, false
+<% if class_name.constantize.columns_hash['password_salt'] -%>
+    change_column_null :<%= table_name %>, :password_salt,false
+<% end -%>
   end
 end

metadata

@@ -1,71 +1,59 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: devise_invitable
-version: !ruby/object:Gem::Version
-  version: 1.3.4
+version: !ruby/object:Gem::Version 
+  version: 1.3.5
 platform: ruby
-authors:
+authors: 
 - Sergio Cambra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-05-09 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.1.0
-- !ruby/object:Gem::Dependency
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: actionmailer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.6
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 3.2.6
     - - <
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: devise
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.0
+      - !ruby/object:Gem::Version 
+        version: "5"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: devise
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 3.2.0
-description: It adds support for send invitations by email (it requires to be authenticated)
-  and accept the invitation by setting a password.
-email:
+  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.
+email: 
 - sergio@entrecables.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - app/controllers/devise/invitations_controller.rb
 - app/controllers/devise_invitable/registrations_controller.rb
 - app/views/devise/invitations/edit.html.erb
@@ -145,33 +133,35 @@ files:
 - test/routes_test.rb
 - test/test_helper.rb
 homepage: https://github.com/scambra/devise_invitable
-licenses:
+licenses: 
 - MIT
 metadata: {}
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.rdoc
 - --charset=UTF-8
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
       version: 1.3.6
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: An invitation strategy for Devise
-test_files:
+test_files: 
 - test/functional/controller_helpers_test.rb
 - test/functional/registrations_controller_test.rb
 - test/generators/views_generator_test.rb
@@ -223,3 +213,4 @@ test_files:
 - test/rails_app/script/rails
 - test/routes_test.rb
 - test/test_helper.rb
+has_rdoc: