rider-kick 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca2aedb4749c52fc2cf24c4ab16564c3bb334eca159e674b4e0ce2e1b138af7c
-  data.tar.gz: d48958c8210c77dc852a9a9f7ccb51c1a439848e7397581be5e8546929a1153b
+  metadata.gz: cbec18d4669bd7258d0e65f0906d7f07221effe04491ec2058d8fa668a6910eb
+  data.tar.gz: 27ef02db28f619ebdc203220c8feea863520ae2dbdb6297a579f8c8675bd1bae
 SHA512:
-  metadata.gz: a3b44f67e107355e1cb5f6c56df0e071393c612d5b5e36d6b8cba84f7cefb36570c9ef4d0b4e38df94ee6ee5eca1a66f2bca03bfaacc812cffb466c490b01b79
-  data.tar.gz: fc8999432b430ddc353aad9d64f459acbb8974ae42ee824928f4821358e1c1ea98a6531322cec9fa10e75f8f98eca4a93f5791edd4ba689d4fe2592298b4ff38
+  metadata.gz: ef2ddbd9b1ea1fd2bdfa16a5e37081e36010c102f842355a0bb0d2516ad9dbfb0b6b9fbce6b4a21ac0918c0f3cc8caf10b7bc2ff425e9e059c3014054e2d2100
+  data.tar.gz: 70712252956a3c89d23d215d1d692808f6d796b81b4770756016e505a048cecbf7d6bd68b2bb4527433353ba21cc726e68761ea15ec0b94e01672b306512f6d2

data/lib/generators/rider_kick/USAGE

@@ -5,5 +5,5 @@ Description:
 Example:
     To Generate scaffold:
         bin/rails generate rider_kick:clean_arch --setup
-        bin/rails generate rider_kick:structure Models::User actor:owner
+        bin/rails generate rider_kick:structure Models::User actor:owner uploaders:asset,images
         bin/rails generate rider_kick:scaffold users scope:dashboard

data/lib/generators/rider_kick/scaffold_generator.rb

@@ -38,6 +38,7 @@ module RiderKick
       entity        = @structure.entity || {}
 
       @actor                = @structure.actor
+      @resource_owner_id    = @structure.resource_owner_id
       @uploaders            = @structure.uploaders || []
       @search_able          = @structure.search_able || []
       @services             = @structure.domains || {}
@@ -83,6 +84,10 @@ module RiderKick
       }
     end
 
+    def is_singular?(str)
+      str.singularize == str
+    end
+
     def generate_files(action, suffix = '')
       use_case_filename   = build_usecase_filename(action, suffix)
       repository_filename = build_repository_filename(action, suffix)

data/lib/generators/rider_kick/structure_generator.rb

@@ -3,7 +3,7 @@ module RiderKick
     source_root File.expand_path('templates', __dir__)
 
     argument :arg_model_name, type: :string, default: '', banner: 'Models::Name'
-    argument :arg_settings, type: :hash, default: '', banner: 'route_scope:dashboard actor:user uploader_filed:assets,images,picture,document'
+    argument :arg_settings, type: :hash, default: '', banner: 'route_scope:dashboard actor:user uploaders:assets,images,picture,document'
 
     def generate_use_case
       validation!
@@ -56,6 +56,10 @@ module RiderKick
       }
     end
 
+    def is_singular?(str)
+      str.singularize == str
+    end
+
     def generate_files(action)
       template 'db/structures/example.yaml.tt', File.join("db/structures/#{action}_structure.yaml")
     end
@@ -69,8 +73,8 @@ module RiderKick
     end
 
     def uploaders
-      return [] unless arg_settings['uploader_filed'].present?
-      arg_settings['uploader_filed'].split(',').map(&:strip)
+      return [] unless arg_settings['uploaders'].present?
+      arg_settings['uploaders'].split(',').map(&:strip)
     end
   end
 end

data/lib/generators/rider_kick/templates/db/structures/example.yaml.tt

@@ -1,5 +1,6 @@
 model: <%= @model_class %>
 resource_name: <%= @scope_path %>
+resource_owner_id: <%= @resource_owner_id %>
 actor: <%= @actor %>
 fields:
 <% @model_class.columns.each do |field| -%>
@@ -36,8 +37,13 @@ controllers:
       type: string
 <% end -%>
 <% (@uploaders).each do |field| -%>
+<% if is_singular?(field) -%>
     - name: <%= field %>
       type: file
+<% else -%>
+    - name: <%= field %>
+      type: files
+<% end -%>
 <% end -%>
 domains:
   action_list:
@@ -54,7 +60,11 @@ domains:
   <% column_type = get_column_type(field) -%>
   <% dry_type = @type_mapping[column_type.to_s] || ':string' -%>
 <% if @uploaders.include?(field) -%>
+<% if is_singular?(field) -%>
     - optional(:<%= field %>).maybe(<%= dry_type %>)
+<% else -%>
+    - optional(:<%= field %>).maybe(:array)
+<% end -%>
 <% else -%>
     - required(:<%= field %>).filled(<%= dry_type %>)
 <% end -%>
@@ -67,7 +77,11 @@ domains:
 <% column_type = get_column_type(field) -%>
 <% dry_type = @type_mapping[column_type.to_s] || ':string' -%>
 <% if @uploaders.include?(field) -%>
+<% if is_singular?(field) -%>
         - optional(:<%= field %>).maybe(<%= dry_type %>)
+<% else -%>
+        - optional(:<%= field %>).maybe(:array)
+<% end -%>
 <% else -%>
         - optional(:<%= field %>).maybe(<%= dry_type %>)
 <% end -%>

data/lib/generators/rider_kick/templates/domains/core/builders/builder.rb.tt

@@ -2,13 +2,24 @@
 
 class Core::Builders::<%=  @subject_class %> < RiderKick::Builders::AbstractActiveRecordEntityBuilder
   acts_as_builder_for_entity Core::Entities::<%= @subject_class%>
+
 <% if @uploaders.present? -%>
   def attributes_for_entity
     {
-<% @uploaders.each_with_index do |upload, index| -%>
-      <%= upload %>: (Rails.application.routes.url_helpers.polymorphic_url(params.<%= upload %>) rescue '')<%= ',' if index < @uploaders.size - 1 %>
+<% @uploaders.each_with_index do |field, index| -%>
+<% if is_singular?(field) -%>
+      <%= field %>: (Rails.application.routes.url_helpers.polymorphic_url(params.<%= field %>) rescue '')<%= ',' if index < @uploaders.size - 1 %>
+<% else -%>
+      <%= field %>: build_assets(params.<%= field %>)<%= ',' if index < @uploaders.size - 1 %>
+<% end -%>
 <% end -%>
     }
   end
+
+private
+
+  def build_assets(assets)
+    assets.to_a.map { |asset| Rails.application.routes.url_helpers.polymorphic_url(asset) rescue '' }.compact
+  end
 <% end -%>
 end

data/lib/generators/rider_kick/templates/domains/core/builders/pagination.rb.tt

@@ -5,7 +5,7 @@ class Core::Builders::Pagination < RiderKick::Builders::AbstractActiveRecordEnti
 
   def attributes_for_entity
     {
-      total_count: params[:count],
+      total_count: params.count,
       page:        params.page,
       per_page:    params.limit,
       page_count:  params.last

data/lib/generators/rider_kick/templates/domains/core/entities/entity.rb.tt

@@ -4,6 +4,14 @@ class Core::Entities::<%=  @subject_class %> < Dry::Struct
 <% (['id'] + @fields + @uploaders + ['created_at', 'updated_at']).each do |field| -%>
 <% column_type = get_column_type(field) -%>
 <% dry_type = @entity_type_mapping[column_type.to_s] || 'Types::Strict::String' -%>
+<% if @uploaders.include?(field) -%>
+<% if is_singular?(field) -%>
+  attribute :<%= field %>, Types::Strict::String
+<% else -%>
+  attribute :<%= field %>, Types::Strict::Array
+<% end -%>
+<% else -%>
   attribute :<%= field %>, <%= dry_type %>
 <% end -%>
+<% end -%>
 end

data/lib/generators/rider_kick/templates/domains/core/repositories/destroy.rb.tt

@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 
 class Core::Repositories::<%= @scope_class %>::<%= @repository_class %> < Core::Repositories::AbstractRepository
-  def initialize(id:)
-    @id  = id
+  def initialize(params:)
+    @id  = params.id
   end
 
   def call(builder: true)
+<% if @resource_owner_id.present? -%>
+    resource = <%= @model_class %>.find_by(id: @id, <%=@resource_owner_id%>: @params.<%=@resource_owner_id%>)
+<% else -%>
     resource = <%= @model_class %>.find_by(id: @id)
+<% end -%>
     return Failure '<%= @subject_class %> not found' unless resource.present?
     unless resource.destroy
       return Failure build_errors(resource)

data/lib/generators/rider_kick/templates/domains/core/repositories/fetch_by_id.rb.tt

@@ -1,12 +1,17 @@
 # frozen_string_literal: true
 
 class Core::Repositories::<%= @scope_class %>::<%= @repository_class %> < Core::Repositories::AbstractRepository
-  def initialize(id:)
-    @id  = id
+  def initialize(params:)
+    @params = params
+    @id     = @params.id
   end
 
   def call(builder: true)
+<% if @resource_owner_id.present? -%>
+    resource = <%= @model_class %>.find_by(id: @id, <%=@resource_owner_id%>: @params.<%=@resource_owner_id%>)
+<% else -%>
     resource = <%= @model_class %>.find_by(id: @id)
+<% end -%>
     return Failure '<%= @subject_class %> not found' unless resource.present?
     Success Core::Builders::<%= @subject_class %>.new(resource).build
   end

data/lib/generators/rider_kick/templates/domains/core/repositories/list.rb.tt

@@ -7,11 +7,15 @@ class Core::Repositories::<%= @scope_class %>::<%= @repository_class%> < Core::R
   end
 
   def call(builder: true)
+<% if @resource_owner_id.present? -%>
+    resources = <%= @model_class %>.where(<%=@resource_owner_id%>: @params.<%=@resource_owner_id%>)
+<% else -%>
     resources = <%= @model_class %>
+<% end -%>
     if @search.present?
       resources = resources.where('<%= @search_able.map { |field| "LOWER(#{field}) LIKE :search" }.join(' OR ')%>', search: "%#{search}%")
     end
-    return Success [] unless resources.present?
+    return Success Success Hashie::Mash.new(response: [], meta: {}) unless resources.present?
     pagy, results = pagy(resources.order(created_at: :desc), limit: @per_page, page: @page)
     response      = results.map { |result| Core::Builders::<%= @subject_class %>.new(result).build }
     Success Hashie::Mash.new(response: response, meta: paginate!(pagy))

data/lib/generators/rider_kick/templates/domains/core/repositories/update.rb.tt

@@ -1,13 +1,17 @@
 # frozen_string_literal: true
 
 class Core::Repositories::<%= @scope_class %>::<%= @repository_class %> < Core::Repositories::AbstractRepository
-  def initialize(id:, params: {})
-    @id     = id
-    @params = prepare! params, sanitize: true
+  def initialize(params:)
+    @id     = params.id
+    @params = prepare! params.except(:id), sanitize: true
   end
 
   def call(builder: true)
+<% if @resource_owner_id.present? -%>
+    resource = <%= @model_class %>.find_by(id: @id, <%=@resource_owner_id%>: @params.<%=@resource_owner_id%>)
+<% else -%>
     resource = <%= @model_class %>.find_by(id: @id)
+<% end -%>
     return Failure '<%= @subject_class %> not found' unless resource.present?
 <% if @uploaders.present? -%>
     # Remove the existing images if a new one is being uploaded

data/lib/generators/rider_kick/templates/domains/core/use_cases/contract/default.rb.tt

@@ -9,9 +9,6 @@ class Core::UseCases::Contract::Default
 
   def default
     Dry::Schema.Params do
-        if @scope_owner_column.present?
-          required(@scope_owner_column).filled(:string)
-        end
     end
   end
 end

data/lib/generators/rider_kick/templates/domains/core/use_cases/create.rb.tt

@@ -4,7 +4,13 @@ class Core::UseCases::<%= [@route_scope_class, @scope_class, @use_case_class].re
   contract do
     params(Core::UseCases::Contract::Default.new.call) do
 <% @contract_create.each do |field| -%>
+<%if field.include?(":#{@resource_owner_id}") -%>
+<% if @resource_owner_id.present? -%>
+      required(:<%= @resource_owner_id %>).filled(:string)
+<% end -%>
+<% else -%>
       <%= field %>
+<% end -%>
 <% end -%>
     end
   end

data/lib/generators/rider_kick/templates/domains/core/use_cases/destroy.rb.tt

@@ -4,7 +4,11 @@ class Core::UseCases::<%= [@route_scope_class, @scope_class, @use_case_class].re
   contract do
     params(Core::UseCases::Contract::Default.new.call) do
 <% @contract_destroy.each do |field| -%>
+<% next if field.include?(":#{@resource_owner_id}") -%>
       <%= field %>
+<% end -%>
+<% if @resource_owner_id.present? -%>
+      required(:<%= @resource_owner_id %>).filled(:string)
 <% end -%>
     end
   end
@@ -13,6 +17,6 @@ class Core::UseCases::<%= [@route_scope_class, @scope_class, @use_case_class].re
 
   def result
     params = yield build_parameter!
-    Core::Repositories::<%= @scope_class%>::<%= @repository_class%>.new(id: params.id).call(builder: true)
+    Core::Repositories::<%= @scope_class%>::<%= @repository_class%>.new(params: params).call(builder: true)
   end
 end

data/lib/generators/rider_kick/templates/domains/core/use_cases/fetch_by_id.rb.tt

@@ -4,7 +4,11 @@ class Core::UseCases::<%= [@route_scope_class, @scope_class, @use_case_class].re
   contract do
     params(Core::UseCases::Contract::Default.new.call) do
 <% @contract_fetch_by_id.each do |field| -%>
+<% next if field.include?(":#{@resource_owner_id}") -%>
       <%= field %>
+<% end -%>
+<% if @resource_owner_id.present? -%>
+      required(:<%= @resource_owner_id %>).filled(:string)
 <% end -%>
     end
   end
@@ -13,6 +17,6 @@ class Core::UseCases::<%= [@route_scope_class, @scope_class, @use_case_class].re
 
   def result
     params = yield build_parameter!
-    Core::Repositories::<%= @scope_class%>::<%= @repository_class%>.new(id: params.id).call(builder: true)
+    Core::Repositories::<%= @scope_class%>::<%= @repository_class%>.new(params: params).call(builder: true)
   end
 end

data/lib/generators/rider_kick/templates/domains/core/use_cases/list.rb.tt

@@ -3,7 +3,11 @@
 class Core::UseCases::<%= [@route_scope_class, @scope_class, @use_case_class].reject { |c| c.empty? }.join("::") %> < RiderKick::UseCases::AbstractUseCase
   contract do
     params(Core::UseCases::Contract::Default.new.call, Core::UseCases::Contract::Pagination.new.call) do
+<% if @resource_owner_id.present? -%>
+      required(:<%= @resource_owner_id %>).filled(:string)
+<% end -%>
 <% @contract_list.each do |field| -%>
+      <% next if field.include?(":#{@resource_owner_id}") %>
       <%= field %>
 <% end -%>
     end

data/lib/generators/rider_kick/templates/domains/core/use_cases/update.rb.tt

@@ -4,7 +4,13 @@ class Core::UseCases::<%= [@route_scope_class, @scope_class, @use_case_class].re
   contract do
     params(Core::UseCases::Contract::Default.new.call) do
 <% @contract_update.each do |field| -%>
+<%if field.include?(":#{@resource_owner_id}") -%>
+<% if @resource_owner_id.present? -%>
+      required(:<%= @resource_owner_id %>).filled(:string)
+<% end -%>
+<% else -%>
       <%= field %>
+<% end -%>
 <% end -%>
     end
   end
@@ -13,6 +19,6 @@ class Core::UseCases::<%= [@route_scope_class, @scope_class, @use_case_class].re
 
   def result
     params = yield build_parameter!
-    Core::Repositories::<%= @scope_class%>::<%= @repository_class%>.new(id: params.id, params: params.except(:id)).call(builder: true)
+    Core::Repositories::<%= @scope_class%>::<%= @repository_class%>.new(params: params).call(builder: true)
   end
 end

data/lib/rider_kick/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module RiderKick
-  VERSION = '0.0.4'
+  VERSION = '0.0.6'
   public_constant :VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rider-kick
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Kotaro Minami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-21 00:00:00.000000000 Z
+date: 2024-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-matcher
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: Clean Architecture Framework.