simple_teams 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da8068e7298920ff8cce86d505171c99e7e9c37a0dea9423f0847fd28440b455
-  data.tar.gz: 7806782011712e2964aeec5d9031e30bc5d4190177e66bd16bafab5aa273e14c
+  metadata.gz: ea436fc244351fbe757513bc528932e72825f362859ce81edf4036a2b353bfc1
+  data.tar.gz: 636891c0d6281d29494eef2231b7a76245b062c04c506af26cc969136e48fc51
 SHA512:
-  metadata.gz: 387bf7830fbc9badf2b076ae56c7190a2af366aa7e1633fcfb1d39441c3280c6507e22b783e2150e6646c7d9551b440d309109c9644e2b7b4412734050df2e8c
-  data.tar.gz: 17401c280915409b8128d13d24492a23916f6fd422f11ae59ff036c7afe0c7efd7c0b68de4734ce5231dc0f54235c40d1ac0b25ac443b493691685f862268ac3
+  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,11 +1,11 @@
 module SimpleTeams
-  class RelatedUsersController < ApplicationController
+  class RelatedMembersController < BaseController
 
     def index
       if params[:term].present?
         @members = SimpleTeams.member_class
           .joins(:team_memberships, :teams)
-          .where("teams_teams.id" => current_user.teams.pluck(:id))
+          .where("simple_teams_teams.id" => current_user.teams.pluck(:id))
           .where("email ilike ?", "%#{params[:term]}%")
           .order("#{SimpleTeams.member_class.table_name}.first_name")
           .uniq

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.2"
+  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.2
+  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
@@ -112,6 +113,7 @@ files:
 - app/views/simple_teams/invitations/edit.html.erb
 - app/views/simple_teams/invitations/new.html.erb
 - app/views/simple_teams/leave_teams/edit.html.erb
+- app/views/simple_teams/mailer/invitation_notification.html.erb
 - app/views/simple_teams/memberships/_form.html.erb
 - app/views/simple_teams/memberships/_membership.html.erb
 - app/views/simple_teams/memberships/edit.html.erb
@@ -120,7 +122,6 @@ files:
 - app/views/simple_teams/teams/_add_member_link.html.erb
 - app/views/simple_teams/teams/_members_table.html.erb
 - app/views/simple_teams/teams/show.html.erb
-- app/views/simple_teams/teams_mailer/invitation_notification.html.erb
 - config/locales/simple_teams.en.yml
 - config/routes.rb
 - db/migrate/20240311052758_create_simple_teams_teams.rb