simple_teams 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acdf88bfe936ac559c9454125c3219d9eba2e9a8d029cda43ac7d749231ac273
-  data.tar.gz: 5eb9a31ff2ab4a078e086c80396ad822f0baf718823de36ca3927290ea1b3a2b
+  metadata.gz: ea436fc244351fbe757513bc528932e72825f362859ce81edf4036a2b353bfc1
+  data.tar.gz: 636891c0d6281d29494eef2231b7a76245b062c04c506af26cc969136e48fc51
 SHA512:
-  metadata.gz: d5dc54ba9215f56f8161b8b22e7e1b110f5e3a73a74be7ed3e57460dc119e38d1bc323c99e21b7ffa92413a942e05144d13892fc9693da96142b0dcbea969326
-  data.tar.gz: c345c9fc4fcbedbf30055ff8af61b48751badceebccfd1b36921a08b038c65757f90088fb41032226ea09e9510896e43fa2c968ef30e192decee50cb31dd9ccd
+  metadata.gz: d8953835540518f246b25150d052553e8fce1de4bdbf70f8bb9045b918323b28d6d57a6b9ef18be6e998be6014816a23d5636de917cc30b1c7f235c5e397db25
+  data.tar.gz: 596cc17142a92d83a48393dc75e299941bde02cfedf5374db8be52526c2a870e3aac796259753500aa4dcc4818e5083671b5ab25a25d8dfa59fdef1fb3c15f70

data/app/controllers/simple_teams/accept_invitations_controller.rb

@@ -1,6 +1,5 @@
 module SimpleTeams
-  class AcceptInvitationsController < ApplicationController
-    skip_before_action :authenticate_user!
+  class AcceptInvitationsController < BaseController
     before_action :set_invitation
     before_action :ensure_invitation_token_is_valid
     before_action :set_team
@@ -12,7 +11,7 @@ module SimpleTeams
     def create
       if params[:commit] == "Decline"
         @invitation.declined!
-        redirect_to root_path, :notice => "You have declined the invitation to the '#{@team.name}' #{@team.teamable.class.model_name.human}."
+        redirect_to main_app.root_path, :notice => "You have declined the invitation to the '#{@team.name}' #{@team.teamable.class.model_name.human}."
       else
         if @service_object.valid?
           @service_object.perform
@@ -26,7 +25,7 @@ module SimpleTeams
             :user_name => current_user.full_name
           ).deliver_later(@team.members)
 
-          redirect_to url_for(@team.teamable), :notice => "You have accepted the invitation to the '#{@team.name}' #{@team.teamable.class.model_name.human}."
+          redirect_to main_app.url_for(@team.teamable), :notice => "You have accepted the invitation to the '#{@team.name}' #{@team.teamable.class.model_name.human}."
         else
           render :new
         end

data/app/controllers/simple_teams/application_controller.rb

@@ -1,13 +1,6 @@
 module SimpleTeams
-  class ApplicationController < SimpleTeams.parent_controller
+  class ApplicationController < ActionController::Base
     before_action :authenticate_user!
 
-    layout SimpleTeams.layout
-
-    def current_ability
-      SimpleTeams::Ability.new(current_user)
-    end
-    helper_method :current_ability
-
   end
 end

data/app/controllers/simple_teams/base_controller.rb

@@ -0,0 +1,12 @@
+module SimpleTeams
+  class BaseController < SimpleTeams.parent_controller
+
+    layout SimpleTeams.layout
+
+    def current_ability
+      SimpleTeams::Ability.new(current_user)
+    end
+    helper_method :current_ability
+
+  end
+end

data/app/controllers/simple_teams/invitations_controller.rb

@@ -1,5 +1,5 @@
 module SimpleTeams
-  class InvitationsController < ApplicationController
+  class InvitationsController < BaseController
     before_action :set_team
     before_action :set_invitation, except: %i[ new create index]
 

data/app/controllers/simple_teams/leave_teams_controller.rb

@@ -1,11 +1,11 @@
 module SimpleTeams
-  class LeaveTeamsController < ApplicationController
+  class LeaveTeamsController < BaseController
     before_action :set_team
     before_action :set_service_object
 
     def destroy
       if @service_object.valid? and @service_object.perform
-        redirect_to root_path, :notice => "You have successfully left the #{@team.name} #{@team.teamable.class.model_name.human}."
+        redirect_to main_app.url_for(@team.teamable.class), :notice => "You have successfully left the #{@team.name} #{@team.teamable.class.model_name.human}."
       else
         redirect_to team_path(@team), :notice => @service_object.errors[:user_id].first
       end

data/app/controllers/simple_teams/memberships_controller.rb

@@ -1,5 +1,5 @@
 module SimpleTeams
-  class MembershipsController < ApplicationController
+  class MembershipsController < BaseController
     before_action :set_team
     before_action :set_membership, :except => [:index]
 

data/app/controllers/simple_teams/related_members_controller.rb

@@ -1,5 +1,5 @@
 module SimpleTeams
-  class RelatedMembersController < ApplicationController
+  class RelatedMembersController < BaseController
 
     def index
       if params[:term].present?

data/app/controllers/simple_teams/teams_controller.rb

@@ -1,5 +1,5 @@
 module SimpleTeams
-  class TeamsController < ApplicationController
+  class TeamsController < BaseController
     before_action :set_team
 
     def show

data/app/service_objects/simple_teams/accept_invitation_service.rb

@@ -32,7 +32,7 @@ module SimpleTeams
     end
 
     def invitation
-      @invitation ||= Teams::Invitation.find_by(token: @invitation_token)
+      @invitation ||= Invitation.find_by(token: @invitation_token)
     end
 
     private

data/config/routes.rb

@@ -15,7 +15,7 @@ SimpleTeams::Engine.routes.draw do
   end
 
   # Team Invitations
-  get "accept_team_invitation/:id", :as => "accept_team_invitation", to: "teams/accept_invitations#new"
-  post "accept_team_invitation/:id", to: "teams/accept_invitations#create"
+  get "accept_team_invitation/:id", :as => "accept_team_invitation", to: "accept_invitations#new"
+  post "accept_team_invitation/:id", to: "accept_invitations#create"
 
 end

data/lib/simple_teams/version.rb

@@ -1,3 +1,3 @@
 module SimpleTeams
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_teams
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Thomas Laney Stroup
@@ -44,6 +44,7 @@ files:
 - app/controllers/simple_teams/admin/memberships_controller.rb
 - app/controllers/simple_teams/admin/teams_controller.rb
 - app/controllers/simple_teams/application_controller.rb
+- app/controllers/simple_teams/base_controller.rb
 - app/controllers/simple_teams/invitations_controller.rb
 - app/controllers/simple_teams/leave_teams_controller.rb
 - app/controllers/simple_teams/memberships_controller.rb