simple_teams 0.1.3 → 0.1.6

data/app/views/simple_teams/_roles_field.html.erb

@@ -7,8 +7,8 @@
           <%= radio_button_tag "#{prefix}[role]", name, [name].include?(f.object.role), :class => "form-check-input" %>
           <%= label_tag "#{prefix}_role_#{name}", :class => "form-check-label w-100" do %>
             <div class="">
-              <div class="col"><b><%= name.capitalize %></b></div>
-              <div class="col"><%= t "simple_teams.roles.#{name}" %></div>
+              <div class="col"><b><%= team_based_role_name(@team, name) %></b></div>
+              <div class="col"><%= team_based_role_description(@team, name) %></div>
             </div>
           <% end %>
         </div>

data/app/views/simple_teams/invitations/_invitation.html.erb

@@ -1,6 +1,6 @@
 <tr id="<%= dom_id invitation %>">
   <td><%= invitation.email %></td>
-  <td><%= invitation.role.capitalize %></td>
+  <td><%= team_based_role_name(team, invitation.role) %></td>
   <td>Invited</td>
   <td><%= invitation.created_at.to_date %></td>
   <td>

data/app/views/simple_teams/invitations/edit.html.erb

@@ -1,10 +1,5 @@
 <div class="centered-content-template">
-  <nav aria-label="breadcrumb">
-    <ol class="breadcrumb">
-      <li class="breadcrumb-item"><a href="<%= team_path(@team) %>"><%= @team.name %></a></li>
-      <li class="breadcrumb-item active" aria-current="page">Update Invitation</li>
-    </ol>
-  </nav>
+  <%= render "simple_teams/nested_action_breadcrumb", :current_page_name => "Update Invitation" %>
 
   <h1>Update Invitation</h1>
 

data/app/views/simple_teams/invitations/new.html.erb

@@ -1,10 +1,5 @@
 <div class="centered-content-template">
-  <nav aria-label="breadcrumb">
-    <ol class="breadcrumb">
-      <li class="breadcrumb-item"><a href="<%= team_path(@team) %>"><%= @team.name %></a></li>
-      <li class="breadcrumb-item active" aria-current="page">Invite User</li>
-    </ol>
-  </nav>
+  <%= render "simple_teams/nested_action_breadcrumb", :current_page_name => "Invite Users" %>
 
   <h1>Invite Users</h1>
 

data/app/views/simple_teams/memberships/_membership.html.erb

@@ -1,6 +1,6 @@
 <tr id="<%= dom_id membership %>">
   <td><%= membership.member.full_name %><%= " (you)" if current_user.membership_for_team(team) == membership %></td>
-  <td><%= membership.role.capitalize %></td>
+  <td><%= team_based_role_name(team, membership.role) %></td>
   <td>Active</td>
   <td><%= membership.created_at.to_date %></td>
   <td>

data/app/views/simple_teams/memberships/edit.html.erb

@@ -1,10 +1,5 @@
 <div class="centered-content-template">
-  <nav aria-label="breadcrumb">
-    <ol class="breadcrumb">
-      <li class="breadcrumb-item"><a href="<%= team_path(@team) %>"><%= @team.name %></a></li>
-      <li class="breadcrumb-item active" aria-current="page">Edit Member</li>
-    </ol>
-  </nav>
+  <%= render "simple_teams/nested_action_breadcrumb", :current_page_name => "Edit Member" %>
 
   <h1>Edit Member: <%= @membership.member.full_name %></h1>
 

data/app/views/simple_teams/teams/_add_member_link.html.erb

@@ -1,3 +1,3 @@
 <div class="text-center">
-  <%= link_to text, new_team_invitation_path(@team), :class => "btn btn-primary" %>
+  <%= link_to "Invite Users", new_team_invitation_path(@team), :class => "btn btn-primary" %>
 </div>

data/app/views/simple_teams/teams/_dropdown_menu.html.erb

@@ -0,0 +1,13 @@
+<div class="dropdown mt-2">
+  <button class="btn btn-outline-dark btn-sm dropdown-toggle" type="button" id="<%= @team.id %>-dropdown-menu" data-bs-toggle="dropdown" aria-expanded="false">
+    Actions
+  </button>
+  <ul class="dropdown-menu" aria-labelledby="<%= @team.id %>-dropdown-menu">
+    <%= link_to "Invite Users", new_team_invitation_path(@team), :class => "dropdown-item" %>
+
+    <% if current_user.membership_for_team(@team).present? %>
+      <li><hr class="dropdown-divider"></li>
+      <%= button_to "Leave", team_leave_team_path(@team), :method => :delete, :class => "btn btn-link dropdown-item", :form => { :data => { "turbo-confirm" => "Are you sure you want to leave this #{ @team.teamable.class.model_name.human }?" } } %>
+    <% end %>
+  </ul>
+</div>

data/app/views/simple_teams/teams/_index_breadcrumb.html.erb

@@ -0,0 +1,7 @@
+<nav aria-label="breadcrumb">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><%= link_to @team.teamable.class.model_name.human(count: 2), main_app.url_for(@team.teamable.class) %></li>
+    <li class="breadcrumb-item"><%= link_to @team.teamable.name, main_app.url_for(@team.teamable) %></li>
+    <li class="breadcrumb-item active" aria-current="page">Team Members</li>
+  </ol>
+</nav>

data/app/views/simple_teams/teams/_members_table.html.erb

@@ -1,4 +1,4 @@
-<table class="table table-bordered mb-5">
+<table class="table table-bordered my-5">
   <thead>
     <tr>
       <th class="col-3">Name</th>

data/app/views/simple_teams/teams/show.html.erb

@@ -1,38 +1,11 @@
-<nav aria-label="breadcrumb">
-  <ol class="breadcrumb">
-    <li class="breadcrumb-item"><%= link_to "Teams", teams_path %></li>
-    <li class="breadcrumb-item active" aria-current="page"><%= @team.name %></li>
-  </ol>
-</nav>
+<%= render "index_breadcrumb" %>
 
-<div class="heading-with-dropdown-menu">
-  <h1><%= @team.name %></h1>
+<div class="heading-with-dropdown-menu d-flex justify-content-between">
+  <h1><%= @team.name %>: Team Members</h1>
 
-  <div class="dropdown">
-    <% if can? :update, @team %>
-      <button class="btn btn-outline-dark btn-sm dropdown-toggle" type="button" id="<%= @team.id %>-dropdown-menu" data-bs-toggle="dropdown" aria-expanded="false">
-        Actions
-      </button>
-      <ul class="dropdown-menu" aria-labelledby="<%= @team.id %>-dropdown-menu">
-        <%= link_to "Invite User", new_team_invitation_path(@team), :class => "dropdown-item" %>
-
-        <li><hr class="dropdown-divider"></li>
-        <%= link_to "Edit", edit_team_path(@team), :class => "dropdown-item" %>
-
-        <% if current_user.membership_for_team(@team).present? %>
-          <li><hr class="dropdown-divider"></li>
-          <%= button_to "Leave", team_leave_team_path(@team), :method => :delete, :class => "btn btn-link dropdown-item", :form => { :data => { "turbo-confirm" => "Are you sure you want to leave this #{ @team.teamable.class.model_name.human }?" } } %>
-        <% end %>
-
-        <% if can? :destroy, @team %>
-          <li><hr class="dropdown-divider"></li>
-          <%= button_to "Delete", team_path(@team), :method => :delete, :class => "btn btn-link dropdown-item", :form => { :data => { "turbo-confirm" => "Are you sure you want to delete this #{ @team.teamable.class.model_name.human }?" } } %>
-        <% end %>
-      </ul>
-    <% end %>
-  </div>
+  <%= render "dropdown_menu" %>
 </div>
 
-<h2 class="mt-5">Members</h2>
-
 <%= render "members_table" %>
+
+<%= render "add_member_link" %>

data/config/locales/simple_teams.en.yml

@@ -1,9 +1,24 @@
 en:
   simple_teams:
     roles:
-      member: "Can view content"
-      administrator: "Can create and delete content, and invite and remove other members"
-      owner: "Same as administrator, but cannot be removed except by another owner"
+      names:
+        member: "Member"
+        administrator: "Administrator"
+        owner: "Owner"
+      descriptions:
+        member: "Can view content"
+        administrator: "Can create and delete content, and invite and remove other members"
+        owner: "Same as administrator, but cannot be removed except by another owner"
+    organizations:
+      roles:
+        names:
+          member: "Member A"
+          administrator: "Member B"
+          owner: "Member C"
+        descriptions:
+          member: "Description A"
+          administrator: "Description B"
+          owner: "Description C"
   simple_form:
     labels:
       invitation_forms_create_combo:

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/engine.rb

@@ -7,6 +7,7 @@ module SimpleTeams
   mattr_accessor :parent_controller
   mattr_accessor :layout
   mattr_accessor :roles
+  mattr_accessor :from_address
 
   def self.member_class
     (@@member_class || "User").constantize
@@ -24,4 +25,8 @@ module SimpleTeams
     (@@roles || [:member, :administrator, :owner])
   end
 
+  def self.from_address
+    (@@from_address || "please-change-me@example.com")
+  end
+
 end

data/lib/simple_teams/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_teams
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.6
 platform: ruby
 authors:
 - Thomas Laney Stroup
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-11 00:00:00.000000000 Z
+date: 2025-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.0.7.2
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.8.1
+- !ruby/object:Gem::Dependency
+  name: cancancan
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+- !ruby/object:Gem::Dependency
+  name: noticed
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.1
+- !ruby/object:Gem::Dependency
+  name: simple_form
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.1.0
 description: SimpleTeams is an all-in-one solution for implementing teams quickly
   in a Ruby on Rails (RoR) application. It follows best practices, using the Rails
   Engine design pattern for easy configurability, CanCan for authorization, and polymorphic
@@ -40,15 +96,14 @@ files:
 - app/assets/config/simple_teams_manifest.js
 - app/assets/stylesheets/simple_teams/application.css
 - app/controllers/simple_teams/accept_invitations_controller.rb
-- app/controllers/simple_teams/admin/invitations_controller.rb
-- 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
 - app/controllers/simple_teams/related_members_controller.rb
 - app/controllers/simple_teams/teams_controller.rb
+- app/forms/application_form.rb
 - app/forms/simple_teams/invitation_form.rb
 - app/forms/simple_teams/invitation_forms/create.rb
 - app/forms/simple_teams/invitation_forms/create_bulk.rb
@@ -56,6 +111,7 @@ files:
 - app/forms/simple_teams/invitation_forms/update.rb
 - app/forms/simple_teams/membership_form.rb
 - app/helpers/simple_teams/application_helper.rb
+- app/helpers/simple_teams/base_helper.rb
 - app/helpers/simple_teams/invitations_helper.rb
 - app/helpers/simple_teams/memberships_helper.rb
 - app/helpers/simple_teams/teams_helper.rb
@@ -69,42 +125,25 @@ files:
 - app/models/simple_teams/invitation.rb
 - app/models/simple_teams/membership.rb
 - app/models/simple_teams/team.rb
-- app/notifications/application_notification.rb
-- app/notifications/simple_teams/bulk_invitations_notification.rb
-- app/notifications/simple_teams/invitation_notification.rb
-- app/notifications/simple_teams/invitations/accepted_notification.rb
-- app/notifications/simple_teams/invitations/created_notification.rb
-- app/notifications/simple_teams/invitations/destroyed_notification.rb
-- app/notifications/simple_teams/invitations/updated_notification.rb
-- app/notifications/simple_teams/membership_notification.rb
-- app/notifications/simple_teams/memberships/destroyed_notification.rb
-- app/notifications/simple_teams/memberships/left_notification.rb
-- app/notifications/simple_teams/memberships/updated_notification.rb
+- app/notifiers/concerns/simple_teams/invitation_notifier.rb
+- app/notifiers/concerns/simple_teams/membership_notifier.rb
+- app/notifiers/simple_teams/application_notifier.rb
+- app/notifiers/simple_teams/bulk_invitations_notifier.rb
+- app/notifiers/simple_teams/invitations/accepted_notifier.rb
+- app/notifiers/simple_teams/invitations/created_notifier.rb
+- app/notifiers/simple_teams/invitations/destroyed_notifier.rb
+- app/notifiers/simple_teams/invitations/updated_notifier.rb
+- app/notifiers/simple_teams/memberships/destroyed_notifier.rb
+- app/notifiers/simple_teams/memberships/left_notifier.rb
+- app/notifiers/simple_teams/memberships/updated_notifier.rb
 - app/service_objects/simple_teams/accept_invitation_service.rb
 - app/service_objects/simple_teams/initialize_team_service.rb
 - app/service_objects/simple_teams/leave_team_service.rb
 - app/views/layouts/simple_teams/application.html.erb
+- app/views/simple_teams/_nested_action_breadcrumb.html.erb
 - app/views/simple_teams/_roles_field.html.erb
 - app/views/simple_teams/accept_invitations/invalid_token.html.erb
 - app/views/simple_teams/accept_invitations/new.html.erb
-- app/views/simple_teams/admin/invitations/_form.html.erb
-- app/views/simple_teams/admin/invitations/_invitation.html.erb
-- app/views/simple_teams/admin/invitations/edit.html.erb
-- app/views/simple_teams/admin/invitations/index.html.erb
-- app/views/simple_teams/admin/invitations/new.html.erb
-- app/views/simple_teams/admin/invitations/show.html.erb
-- app/views/simple_teams/admin/memberships/_form.html.erb
-- app/views/simple_teams/admin/memberships/_membership.html.erb
-- app/views/simple_teams/admin/memberships/edit.html.erb
-- app/views/simple_teams/admin/memberships/index.html.erb
-- app/views/simple_teams/admin/memberships/new.html.erb
-- app/views/simple_teams/admin/memberships/show.html.erb
-- app/views/simple_teams/admin/teams/_form.html.erb
-- app/views/simple_teams/admin/teams/_team.html.erb
-- app/views/simple_teams/admin/teams/edit.html.erb
-- app/views/simple_teams/admin/teams/index.html.erb
-- app/views/simple_teams/admin/teams/new.html.erb
-- app/views/simple_teams/admin/teams/show.html.erb
 - app/views/simple_teams/invitations/_bulk_form.html.erb
 - app/views/simple_teams/invitations/_form.html.erb
 - app/views/simple_teams/invitations/_invitation.html.erb
@@ -119,6 +158,8 @@ files:
 - app/views/simple_teams/related_members/index.json.jbuilder
 - app/views/simple_teams/related_members/select2.json.jbuilder
 - app/views/simple_teams/teams/_add_member_link.html.erb
+- app/views/simple_teams/teams/_dropdown_menu.html.erb
+- app/views/simple_teams/teams/_index_breadcrumb.html.erb
 - app/views/simple_teams/teams/_members_table.html.erb
 - app/views/simple_teams/teams/show.html.erb
 - config/locales/simple_teams.en.yml
@@ -138,7 +179,7 @@ metadata:
   homepage_uri: https://github.com/strouptl/simple_teams
   source_code_uri: https://github.com/strouptl/simple_teams
   changelog_uri: https://github.com/strouptl/simple_teams/blob/main/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -153,8 +194,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key: 
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: A simple gem for adding teams to a Ruby on Rails application
 test_files: []

data/app/controllers/simple_teams/admin/invitations_controller.rb

@@ -1,60 +0,0 @@
-module SimpleTeams
-  class InvitationsController < ApplicationController
-    before_action :set_invitation, only: %i[ show edit update destroy ]
-
-    # GET /invitations
-    def index
-      @invitations = Invitation.all
-    end
-
-    # GET /invitations/1
-    def show
-    end
-
-    # GET /invitations/new
-    def new
-      @invitation = Invitation.new
-    end
-
-    # GET /invitations/1/edit
-    def edit
-    end
-
-    # POST /invitations
-    def create
-      @invitation = Invitation.new(invitation_params)
-
-      if @invitation.save
-        redirect_to @invitation, notice: "Invitation was successfully created."
-      else
-        render :new, status: :unprocessable_entity
-      end
-    end
-
-    # PATCH/PUT /invitations/1
-    def update
-      if @invitation.update(invitation_params)
-        redirect_to @invitation, notice: "Invitation was successfully updated.", status: :see_other
-      else
-        render :edit, status: :unprocessable_entity
-      end
-    end
-
-    # DELETE /invitations/1
-    def destroy
-      @invitation.destroy
-      redirect_to invitations_url, notice: "Invitation was successfully destroyed.", status: :see_other
-    end
-
-    private
-      # Use callbacks to share common setup or constraints between actions.
-      def set_invitation
-        @invitation = Invitation.find(params[:id])
-      end
-
-      # Only allow a list of trusted parameters through.
-      def invitation_params
-        params.require(:invitation).permit(:team_id, :inviter_id, :membership_id, :email, :role, :token, :status, :sent_at, :expires_at)
-      end
-  end
-end

data/app/controllers/simple_teams/admin/memberships_controller.rb

@@ -1,60 +0,0 @@
-module SimpleTeams
-  class MembershipsController < ApplicationController
-    before_action :set_membership, only: %i[ show edit update destroy ]
-
-    # GET /memberships
-    def index
-      @memberships = Membership.all
-    end
-
-    # GET /memberships/1
-    def show
-    end
-
-    # GET /memberships/new
-    def new
-      @membership = Membership.new
-    end
-
-    # GET /memberships/1/edit
-    def edit
-    end
-
-    # POST /memberships
-    def create
-      @membership = Membership.new(membership_params)
-
-      if @membership.save
-        redirect_to @membership, notice: "Membership was successfully created."
-      else
-        render :new, status: :unprocessable_entity
-      end
-    end
-
-    # PATCH/PUT /memberships/1
-    def update
-      if @membership.update(membership_params)
-        redirect_to @membership, notice: "Membership was successfully updated.", status: :see_other
-      else
-        render :edit, status: :unprocessable_entity
-      end
-    end
-
-    # DELETE /memberships/1
-    def destroy
-      @membership.destroy
-      redirect_to memberships_url, notice: "Membership was successfully destroyed.", status: :see_other
-    end
-
-    private
-      # Use callbacks to share common setup or constraints between actions.
-      def set_membership
-        @membership = Membership.find(params[:id])
-      end
-
-      # Only allow a list of trusted parameters through.
-      def membership_params
-        params.require(:membership).permit(:team_id, :member_id, :role)
-      end
-  end
-end

data/app/controllers/simple_teams/admin/teams_controller.rb

@@ -1,60 +0,0 @@
-module SimpleTeams
-  class TeamsController < ApplicationController
-    before_action :set_team, only: %i[ show edit update destroy ]
-
-    # GET /teams
-    def index
-      @teams = Team.all
-    end
-
-    # GET /teams/1
-    def show
-    end
-
-    # GET /teams/new
-    def new
-      @team = Team.new
-    end
-
-    # GET /teams/1/edit
-    def edit
-    end
-
-    # POST /teams
-    def create
-      @team = Team.new(team_params)
-
-      if @team.save
-        redirect_to @team, notice: "Team was successfully created."
-      else
-        render :new, status: :unprocessable_entity
-      end
-    end
-
-    # PATCH/PUT /teams/1
-    def update
-      if @team.update(team_params)
-        redirect_to @team, notice: "Team was successfully updated.", status: :see_other
-      else
-        render :edit, status: :unprocessable_entity
-      end
-    end
-
-    # DELETE /teams/1
-    def destroy
-      @team.destroy
-      redirect_to teams_url, notice: "Team was successfully destroyed.", status: :see_other
-    end
-
-    private
-      # Use callbacks to share common setup or constraints between actions.
-      def set_team
-        @team = Team.find(params[:id])
-      end
-
-      # Only allow a list of trusted parameters through.
-      def team_params
-        params.require(:team).permit(:teamable_id, :teamable_type)
-      end
-  end
-end

data/app/notifications/application_notification.rb

@@ -1,4 +0,0 @@
-class ApplicationNotification < Noticed::Base
-  deliver_by :database
-
-end

data/app/notifications/simple_teams/bulk_invitations_notification.rb

@@ -1,51 +0,0 @@
-module SimpleTeams
-  class BulkInvitationsNotification < ApplicationNotification
-
-    param :team_id, :user_id, :team_name, :user_name, :invitation_names
-
-    def message
-      "#{user_name} invited #{invitation_names.to_sentence} to #{team_name}."
-    end
-
-    def subject
-      "Users Invited"
-    end
-
-    def url
-      if team.present? and team.members.include? recipient
-        "/teams/#{team.id}"
-      end
-    end
-
-    def link_text
-      "View Invitations"
-    end
-
-    # Objects
-    def team
-      Team.find_by(id: params[:team_id])
-    end
-
-    def user
-      SimpleTeams.member_class.find_by(id: params[:user_id])
-    end
-
-    # Names (fallback)
-    def team_name
-      team.present? ? team.name : params[:team_name]
-    end
-
-    def invitation_names
-      params[:invitation_names]
-    end
-
-    def user_name
-      if recipient.id == params[:user_id]
-        "You"
-      else
-        user.present? ? user.full_name : params[:user_name]
-      end
-    end
-
-  end
-end