invitation 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fb6ecb6c28da3b30a263c6463d7414c0f51833d
-  data.tar.gz: 20809ed7eeb1a17b9670ca1bf367239c4a756b08
+  metadata.gz: 4a8f89d369c24f891983b625b72501697feb718b
+  data.tar.gz: 63d62ec182515cfc19cb56c0f8b277627807a3dc
 SHA512:
-  metadata.gz: 19fd8f1e9fd2ee55f6098c86e5d4ffcae60913c29696b3180ed1a4aeaf953d0e0f4a373ec4977f8a09e4201b6acbdff6cf2fd98baf6bcb61c8813619ff872a3b
-  data.tar.gz: 6b3cff19c001aa3cd885e1753adbc14cd53e6d57985f289b93b03ee0bf0a01774e6648dccfdc6467694fbb992dbd57aabc34e842f081c59f1377aa2d7bf13fdf
+  metadata.gz: d09d203673dcaf4b5a1016b8f4043767a91f1c09ed881e7c962ae8a5f549c50bc6c8eacfacfcac3988dbd0db315b13eef5361e9757f8fda4accd18256399ea63
+  data.tar.gz: 9c9beaad4470e5dad9fa5c0796090d7c9ca2a7552b63023fdbbfa63019ffe7228ffaa42db55ad060a8f044173dee4af8f35b13bed7e1ff5528354d8c9ed302c7

data/app/controllers/invitation/invites_controller.rb

@@ -1,133 +1,106 @@
-#
-# Invitation::InvitesController - issue invitations to users via email address.
-#
-# Controller uses an (inner class) Form object that is not a persisted model. The
-# form can accept many email addresses, and creates on Invite per email address.
-#
-# Subclass and modify or extend, or copy the controller into your app with `rails generate invitation:controller`.
-#
-# Common extensions include:
-# * add authorization checks: subclass and add before_actions to :new and :create.
-# * override after_invite_existing_user or after_invite_new_user
-#
-class Invitation::InvitesController < ApplicationController
-  def new
-    @invite = InviteForm.new(invite_params)
-    render template: 'invites/new'
-  end
+module Invitation
 
-  # Create one or more Invite instances.
-  #   invite: { invitable_id, invitable_type, email or emails:[] }
   #
-  def create
-    failures = []
-    invites = InviteForm.new(invite_params).build_invites(current_user)
-    ActiveRecord::Base.transaction do
-      invites.each { |invite| invite.save ? do_invite(invite) : failures << invite.email }
+  # Invitation::InvitesController - issue invitations to users via email address.
+  #
+  # Controller uses an (inner class) Form object that is not a persisted model. The
+  # form can accept many email addresses, and creates on Invite per email address.
+  #
+  # Subclass and modify/extend, or copy the controller into your app with `rails generate invitation:controller`.
+  #
+  # Common extensions could include:
+  # * add authorization checks: subclass and add before_actions to :new and :create.
+  # * override after_invite_existing_user or after_invite_new_user
+  #
+  class InvitesController < ApplicationController
+    
+    def new
+      @invite = InviteForm.new(invite_params)
+      render template: 'invites/new'
     end
-    logger.info "!!!!!!!!!!!!!!!!!!!!! INSIDE CREATE: current_user: #{current_user.inspect}"
-    respond_to do |format|
-      format.html do
-        if failures.empty?
-          flash[:notice] = t('invitation.flash.invite_issued', count: invites.count)
-        else
-          flash[:error] = t('invitation.flash.invite_error', count: failures.count, email: failures.to_sentence)
-        end
-        redirect_to url_after_invite(invites.first) # FIXME: redirect to back
+
+    #
+    # Create one or more Invite instances.
+    #   invite: { invitable_id, invitable_type, email or emails:[] }
+    #
+    def create
+      failures = []
+      invites = InviteForm.new(invite_params).build_invites(current_user)
+      ActiveRecord::Base.transaction do
+        invites.each { |invite| invite.save ? do_invite(invite) : failures << invite.email }
       end
-      format.json do
-        if failures.empty?
-          # If we received a single email, json response should be a scalar, not an array.
-          invites = params[:invite].key?('email') ? invites.first : invites
-          render json: invites.as_json(except: [:token, :created_at, :updated_at]), status: 201
-        else
-          render json: {
-            message: t('invitation.flash.invite_error', count: failures.count, email: failures.to_sentence),
-            status: :unprocessable_entity
-          }
+
+      logger.info "!!!!!!!!!!!!!!!!!!!!! INSIDE CREATE: current_user: #{current_user.inspect}"
+      respond_to do |format|
+        format.html do
+          if failures.empty?
+            flash[:notice] = t('invitation.flash.invite_issued', count: invites.count)
+          else
+            flash[:error] = t('invitation.flash.invite_error', count: failures.count, email: failures.to_sentence)
+          end
+          redirect_to url_after_invite(invites.first) # FIXME: redirect to back
+        end
+        format.json do
+          if failures.empty?
+            # If we received a single email, json response should be a scalar, not an array.
+            invites = params[:invite].key?('email') ? invites.first : invites
+            render json: invites.as_json(except: [:token, :created_at, :updated_at]), status: 201
+          else
+            render json: {
+              message: t('invitation.flash.invite_error', count: failures.count, email: failures.to_sentence),
+              status: :unprocessable_entity
+            }
+          end
         end
       end
     end
-  end
 
-  private
-
-  # A form object pretends to be 'invite', but accepts both 'email' and 'emails'.
-  # It knows how to build all of the invite instances.
-  class InviteForm
-    include ActiveModel::Model
-    attr_accessor :invitable_id, :invitable_type, :email, :emails
-    attr_reader :invitable
+    private
 
-    def self.model_name # form masquerades as 'invite'
-      ActiveModel::Name.new(self, nil, 'Invite')
+    # Override this if you want to do something more complicated for existing users.
+    # For example, if you have a more complex permissions scheme than just a simple
+    # has_many relationship, enable it here.
+    def after_invite_existing_user(invite)
+      # Add the user to the invitable resource/organization
+      invite.invitable.add_invited_user(invite.recipient)
     end
 
-    def initialize(attributes = {})
-      @emails ||= []
-      super
+    # Override if you want to do something more complicated for new users.
+    # By default we don't do anything extra.
+    def after_invite_new_user(invite)
     end
 
-    def invitable
-      @invitable ||= @invitable_type.classify.constantize.find(@invitable_id)
+    # After an invite is created, redirect the user here.
+    # Default implementation doesn't return a url, just the invitable.
+    def url_after_invite(invite)
+      invite.invitable
     end
 
-    def build_invites(current_user)
-      all_emails.reject(&:blank?).collect do |e|
-        Invite.new(invitable_id: @invitable_id, invitable_type: @invitable_type, sender_id: current_user.id, email: e)
-      end
+    def invite_params
+      params[:invite] ? params.require(:invite).permit(:invitable_id, :invitable_type, :email, emails: []) : {}
     end
 
-    private
-
-    def all_emails
-      @emails + [@email]
-    end
-  end
-
-  # Override this if you want to do something more complicated for existing users.
-  # For example, if you have a more complex permissions scheme than just a simple
-  # has_many relationship, enable it here.
-  def after_invite_existing_user(invite)
-    # Add the user to the invitable resource/organization
-    invite.invitable.add_invited_user(invite.recipient)
-  end
-
-  # Override if you want to do something more complicated for new users.
-  # By default we don't do anything extra.
-  def after_invite_new_user(invite)
-  end
-
-  # After an invite is created, redirect the user here.
-  # Default implementation doesn't return a url, just the invitable.
-  def url_after_invite(invite)
-    invite.invitable
-  end
-
-  def invite_params
-    params[:invite] ? params.require(:invite).permit(:invitable_id, :invitable_type, :email, emails: []) : {}
-  end
-
-  # Invite user by sending email.
-  # Existing users are granted permissions via #after_invite_existing_user.
-  # New users are granted permissions via #after_invite_new_user, currently a null op.
-  def do_invite(invite)
-    if invite.existing_user?
-      deliver_email(InviteMailer.existing_user(invite))
-      after_invite_existing_user(invite)
-      invite.save
-    else
-      deliver_email(InviteMailer.new_user(invite))
-      after_invite_new_user(invite)
+    # Invite user by sending email.
+    # Existing users are granted permissions via #after_invite_existing_user.
+    # New users are granted permissions via #after_invite_new_user, currently a null op.
+    def do_invite(invite)
+      if invite.existing_user?
+        deliver_email(InviteMailer.existing_user(invite))
+        after_invite_existing_user(invite)
+        invite.save
+      else
+        deliver_email(InviteMailer.new_user(invite))
+        after_invite_new_user(invite)
+      end
     end
-  end
 
-  # Use deliver_later from rails 4.2+ if available.
-  def deliver_email(mail)
-    if mail.respond_to?(:deliver_later)
-      mail.deliver_later
-    else
-      mail.deliver
+    # Use deliver_later from rails 4.2+ if available.
+    def deliver_email(mail)
+      if mail.respond_to?(:deliver_later)
+        mail.deliver_later
+      else
+        mail.deliver
+      end
     end
   end
 end

data/app/forms/invitation/invite_form.rb

@@ -0,0 +1,36 @@
+module Invitation
+
+  # A form object pretends to be 'invite', but accepts both 'email' and 'emails'.
+  # It knows how to build all of the invite instances.
+  class InviteForm
+    include ActiveModel::Model
+
+    attr_accessor :invitable_id, :invitable_type, :email, :emails
+    attr_reader :invitable
+
+    def self.model_name # form masquerades as 'invite'
+      ActiveModel::Name.new(self, nil, 'Invite')
+    end
+
+    def initialize(attributes = {})
+      @emails ||= []
+      super
+    end
+
+    def invitable
+      @invitable ||= @invitable_type.classify.constantize.find(@invitable_id)
+    end
+
+    def build_invites(current_user)
+      all_emails.reject(&:blank?).collect do |e|
+        Invite.new(invitable_id: @invitable_id, invitable_type: @invitable_type, sender_id: current_user.id, email: e)
+      end
+    end
+
+    private
+
+    def all_emails
+      @emails + [@email]
+    end
+  end
+end

data/lib/generators/invitation/controllers/controllers_generator.rb

@@ -15,6 +15,10 @@ module Invitation
       def create_mailers
         directory 'app/mailers'
       end
+
+      def create_forms
+        directory 'app/forms'
+      end
     end
   end
 end

data/lib/invitation/version.rb

@@ -1,3 +1,3 @@
 module Invitation
-  VERSION = '0.4.5'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invitation
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Justin Tomich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-10 00:00:00.000000000 Z
+date: 2018-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -207,6 +207,7 @@ extra_rdoc_files: []
 files:
 - Rakefile
 - app/controllers/invitation/invites_controller.rb
+- app/forms/invitation/invite_form.rb
 - app/mailers/invite_mailer.rb
 - app/models/invite.rb
 - app/views/invite_mailer/existing_user.html.erb
@@ -235,7 +236,6 @@ files:
 - lib/invitation/user.rb
 - lib/invitation/user_registration.rb
 - lib/invitation/version.rb
-- lib/tasks/invitation_tasks.rake
 homepage: http://github.com/tomichj/invitation
 licenses:
 - MIT

data/lib/tasks/invitation_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :invitation do
-#   # Task goes here
-# end