lesli 5.0.24 → 5.1.1

data/lib/generators/lesli/service/service_generator.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "rails/generators"
+require_relative "../base_generator"
+
+module Lesli
+    module Generators
+        # Generates a Lesli-style service object inside the current engine.
+        class ServiceGenerator < BaseGenerator
+            argument :attributes, type: :array, default: [], banner: "field:type field:type"
+
+            source_root File.expand_path("templates", __dir__)
+
+            # Creates the service file from the template.
+            def create_service_file
+                template "service.rb.tt", service_file_path
+            end
+
+            private
+
+            # Returns the service directory inside the engine namespace.
+            #
+            # Example:
+            #   app/services/lesli_support
+            #   app/services/my_engine
+            #   app/services/store
+            def service_directory
+                File.join(ENGINE_ROOT, "app/services", engine_name)
+            end
+
+            # Returns the final service file path.
+            #
+            # Example:
+            #   app/services/lesli_support/ticket_service.rb
+            def service_file_path
+                File.join(service_directory, "#{resource_name}_service.rb")
+            end
+        end
+    end
+end

data/lib/generators/lesli/service/templates/service.rb.tt

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module <%= engine_namespace %>
+  class <%= service_class_name %> < Lesli::ApplicationLesliService
+
+    def find(id: nil, uid: nil)
+      scope = current_user.account.<%= engine_domain_name %>.<%= resource_collection_name %>
+
+      # Build the search hash using only present values.
+      params = { id: id, uid: uid }.compact
+
+      # Only perform the lookup when at least one filter is present.
+      super(scope.find_by(params)) if params.any?
+    end
+
+    def index
+      current_user.account.<%= engine_domain_name %>.<%= resource_collection_name %>.order(id: :desc)
+    end
+
+    def create(<%= params_method_name %>)
+      <%= resource_name %> = current_user.account.<%= engine_domain_name %>.<%= resource_collection_name %>.new(<%= params_method_name %>)
+
+      if <%= resource_name %>.save
+        self.resource = <%= resource_name %>
+      else
+        self.error(<%= resource_name %>.errors.full_messages.to_sentence)
+      end
+
+      self
+    end
+
+    def show
+      self.resource
+    end
+
+    def update(params)
+      self.resource.update(params)
+    end
+
+    def destroy
+      self.resource.destroy
+    end
+  end
+end

data/lib/generators/lesli/views/templates/_form.html.erb.tt

@@ -0,0 +1,22 @@
+<%%= form_with(model: <%= resource_instance %>, builder: LesliView::Forms::Builder) do |form| %>
+    <%%= form.fieldset do %>
+        <% form_attributes.each do |attribute| -%>
+            <% if attribute == "description" -%>
+                <%%= form.field_control_textarea(:<%= attribute %>, label: false) %>
+            <% else -%>
+                <%%= form.field_control(:<%= attribute %>) %>
+            <% end -%>
+        <% end -%>
+
+        <% if select_attributes.any? -%>
+            <div class="columns">
+                <% select_attributes.each do |attribute| -%>
+                    <div class="column">
+                        <%%= form.field_control_select(:<%= attribute %>, []) %>
+                    </div>
+                <% end -%>
+            </div>
+        <% end -%>
+        <%%= form.field_control_submit %>
+    <%% end %>
+<%% end %>

data/lib/generators/lesli/views/templates/index.html.erb.tt

@@ -0,0 +1,17 @@
+<%% columns = [
+    {
+        label: "ID",
+        field: "id"
+    }
+] %>
+
+<%%= render(LesliView::Layout::Container.new("<%= engine_domain_name %> - <%= resource_collection_name %>")) do %>
+    <%%= render(LesliView::Components::Header.new("<%= resource_collection_name.humanize %>", new_path: new_<%= resource_name %>_path)) %>
+    <%%= render(LesliView::Components::Toolbar.new) %>
+
+    <%%= render(LesliView::Elements::Table.new(
+        columns: columns,
+        records: <%= resource_collection_instance %>.dig(:records),
+        link: -> (<%= resource_name %>) { <%= resource_name %>_path(<%= resource_name %>.id) }
+    )) %>
+<%% end %>

data/lib/generators/lesli/views/templates/new.html.erb.tt

@@ -0,0 +1,4 @@
+<%%= render(LesliView::Layout::Container.new("new-<%= resource_name %>")) do %>
+    <%%= render(LesliView::Components::Header.new("New <%= resource_class_name %>")) %>
+    <%%= render("form") %>
+<%% end %>

data/lib/generators/lesli/views/templates/show.html.erb.tt

@@ -0,0 +1,22 @@
+<%%= render(LesliView::Layout::Container.new("<%= engine_domain_name %>-<%= resource_collection_name %>")) do %>
+
+    <%%= render(LesliView::Components::Header.new("<%= resource_class_name %>")) %>
+
+    <%%= render(LesliView::Components::Tabs.new(active_tab: "<%= resource_name %>-information")) do |tabs| %>
+        <%% tabs.with_tab(id:"<%= resource_name %>-information", title:"Information", icon:"info") do %>
+            <%%= render("form") %>
+        <%% end %>
+
+        <%% tabs.with_tab(id:"<%= resource_name %>-discussions", title:"Discussions", icon:"forum") do %>
+            <%%= render(LesliView::Items::Discussions.new(<%= resource_instance %>)) %>
+        <%% end %>
+
+        <%% tabs.with_tab(id:"<%= resource_name %>-tasks", title:"Tasks", icon:"checklist") do %>
+            <%%= render(LesliView::Item::Tasks.new(<%= resource_instance %>)) %>
+        <%% end %>
+
+        <%% tabs.with_tab(id:"<%= resource_name %>-activities", title:"Activities", icon:"search_activity") do %>
+            <%%= render(LesliView::Items::Activities.new(<%= resource_instance %>)) %>
+        <%% end %>
+    <%% end %>
+<%% end %>

data/lib/generators/lesli/views/views_generator.rb

@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+require "rails/generators"
+require_relative "../base_generator"
+
+module Lesli
+    module Generators
+        # Generates Lesli-style views for a resource inside the current engine.
+        #
+        # Example:
+        #   rails generate lesli:views tickets subject:string description:text owner_id:integer
+        #
+        # Result:
+        #   app/views/lesli_support/tickets/
+        #     _form.html.erb
+        #     index.html.erb
+        #     show.html.erb
+        #     new.html.erb
+        #     edit.html.erb
+        class ViewsGenerator < BaseGenerator
+            argument :attributes, type: :array, default: [], banner: "field:type field:type"
+
+            source_root File.expand_path("templates", __dir__)
+
+            # Creates the views directory if it does not exist.
+            def create_views_directory
+                empty_directory views_directory
+            end
+
+            # Generates the shared form partial.
+            def create_form_partial
+                template "_form.html.erb.tt", File.join(views_directory, "_form.html.erb")
+            end
+
+            # Generates the index view.
+            def create_index_view
+                template "index.html.erb.tt", File.join(views_directory, "index.html.erb")
+            end
+
+            # Generates the show view.
+            def create_show_view
+                template "show.html.erb.tt", File.join(views_directory, "show.html.erb")
+            end
+
+            # Generates the new view.
+            def create_new_view
+                template "new.html.erb.tt", File.join(views_directory, "new.html.erb")
+            end
+
+            private
+
+            # Returns the target views directory for the current resource.
+            #
+            # Example:
+            #   app/views/lesli_support/tickets
+            def views_directory
+                File.join(ENGINE_ROOT, "app/views", engine_name, resource_collection_name)
+            end
+
+            # Returns only scalar-like attributes that can be rendered
+            # as regular text inputs by default.
+            def form_attributes
+                permitted_attributes.reject do |attribute|
+                    attribute.end_with?("_id") || attribute == "id"
+                end
+            end
+
+            # Returns attributes that look like foreign keys.
+            #
+            # Example:
+            #   owner_id, category_id, priority_id
+            #
+            # These are rendered as generic select controls.
+            def select_attributes
+                permitted_attributes.select { |attribute| attribute.end_with?("_id") }
+            end
+
+            # Returns the default columns used for the index table.
+            #
+            # We prefer to include uid first when it exists.
+            def index_columns
+                columns = []
+
+                if permitted_attributes.include?("uid")
+                    columns << { label: "ID", field: "uid" }
+                end
+
+                form_attributes.each do |attribute|
+                    columns << {
+                        label: attribute.humanize,
+                        field: attribute
+                    }
+                end
+
+                select_attributes.each do |attribute|
+                    columns << {
+                        label: attribute.delete_suffix("_id").humanize,
+                        field: attribute
+                    }
+                end
+
+                columns
+            end
+        end
+    end
+end

data/lib/lesli/engine.rb

@@ -36,7 +36,7 @@ require "kaminari"
 
 # · Tools used to build the Lesli Framework
 require "L2"
-#require "useragent"
+require "termline"
 require "acts_as_paranoid"
 
 # The hole Lesli ecosystem depends on current_user, so we
@@ -48,26 +48,14 @@ require "lesli_view"
 require "lesli_assets"
 require "lesli_system"
 
-require "importmap-rails"
 require "turbo-rails"
 
 module Lesli
     class Engine < ::Rails::Engine
         isolate_namespace Lesli
 
-        initializer "lesli.importmap", before: "importmap" do |app|
-            app.config.importmap.paths << Engine.root.join("config/importmap.rb")
-        end
-
         initializer :lesli do |app|
 
-
-            # Lesli standard engine configuration
-
-            
-            # register assets manifest
-            #config.assets.precompile += %w[lesli_manifest.js]
-
             # register engine migrations path
             unless app.root.to_s.match root.to_s
                 config.paths["db/migrate"].expanded.each do |expanded_path|
@@ -75,20 +63,10 @@ module Lesli
                 end
             end
 
-
-            # Lesli Framework configuration
-
-
             # Default languages
             config.i18n.default_locale = :en
             config.i18n.available_locales = [:en]
 
-            # Force to not use digest, 
-            # if this is not false Rails will fingerprint the assets by default 
-            # and precompile will be needed, so, donot digest if not production
-            #config.assets.digest = false unless Rails.env.production?
-
-
             # Lesli Framework Mailer configuration
 
 

data/lib/lesli/router.rb

@@ -71,7 +71,7 @@ module Lesli
             router.resource :dashboard, only: %i[show edit]
 
             # Load Lesli items
-            router.namespace :item do
+            router.namespace :items do
 
                 # Load item tasks
                 router.resources :tasks, only: %i[index update create]

data/lib/lesli/version.rb

@@ -1,4 +1,4 @@
 module Lesli
-  VERSION = "5.0.24"
-  BUILD = "1773615963"
+  VERSION = "5.1.1"
+  BUILD = "1776570122"
 end

data/lib/migrate/common.rb

@@ -40,12 +40,12 @@ module MigrationHelpers
             return [table_name, table_name_account]
         end
 
-        def table_name_for_item(resources, item)
+        def table_name_for_items(resources, item)
 
             engine = infer_engine_from_namespace
 
             resource = resources.to_s.singularize
-            table_name = "#{resource}_item_#{item}".to_sym
+            table_name = "#{resource}_items_#{item}".to_sym
             foreign_key = resource.sub("#{engine}_","")
 
             return [table_name, foreign_key]

data/lib/migrate/items/activity_structure.rb

@@ -35,7 +35,7 @@ module MigrationHelpers
         module ActivityStructure
             def create_table_lesli_item_activities_10(engine)
 
-                table_name, foreign_key = table_name_for_item(engine, :activities)
+                table_name, foreign_key = table_name_for_items(engine, :activities)
 
                 create_table table_name do |t|
 

data/lib/migrate/items/attachment_structure.rb

@@ -35,7 +35,7 @@ module MigrationHelpers
         module AttachmentStructure
             def create_table_lesli_item_attachments_10(resources)
 
-                table_name, foreign_key = table_name_for_item(resources, :attachments)
+                table_name, foreign_key = table_name_for_items(resources, :attachments)
 
                 create_table table_name do |t|
                     t.string :name

data/lib/migrate/items/discussion_structure.rb

@@ -35,7 +35,7 @@ module MigrationHelpers
         module DiscussionStructure
             def create_table_lesli_item_discussions_10(engine)
 
-                table_name, foreign_key = table_name_for_item(engine, :discussions)
+                table_name, foreign_key = table_name_for_items(engine, :discussions)
     
                 create_table table_name do |t|
                     t.text :message

data/lib/migrate/items/subscriber_structure.rb

@@ -35,7 +35,7 @@ module MigrationHelpers
         module SubscriberStructure
             def create_table_lesli_item_subscribers_10(resources)
 
-                table_name, foreign_key = table_name_for_item(resources, :subscribers)
+                table_name, foreign_key = table_name_for_items(resources, :subscribers)
 
                 create_table table_name do |t|
                     t.timestamps

data/lib/migrate/items/task_structure.rb

@@ -35,7 +35,7 @@ module MigrationHelpers
         module TaskStructure
             def create_table_lesli_item_tasks_10(engine)
 
-                table_name, foreign_key = table_name_for_item(engine, :tasks)
+                table_name, foreign_key = table_name_for_items(engine, :tasks)
 
                 create_table table_name do |t|
                     t.string  :title, null: false

data/lib/migrate/items/version_structure.rb

@@ -35,7 +35,7 @@ module MigrationHelpers
         module VersionStructure
             def create_table_lesli_item_versions_10(resources)
 
-                table_name, foreign_key = table_name_for_item(resources, :versions)
+                table_name, foreign_key = table_name_for_items(resources, :versions)
 
                 create_table table_name do |t|
                     t.string :column_name

data/lib/tasks/lesli/db.rake

@@ -85,12 +85,12 @@ namespace :lesli do
         L2.m("Drop the Lesli database (development only)")
 
         Rake::Task['db:drop'].invoke
-        L2.info("Databases deleted")
+        Termline.info("Databases deleted")
 
         schema_file = Rails.root.join('db', 'schema.rb')
         if File.exist?(schema_file)
             File.delete(schema_file)
-            L2.info("Schema.rb file deleted")
+            Termline.info("Schema.rb file deleted")
         end
     end
 
@@ -98,7 +98,7 @@ namespace :lesli do
     def create
 
         # print a message to let the users show the action running
-        L2.m("Create the Lesli database")
+        Termline.info("Create the Lesli database")
 
         Rake::Task['db:create'].invoke
     end
@@ -142,15 +142,15 @@ namespace :lesli do
         end
 
         # scan rails routes to build the controllers index
-        Rake::Task['lesli:shield:privileges'].invoke if defined?(LesliShield)
+        Rake::Task['lesli_shield:privileges'].invoke if defined?(LesliShield)
 
         if defined?(LesliBabel)
 
             # scan rails routes to build the base of translations
-            Rake::Task['lesli:babel:scan'].invoke 
+            Rake::Task['lesli_babel:scan'].invoke 
 
             # import local translations into LesliBabel
-            Rake::Task['lesli:babel:import'].invoke 
+            Rake::Task['lesli_babel:import'].invoke 
         end
     end 
 

data/lib/tasks/lesli_tasks.rake

@@ -32,31 +32,6 @@ Building a better future, one line of code at a time.
 
 # · 
 namespace :lesli do 
-    namespace :babel do 
-
-        desc "Scan and register labels"
-        task :scan => :environment do |task, args|
-            Rake::Task['lesli_babel:scan'].invoke
-        end 
-
-        desc "Import local translations into LesliBabel"
-        task :import => :environment do |task, args|
-            Rake::Task['lesli_babel:import'].invoke
-        end 
-
-        desc "Export translations to json files"
-        task :export => :environment do |task, args|
-            Rake::Task['lesli_babel:export'].invoke
-        end 
-    end
-
-    namespace :shield do 
-
-        desc "Syncing privileges for all the available roles"
-        task :privileges => :environment do |task, args|
-            Rake::Task['lesli_shield:privileges'].invoke
-        end 
-    end
 
     desc "Lesli module status"
     task :status => :environment do |task, args|
@@ -88,18 +63,18 @@ namespace :lesli do
         end
 
         # print pretty instance information 
-        L2.br(2)
+        Termline.br(2)
 
         # core information
-        L2.msg(instance)
-        L2.br()
+        Termline.m(instance)
+        Termline.br()
 
         # print list of engines
-        L2.table(engines)
-        L2.br(2)
+        Termline.table(engines)
+        Termline.br(2)
 
-        L2.m "Environment: " + Rails.env
-        L2.br(2)
+        Termline.info "Environment: " + Rails.env
+        Termline.br(2)
 
     end
 end

data/readme.md

@@ -122,9 +122,9 @@ RAILS_SERVE_STATIC_FILES=true rails s --environment=production
 
 ### Connect with Lesli
 
-* [X: @LesliTech](https://x.com/LesliTech)
-* [Email: hello@lesli.tech](hello@lesli.tech)
-* [Website: https://www.lesli.tech](https://www.lesli.tech)
+* [@LesliTech](https://x.com/LesliTech)
+* [hello@lesli.tech](hello@lesli.tech)
+* [https://www.lesli.tech](https://www.lesli.tech)
 
 
 ### License