diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb new file mode 100644 index 0000000..e254ef8 --- /dev/null +++ b/app/controllers/topics_controller.rb @@ -0,0 +1,72 @@ +class TopicsController < ApplicationController + include Authorization + + before_action :set_topic, only: %i[ show edit update destroy ] + + # GET /topics or /topics.json + def index + @topics = Topic.all + end + + # GET /topics/1 or /topics/1.json + def show + end + + # GET /topics/new + def new + @topic = Topic.new + end + + # GET /topics/1/edit + def edit + end + + # POST /topics or /topics.json + def create + @topic = Topic.new(topic_params) + + respond_to do |format| + if @topic.save + format.html { redirect_to @topic, notice: "Topic was successfully created." } + format.json { render :show, status: :created, location: @topic } + else + format.html { render :new, status: :unprocessable_entity } + format.json { render json: @topic.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /topics/1 or /topics/1.json + def update + respond_to do |format| + if @topic.update(topic_params) + format.html { redirect_to @topic, notice: "Topic was successfully updated." } + format.json { render :show, status: :ok, location: @topic } + else + format.html { render :edit, status: :unprocessable_entity } + format.json { render json: @topic.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /topics/1 or /topics/1.json + def destroy + @topic.destroy! + + respond_to do |format| + format.html { redirect_to topics_path, status: :see_other, notice: "Topic was successfully destroyed." } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_topic + @topic = Topic.find(params.expect(:id)) + end + + # Only allow a list of trusted parameters through. + def topic_params + params.expect(topic: [ :title, :description, :uid, :state, :language_id, :provider_id ]) + end +end diff --git a/app/helpers/topics_helper.rb b/app/helpers/topics_helper.rb new file mode 100644 index 0000000..488eed5 --- /dev/null +++ b/app/helpers/topics_helper.rb @@ -0,0 +1,2 @@ +module TopicsHelper +end diff --git a/app/models/language.rb b/app/models/language.rb index 9625d5a..7dbf1aa 100644 --- a/app/models/language.rb +++ b/app/models/language.rb @@ -2,4 +2,6 @@ class Language < ApplicationRecord validates :name, presence: true validates :name, uniqueness: true validates :file_share_folder, presence: true + + has_many :topics end diff --git a/app/models/provider.rb b/app/models/provider.rb index 9bde6c2..c359cc3 100644 --- a/app/models/provider.rb +++ b/app/models/provider.rb @@ -3,4 +3,5 @@ class Provider < ApplicationRecord validates :name, uniqueness: true has_many :users + has_many :topics end diff --git a/app/models/topic.rb b/app/models/topic.rb new file mode 100644 index 0000000..4c753b9 --- /dev/null +++ b/app/models/topic.rb @@ -0,0 +1,10 @@ +class Topic < ApplicationRecord + validates :description, presence: true + validates :title, presence: true + validates :title, uniqueness: true + + belongs_to :language + belongs_to :provider + + enum :state, [ :active, :archived ] +end diff --git a/app/views/layouts/_sidebar.html.erb b/app/views/layouts/_sidebar.html.erb index 3da6552..40d8777 100644 --- a/app/views/layouts/_sidebar.html.erb +++ b/app/views/layouts/_sidebar.html.erb @@ -16,8 +16,11 @@ Dashboard +
  • + <%= nav_link("Topics", topics_path, "translate") %> +
    • -
  • @@ -43,7 +46,7 @@ Textarea
    • - + %> <% if current_user_is_admin? %>
  • Admin Tools
  • diff --git a/app/views/topics/_form.html.erb b/app/views/topics/_form.html.erb new file mode 100644 index 0000000..f974409 --- /dev/null +++ b/app/views/topics/_form.html.erb @@ -0,0 +1,53 @@ +
    +
    +

    Topics 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.

    + <%= form_with(model: @topic, local: true, class: "form") do |f| %> +
    +
    +
    + <%= f.label :title %> + <%= f.text_field :title, class: "form-control", placeholder: "Topic" %> +
    +
    +
    +
    + <%= f.label :description %> + <%= f.text_area :description, class: "form-control", placeholder: "Description" %> +
    +
    +
    +
    + <%= f.label :uid %> + <%= f.text_field :uid, class: "form-control", placeholder: "UID" %> +
    +
    +
    +
    + <%= f.label :state %> + <%= f.text_field :state, class: "form-control", placeholder: "State" %> +
    +
    +
    +
    + <%= f.label :language %> + <%= f.collection_select(:language_id, Language.all, :id, :name) %> +
    +
    +
    +
    + <%= f.label :provider %> + <%= f.collection_select(:provider_id, Provider.all, :id, :name) %> +
    +
    +
    + <%= submit_button(f) %> + <%= link_to "Cancel", topics_path, class: "btn btn-light-secondary me-1 mb-1" %> +
    +
    + <% end %> +
    +
    diff --git a/app/views/topics/_topic.html.erb b/app/views/topics/_topic.html.erb new file mode 100644 index 0000000..ea59d3e --- /dev/null +++ b/app/views/topics/_topic.html.erb @@ -0,0 +1,32 @@ +
    +

    + Title: + <%= topic.title %> +

    + +

    + Description: + <%= topic.description %> +

    + +

    + Uid: + <%= topic.uid %> +

    + +

    + State: + <%= topic.state %> +

    + +

    + Language: + <%= topic.language.name %> +

    + +

    + Provider: + <%= topic.provider.name %> +

    + +
    diff --git a/app/views/topics/edit.html.erb b/app/views/topics/edit.html.erb new file mode 100644 index 0000000..0663eb9 --- /dev/null +++ b/app/views/topics/edit.html.erb @@ -0,0 +1,14 @@ +<% content_for :title, "Editing topic" %> + +
    +
    +
    +
    +
    +

    Edit Topic

    +
    + <%= render "form", topic:@topic %> +
    +
    +
    +
    diff --git a/app/views/topics/index.html.erb b/app/views/topics/index.html.erb new file mode 100644 index 0000000..c4bf6f3 --- /dev/null +++ b/app/views/topics/index.html.erb @@ -0,0 +1,51 @@ +
    +
    +
    +
    +
    +

    Topics

    + <%= link_to new_topic_path, class: "btn btn-primary" do %> + Add New Topic + <% 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. +

    + +
    + + + + + + + + + + <% @topics.each do |topic| %> + + + + + + <% end %> + +
    TitleProviderTopic Actions
    <%= topic.title %><%= topic.provider.name %> + <%= show_page_tool_link(topic, "Show Topic Details") %> + <%= link_to edit_topic_path(topic), class: "btn btn-secondary btn-sm" do %> + + <% end %> + <%= delete_tool_link(topic, "Delete Topic") %> +
    +
    +
    +
    +
    +
    +
    diff --git a/app/views/topics/new.html.erb b/app/views/topics/new.html.erb new file mode 100644 index 0000000..45708ad --- /dev/null +++ b/app/views/topics/new.html.erb @@ -0,0 +1,12 @@ +
    +
    +
    +
    +
    +

    Create New Topic

    +
    + <%= render "form", topic:@topic %> +
    +
    +
    +
    diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb new file mode 100644 index 0000000..011d690 --- /dev/null +++ b/app/views/topics/show.html.erb @@ -0,0 +1,26 @@ +

    <%= notice %>

    + +
    +
    +
    +
    +
    +

    Topics

    +

    <%= @topic.title %>

    +
    +
    +
    + <%= render @topic %> + +
    + <%= link_to "Edit this topic", edit_topic_path(@topic) %> | + <%= link_to "Back to topics", topics_path %> + + <%= button_to "Destroy this topic", @topic, method: :delete %> +
    +
    +
    +
    +
    +
    +
    diff --git a/config/routes.rb b/config/routes.rb index 83d0bf7..1e789f8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,7 @@ resources :providers resources :users resources :regions + resources :topics resource :session resources :passwords, param: :token diff --git a/db/migrate/20250120173825_create_topics.rb b/db/migrate/20250120173825_create_topics.rb new file mode 100644 index 0000000..0eae312 --- /dev/null +++ b/db/migrate/20250120173825_create_topics.rb @@ -0,0 +1,14 @@ +class CreateTopics < ActiveRecord::Migration[8.0] + def change + create_table :topics do |t| + t.string :title + t.text :description + t.string :uid + t.integer :state, default: 0 + t.references :language, null: false, foreign_key: true + t.references :provider, null: false, foreign_key: true + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index ad922b0..ebaa379 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[8.0].define(version: 2025_01_19_200109) do +ActiveRecord::Schema[8.0].define(version: 2025_01_20_173825) do # These are extensions that must be enabled in order to support this database enable_extension "pg_catalog.plpgsql" @@ -43,6 +43,19 @@ t.index ["user_id"], name: "index_sessions_on_user_id" end + create_table "topics", force: :cascade do |t| + t.string "title" + t.text "description" + t.string "uid" + t.integer "state", default: 0 + t.bigint "language_id", null: false + t.bigint "provider_id", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["language_id"], name: "index_topics_on_language_id" + t.index ["provider_id"], name: "index_topics_on_provider_id" + end + create_table "users", force: :cascade do |t| t.string "email_address", null: false t.string "password_digest", null: false @@ -54,4 +67,6 @@ end add_foreign_key "sessions", "users" + add_foreign_key "topics", "languages" + add_foreign_key "topics", "providers" end diff --git a/spec/factories/languages.rb b/spec/factories/languages.rb index 18bc173..04c1b4d 100644 --- a/spec/factories/languages.rb +++ b/spec/factories/languages.rb @@ -1,6 +1,6 @@ FactoryBot.define do factory :language do - name { "MyString" } + sequence(:name) { |n| "MyString#{n}" } file_share_folder { "MyString" } end end diff --git a/spec/factories/topics.rb b/spec/factories/topics.rb new file mode 100644 index 0000000..765ad79 --- /dev/null +++ b/spec/factories/topics.rb @@ -0,0 +1,10 @@ +FactoryBot.define do + factory :topic do + sequence(:title) { |n| "MyString#{n}" } + description { "MyText" } + uid { "MyString" } + state { 0 } + language + provider + end +end diff --git a/spec/helpers/topics_helper_spec.rb b/spec/helpers/topics_helper_spec.rb new file mode 100644 index 0000000..6adfadb --- /dev/null +++ b/spec/helpers/topics_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the TopicsHelper. For example: +# +# describe TopicsHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe TopicsHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/provider_spec.rb b/spec/models/provider_spec.rb index a06cbba..2034b1c 100644 --- a/spec/models/provider_spec.rb +++ b/spec/models/provider_spec.rb @@ -9,5 +9,6 @@ describe 'associations' do subject { FactoryBot.build(:provider) } it { should have_many :users } + it { should have_many :topics } end end diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb new file mode 100644 index 0000000..5b6a08e --- /dev/null +++ b/spec/models/topic_spec.rb @@ -0,0 +1,14 @@ +require 'rails_helper' + +RSpec.describe Topic, type: :model do + describe 'validations' do + it { should validate_presence_of(:title) } + # it { should validate_uniqueness_of(:title) } + end + + describe 'associations' do + subject { FactoryBot.build(:topic) } + it { should belong_to(:provider) } + it { should belong_to(:language) } + end +end diff --git a/spec/requests/topics_spec.rb b/spec/requests/topics_spec.rb new file mode 100644 index 0000000..fe8f64e --- /dev/null +++ b/spec/requests/topics_spec.rb @@ -0,0 +1,62 @@ +require 'rails_helper' + +RSpec.describe "Topics", type: :request do + let(:user) { FactoryBot.create(:user) } + let(:admin_user) { FactoryBot.create(:user, is_admin: true) } + + let(:topic) { FactoryBot.create(:topic) } + + describe "GET /index" do + it "returns http success" do + login_as(admin_user) + get topics_url + expect(response).to have_http_status(:success) + end + end + + describe "GET /show" do + it "returns http success" do + login_as(admin_user) + get topic_url(topic) + expect(response).to have_http_status(:success) + end + end + + describe "GET /new" do + it "returns http success" do + login_as(admin_user) + get new_topic_url + expect(response).to have_http_status(:success) + end + end + + # describe "GET /create" do + # it "returns http success" do + # login_as(admin_user) + # get "/topics/create" + # expect(response).to have_http_status(:success) + # end + # end + + describe "GET /edit" do + it "returns http success" do + login_as(admin_user) + get edit_topic_url(topic) + expect(response).to have_http_status(:success) + end + end + + # describe "GET /update" do + # it "returns http success" do + # get "/topics/update" + # expect(response).to have_http_status(:success) + # end + # end + + # describe "GET /destroy" do + # it "returns http success" do + # get "/topics/destroy" + # expect(response).to have_http_status(:success) + # end + # end +end diff --git a/spec/routing/topics_routing_spec.rb b/spec/routing/topics_routing_spec.rb new file mode 100644 index 0000000..e813c06 --- /dev/null +++ b/spec/routing/topics_routing_spec.rb @@ -0,0 +1,38 @@ +require "rails_helper" + +RSpec.describe TopicsController, type: :routing do + describe "routing" do + it "routes to #index" do + expect(get: "/topics").to route_to("topics#index") + end + + it "routes to #new" do + expect(get: "/topics/new").to route_to("topics#new") + end + + it "routes to #show" do + expect(get: "/topics/1").to route_to("topics#show", id: "1") + end + + it "routes to #edit" do + expect(get: "/topics/1/edit").to route_to("topics#edit", id: "1") + end + + + it "routes to #create" do + expect(post: "/topics").to route_to("topics#create") + end + + it "routes to #update via PUT" do + expect(put: "/topics/1").to route_to("topics#update", id: "1") + end + + it "routes to #update via PATCH" do + expect(patch: "/topics/1").to route_to("topics#update", id: "1") + end + + it "routes to #destroy" do + expect(delete: "/topics/1").to route_to("topics#destroy", id: "1") + end + end +end diff --git a/spec/views/topics/create.html.erb_spec.rb b/spec/views/topics/create.html.erb_spec.rb new file mode 100644 index 0000000..203a672 --- /dev/null +++ b/spec/views/topics/create.html.erb_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe "topics/create.html.erb", type: :view do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/views/topics/destroy.html.erb_spec.rb b/spec/views/topics/destroy.html.erb_spec.rb new file mode 100644 index 0000000..71abb57 --- /dev/null +++ b/spec/views/topics/destroy.html.erb_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe "topics/destroy.html.erb", type: :view do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/views/topics/edit.html.erb_spec.rb b/spec/views/topics/edit.html.erb_spec.rb new file mode 100644 index 0000000..4223a37 --- /dev/null +++ b/spec/views/topics/edit.html.erb_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe "topics/edit.html.erb", type: :view do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/views/topics/index.html.erb_spec.rb b/spec/views/topics/index.html.erb_spec.rb new file mode 100644 index 0000000..d3f2b1e --- /dev/null +++ b/spec/views/topics/index.html.erb_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +RSpec.describe "topics/index.html.erb", type: :view do + before(:each) do + assign(:topics, [ + FactoryBot.create(:topic), FactoryBot.create(:topic) + ]) + end + + it "renders a list of topics" do + render + cell_selector = 'tr.topic-listing' + assert_select cell_selector, text: Regexp.new("MyString".to_s), count: 2 + end +end diff --git a/spec/views/topics/new.html.erb_spec.rb b/spec/views/topics/new.html.erb_spec.rb new file mode 100644 index 0000000..daf22a1 --- /dev/null +++ b/spec/views/topics/new.html.erb_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe "topics/new.html.erb", type: :view do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/views/topics/show.html.erb_spec.rb b/spec/views/topics/show.html.erb_spec.rb new file mode 100644 index 0000000..d515efc --- /dev/null +++ b/spec/views/topics/show.html.erb_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe "topics/show.html.erb", type: :view do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/views/topics/update.html.erb_spec.rb b/spec/views/topics/update.html.erb_spec.rb new file mode 100644 index 0000000..8d1b980 --- /dev/null +++ b/spec/views/topics/update.html.erb_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe "topics/update.html.erb", type: :view do + pending "add some examples to (or delete) #{__FILE__}" +end