devise_invitations 0.1.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 571cabebaec7e8d1dccc1639051edec0f66bbba0
-  data.tar.gz: 145f71e275f1bd5c6863362e3c6ed6a965acc7b9
+  metadata.gz: 91bd073ebc856b96f8e2f0541c39983cedc74799
+  data.tar.gz: 93f4bfb68faec7e739d1f1d36010c6fcbeab6291
 SHA512:
-  metadata.gz: 3a6e3a092b0e535e5f93fb672ff50cbc1a1052ee3327ffc24f1c0ef3bc7209fdee8e7e5eea0f3131fea14908bbdd1d533a144a8cafd1efc314de39fabc2eee2c
-  data.tar.gz: ebd2ecb9e7a2a1757d42cbc5ae29bbc1b1a83b33aa8369190f3d429daf3251404e5b8360d9dd8c76333df4772bda601e00fee71176e37da48966f8371c0b149b
+  metadata.gz: cac6278daf78658be5d5229c358225b241fbbfb56434c280eb822072fbc74a09fd2049f4f83bc45c650a0692eaf1015f42b8695cf86681bbf43b2073a607c03f
+  data.tar.gz: e8e2880cf12d27ef549ff7eb96941fac48f9009d08fd91c890f8ba4ac1ada873682a91966ae538c9eeaeba0543fd973e3178030ac77f8bd2ae7eb458877e2ae7

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    devise_invitations (0.1.1)
+    devise_invitations (0.2)
       devise_invitable (~> 1.5)
       faker (~> 1.6)
       has_secure_token (~> 1.0)
-      shoulda-matchers (~> 3.0)
+      shoulda-matchers (>= 2.8)
 
 GEM
   remote: https://rubygems.org/
@@ -48,7 +48,7 @@ GEM
     arel (6.0.3)
     bcrypt (3.1.10)
     builder (3.2.2)
-    devise (3.5.4)
+    devise (3.5.5)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -73,8 +73,8 @@ GEM
       mime-types (>= 1.16, < 3)
     mime-types (2.99)
     mini_portile2 (2.0.0)
-    minitest (5.8.3)
-    nokogiri (1.6.7.1)
+    minitest (5.8.4)
+    nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     orm_adapter (0.5.0)
     rack (1.6.4)

data/README.md

@@ -1,7 +1,7 @@
 [![Circle CI](https://circleci.com/gh/RoxasShadow/devise_invitations.svg?style=svg)](https://circleci.com/gh/RoxasShadow/devise_invitations)
 
-DeviseInvitable
-===============
+devise_invitations
+=================
 Allow multiple invitations on top of [devise_invitable](https://github.com/scambra/devise_invitable).
 
 Why?
@@ -17,7 +17,7 @@ So let's create a new table that allows an email address to be invited multiple
 
 But *devise_invitable* is useful!
 ---------------------------------
-I know, in fact I'm creating nothing but a layer on top of it. You still need and use *devise_invitable* (I mean, views, controller and the attributes it sets on the invited users).
+I know, in fact I'm creating nothing but a layer on top of it. As *devise_invitations* is not a replacement, *devise_invitable* is still needed (well, we could rid it off anyway, PRs are welcomed!)
 
 Setup
 -----
@@ -33,8 +33,6 @@ This is what's new in your project:
 - A `has_many` association for `User` (useful to fetch the sent invitations) is injected
 - A new route for said action is injected as well
 
-If you need to customize something feel free to hard-copy it into your project (i.e. the mailer and the related view).
-
 If you use *RSpec* and *FactoryGirl* you can run `$ bin/rails g devise_invitations:specs` to copy the specs for the new associations, controllers and models to your codebase. You can extend and customize them as you wish.
 
 Now, you need an action to let your users invite other ones. Basically it's just
@@ -43,4 +41,12 @@ Now, you need an action to let your users invite other ones. Basically it's just
 DeviseInvitations::Invitation.create!(email: params[:email], sent_by: current_user)
 ```
 
-You can add new columns to the table for new attributes too, like `user_type`, `message` or whatever you want.
+Customization
+-------------
+
+You can add new columns to the `invitations` table to add new new attributes too, like `user_type`, `welcome_message` or whatever you want.
+Create a new class `InvitationsController` that extends the original `DeviseInvitations::InvitationsController`, and override the private method `#invitation_params` to inject these additional attributes. Remember to edit the controller used for handling the invitations in the related route.
+
+To modify the content of the invitation email, what you need is just a view called `instructions` (use the template engine you prefer) placed inside `app/views/invitation_mailer/`.
+
+Locales are stored in `config/locales/devise_invitations.en.yml`.

data/devise_invitations.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'devise_invitable', '~> 1.5'
   s.add_dependency 'has_secure_token', '~> 1.0'
-  s.add_dependency 'shoulda-matchers', '~> 3.0'
+  s.add_dependency 'shoulda-matchers', '>= 2.8'
   s.add_dependency 'faker',            '~> 1.6'
 end

data/lib/devise_invitations/controller.rb

@@ -3,11 +3,12 @@ class DeviseInvitations::InvitationsController < Devise::InvitationsController
     invitation = DeviseInvitations::Invitation.pending.find_by(token: params[:token])
 
     if invitation.present? && invitation.valid?
-      invitation_params = { email: invitation.email }
-
-      user = User.invite!(invitation_params, invitation.sent_by) do |u|
-        u.skip_invitation = true
-      end
+      user = User.invite!(
+        invitation_params(invitation).merge(
+          skip_invitation: true
+        ),
+        invitation.sent_by
+      )
 
       user.update(invitation_sent_at: Time.now.utc)
 
@@ -23,4 +24,10 @@ class DeviseInvitations::InvitationsController < Devise::InvitationsController
       redirect_to root_path
     end
   end
+
+  private
+
+  def invitation_params(invitation)
+    { email: invitation.email }
+  end
 end

data/lib/devise_invitations/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitations
-  VERSION = '0.1.1'
+  VERSION = '0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_invitations
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.2'
 platform: ruby
 authors:
 - Roxas Shadow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise_invitable
@@ -42,16 +42,16 @@ dependencies:
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -88,14 +88,10 @@ files:
 - lib/devise_invitations/mailer.rb
 - lib/devise_invitations/model.rb
 - lib/devise_invitations/version.rb
-- lib/generators/devise_invitations/.DS_Store
 - lib/generators/devise_invitations/install_generator.rb
-- lib/generators/devise_invitations/migrations/.DS_Store
 - lib/generators/devise_invitations/migrations/templates/migration.rb
-- lib/generators/devise_invitations/models/.DS_Store
 - lib/generators/devise_invitations/models/templates/associations.rb
 - lib/generators/devise_invitations/routes/templates/routes.rb
-- lib/generators/devise_invitations/specs/.DS_Store
 - lib/generators/devise_invitations/specs/templates/association.rb
 - lib/generators/devise_invitations/specs/templates/controller.rb
 - lib/generators/devise_invitations/specs/templates/factory.rb