diff --git a/.gitignore b/.gitignore index f92525ca..3d80232f 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,6 @@ # Ignore master key for decrypting credentials and more. /config/master.key + +# Ignore IDE config files +.idea/ diff --git a/Gemfile b/Gemfile index 777af1b8..3a81224e 100644 --- a/Gemfile +++ b/Gemfile @@ -55,6 +55,7 @@ group :development, :test do end group :development do + gem "hotwire-spark" # Use console on exceptions pages [https://github.com/rails/web-console] gem "web-console" end diff --git a/Gemfile.lock b/Gemfile.lock index 8946eb2b..22660e83 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -116,11 +116,23 @@ GEM factory_bot_rails (6.4.4) factory_bot (~> 6.5) railties (>= 5.0.0) + ffi (1.17.1-aarch64-linux-gnu) + ffi (1.17.1-aarch64-linux-musl) + ffi (1.17.1-arm-linux-gnu) + ffi (1.17.1-arm-linux-musl) + ffi (1.17.1-arm64-darwin) + ffi (1.17.1-x86_64-darwin) + ffi (1.17.1-x86_64-linux-gnu) + ffi (1.17.1-x86_64-linux-musl) fugit (1.11.1) et-orbi (~> 1, >= 1.2.11) raabro (~> 1.4) globalid (1.2.1) activesupport (>= 6.1) + hotwire-spark (0.1.13) + listen + rails (>= 7.0.0) + zeitwerk i18n (1.14.7) concurrent-ruby (~> 1.0) importmap-rails (2.1.0) @@ -148,6 +160,9 @@ GEM thor (~> 1.3) zeitwerk (>= 2.6.18, < 3.0) language_server-protocol (3.17.0.4) + listen (3.9.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) logger (1.6.5) loofah (2.24.0) crass (~> 1.0.2) @@ -253,6 +268,9 @@ GEM zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.2.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) + ffi (~> 1.0) rdoc (6.11.0) psych (>= 4.0.0) regexp_parser (2.10.0) @@ -378,6 +396,7 @@ PLATFORMS arm-linux-gnu arm-linux-musl arm64-darwin-24 + x86_64-darwin-23 x86_64-darwin-24 x86_64-linux x86_64-linux-gnu @@ -390,6 +409,7 @@ DEPENDENCIES capybara debug factory_bot_rails + hotwire-spark importmap-rails jbuilder kamal diff --git a/app/controllers/regions_controller.rb b/app/controllers/regions_controller.rb new file mode 100644 index 00000000..1b6b548e --- /dev/null +++ b/app/controllers/regions_controller.rb @@ -0,0 +1,65 @@ +class RegionsController < ApplicationController + before_action :set_region, only: %i[ show edit update destroy ] + + # GET /regions + def index + @regions = Region.all + end + + # GET /regions/1 + def show + end + + # GET /regions/new + def new + @region = Region.new + end + + # GET /regions/1/edit + def edit + end + + # POST /regions + def create + @region = Region.new(region_params) + + respond_to do |format| + if @region.save + format.html { redirect_to @region, notice: "Region was successfully created." } + else + format.html { render :new, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /regions/1 + def update + respond_to do |format| + if @region.update(region_params) + format.html { redirect_to @region, notice: "Region was successfully updated." } + else + format.html { render :edit, status: :unprocessable_entity } + end + end + end + + # DELETE /regions/1 + def destroy + @region.destroy! + + respond_to do |format| + format.html { redirect_to regions_path, status: :see_other, notice: "Region was successfully destroyed." } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_region + @region = Region.find(params.expect(:id)) + end + + # Only allow a list of trusted parameters through. + def region_params + params.expect(region: [ :name ]) + end +end diff --git a/app/models/region.rb b/app/models/region.rb new file mode 100644 index 00000000..491c0b45 --- /dev/null +++ b/app/models/region.rb @@ -0,0 +1,3 @@ +class Region < ApplicationRecord + validates :name, presence: true +end diff --git a/app/views/layouts/_sidebar.html.erb b/app/views/layouts/_sidebar.html.erb index b8ee5cff..8c1bce96 100644 --- a/app/views/layouts/_sidebar.html.erb +++ b/app/views/layouts/_sidebar.html.erb @@ -55,11 +55,10 @@
  • Administration
  • - + Regions -
  • diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 569dcca7..dbbc98e4 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -18,6 +18,7 @@ <%# Includes all stylesheet files in app/assets/stylesheets %> + SkillRx diff --git a/app/views/layouts/mazer.html.erb b/app/views/layouts/mazer.html.erb index 9ec18255..d966f3f0 100644 --- a/app/views/layouts/mazer.html.erb +++ b/app/views/layouts/mazer.html.erb @@ -16,7 +16,6 @@ <%# Enable PWA manifest for installable apps (make sure to enable in config/routes.rb too!) %> <%#= tag.link rel: "manifest", href: pwa_manifest_path(format: :json) %> - @@ -28,13 +27,13 @@ - <%= render "layouts/sidebar" %> - - <%= yield %> - + <%= render "layouts/sidebar" %> + +
    <%= yield %>
    + @@ -45,4 +44,4 @@ - \ No newline at end of file + diff --git a/app/views/regions/_form.html.erb b/app/views/regions/_form.html.erb new file mode 100644 index 00000000..3d79feae --- /dev/null +++ b/app/views/regions/_form.html.erb @@ -0,0 +1,27 @@ +<%= form_with(model: region) do |form| %> + <% if region.errors.any? %> +
    +

    <%= pluralize(region.errors.count, "error") %> prohibited this region from being saved:

    + + +
    + <% end %> + +
    +
    + <%= form.label :name, style: "display: block" %> + <%= form.text_field :name, id: "basicInput", class: "form-control", autofocus: true %> +
    +
    + +
    +
    + <%= form.submit "Create Region", class: "btn btn-primary me-1 mb-1" %> + <%= link_to "Cancel", regions_path, class: "btn btn-light-secondary me-1 mb-1" %> +
    +
    +<% end %> diff --git a/app/views/regions/_region.html.erb b/app/views/regions/_region.html.erb new file mode 100644 index 00000000..679665aa --- /dev/null +++ b/app/views/regions/_region.html.erb @@ -0,0 +1,3 @@ +
    +

    <%= region.name %>

    +
    diff --git a/app/views/regions/edit.html.erb b/app/views/regions/edit.html.erb new file mode 100644 index 00000000..6e659d5c --- /dev/null +++ b/app/views/regions/edit.html.erb @@ -0,0 +1,10 @@ +<% content_for :title, "Editing region" %> + +

    Editing region

    + +<%= render "form", region: @region %> + +
    + <%= link_to "Show this region", @region %> | + <%= link_to "Back to regions", regions_path %> +
    diff --git a/app/views/regions/index.html.erb b/app/views/regions/index.html.erb new file mode 100644 index 00000000..ebe29d06 --- /dev/null +++ b/app/views/regions/index.html.erb @@ -0,0 +1,58 @@ +<% content_for :title, "Regions" %> + +
    +
    +
    +
    +
    +

    Regions Served

    + <%= link_to new_region_path, class: "btn btn-primary" do %> + Add New Region + <% end %> +
    +
    +
    +

    + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut + labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip + ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla + pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est + laborum. +

    + +
    + + + + + + + + + + <% @regions.each do |region| %> + + + + + + <% end %> + +
    RegionProvidersRegion Actions
    <%= region.name %>1 + <%= link_to region, class: "btn btn-primary btn-sm" do %> + View + <% end %> + <%= link_to edit_region_path(region), class: "btn btn-secondary btn-sm" do %> + Edit + <% end %> + <%= link_to region, method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-danger btn-sm" do %> + Delete + <% end %> +
    +
    +
    +
    +
    +
    +
    + diff --git a/app/views/regions/new.html.erb b/app/views/regions/new.html.erb new file mode 100644 index 00000000..84f58792 --- /dev/null +++ b/app/views/regions/new.html.erb @@ -0,0 +1,23 @@ +<% content_for :title, "New region" %> + +
    +
    +
    +
    +
    +

    Create New Region

    +
    +
    +
    +

    Regions should ... Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut + labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip + ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla + pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est + laborum.

    + <%= render "form", region: @region %> +
    +
    +
    +
    +
    +
    diff --git a/app/views/regions/show.html.erb b/app/views/regions/show.html.erb new file mode 100644 index 00000000..9e522be0 --- /dev/null +++ b/app/views/regions/show.html.erb @@ -0,0 +1,12 @@ +
    <%= notice %>
    + +<%= render @region %> + +
    + <%= link_to "Edit this region", edit_region_path(@region) %> | + <%= link_to "Back to regions", regions_path %> +
    + +
    + <%= button_to "Destroy this region", @region, method: :delete, class: "btn btn-danger mt-4" %> +
    diff --git a/config/database.yml b/config/database.yml index 5e0be171..4c8c0429 100644 --- a/config/database.yml +++ b/config/database.yml @@ -15,6 +15,10 @@ default: &default adapter: postgresql encoding: unicode + username: postgres + password: postgres + host: localhost + port: 5432 # For details on connection pooling, see Rails configuration guide # https://guides.rubyonrails.org/configuring.html#database-pooling pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> diff --git a/config/routes.rb b/config/routes.rb index 9acc2b24..c223c9f9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,5 @@ Rails.application.routes.draw do + resources :regions root "home#index" get "home/index", as: :home resource :session diff --git a/db/migrate/20250203133408_create_regions.rb b/db/migrate/20250203133408_create_regions.rb new file mode 100644 index 00000000..35fcd8f6 --- /dev/null +++ b/db/migrate/20250203133408_create_regions.rb @@ -0,0 +1,9 @@ +class CreateRegions < ActiveRecord::Migration[8.0] + def change + create_table :regions do |t| + t.string :name + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 7e4786d3..4585402f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,10 +10,16 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[8.0].define(version: 2025_02_03_094127) do +ActiveRecord::Schema[8.0].define(version: 2025_02_03_133408) do # These are extensions that must be enabled in order to support this database enable_extension "pg_catalog.plpgsql" + create_table "regions", force: :cascade do |t| + t.string "name" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "sessions", force: :cascade do |t| t.bigint "user_id", null: false t.string "ip_address" diff --git a/spec/factories/regions.rb b/spec/factories/regions.rb new file mode 100644 index 00000000..3d2de86d --- /dev/null +++ b/spec/factories/regions.rb @@ -0,0 +1,5 @@ +FactoryBot.define do + factory :region do + name { "The Region" } + end +end diff --git a/spec/factories/users.rb b/spec/factories/users.rb new file mode 100644 index 00000000..6539baf9 --- /dev/null +++ b/spec/factories/users.rb @@ -0,0 +1,6 @@ +FactoryBot.define do + factory :user do + email { "john@doe.com" } + password { "password" } + end +end diff --git a/spec/models/region_spec.rb b/spec/models/region_spec.rb new file mode 100644 index 00000000..d6e64632 --- /dev/null +++ b/spec/models/region_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Region, type: :model do + it { should validate_presence_of(:name) } +end diff --git a/spec/requests/regions_spec.rb b/spec/requests/regions_spec.rb new file mode 100644 index 00000000..4ebdd11b --- /dev/null +++ b/spec/requests/regions_spec.rb @@ -0,0 +1,132 @@ +require 'rails_helper' + +# This spec was generated by rspec-rails when you ran the scaffold generator. +# It demonstrates how one might use RSpec to test the controller code that +# was generated by Rails when you ran the scaffold generator. +# +# It assumes that the implementation code is generated by the rails scaffold +# generator. If you are using any extension libraries to generate different +# controller code, this generated spec may or may not pass. +# +# It only uses APIs available in rails and/or rspec-rails. There are a number +# of tools you can use to make these specs even more expressive, but we're +# sticking to rails and rspec-rails APIs to keep things simple and stable. + +RSpec.describe "/regions", type: :request do + let(:user) { create(:user) } + + include AuthHelper + + before do + sign_in(user) + end + + # This should return the minimal set of attributes required to create a valid + # Region. As you add validations to Region, be sure to + # adjust the attributes here as well. + let(:valid_attributes) { { name: "Old Region" } } + + let(:invalid_attributes) { { name: "" } } + + describe "GET /index" do + it "renders a successful response" do + region = FactoryBot.create(:region) + get regions_url + expect(response).to be_successful + end + end + + describe "GET /show" do + it "renders a successful response" do + region = FactoryBot.create(:region) + get region_url(region) + expect(response).to be_successful + end + end + + describe "GET /new" do + it "renders a successful response" do + get new_region_url + expect(response).to be_successful + end + end + + describe "GET /edit" do + it "renders a successful response" do + region = FactoryBot.create(:region) + get edit_region_url(region) + expect(response).to be_successful + end + end + + describe "POST /create" do + context "with valid parameters" do + it "creates a new Region" do + expect { + post regions_url, params: { region: valid_attributes } + }.to change(Region, :count).by(1) + end + + it "redirects to the created region" do + post regions_url, params: { region: valid_attributes } + expect(response).to redirect_to(region_url(Region.last)) + end + end + + context "with invalid parameters" do + it "does not create a new Region" do + expect { + post regions_url, params: { region: invalid_attributes } + }.to change(Region, :count).by(0) + end + + it "renders a response with 422 status (i.e. to display the 'new' template)" do + post regions_url, params: { region: invalid_attributes } + expect(response).to have_http_status(:unprocessable_entity) + end + end + end + + describe "PATCH /update" do + context "with valid parameters" do + let(:new_attributes) { { name: "Updated Region" } } + + it "updates the requested region" do + region = Region.create! valid_attributes + patch region_url(region), params: { region: new_attributes } + region.reload + expect(region.name).to eq("Updated Region") + end + + it "redirects to the region" do + region = Region.create! valid_attributes + patch region_url(region), params: { region: new_attributes } + region.reload + expect(response).to redirect_to(region_url(region)) + end + end + + context "with invalid parameters" do + it "renders a response with 422 status (i.e. to display the 'edit' template)" do + region = Region.create! valid_attributes + patch region_url(region), params: { region: invalid_attributes } + expect(response).to have_http_status(:unprocessable_entity) + end + end + end + + describe "DELETE /destroy" do + it "destroys the requested region" do + region = Region.create! valid_attributes + expect { + delete region_url(region) + }.to change(Region, :count).by(-1) + end + + it "redirects to the regions list" do + region = Region.create! valid_attributes + delete region_url(region) + expect(response).to redirect_to(regions_url) + end + end +end diff --git a/spec/routing/regions_routing_spec.rb b/spec/routing/regions_routing_spec.rb new file mode 100644 index 00000000..2d726742 --- /dev/null +++ b/spec/routing/regions_routing_spec.rb @@ -0,0 +1,38 @@ +require "rails_helper" + +RSpec.describe RegionsController, type: :routing do + describe "routing" do + it "routes to #index" do + expect(get: "/regions").to route_to("regions#index") + end + + it "routes to #new" do + expect(get: "/regions/new").to route_to("regions#new") + end + + it "routes to #show" do + expect(get: "/regions/1").to route_to("regions#show", id: "1") + end + + it "routes to #edit" do + expect(get: "/regions/1/edit").to route_to("regions#edit", id: "1") + end + + + it "routes to #create" do + expect(post: "/regions").to route_to("regions#create") + end + + it "routes to #update via PUT" do + expect(put: "/regions/1").to route_to("regions#update", id: "1") + end + + it "routes to #update via PATCH" do + expect(patch: "/regions/1").to route_to("regions#update", id: "1") + end + + it "routes to #destroy" do + expect(delete: "/regions/1").to route_to("regions#destroy", id: "1") + end + end +end diff --git a/spec/support/authentication_helper.rb b/spec/support/authentication_helper.rb new file mode 100644 index 00000000..3e77d93d --- /dev/null +++ b/spec/support/authentication_helper.rb @@ -0,0 +1,5 @@ +module AuthHelper + def sign_in(user) + post session_path, params: { email: user.email, password: user.password } + end +end diff --git a/spec/views/regions/edit.html.erb_spec.rb b/spec/views/regions/edit.html.erb_spec.rb new file mode 100644 index 00000000..6e3cbbd3 --- /dev/null +++ b/spec/views/regions/edit.html.erb_spec.rb @@ -0,0 +1,21 @@ +require 'rails_helper' + +RSpec.describe "regions/edit", type: :view do + let(:region) { + Region.create!( + name: "MyString" + ) + } + + before(:each) do + assign(:region, region) + end + + it "renders the edit region form" do + render + + assert_select "form[action=?][method=?]", region_path(region), "post" do + assert_select "input[name=?]", "region[name]" + end + end +end diff --git a/spec/views/regions/index.html.erb_spec.rb b/spec/views/regions/index.html.erb_spec.rb new file mode 100644 index 00000000..e37b23e9 --- /dev/null +++ b/spec/views/regions/index.html.erb_spec.rb @@ -0,0 +1,20 @@ +require 'rails_helper' + +RSpec.describe "regions/index", type: :view do + before(:each) do + assign(:regions, [ + Region.create!( + name: "Name" + ), + Region.create!( + name: "Name" + ) + ]) + end + + it "renders a list of regions" do + render + cell_selector = 'table>tbody>tr' + assert_select cell_selector, text: Regexp.new("Name".to_s), count: 2 + end +end diff --git a/spec/views/regions/new.html.erb_spec.rb b/spec/views/regions/new.html.erb_spec.rb new file mode 100644 index 00000000..1c312f11 --- /dev/null +++ b/spec/views/regions/new.html.erb_spec.rb @@ -0,0 +1,17 @@ +require 'rails_helper' + +RSpec.describe "regions/new", type: :view do + before(:each) do + assign(:region, Region.new( + name: "MyString" + )) + end + + it "renders new region form" do + render + + assert_select "form[action=?][method=?]", regions_path, "post" do + assert_select "input[name=?]", "region[name]" + end + end +end diff --git a/spec/views/regions/show.html.erb_spec.rb b/spec/views/regions/show.html.erb_spec.rb new file mode 100644 index 00000000..d80cff16 --- /dev/null +++ b/spec/views/regions/show.html.erb_spec.rb @@ -0,0 +1,14 @@ +require 'rails_helper' + +RSpec.describe "regions/show", type: :view do + before(:each) do + assign(:region, Region.create!( + name: "Name" + )) + end + + it "renders attributes in

    " do + render + expect(rendered).to match(/Name/) + end +end