sun-sword 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2eefd4a0b6dca262f359265aa4cdae141b33e7305f8c945935dfc9c2b5fab8df
-  data.tar.gz: 5eefa90794d726cda2e144abfcb9b1d368fbdc4db04a6b1d7a6d99063f6550ae
+  metadata.gz: 6e4ddac73f4a2f50ec6923ddc5f5f69e9bcc547be9e17d55c60bc6ecc993d4d0
+  data.tar.gz: dcfe5d73943110eb8b165991e7677b0594db726522c23b1ca483140714e6e525
 SHA512:
-  metadata.gz: 1442f3d391b08b44242c447a2fc522a5bb94b537dc1c22e131343ac83789ff06d161448e6a6191c724a2d06ec735b1117e788726843bbf2ec2262377221db4fd
-  data.tar.gz: b8e4e72e81238060bfc29751d1ebd6a48c9f14f4bb13a33891915e78613ad48c529203eb3972ad8bd18cf5d0e1fecda2a79b07d607b0be0f860a415099280a0b
+  metadata.gz: f48f2974b697c84430061f2a4cb75e0512e3cfc7001bb599edb7894a56a3ef352efc5de33b5fe96def472fda01f665f7c5aed7b890c190e728748ea6066c71fe
+  data.tar.gz: 9c12c9c9d150325af5840927e5ca6c8063fdb32a7249f7ab8c03ffe3ebeebebce78a50974cc5756928f70655b3ead5777d8d372caa96f27f5157e6c135cd2b2f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sun-sword (0.0.13)
+    sun-sword (0.0.14)
       activesupport (>= 7.0, < 9.0)
       hashie (>= 5.0, < 6.0)
       thor (>= 1.2, < 2.0)

data/lib/generators/sun_sword/frontend_generator.rb

@@ -55,13 +55,12 @@ module SunSword
 
     def add_to_gemfile
       gem_dependencies = <<~RUBY
+
         # --- SunSword Package frontend
         group :development do
           gem "listen"
         end
-        group :test do
-          gem "rails-controller-testing"
-        end
+
         gem 'turbo-rails'
         gem 'vite_rails'
       RUBY
@@ -109,7 +108,6 @@ module SunSword
     end
 
     def generate_controllers_tests
-      run 'rails g controller tests stimulus turbo_drive turbo_frame frame_content update_content'
       template 'controllers/tests_controller.rb', File.join(path_app, 'controllers/tests_controller.rb')
       template 'controllers/tests_controller_spec.rb', File.join(path_app, 'controllers/tests_controller_spec.rb')
       template 'controllers/application_controller.rb.tt', File.join(path_app, 'controllers/application_controller.rb')

data/lib/generators/sun_sword/frontend_generator_spec.rb

@@ -398,12 +398,6 @@ RSpec.describe SunSword::FrontendGenerator, type: :generator do
       allow(generator).to receive(:say)
     end
 
-    it 'runs rails generator command' do
-      generator.send(:generate_controllers_tests)
-
-      expect(generator).to have_received(:run).with('rails g controller tests stimulus turbo_drive turbo_frame frame_content update_content')
-    end
-
     it 'calls template for controller files' do
       generator.send(:generate_controllers_tests)
 

data/lib/generators/sun_sword/scaffold_generator.rb

@@ -67,6 +67,11 @@ module SunSword
       @scope_class      = @scope_path.camelize
       @scope_subject    = @scope_path.singularize
       @model_class      = model_name.camelize.constantize
+
+      # Column metadata
+      @columns_meta      = columns_meta
+      @columns_meta_hash = @columns_meta.index_by { |c| c[:name] }
+
       @subject_class    = @variable_subject.camelize
       @fields           = contract_fields
       @form_fields      = @controllers.form_fields
@@ -394,6 +399,25 @@ module SunSword
       @model_class.columns.reject { |column| skip_contract_fields.include?(column.name.to_s) }.map { |column| [column.name.to_s, column.type.to_s] }
     end
 
+    def columns_meta
+      @model_class.columns.map do |c|
+        {
+          name:      c.name.to_s,
+          type:      c.type,
+          sql_type:  (c.respond_to?(:sql_type) ? c.sql_type : nil),
+          null:      (c.respond_to?(:null) ? c.null : nil),
+          default:   (c.respond_to?(:default) ? c.default : nil),
+          precision: (c.respond_to?(:precision) ? c.precision : nil),
+          scale:     (c.respond_to?(:scale) ? c.scale : nil),
+          limit:     (c.respond_to?(:limit) ? c.limit : nil)
+        }
+      end
+    end
+
+    def get_column_meta(field)
+      @columns_meta_hash[field.to_s] || {}
+    end
+
     def strong_params
       # pakai controllers.form_fields kalau ada, kalau tidak jatuh ke kolom model (contract_fields)
       raw_fields = @controllers&.form_fields || contract_fields

data/lib/generators/sun_sword/scaffold_generator_spec.rb

@@ -507,9 +507,9 @@ RSpec.describe SunSword::ScaffoldGenerator, type: :generator do
           expect(content).to include('POST #create')
           expect(content).to include('PATCH #update')
           expect(content).to include('DELETE #destroy')
-          expect(content).to include('instance_double')
-          expect(content).to include('Dry::Monads::Success')
-          expect(content).to include('Dry::Monads::Failure')
+          expect(content).to include('stub_use_case(')
+          expect(content).to include('response: :success')
+          expect(content).to include('response: :failure')
         end
       end
 
@@ -554,7 +554,7 @@ RSpec.describe SunSword::ScaffoldGenerator, type: :generator do
           controller_spec_path = File.join(destination_root, 'app', 'controllers', 'admin', 'test_models_controller_spec.rb')
           content = File.read(controller_spec_path)
           expect(content).to include('RSpec.describe Admin::TestModelsController')
-          expect(content).to include('Core::UseCases::Admin')
+          expect(content).to include('UseCases::Admin')
         end
       end
     end
@@ -597,9 +597,8 @@ RSpec.describe SunSword::ScaffoldGenerator, type: :generator do
 
           controller_spec_path = File.join(destination_root, 'engines', 'admin', 'app', 'controllers', 'admin', 'test_models_controller_spec.rb')
           content = File.read(controller_spec_path)
-          expect(content).to include('instance_double')
+          expect(content).to include('stub_use_case(')
           expect(content).to include('create(:')
-          expect(content).to include('build(:')
         end
       end
     end

data/lib/generators/sun_sword/templates_frontend/config/devise.rb

@@ -302,7 +302,7 @@ Devise.setup do |config|
   # apps is `200 OK` and `302 Found` respectively, but new apps are generated with
   # these new defaults that match Hotwire/Turbo behavior.
   # Note: These might become the new default in future versions of Devise.
-  config.responder.error_status = :unprocessable_entity
+  config.responder.error_status = :unprocessable_content
   config.responder.redirect_status = :see_other
 
   # ==> Configuration for :registerable

data/lib/generators/sun_sword/templates_scaffold/controllers/controller.rb.tt

@@ -1,5 +1,5 @@
 # Template for the controller (controllers/controller.rb.tt)
-class <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.join("::") %>Controller < ApplicationController
+class <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.join("::") %>Controller < <%= [@engine_scope_class].reject { |c| c.empty? }.join("::").sub(/(.+)/, '\1::') %>ApplicationController
   before_action :set_<%= @variable_subject %>, only: %i[edit update]
   layout :set_layouts
 
@@ -14,7 +14,9 @@ class <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.join("::")
         render '<%= [@route_scope_path.singularize].reject { |c| c.empty? }.join("_") + "/" %><%= [@engine_mount_path, @scope_path, "index"].reject { |c| c.empty? }.join("/") %>'
       end
       matcher.failure do |errors|
-        redirect_to root_path, success: errors
+        @<%= @variable_subject.pluralize %> = Hashie::Mash.new({ response: [] })
+        flash.now[:error] = errors.pluck(:message).join(", ")
+        render '<%= [@route_scope_path.singularize].reject { |c| c.empty? }.join("_") + "/" %><%= [@engine_mount_path, @scope_path, "index"].reject { |c| c.empty? }.join("/") %>'
       end
     end
   end
@@ -29,7 +31,7 @@ class <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.join("::")
         @<%= @variable_subject %> = response
       end
       matcher.failure do |errors|
-        redirect_to root_path, success: errors
+        redirect_to <%= [@scope_path].reject { |c| c.empty? }.join("_") %>_url, success: errors
       end
     end
   end
@@ -50,11 +52,11 @@ class <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.join("::")
     result   = use_case.new(contract).result
     Dry::Matcher::ResultMatcher.call(result) do |matcher|
       matcher.success do |response|
-        redirect_to <%= [@route_scope_path.singularize].reject { |c| c.empty? }.join("_") + "_" %><%= [@scope_path.singularize].reject { |c| c.empty? }.join("_") %>_url(id: response.id), success: '<%= @subject_class %> was successfully created.'
+        redirect_to <%= [@route_scope_path.singularize].reject { |c| c.empty? }.join("_").sub(/(.+)/, '\1_')  %><%= [@scope_path.singularize].reject { |c| c.empty? }.join("_") %>_url(id: response.id), success: '<%= @subject_class %> was successfully created.'
       end
       matcher.failure do |errors|
         @<%= @variable_subject %> = build_form_errors(<%= @variable_subject %>_params, <%= @model_class %>.new, errors)
-        render '<%= [@route_scope_path.singularize].reject { |c| c.empty? }.join("_") + "/" %><%= [@engine_mount_path, @scope_path, "new"].reject { |c| c.empty? }.join("/") %>', status: :unprocessable_entity
+        render '<%= [@route_scope_path.singularize].reject { |c| c.empty? }.join("_") + "/" %><%= [@engine_mount_path, @scope_path, "new"].reject { |c| c.empty? }.join("/") %>', status: :unprocessable_content
       end
     end
   end
@@ -66,11 +68,11 @@ class <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.join("::")
     result   = use_case.new(contract).result
     Dry::Matcher::ResultMatcher.call(result) do |matcher|
       matcher.success do |response|
-        redirect_to <%= [@route_scope_path.singularize].reject { |c| c.empty? }.join("_") + "_" %><%= [@scope_path.singularize].reject { |c| c.empty? }.join("_") %>_url(id: response.id), success: '<%= @subject_class %> was successfully updated.'
+        redirect_to <%= [@route_scope_path.singularize].reject { |c| c.empty? }.join("_").sub(/(.+)/, '\1_')  %><%= [@scope_path.singularize].reject { |c| c.empty? }.join("_") %>_url(id: response.id), success: '<%= @subject_class %> was successfully updated.'
       end
       matcher.failure do |errors|
         @<%= @variable_subject %> = build_form_errors(<%= @variable_subject %>_params, <%= @model_class %>.find(params[:id]), errors)
-        render '<%= [@route_scope_path.singularize].reject { |c| c.empty? }.join("_") + "/" %><%= [@engine_mount_path, @scope_path, "edit"].reject { |c| c.empty? }.join("/") %>', status: :unprocessable_entity
+        render '<%= [@route_scope_path.singularize].reject { |c| c.empty? }.join("_") + "/" %><%= [@engine_mount_path, @scope_path, "edit"].reject { |c| c.empty? }.join("/") %>', status: :unprocessable_content
       end
     end
   end
@@ -82,10 +84,10 @@ class <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.join("::")
     result   = use_case.new(contract).result
     Dry::Matcher::ResultMatcher.call(result) do |matcher|
       matcher.success do |response|
-        redirect_to <%= [@route_scope_path.singularize].reject { |c| c.empty? }.join("_") + "_" %><%= [@scope_path].reject { |c| c.empty? }.join("_") %>_url, notice: '<%= @subject_class %> was successfully destroyed.'
+        redirect_to <%= [@route_scope_path.singularize].reject { |c| c.empty? }.join("_").sub(/(.+)/, '\1_')  %><%= [@scope_path].reject { |c| c.empty? }.join("_") %>_url, notice: '<%= @subject_class %> was successfully destroyed.'
       end
       matcher.failure do |errors|
-        redirect_to <%= [@route_scope_path.singularize].reject { |c| c.empty? }.join("_") + "_" %><%= [@scope_path].reject { |c| c.empty? }.join("_") %>_url, error: '<%= @subject_class %> could not be destroyed.'
+        redirect_to <%= [@route_scope_path.singularize].reject { |c| c.empty? }.join("_").sub(/(.+)/, '\1_')  %><%= [@scope_path].reject { |c| c.empty? }.join("_") %>_url, error: '<%= @subject_class %> could not be destroyed.'
       end
     end
   end
@@ -107,7 +109,7 @@ class <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.join("::")
 <%else -%>
     @<%= @variable_subject %> = <%= @model_class %>.find_by(id: params[:id])
 <%end -%>
-    redirect_to <%= [@route_scope_path.singularize].reject { |c| c.empty? }.join("_") + "_" %><%= [@scope_path].reject { |c| c.empty? }.join("_") %>_url, error: '<%= @subject_class %> not found.' if @<%= @variable_subject %>.nil?
+    redirect_to <%= [@route_scope_path.singularize].reject { |c| c.empty? }.join("_").sub(/(.+)/, '\1_')  %><%= [@scope_path].reject { |c| c.empty? }.join("_") %>_url, error: '<%= @subject_class %> not found.' if @<%= @variable_subject %>.nil?
   end
 
   # Only allow a list of trusted parameters through.

data/lib/generators/sun_sword/templates_scaffold/controllers/controller_spec.rb.tt

@@ -3,10 +3,36 @@
 require 'rails_helper'
 
 RSpec.describe <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.join("::") %>Controller, type: :controller do
+<% if @engine_scope_class.present? -%>
+  routes { <%= @engine_scope_class%>::Engine.routes }
+<% end -%>
+
 <% if @resource_owner_id.present? -%>
-  let(:owner) { create(:<%= @resource_owner %>) }
-  let(:actor) { create(:actor, <%= @resource_owner_id%>: owner.id) }
+    let(:<%= @resource_owner %>) { create(:<%= @resource_owner %>)}
+    let(:<%= @resource_owner_id %>) { <%= @resource_owner %>.id }
+<% end -%>
+<% @fields.each do |field| -%>
+<% next if @resource_owner_id.present? && field[0] == @resource_owner_id -%>
+<% field_meta = columns_meta.find { |col| col[:name] == field[0] } -%>
+<% if field_meta && field_meta[:type] == :uuid -%>
+    let(:<%= field[0].delete_suffix("_id") %>) { create(:<%= field[0].delete_suffix("_id") %>, <%= @resource_owner %>: <%= @resource_owner %>) }
+    let(:<%= field[0] %>) { <%= field[0].delete_suffix("_id") %>.id }
 <% end -%>
+<% end -%>
+<%
+  explicit_params = []
+  if @resource_owner_id.present?
+    explicit_params << "#{@resource_owner_id}: #{@resource_owner}.id"
+  end
+  @fields.each do |field|
+    next if @resource_owner_id.present? && field[0] == @resource_owner_id
+    field_meta = columns_meta.find { |col| col[:name] == field[0] }
+    if field_meta && field_meta[:type] == :uuid
+      explicit_params << "#{field[0]}: #{field[0].delete_suffix('_id')}.id"
+    end
+  end
+  create_params_str = explicit_params.any? ? ", #{explicit_params.join(', ')}" : ''
+-%>
 
   let(:valid_attributes) do
     {
@@ -28,22 +54,23 @@ RSpec.describe <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.j
 
   let(:invalid_attributes) do
     {
-<% @fields.first(2).each_with_index do |(field, type), index| -%>
-<% next if field.to_s == 'id' || field.to_s.end_with?('_id') -%>
-      <%= field %>: nil<%= ',' unless index == 1 %>
+<% @fields.each_with_index do |field, index| -%>
+<% next if @resource_owner_id.present? && field == @resource_owner_id -%>
+<% is_last = index == @fields.length - 1 || (@resource_owner_id.present? && index == @fields.length - 1) -%>
+        <%= field[0] %>: 'nil'<%= is_last ? '' : ',' %>
 <% end -%>
-    }
-  end
+      }
+end
 
 <% if @resource_owner_id.present? -%>
   before do
-    allow(controller).to receive(:<%= @resource_owner_id %>).and_return(owner.id)
+    allow(controller).to receive(:<%= @resource_owner_id %>).and_return(<%= @resource_owner %>.id)
   end
 
 <% end -%>
   describe 'GET #index' do
     context 'when use case succeeds' do
-      let(:<%= @variable_subject.pluralize %>) { create_list(:<%= @variable_subject %>, 3) }
+      let(:<%= @variable_subject.pluralize %>) { create_list(:<%= @variable_subject %>, 3<%= create_params_str %>) }
 
       before do
         stub_use_case(<%= [@usecase_domain].reject { |c| c.empty? }.join("::").sub(/(.+)/, '\1::') %>UseCases::<%= [@route_scope_class, @scope_class, build_usecase_filename('list')].reject { |c| c.empty? }.join("::") %>, <%= @variable_subject.pluralize %>, response: :success)
@@ -58,7 +85,7 @@ RSpec.describe <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.j
       end
 
       it 'calls use case with correct contract' do
-        expect(<%= [@usecase_domain].reject { |c| c.empty? }.join("::").sub(/(.+)/, '\1::') %>UseCases::<%= [@route_scope_class, @scope_class, build_usecase_filename('list')].reject { |c| c.empty? }.join("::") %>).to receive(:contract!)<%= @resource_owner_id.present? ? "\n          .with(hash_including(#{@resource_owner_id}: owner.id))" : '' %>
+        expect(<%= [@usecase_domain].reject { |c| c.empty? }.join("::").sub(/(.+)/, '\1::') %>UseCases::<%= [@route_scope_class, @scope_class, build_usecase_filename('list')].reject { |c| c.empty? }.join("::") %>).to receive(:contract!)<%= @resource_owner_id.present? ? "\n          .with(hash_including(#{@resource_owner_id}: #{@resource_owner}.id))" : '' %>
 
         get :index
       end
@@ -75,14 +102,14 @@ RSpec.describe <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.j
       it 'redirects to root path with error' do
         get :index
 
-        expect(response).to redirect_to(root_path)
+        expect(response).to redirect_to(<%= @variable_subject.pluralize %>_url)
         expect(flash[:success]).to eq('Error loading <%= @variable_subject.pluralize %>')
       end
     end
   end
 
   describe 'GET #show' do
-    let(:<%= @variable_subject %>) { create(:<%= @variable_subject %><%= @resource_owner_id.present? ? ", #{@resource_owner_id}: owner.id" : '' %>) }
+    let(:<%= @variable_subject %>) { create(:<%= @variable_subject %><%= create_params_str %>) }
 
     context 'when use case succeeds' do
       let(:use_case_instance) { instance_double(<%= [@usecase_domain].reject { |c| c.empty? }.join("::").sub(/(.+)/, '\1::') %>UseCases::<%= [@route_scope_class, @scope_class, build_usecase_filename('fetch', '_by_id')].reject { |c| c.empty? }.join("::") %>) }
@@ -101,7 +128,7 @@ RSpec.describe <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.j
 
       it 'calls use case with correct contract' do
         expect(<%= [@usecase_domain].reject { |c| c.empty? }.join("::").sub(/(.+)/, '\1::') %>UseCases::<%= [@route_scope_class, @scope_class, build_usecase_filename('fetch', '_by_id')].reject { |c| c.empty? }.join("::") %>).to receive(:contract!)
-          .with(hash_including(<%= @resource_owner_id.present? ? "#{@resource_owner_id}: owner.id, " : '' %>id: <%= @variable_subject %>.id))
+          .with(hash_including(<%= @resource_owner_id.present? ? "#{@resource_owner_id}: #{@resource_owner}.id, " : '' %>id: <%= @variable_subject %>.id))
 
         get :show, params: { id: <%= @variable_subject %>.id }
       end
@@ -115,10 +142,10 @@ RSpec.describe <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.j
         stub_use_case(<%= [@usecase_domain].reject { |c| c.empty? }.join("::").sub(/(.+)/, '\1::') %>UseCases::<%= [@route_scope_class, @scope_class, build_usecase_filename('fetch', '_by_id')].reject { |c| c.empty? }.join("::") %>, failure_result, response: :failure)
       end
 
-      it 'redirects to root path with error' do
+      it 'redirects to <%= @variable_subject.pluralize %> path with error' do
         get :show, params: { id: 'non-existent' }
 
-        expect(response).to redirect_to(root_path)
+        expect(response).to redirect_to(<%= @variable_subject.pluralize %>_url)
         expect(flash[:success]).to eq('<%= @subject_class %> not found')
       end
     end
@@ -134,12 +161,12 @@ RSpec.describe <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.j
   end
 
   describe 'GET #edit' do
-    let(:<%= @variable_subject %>) { create(:<%= @variable_subject %><%= @resource_owner_id.present? ? ", #{@resource_owner_id}: owner.id" : '' %>) }
+    let(:<%= @variable_subject %>) { create(:<%= @variable_subject %><%= create_params_str %>) }
 
     context 'when <%= @variable_subject %> exists<%= @resource_owner_id.present? ? " and belongs to owner" : '' %>' do
       before do
         allow(<%= @model_class %>).to receive(:find_by)
-          .with(<%= @resource_owner_id.present? ? "id: #{@variable_subject}.id, #{@resource_owner_id}: owner.id" : "id: #{@variable_subject}.id" %>)
+          .with(<%= @resource_owner_id.present? ? "id: #{@variable_subject}.id, #{@resource_owner_id}: #{@resource_owner}.id" : "id: #{@variable_subject}.id" %>)
           .and_return(<%= @variable_subject %>)
       end
 
@@ -154,7 +181,7 @@ RSpec.describe <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.j
     context 'when <%= @variable_subject %> does not exist<%= @resource_owner_id.present? ? " or does not belong to owner" : '' %>' do
       before do
         allow(<%= @model_class %>).to receive(:find_by)
-          .with(<%= @resource_owner_id.present? ? "id: 'non-existent', #{@resource_owner_id}: owner.id" : "id: 'non-existent'" %>)
+          .with(<%= @resource_owner_id.present? ? "id: 'non-existent', #{@resource_owner_id}: #{@resource_owner}.id" : "id: 'non-existent'" %>)
           .and_return(nil)
       end
 
@@ -186,7 +213,7 @@ RSpec.describe <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.j
 
       it 'calls use case with correct contract' do
         expect(<%= [@usecase_domain].reject { |c| c.empty? }.join("::").sub(/(.+)/, '\1::') %>UseCases::<%= [@route_scope_class, @scope_class, build_usecase_filename('create')].reject { |c| c.empty? }.join("::") %>).to receive(:contract!)
-          .with(hash_including(<%= @resource_owner_id.present? ? "#{@resource_owner_id}: owner.id, " : '' %>**valid_attributes.stringify_keys))
+          .with(hash_including(<%= @resource_owner_id.present? ? "#{@resource_owner_id}: #{@resource_owner}.id, " : '' %>**valid_attributes.stringify_keys))
 
         post :create, params: { models_<%= @subject_class.underscore %>: valid_attributes }
       end
@@ -204,7 +231,7 @@ RSpec.describe <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.j
       it 'does not create and renders new with errors' do
         post :create, params: { models_<%= @subject_class.underscore %>: invalid_attributes }
 
-        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response).to have_http_status(:unprocessable_content)
         expect(response).to render_template('<%= [@route_scope_path, @scope_path, 'new'].reject { |c| c.empty? }.join("/") %>')
         expect(assigns(:<%= @variable_subject %>)).to be_a(<%= @model_class %>)
       end
@@ -219,12 +246,12 @@ RSpec.describe <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.j
   end
 
   describe 'PATCH #update' do
-    let(:<%= @variable_subject %>) { create(:<%= @variable_subject %><%= @resource_owner_id.present? ? ", #{@resource_owner_id}: owner.id" : '' %>) }
+    let(:<%= @variable_subject %>) { create(:<%= @variable_subject %><%= create_params_str %>) }
     let(:updated_attributes) { { <%= @fields.first.first %>: 'Updated Value' } }
 
     before do
       allow(<%= @model_class %>).to receive(:find_by)
-        .with(<%= @resource_owner_id.present? ? "id: #{@variable_subject}.id, #{@resource_owner_id}: owner.id" : "id: #{@variable_subject}.id" %>)
+        .with(<%= @resource_owner_id.present? ? "id: #{@variable_subject}.id, #{@resource_owner_id}: #{@resource_owner}.id" : "id: #{@variable_subject}.id" %>)
         .and_return(<%= @variable_subject %>)
     end
 
@@ -232,7 +259,7 @@ RSpec.describe <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.j
       let(:updated_<%= @variable_subject %>) { <%= @variable_subject %>.tap { |obj| obj.<%= @fields.first.first %> = 'Updated Value' } }
 
       before do
-        stub_use_case(<%= [@usecase_domain].reject { |c| c.empty? }.join("::").sub(/(.+)/, '\1::') %>UseCases::<%= [@route_scope_class, @scope_class, build_usecase_filename('update')].reject { |c| c.empty? }.join("::") %>, updated_campaign, response: :success)
+        stub_use_case(<%= [@usecase_domain].reject { |c| c.empty? }.join("::").sub(/(.+)/, '\1::') %>UseCases::<%= [@route_scope_class, @scope_class, build_usecase_filename('update')].reject { |c| c.empty? }.join("::") %>, updated_<%= @variable_subject %>, response: :success)
       end
 
       it 'updates and redirects with success message' do
@@ -244,7 +271,7 @@ RSpec.describe <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.j
 
       it 'calls use case with correct contract' do
         expect(<%= [@usecase_domain].reject { |c| c.empty? }.join("::").sub(/(.+)/, '\1::') %>UseCases::<%= [@route_scope_class, @scope_class, build_usecase_filename('update')].reject { |c| c.empty? }.join("::") %>).to receive(:contract!)
-          .with(hash_including(<%= @resource_owner_id.present? ? "#{@resource_owner_id}: owner.id, " : '' %>id: <%= @variable_subject %>.id, **updated_attributes.stringify_keys))
+          .with(hash_including(<%= @resource_owner_id.present? ? "#{@resource_owner_id}: #{@resource_owner}.id, " : '' %>id: <%= @variable_subject %>.id, **updated_attributes.stringify_keys))
 
         patch :update, params: { id: <%= @variable_subject %>.id, models_<%= @subject_class.underscore %>: updated_attributes }
       end
@@ -263,7 +290,7 @@ RSpec.describe <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.j
       it 'does not update and renders edit with errors' do
         patch :update, params: { id: <%= @variable_subject %>.id, models_<%= @subject_class.underscore %>: invalid_attributes }
 
-        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response).to have_http_status(:unprocessable_content)
         expect(response).to render_template('<%= [@route_scope_path, @scope_path, 'edit'].reject { |c| c.empty? }.join("/") %>')
         expect(assigns(:<%= @variable_subject %>)).to eq(<%= @variable_subject %>)
       end
@@ -271,7 +298,7 @@ RSpec.describe <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.j
   end
 
   describe 'DELETE #destroy' do
-    let(:<%= @variable_subject %>) { create(:<%= @variable_subject %><%= @resource_owner_id.present? ? ", #{@resource_owner_id}: owner.id" : '' %>) }
+    let(:<%= @variable_subject %>) { create(:<%= @variable_subject %><%= create_params_str %>) }
 
     context 'when deletion succeeds' do
       let(:success_result) { true }
@@ -289,7 +316,7 @@ RSpec.describe <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.j
 
       it 'calls use case with correct contract' do
         expect(<%= [@usecase_domain].reject { |c| c.empty? }.join("::").sub(/(.+)/, '\1::') %>UseCases::<%= [@route_scope_class, @scope_class, build_usecase_filename('destroy')].reject { |c| c.empty? }.join("::") %>).to receive(:contract!)
-          .with(hash_including(<%= @resource_owner_id.present? ? "#{@resource_owner_id}: owner.id, " : '' %>id: <%= @variable_subject %>.id))
+          .with(hash_including(<%= @resource_owner_id.present? ? "#{@resource_owner_id}: #{@resource_owner}.id, " : '' %>id: <%= @variable_subject %>.id))
 
         delete :destroy, params: { id: <%= @variable_subject %>.id }
       end
@@ -317,17 +344,17 @@ RSpec.describe <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.j
         params = { <%= @fields.first.first %>: 'Test' }
         result = controller.send(:build_contract, params)
 
-        expect(result).to include(<%= @resource_owner_id.present? ? "#{@resource_owner_id}: owner.id, " : '' %><%= @fields.first.first %>: 'Test')
+        expect(result).to include(<%= @resource_owner_id.present? ? "#{@resource_owner_id}: #{@resource_owner}.id, " : '' %><%= @fields.first.first %>: 'Test')
       end
     end
 
     describe '#set_<%= @variable_subject %>' do
       context 'when <%= @variable_subject %> exists' do
-        let(:<%= @variable_subject %>) { create(:<%= @variable_subject %><%= @resource_owner_id.present? ? ", #{@resource_owner_id}: owner.id" : '' %>) }
+        let(:<%= @variable_subject %>) { create(:<%= @variable_subject %><%= create_params_str %>) }
 
         before do
           allow(<%= @model_class %>).to receive(:find_by)
-            .with(<%= @resource_owner_id.present? ? "id: #{@variable_subject}.id, #{@resource_owner_id}: owner.id" : "id: #{@variable_subject}.id" %>)
+            .with(<%= @resource_owner_id.present? ? "id: #{@variable_subject}.id, #{@resource_owner_id}: #{@resource_owner}.id" : "id: #{@variable_subject}.id" %>)
             .and_return(<%= @variable_subject %>)
         end
 
@@ -343,7 +370,7 @@ RSpec.describe <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.j
       context 'when <%= @variable_subject %> does not exist' do
         before do
           allow(<%= @model_class %>).to receive(:find_by)
-            .with(<%= @resource_owner_id.present? ? "id: 'non-existent', #{@resource_owner_id}: owner.id" : "id: 'non-existent'" %>)
+            .with(<%= @resource_owner_id.present? ? "id: 'non-existent', #{@resource_owner_id}: #{@resource_owner}.id" : "id: 'non-existent'" %>)
             .and_return(nil)
         end
 
@@ -354,7 +381,7 @@ RSpec.describe <%= [@engine_scope_class, @scope_class].reject { |c| c.empty? }.j
           controller.send(:set_<%= @variable_subject %>)
 
           expect(controller.instance_variable_get(:@<%= @variable_subject %>)).to be_nil
-          expect(controller).to have_received(:redirect_to).with(<%= [@route_scope_path, @scope_path].reject { |c| c.empty? }.join("_") %>_url, error: 'Campaign not found.')
+          expect(controller).to have_received(:redirect_to).with(<%= [@route_scope_path, @scope_path].reject { |c| c.empty? }.join("_") %>_url, error: '<%= @subject_class %> not found.')
         end
       end
     end

data/lib/generators/sun_sword/templates_scaffold/views/index.html.erb.tt

@@ -16,37 +16,39 @@
         <%% end %>
       </div>
     </div>
-    <div class="overflow-x-auto sm:flex-auto">
-      <div class="inline-block min-w-full align-middle">
-        <table class="min-w-full divide-y divide-gray-300">
-          <thead>
-          <tr>
-            <%% <%= @controllers.list_fields.map { |tc| [tc.titleize.to_s, '']} + [["Action", "text-center"]]%>.each do |title, attr_class| %>
-              <th scope="col" class="class-tr <%%= attr_class %>"><%%= title %></th>
-            <%% end %>
-            </th>
-          </tr>
-          </thead>
-          <tbody class="min-w-full divide-y divide-gray-100">
-          <%% @<%= @variable_subject.pluralize %>.response.each do |<%= @variable_subject %>| %>
-            <tr class="even:bg-gray-50">
-<%@controllers.list_fields.each do |field| -%>
-              <td class="class-td">
-                <div class="flex items-center">
-                  <div>
-                    <div class="text-sm text-gray-900"><%%= <%= @variable_subject %>.<%=field %> %></div>
-                  </div>
-                </div>
-              </td>
-<%end-%>
-              <td class="class-td text-center">
-                <%%= render "components/link_action", key: "<%= [@route_scope_path, @scope_subject].reject { |c| c.empty? }.join("_") %>", value: <%= @variable_subject %>, actions: [:show, :edit, :destroy] %>
-              </td>
+    <%% if @<%= @variable_subject.pluralize %>.response.present? %>
+      <div class="overflow-x-auto sm:flex-auto">
+        <div class="inline-block min-w-full align-middle">
+          <table class="min-w-full divide-y divide-gray-300">
+            <thead>
+            <tr>
+              <%% <%= @controllers.list_fields.map { |tc| [tc.titleize.to_s, '']} + [["Action", "text-center"]]%>.each do |title, attr_class| %>
+                <th scope="col" class="class-tr <%%= attr_class %>"><%%= title %></th>
+              <%% end %>
+              </th>
             </tr>
-          <%% end %>
-          </tbody>
-        </table>
+            </thead>
+            <tbody class="min-w-full divide-y divide-gray-100">
+            <%% @<%= @variable_subject.pluralize %>.response.each do |<%= @variable_subject %>| %>
+              <tr class="even:bg-gray-50">
+  <%@controllers.list_fields.each do |field| -%>
+                <td class="class-td">
+                  <div class="flex items-center">
+                    <div>
+                      <div class="text-sm text-gray-900"><%%= <%= @variable_subject %>.<%=field %> %></div>
+                    </div>
+                  </div>
+                </td>
+  <%end-%>
+                <td class="class-td text-center">
+                  <%%= render "components/link_action", key: "<%= [@route_scope_path, @scope_subject].reject { |c| c.empty? }.join("_") %>", value: <%= @variable_subject %>, actions: [:show, :edit, :destroy] %>
+                </td>
+              </tr>
+            <%% end %>
+            </tbody>
+          </table>
+        </div>
       </div>
-    </div>
+    <%% end %>
   </div>
 </div>

data/lib/sun_sword/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module SunSword
-  VERSION = '0.0.13'
+  VERSION = '0.0.14'
   public_constant :VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sun-sword
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Kotaro Minami