Add organization gems and organization edit/update

app/controllers/organizations/gems_controller.rb

@@ -0,0 +1,21 @@
+class Organizations::GemsController < ApplicationController
+  before_action :redirect_to_signin, unless: :signed_in?
+  before_action :redirect_to_new_mfa, if: :mfa_required_not_yet_enabled?
+  before_action :redirect_to_settings_strong_mfa_required, if: :mfa_required_weak_level_enabled?
+
+  before_action :find_organization, only: %i[index]
+
+  layout "subject"
+
+  # GET /organizations/:handle/gems
+
+  def index
+    @gems = @organization.rubygems.with_versions.by_downloads.preload(:most_recent_version, :gem_download).load_async
+  end
+
+  private
+
+  def find_organization
+    @organization = Organization.find_by_handle!(params[:organization_handle])
+  end
+end

app/controllers/organizations_controller.rb

@@ -3,7 +3,7 @@ class OrganizationsController < ApplicationController
   before_action :redirect_to_new_mfa, only: :index, if: :mfa_required_not_yet_enabled?
   before_action :redirect_to_settings_strong_mfa_required, only: :index, if: :mfa_required_weak_level_enabled?
 
-  before_action :find_organization, only: %i[show]
+  before_action :find_organization, only: %i[show edit update]
 
   layout "subject"
 
@@ -26,9 +26,30 @@ def show
     @memberships_count = @organization.memberships.count
   end
 
+  def edit
+    add_breadcrumb t("breadcrumbs.org_name", name: @organization.handle), organization_path(@organization)
+    add_breadcrumb t("breadcrumbs.settings")
+
+    authorize @organization
+  end
+
+  def update
+    authorize @organization
+
+    if @organization.update(organization_params)
+      redirect_to organization_path(@organization)
+    else
+      render :edit
+    end
+  end
+
   private
 
   def find_organization
     @organization = Organization.find_by_handle!(params[:handle])
   end
+
+  def organization_params
+    params.permit(organization: [:name]).require(:organization)
+  end
 end

app/policies/organization_policy.rb

@@ -10,6 +10,8 @@ def update?
     organization_member_with_role?(user, minimum_required_role: Access::OWNER)
   end
 
+  alias edit? update?
+
   def create?
     true
   end

app/views/organizations/_subject.html.erb

@@ -15,9 +15,11 @@
 <hr class="hidden lg:block lg:mb-6 border-neutral-400 dark:border-neutral-600" />
 
 <%= render Subject::NavComponent.new(current:) do |nav| %>
-  <%= nav.link t("layouts.application.header.dashboard"), dashboard_path, name: :dashboard, icon: "space-dashboard" %>
-  <%= nav.link t("organizations.show.history"), subscriptions_path, name: :subscriptions, icon: "notifications" %>
-  <%= nav.link t("organizations.show.gems"), organizations_path, name: :gems, icon: "gems" %>
-  <%= nav.link t("organizations.show.members"), organizations_path, name: :organizations, icon: "organizations" %>
-  <%= nav.link t("layouts.application.header.settings"), edit_settings_path, name: :settings, icon: "settings" %>
+  <%= nav.link t("layouts.application.header.dashboard"), organization_path(@organization), name: :dashboard, icon: "space-dashboard" %>
+  <%= nav.link t("organizations.show.history"), organization_path(@organization), name: :subscriptions, icon: "notifications" %>
+  <%= nav.link t("organizations.show.gems"), organization_gems_path(@organization), name: :gems, icon: "gems" %>
+  <%= nav.link t("organizations.show.members"), organization_path(@organization), name: :organizations, icon: "organizations" %>
+  <% if policy(@organization).edit? %>
+    <%= nav.link t("layouts.application.header.settings"), edit_organization_path(@organization), name: :settings, icon: "settings" %>
+  <% end %>
 <% end %>

app/views/organizations/edit.html.erb

@@ -0,0 +1,26 @@
+<% content_for :subject do %>
+  <%= render "organizations/subject", organization: @organization, current: :settings %>
+<% end %>
+
+<h1 class="text-h2 mb-10"><%= t("layouts.application.header.settings") %></h1>
+
+<%= render CardComponent.new do |c| %>
+  <%= c.head do %>
+    <%= c.title t("layouts.application.header.settings"), icon: "settings" %>
+  <% end %>
+  <%= form_with model: @organization, url: organization_path(@organization), method: :patch do |form| %>
+    <div>
+      <%= form.label :name, "Display Name", class: "block text-b2 font-semibold mb-2" %>
+      <%= form.text_field(
+        :name,
+        class: "w-full text-b2 rounded-lg dark:bg-neutral-950 focus:ring-inset focus:ring-1 focus:ring-orange-500",
+        required: true,
+        autocomplete: "organization",
+      ) %>
+    </div>
+
+    <div class="flex mt-10">
+      <%= render ButtonComponent.new("Update", type: :submit, style: :outline) %>
+    </div>
+  <% end %>
+<% end %>

app/views/organizations/gems/index.html.erb

@@ -0,0 +1,36 @@
+<% content_for :subject do %>
+  <%= render "organizations/subject", organization: @organization, current: :gems %>
+<% end %>
+
+<h1 class="text-h2 mb-10"><%= t("organizations.show.gems") %></h1>
+
+<%= render CardComponent.new do |c| %>
+  <%= c.head do %>
+    <%= c.title t("organizations.show.gems"), icon: "gems", count: @gems_count %>
+  <% end %>
+  <% if @gems.empty? %>
+    <%= prose do %>
+      <i><%= t('organizations.show.no_gems') %></i>
+    <% end %>
+  <% else %>
+    <%= c.divided_list do %>
+      <% @gems.each do |rubygem| %>
+        <%= c.list_item_to(
+          rubygem_path(rubygem.slug),
+          title: short_info(rubygem.most_recent_version),
+        ) do %>
+          <div class="flex flex-col w-full justify-between">
+            <div class="flex flex-row w-full items-center justify-between">
+              <h4 class="text-b1 flex"><%= rubygem.name %></h4>
+              <%= version_number(rubygem.most_recent_version) %>
+            </div>
+            <div class="flex flex-row w-full items-center justify-between">
+              <%= download_count_component(rubygem, class: "flex") %>
+              <div class="flex text-neutral-600"><%= version_date_component(rubygem.most_recent_version) %></div>
+            </div>
+          </div>
+        <% end %>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>

app/views/organizations/show.html.erb

@@ -42,7 +42,7 @@
   <% end %>
   <% if @gems.empty? %>
     <%= prose do %>
-      <i><%= t('.no_gems', :creating_link => link_to(t('.creating_link_text'), "https://guides.rubygems.org/make-your-own-gem/")) %></i>
+      <i><%= t('.no_gems') %></i>
     <% end %>
   <% else %>
     <%= c.divided_list do %>

config/locales/en.yml

@@ -416,6 +416,7 @@ en:
     index:
       title: Organizations
     show:
+      organization: Organization
       gems: Gems
       history: History
       members: Members

config/routes.rb

@@ -267,7 +267,9 @@
 
     get '/sign_up' => 'users#new', as: 'sign_up' if Clearance.configuration.allow_sign_up?
 
-    resources :organizations, only: [:index, :show], param: :handle, constraints: { handle: Patterns::ROUTE_PATTERN }
+    resources :organizations, only: %i[index show edit update], param: :handle, constraints: { handle: Patterns::ROUTE_PATTERN } do
+      resources :gems, only: :index
+    end
     namespace :organizations, as: :organization do
       resource :onboarding, only: %i[index destroy], controller: "onboarding"
       namespace :onboarding do

test/integration/organizations/gems_test.rb

@@ -0,0 +1,25 @@
+require "test_helper"
+
+class Organizations::GemsTest < ActionDispatch::IntegrationTest
+  setup do
+    @user = create(:user, remember_token_expires_at: Gemcutter::REMEMBER_FOR.from_now)
+    post session_path(session: { who: @user.handle, password: PasswordHelpers::SECURE_TEST_PASSWORD })
+  end
+
+  test "should get index" do
+    @organization = create(:organization, owners: [@user])
+    @organization.rubygems << create(:rubygem, name: "arrakis", number: "1.0.0")
+
+    get "/organizations/#{@organization.to_param}/gems"
+
+    assert page.has_content? "arrakis"
+  end
+
+  test "should get index with no gems" do
+    @organization = create(:organization, owners: [@user])
+
+    get "/organizations/#{@organization.to_param}/gems"
+
+    assert page.has_content? "No gems yet"
+  end
+end

test/integration/organizations_test.rb

@@ -0,0 +1,63 @@
+require "test_helper"
+
+class OrganizationsTest < ActionDispatch::IntegrationTest
+  setup do
+    @user = create(:user, remember_token_expires_at: Gemcutter::REMEMBER_FOR.from_now)
+    post session_path(session: { who: @user.handle, password: PasswordHelpers::SECURE_TEST_PASSWORD })
+  end
+
+  test "should show an organization" do
+    @organization = create(:organization, owners: [@user])
+    @organization.rubygems << create(:rubygem, name: "arrakis", number: "1.0.0")
+
+    get "/organizations/#{@organization.to_param}"
+
+    assert_response :success
+    assert page.has_content? "arrakis"
+  end
+
+  test "should render not found when an organization doesn't exist" do
+    get "/organizations/notfound"
+
+    assert_response :not_found
+  end
+
+
+  test "should list no organization for a user with none" do
+    get "/organizations"
+
+    assert_response :success
+  end
+
+  test "should list organizations for a user" do
+    @organization = create(:organization, owners: [@user])
+
+    get "/organizations"
+
+    assert_response :success
+    assert page.has_content? @organization.name
+  end
+
+  test "should render organization edit form" do
+    @organization = create(:organization, owners: [@user])
+
+    get "/organizations/#{@organization.to_param}/edit"
+
+    assert_response :success
+    assert_select "form[action=?]", organization_path(@organization)
+    assert_select "input[name=?]", "organization[name]"
+  end
+
+  test "should update an organization display name" do
+    @organization = create(:organization, owners: [@user])
+
+    patch "/organizations/#{@organization.to_param}", params: {
+      organization: { name: "New Name" }
+    }
+
+    assert_redirected_to organization_path(@organization)
+    follow_redirect!
+
+    assert page.has_content? "New Name"
+  end
+end