🧹 Furniture: Complete the rename!

.rubocop_todo.yml

@@ -41,11 +41,11 @@ RSpec/ExampleLength:
     - 'spec/furniture/journal/entries_request_spec.rb'
     - 'spec/furniture/markdown_text_block_spec.rb'
     - 'spec/furniture/marketplace/products_controller_request_spec.rb'
-    - 'spec/models/furniture_placement_spec.rb'
+    - 'spec/models/furniture_spec.rb'
     - 'spec/models/membership_spec.rb'
     - 'spec/models/room_spec.rb'
     - 'spec/policies/room_policy_spec.rb'
-    - 'spec/requests/furniture_placements_controller_request_spec.rb'
+    - 'spec/requests/furnitures_controller_request_spec.rb'
     - 'spec/requests/rsvps_controller_request_spec.rb'
     - 'spec/requests/spaces/invitations_request_spec.rb'
     - 'spec/requests/spaces_controller_request_spec.rb'

app/controllers/application_controller.rb

@@ -124,7 +124,7 @@ def pundit_user
   end
 
   def space_repository
-    policy_scope(Space.includes(:rooms, entrance: [:furniture_placements]))
+    policy_scope(Space.includes(:rooms, entrance: [:furnitures]))
   end
 
   # Retrieves the room based upon the current_space and params

app/controllers/furnitures_controller.rb

@@ -0,0 +1,67 @@
+class FurnituresController < ApplicationController
+  def edit
+    respond_to do |format|
+      format.turbo_stream
+      format.html
+    end
+  end
+
+  def create
+    respond_to do |format|
+      if furniture.save!
+        format.html do
+          redirect_to(
+            [furniture.room.space, furniture.room],
+            notice: t(".success", name: furniture.furniture.model_name.human)
+          )
+        end
+        format.turbo_stream
+      end
+    end
+  end
+
+  def update
+    respond_to do |format|
+      if furniture.update!(furniture_params)
+        format.html do
+          redirect_to(
+            [:edit, furniture.room.space, furniture.room],
+            notice: t(".success", name: furniture.furniture.model_name.human)
+          )
+        end
+      end
+    end
+  end
+
+  def destroy
+    furniture.furniture.destroy!
+    respond_to do |format|
+      format.html do
+        redirect_to(
+          [furniture.room.space, furniture.room],
+          notice: t(".success", name: furniture.furniture.model_name.human.titleize)
+        )
+      end
+
+      format.turbo_stream do
+        render turbo_stream: turbo_stream.remove(furniture)
+      end
+    end
+  end
+
+  helper_method def furniture
+    @furniture ||= find_or_build.tap do |furniture|
+      authorize(furniture)
+    end
+  end
+
+  def find_or_build
+    return current_room.furnitures.find(params[:id]) if params[:id]
+
+    current_room.furnitures.new(furniture_params)
+  end
+
+  def furniture_params
+    policy(Furniture).permit(params.require(:furniture))
+  end
+end

app/furniture/embedded_form.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class EmbeddedForm < FurniturePlacement
+class EmbeddedForm < Furniture
   def form_url=(form_url)
     settings["form_url"] = form_url
   end

app/furniture/journal/journal.rb

@@ -1,4 +1,4 @@
-class Journal::Journal < FurniturePlacement
+class Journal::Journal < Furniture
   self.location_parent = :room
 
   extend StripsNamespaceFromModelName

app/furniture/livestream.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Renders a Twitch Livestream in a Room
-class Livestream < FurniturePlacement
+class Livestream < Furniture
   def channel=(channel)
     settings["channel"] = channel
   end

app/furniture/markdown_text_block.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Renders some HTML in a {Room}.
-class MarkdownTextBlock < FurniturePlacement
+class MarkdownTextBlock < Furniture
   include RendersMarkdown
 
   def to_html

app/furniture/marketplace/marketplace.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Marketplace
-  class Marketplace < FurniturePlacement
+  class Marketplace < Furniture
     self.location_parent = :room
 
     has_many :products, inverse_of: :marketplace, dependent: :destroy

app/lib/space_routes.rb

@@ -5,8 +5,8 @@ def self.append_routes(router)
       router.resource :rsvp, only: %i[show update]
     end
     router.resources :rooms, only: %i[show edit update new create destroy] do
-      FurniturePlacement.append_routes(router)
-      router.resources :furniture_placements, only: %i[create edit update destroy]
+      Furniture.append_routes(router)
+      router.resources :furnitures, only: %i[create edit update destroy]
     end
 
     router.resources :utility_hookups

app/models/blueprint.rb

@@ -26,19 +26,19 @@ def find_or_create!
   def set_rooms
     space_attributes.fetch(:rooms, []).each do |room_attributes|
       room = space.rooms.find_or_initialize_by(name: room_attributes[:name])
-      room.update!(merge_non_empty(room.attributes, room_attributes).except(:name, :furniture_placements))
+      room.update!(merge_non_empty(room.attributes, room_attributes).except(:name, :furnitures))
       add_furniture(room, room_attributes)
     end
   end
 
   def add_furniture(room, room_attributes)
-    furniture_placements = room_attributes.fetch(:furniture_placements, {})
-    furniture_placements.each.with_index do |(furniture, settings), slot|
-      furniture_placement = room.furniture_placements
+    furnitures = room_attributes.fetch(:furnitures, {})
+    furnitures.each.with_index do |(furniture_kind, settings), slot|
+      furniture = room.furnitures
         .find_or_initialize_by(slot: slot)
-      furniture_placement
-        .update!(settings: merge_non_empty(settings, furniture_placement.settings),
-          furniture_kind: furniture)
+      furniture
+        .update!(settings: merge_non_empty(settings, furniture.settings),
+          furniture_kind: furniture_kind)
     end
   end
 
@@ -102,32 +102,32 @@ def space_attributes
           name: "Listed Room 1",
           publicity_level: :listed,
           access_level: :public,
-          furniture_placements: {
+          furnitures: {
             markdown_text_block: {content: "# Welcome!"}
           }
         },
         {
           name: "Listed Room 2",
           publicity_level: :listed,
           access_level: :public,
-          furniture_placements: {}
+          furnitures: {}
         },
         {
           name: "Unlisted Room 1",
           publicity_level: :unlisted,
           access_level: :public,
-          furniture_placements: {}
+          furnitures: {}
         },
         {
           name: "Unlisted Room 2",
           publicity_level: :unlisted,
           access_level: :public,
-          furniture_placements: {}
+          furnitures: {}
         },
         {
           name: "Entrance Hall",
           publicity_level: :unlisted,
-          furniture_placements: {
+          furnitures: {
             markdown_text_block: {content: "# Wooo!"}
           }
         }

app/models/furniture_placement.rb → app/models/furniture.rb

@@ -4,7 +4,7 @@
 # {Furniture} is configured using the {#settings} attribute, which is structured
 # as JSON, so that {Furniture} can be tweaked and configured as appropriate for
 # it's particular use case.
-class FurniturePlacement < ApplicationRecord
+class Furniture < ApplicationRecord
   include RankedModel
   include WithinLocation
   self.location_parent = :room
@@ -24,7 +24,7 @@ class FurniturePlacement < ApplicationRecord
   delegate :attributes=, to: :furniture, prefix: true
 
   def furniture
-    @furniture ||= FurniturePlacement.from_placement(self)
+    @furniture ||= Furniture.from_placement(self)
   end
 
   def title
@@ -36,11 +36,11 @@ def utilities
   end
 
   def form_template
-    "furniture_placements/noop"
+    "furnitures/noop"
   end
 
   def configurable?
-    furniture.form_template != "furniture_placements/noop"
+    furniture.form_template != "furnitures/noop"
   end
 
   def write_attribute(name, value)
@@ -71,7 +71,7 @@ def self.append_routes(router)
     end
   end
 
-  # @return [FurniturePlacement]
+  # @return [Furniture]
   def self.from_placement(placement)
     furniture_class = registry.fetch(placement.furniture_kind.to_sym)
     placement.becomes(furniture_class)

app/models/furniture/serializer.rb

@@ -0,0 +1,12 @@
+class Furniture::Serializer < ApplicationSerializer
+  # @return [Furniture]
+  alias_method :furniture, :resource
+
+  def to_json(*_args)
+    super.merge(
+      furniture: {
+        id: furniture.id
+      }
+    )
+  end
+end

app/models/room.rb

@@ -49,8 +49,8 @@ def unlisted?
     publicity_level&.to_sym == :unlisted
   end
 
-  has_many :furniture_placements, dependent: :destroy_async
-  accepts_nested_attributes_for :furniture_placements
+  has_many :furnitures, dependent: :destroy_async
+  accepts_nested_attributes_for :furnitures
 
   def full_slug
     "#{space.slug}--#{slug}"

app/models/room/serializer.rb

@@ -11,7 +11,7 @@ def to_json(*_args)
         id: room.id,
         slug: room.slug,
         name: room.name,
-        furniture_placements: room.furniture_placements.map(&FurniturePlacement::Serializer.method(:new)).map(&:to_json)
+        furnitures: room.furnitures.map(&Furniture::Serializer.method(:new)).map(&:to_json)
       }
     )
   end

app/policies/furniture_placement_policy.rb → app/policies/furniture_policy.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-class FurniturePlacementPolicy < ApplicationPolicy
-  alias_method :furniture_placement, :object
-  delegate :space, to: :furniture_placement
+class FurniturePolicy < ApplicationPolicy
+  alias_method :furniture, :object
+  delegate :space, to: :furniture
 
   class Scope < ApplicationScope
     def resolve
@@ -16,7 +16,7 @@ def show?
   end
 
   def update?
-    person&.operator? || person&.member_of?(furniture_placement.space)
+    person&.operator? || person&.member_of?(furniture.space)
   end
 
   alias_method :edit?, :update?
@@ -29,6 +29,6 @@ def permitted_attributes(_params)
   end
 
   def furniture_params
-    FurniturePlacement.registry.values.flat_map { |f| f.new.try(:attribute_names) }.compact
+    Furniture.registry.values.flat_map { |f| f.new.try(:attribute_names) }.compact
   end
 end