sun-sword 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b414900e8daf53df2781f85514ad0b2ff9bd876b59bab1414f954acf9920b83
-  data.tar.gz: f3adc01b9e3aa64c3c07d9aa9c843282eb978d0bd2a84542acefc94012cafd06
+  metadata.gz: e876a062dad8a99dc15b8954c7bdf447f843de121bc578932068394cab917000
+  data.tar.gz: 67c9dc597e823267475da811830f40699496537467a0fb2ca0cf20395543addc
 SHA512:
-  metadata.gz: 5ef80ec8a386908e924568e666fc8616754d4fd5fc0df9a335996a0dcb8d69970d9698efe1366a61ce3c082b2921bacf70cfa75a229bb7fff745caa1eed6197e
-  data.tar.gz: 30cc226b312508adb9fc7fa2a04cdce9432170038bb2661d9042b78c301bc03a600ce56220e6f90d47423edaac6ac615a8b58fbc7c6cfee411b77a2d2067a4d0
+  metadata.gz: 3b81d13ef0544cb3aa9ec08fb89aaae894a6636e551aa8234653cd03ec55a1ca8a4df89616aad8266f81222320655f112d16b2a50c02bcfdcf5d9f417715f7f4
+  data.tar.gz: 2b2f61c502fed7615f2efbc868d4874c390261103d261364e893af9f4ff4233d66528557cb8a911e7bfc7d8837bfb0eb8d41cec2d4c501ab3dccb57f03614f66

data/lib/generators/sun_sword/frontend_generator.rb

@@ -10,11 +10,9 @@ module SunSword
       end
     end
 
-    desc 'This generator installs Vite with Rails 7 configuration'
+    desc 'This generator installs Vite with Rails 8 configuration'
 
     def setup
-      validation!
-      remove_assets_folder
       copy_assets_from_template
 
       add_vite_to_gemfile
@@ -26,50 +24,10 @@ module SunSword
       generate_controllers_site
       generate_components
       modify_layout_for_vite
-
-      setup_migration
-      setup_models
-      gem_dependencies
     end
 
     private
 
-    def gem_dependencies
-      # auth
-      # rails generate devise:install
-      # config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
-      # devise_for :auths, class_name: "Models::Auth", controllers: {
-      #   sessions: 'auths/sessions'
-      # }
-      gem 'devise', '~> 4.9'
-
-      say 'Menjalankan bundle install...'
-      run 'bundle install'
-      run 'rails generate devise:install'
-      inject_into_file 'config/routes.rb', "  devise_for :auths, class_name: 'Models::Auth'\n", after: "Rails.application.routes.draw do\n"
-    end
-
-    def setup_migration
-      template 'db/migrate/20241117042039_devise_create_auths.rb', File.join("db/migrate/#{Time.now.strftime('%Y%m%d%H%M')}11_devise_create_auths.rb")
-      template 'db/migrate/20241117043154_create_models_accounts.rb', File.join("db/migrate/#{Time.now.strftime('%Y%m%d%H%M')}22_create_models_accounts.rb")
-      template 'db/migrate/20241117044142_create_models_users.rb', File.join("db/migrate/#{Time.now.strftime('%Y%m%d%H%M')}33_create_models_users.rb")
-
-      template 'db/seeds.rb', File.join('db/seeds.rb')
-    end
-
-    def setup_models
-      template 'models/models/account.rb', File.join('app/models/models/account.rb')
-      template 'models/models/auth.rb', File.join('app/models/models/auth.rb')
-      template 'models/models/user.rb', File.join('app/models/models/user.rb')
-    end
-
-    def validation!
-      unless File.exist?('config/initializers/sun_sword.rb')
-        say 'Error must create init configuration for sun_sword!'
-        raise Thor::Error, 'run: bin/rails generate sun_sword:init'
-      end
-    end
-
     def remove_assets_folder
       assets_path = "#{path_app}/assets"
       if Dir.exist?(assets_path)
@@ -144,6 +102,7 @@ module SunSword
       template 'controllers/application_controller.rb.tt', File.join('app/controllers/application_controller.rb')
       site_route = <<-RUBY
 
+  default_url_options :host => "#{ENV['BASE_URL']}"
   root "site#stimulus"
   get "site/jadi_a"
   get "site/jadi_b"

data/lib/generators/sun_sword/scaffold_generator.rb

@@ -6,7 +6,6 @@ module SunSword
     argument :arg_scope, type: :hash, default: '', banner: 'scope:dashboard'
 
     def running
-      validation!
       setup_variables
       create_root_folder
       create_controller_file
@@ -16,13 +15,6 @@ module SunSword
 
     private
 
-    def validation!
-      unless File.exist?('config/initializers/sun_sword.rb')
-        say 'Error must create init configuration for sun_sword!'
-        raise Thor::Error, 'run: bin/rails generate sun_sword:init'
-      end
-    end
-
     def setup_variables
       config     = YAML.load_file("db/structures/#{arg_structure}_structure.yaml")
       @structure = Hashie::Mash.new(config)
@@ -33,6 +25,7 @@ module SunSword
       entity        = @structure.entity || {}
 
       @actor                = @structure.actor
+      @resource_owner_id    = @structure.resource_owner_id
       @uploaders            = @structure.uploaders || []
       @search_able          = @structure.search_able || []
       @services             = @structure.domains || {}
@@ -221,15 +214,12 @@ module SunSword
       if @route_scope_path.present?
         inject_into_file routes_file, "    resources :#{@scope_path}\n", after: "namespace :#{@route_scope_path} do\n"
       else
-        inject_into_file routes_file, "    resources :#{@scope_path}\n", after: "Rails.application.routes.draw do\n"
+        inject_into_file routes_file, "  resources :#{@scope_path}\n", after: "Rails.application.routes.draw do\n"
       end
     end
 
     def contract_fields
       skip_contract_fields = @skipped_fields.map(&:strip).uniq
-      if SunSword.scope_owner_column.present?
-        skip_contract_fields << SunSword.scope_owner_column.to_s
-      end
       @model_class.columns.reject { |column| skip_contract_fields.include?(column.name.to_s) }.map(&:name).map(&:to_s)
     end
 

data/lib/generators/sun_sword/templates_frontend/controllers/application_controller.rb.tt

@@ -5,13 +5,12 @@ class ApplicationController < ActionController::Base
 
   protected
 
-  def <%=SunSword.scope_owner_column%>
-    current_auth.account.id
-  end
+  # Adjust the value of <resource_owner_id> in db/structures/<resource>_structure.yaml
+  # Ignore this comment if you haven't generated the structure yet
 
-  def build_contract(params)
-    { <%=SunSword.scope_owner_column.to_s%>: <%=SunSword.scope_owner_column.to_s%> }.merge(params)
-  end
+  #def <resource_owner_id>
+  #   current_auth.<resource_owner_id>
+  #end
 
   def build_form_errors(params, model, errors)
     params.keys.each do |key|
@@ -35,6 +34,6 @@ class ApplicationController < ActionController::Base
 
   def set_layouts
     # "#{current_auth.user.role}/application"
-    "owner/application"
+    'owner/application'
   end
 end

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

@@ -8,11 +8,15 @@ class <%= [@route_scope_class, @scope_class].reject { |c| c.empty? }.join("::")
     use_case = Core::UseCases::<%= [@route_scope_class, @scope_class, build_usecase_filename('list')].reject { |c| c.empty? }.join("::") %>
     contract = use_case.contract!(build_contract({}))
     result   = use_case.new(contract).result
-    @<%= @variable_subject %> = Dry::Matcher::ResultMatcher.call(result) do |matcher|
-      matcher.success { |response| response }
-      matcher.failure { |errors| errors }
+    Dry::Matcher::ResultMatcher.call(result) do |matcher|
+      matcher.success do |response|
+        @<%= @scope_path %> = response
+        render '<%= @route_scope_path %>/<%= @scope_path %>/index'
+      end
+      matcher.failure do |errors|
+        redirect_to root_path, success: errors
+      end
     end
-    render '<%= @route_scope_path %>/<%= @scope_path %>/index'
   end
 
   # GET /<%= [@route_scope_path, @scope_path, ":uuid"].reject { |c| c.empty? }.join("/") %>
@@ -20,9 +24,13 @@ class <%= [@route_scope_class, @scope_class].reject { |c| c.empty? }.join("::")
     use_case = Core::UseCases::<%= [@route_scope_class, @scope_class, build_usecase_filename('fetch', '_by_id')].reject { |c| c.empty? }.join("::") %>
     contract = use_case.contract!(build_contract({ id: params[:id] }))
     result   = use_case.new(contract).result
-    @<%= @scope_path %> = Dry::Matcher::ResultMatcher.call(result) do |matcher|
-      matcher.success { |response| response }
-      matcher.failure { |errors| errors }
+    Dry::Matcher::ResultMatcher.call(result) do |matcher|
+      matcher.success do |response|
+        @<%= @variable_subject %> = response
+      end
+      matcher.failure do |errors|
+        redirect_to root_path, success: errors
+      end
     end
   end
 
@@ -84,10 +92,14 @@ class <%= [@route_scope_class, @scope_class].reject { |c| c.empty? }.join("::")
 
   private
 
+  def build_contract(params)
+    { <%=@resource_owner_id%>: <%=@resource_owner_id%> }.merge(params)
+  end
+
   # Use callbacks to share common setup or constraints between actions.
   def set_<%= @variable_subject %>
-<% if SunSword.scope_owner_column.present? -%>
-    @<%= @variable_subject %> = <%= @model_class %>.find_by(id: params[:id], <%=SunSword.scope_owner_column%>: <%=SunSword.scope_owner_column%>)
+<% if @resource_owner_id.present? -%>
+    @<%= @variable_subject %> = <%= @model_class %>.find_by(id: params[:id], <%=@resource_owner_id%>: <%=@resource_owner_id%>)
 <%else %>
     @<%= @variable_subject %> = <%= @model_class %>.find_by(id: params[:id])
 <%end %>

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

@@ -12,10 +12,31 @@
     <div class="border-t border-gray-100">
       <dl class="divide-y divide-gray-100">
 <%@controllers.show_fields.each do |col| -%>
+<%if @uploaders.include?(col)-%>
+        <div class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+          <dt class="text-sm font-medium text-gray-900"><%=col.titleize%></dt>
+          <dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">
+            <section class="overflow-hidden text-gray-700 ">
+              <div class="container px-5 py-2 mx-auto">
+                <div class="flex flex-wrap -m-1 md:-m-2">
+                  <div class="flex flex-wrap w-1/1">
+                    <%%=  [@<%=@variable_subject%>.<%=col%>].flatten.each do |asset| %>
+                      <div class="w-1/3 p-1 md:p-2">
+                        <img alt="<%=col.titleize%>" class="block object-cover object-center w-100 rounded-lg" src="<%%= asset %>">
+                      </div>
+                    <%% end %>
+                  </div>
+                </div>
+              </div>
+            </section>
+          </dd>
+        </div>
+<%else-%>
         <div class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
           <dt class="text-sm font-medium text-gray-900"><%=col.titleize%></dt>
           <dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0"><%%= @<%=@variable_subject%>.<%=col%> %></dd>
         </div>
+<%end-%>
 <%end-%>
       </dl>
     </div>

data/lib/sun_sword/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sun-sword
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - kotarominami
@@ -77,9 +77,6 @@ files:
 - lib/generators/sun_sword/templates_frontend/config/vite.json
 - lib/generators/sun_sword/templates_frontend/controllers/application_controller.rb.tt
 - lib/generators/sun_sword/templates_frontend/controllers/site_controller.rb
-- lib/generators/sun_sword/templates_frontend/db/migrate/20241117042039_devise_create_auths.rb
-- lib/generators/sun_sword/templates_frontend/db/migrate/20241117043154_create_models_accounts.rb
-- lib/generators/sun_sword/templates_frontend/db/migrate/20241117044142_create_models_users.rb
 - lib/generators/sun_sword/templates_frontend/db/seeds.rb
 - lib/generators/sun_sword/templates_frontend/db/structures/example.yaml.tt
 - lib/generators/sun_sword/templates_frontend/env.development
@@ -93,9 +90,6 @@ files:
 - lib/generators/sun_sword/templates_frontend/frontend/pages/web.js
 - lib/generators/sun_sword/templates_frontend/frontend/stylesheets/application.scss
 - lib/generators/sun_sword/templates_frontend/helpers/application_helper.rb
-- lib/generators/sun_sword/templates_frontend/models/models/account.rb
-- lib/generators/sun_sword/templates_frontend/models/models/auth.rb
-- lib/generators/sun_sword/templates_frontend/models/models/user.rb
 - lib/generators/sun_sword/templates_frontend/package.json
 - lib/generators/sun_sword/templates_frontend/postcss.config.js
 - lib/generators/sun_sword/templates_frontend/rubocop.yml.tt

data/lib/generators/sun_sword/templates_frontend/db/migrate/20241117042039_devise_create_auths.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-class DeviseCreateAuths < ActiveRecord::Migration[7.2]
-  def change
-    create_table :auths, id: :uuid do |t|
-      ## Database authenticatable
-      t.string :email,              null: false, default: ''
-      t.string :encrypted_password, null: false, default: ''
-      t.uuid :account_id, null: false
-      t.uuid :user_id, null: false
-
-      ## Recoverable
-      t.string   :reset_password_token
-      t.datetime :reset_password_sent_at
-
-      ## Rememberable
-      t.datetime :remember_created_at
-
-      ## Trackable
-      # t.integer  :sign_in_count, default: 0, null: false
-      # t.datetime :current_sign_in_at
-      # t.datetime :last_sign_in_at
-      # t.string   :current_sign_in_ip
-      # t.string   :last_sign_in_ip
-
-      ## Confirmable
-      # t.string   :confirmation_token
-      # t.datetime :confirmed_at
-      # t.datetime :confirmation_sent_at
-      # t.string   :unconfirmed_email # Only if using reconfirmable
-
-      ## Lockable
-      # t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
-      # t.string   :unlock_token # Only if unlock strategy is :email or :both
-      # t.datetime :locked_at
-
-      t.timestamps null: false
-    end
-
-    add_index :auths, :email, unique: true
-    add_index :auths, :user_id, unique: true
-    add_index :auths, :reset_password_token, unique: true
-    add_index :auths, :account_id
-    add_index :auths, :created_at
-    add_index :auths, :updated_at
-  end
-end

data/lib/generators/sun_sword/templates_frontend/db/migrate/20241117043154_create_models_accounts.rb

@@ -1,11 +0,0 @@
-class CreateModelsAccounts < ActiveRecord::Migration[7.2]
-  def change
-    create_table :accounts, id: :uuid do |t|
-      t.string :name, null: false
-
-      t.timestamps
-    end
-    add_index :accounts, :created_at
-    add_index :accounts, :updated_at
-  end
-end

data/lib/generators/sun_sword/templates_frontend/db/migrate/20241117044142_create_models_users.rb

@@ -1,16 +0,0 @@
-class CreateModelsUsers < ActiveRecord::Migration[7.2]
-  def change
-    create_table :users, id: :uuid do |t|
-      t.uuid :account_id, null: false
-      t.string :full_name, null: false
-      t.string :role, null: false
-
-      t.timestamps
-    end
-    add_index :users, :full_name
-    add_index :users, :role
-    add_index :users, :account_id
-    add_index :users, :created_at
-    add_index :users, :updated_at
-  end
-end

data/lib/generators/sun_sword/templates_frontend/models/models/account.rb

@@ -1,4 +0,0 @@
-class Models::Account < ApplicationRecord
-  has_many :auths, foreign_key: 'account_id', class_name: 'Models::Auth'
-  has_many :users, foreign_key: 'account_id', class_name: 'Models::User'
-end

data/lib/generators/sun_sword/templates_frontend/models/models/auth.rb

@@ -1,8 +0,0 @@
-class Models::Auth < ApplicationRecord
-  # Include default devise modules. Others available are:
-  # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
-  devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :validatable
-  belongs_to :account, class_name: 'Models::Account', foreign_key: 'account_id'
-  belongs_to :user, class_name: 'Models::User', foreign_key: 'user_id'
-end

data/lib/generators/sun_sword/templates_frontend/models/models/user.rb

@@ -1,4 +0,0 @@
-class Models::User < ApplicationRecord
-  belongs_to :account, class_name: 'Models::Account', foreign_key: 'account_id'
-  enum :role, { owner: 'owner', contact: 'contact' }
-end