trek 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c361aedf0c96319053cdbb1e2d80ac77248791c84fedd2f0bb49e89b3d6afa7f
-  data.tar.gz: 40fd5afd6fa1cd82f8095e2164d46f5943c0a723fe79878e4046cb576bb3eba0
+  metadata.gz: 8836f5f71ee9aeae0475df30e1e941038aeac1d3ba5a1f0a8bc548ddf87cedff
+  data.tar.gz: 2b07e244708e2e9a6258d9d352f04fc03bba3777e11b2a6ae3a7ad7e0e100fd5
 SHA512:
-  metadata.gz: 37c0db5305f16dfc336b2e9383bb03997dc6613c77a0c797648dd3a77ed2f0300028330b4eae72d2775dbfc407e260b3f8b8877cd3e0c3120b884447b53235cc
-  data.tar.gz: 7a7d98baf92ad4bed55736607976a73af61696381b90252e3f0f63a691dfb31f5b959982c5570a452ec004199c92ea344a12116904049d7dba315c57c6d3b9ff
+  metadata.gz: 568c5f70e0482e4ef6c86e66d4ffe46bc5828848c28ec8646129468bbc4db60c362fb3ddd4bee9ba9e747fffc5d24385f3198876bc8a3dc9031658c3eb1dc380
+  data.tar.gz: 322f0ab2ab3fc8d3bef7cabc8fadbd750b43b790163e9abf915c7bb8766c594bec7161980695e020e6d0e8b7a3e8e4a6c47309edefea2a2df72bd1918a8ffe77

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trek (0.1.19)
+    trek (0.1.20)
       action_policy (~> 0.6)
       actioncable
       acts_as_list (~> 1.1)

data/app/components/trek/dashboard/analytics_component/analytics_component.css

@@ -0,0 +1,4 @@
+.root {
+  display: block;
+  max-width: 120rem;
+}

data/app/components/trek/dashboard/analytics_component/analytics_component.html.slim

@@ -0,0 +1,2 @@
+div(class=root_class)
+  div(class=class_for("info")) = section

data/app/components/trek/dashboard/analytics_component/analytics_component.js

@@ -0,0 +1 @@
+import "./analytics_component.css";

data/app/components/trek/dashboard/analytics_component.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Trek
+  class Dashboard::AnalyticsComponent < Trek::Component
+    renders_one :section, Trek::Dashboard::SectionComponent
+  end
+end

data/app/components/trek/form/actions_component.rb

@@ -14,7 +14,7 @@ module Trek
 
         with_button(
           text: helpers.t("admin.actions.delete"),
-          to: [:admin, object],
+          to: [:admin, *helpers.model_element_route[0...-1], object],
           method: :delete,
           data: {
             turbo_confirm: helpers.t("admin.#{model_collection}.destroy.confirm")

data/app/components/trek/form/content_editor_component/extensions/image_block.js

@@ -48,14 +48,7 @@ export default Node.create({
   },
 
   addNodeView() {
-    return ({
-      editor,
-      node,
-      getPos,
-      HTMLAttributes,
-      decorations,
-      extension,
-    }) => {
+    return ({ node }) => {
       const dom = document.createElement("image-block");
       const params = attributesToParams(node.attrs);
 

data/app/components/trek/form/content_editor_component/extensions/prompts_block.js

@@ -45,14 +45,7 @@ export default Node.create({
   },
 
   addNodeView() {
-    return ({
-      editor,
-      node,
-      getPos,
-      HTMLAttributes,
-      decorations,
-      extension,
-    }) => {
+    return ({ node }) => {
       const dom = document.createElement("prompts-block");
       const params = attributesToParams(node.attrs);
 

data/app/components/trek/list/item_component.rb

@@ -27,8 +27,9 @@ module Trek
 
     def item_link
       [
-        (action == :show) ? nil : action,
+        ((action == :show) ? nil : action),
         :admin,
+        *helpers.model_element_route[0...-1],
         item
       ].compact
     end

data/app/controllers/concerns/trek/model.rb

@@ -5,7 +5,7 @@ module Trek
     included do
       delegate :model_name, to: :model
 
-      helper_attr :model, :model_name, :model_collection, :model_element, :model_intro
+      helper_attr :model, :model_name, :model_collection, :model_collection_route, :model_element, :model_element_route, :model_intro
     end
 
     def model
@@ -20,10 +20,24 @@ module Trek
       model_name.collection.to_sym
     end
 
+    # Returns model collection as an array of symbols for route building.
+    # For namespaced models like Missive::List, returns [:missive, :lists].
+    # For non-namespaced models like Page, returns [:pages].
+    def model_collection_route
+      model_name.collection.split("/").map(&:to_sym)
+    end
+
     def model_element
       model_name.element.to_sym
     end
 
+    # Returns model element as an array of symbols for route building.
+    # For namespaced models like Missive::List, returns [:missive, :list].
+    # For non-namespaced models like Page, returns [:page].
+    def model_element_route
+      model_name.element.split("/").map(&:to_sym)
+    end
+
     def model_intro(action: nil)
       action ||= @object&.new_record? ? "new" : "edit"
       t("admin.#{model_collection}.#{action}.intro")

data/app/controllers/concerns/trek/redirections.rb

@@ -17,7 +17,7 @@ module Trek
     end
 
     def success_redirect
-      [:admin, model_collection]
+      [:admin, *model_collection_route]
     end
   end
 end

data/app/controllers/concerns/trek/reorderable.rb

@@ -31,7 +31,7 @@ module Trek
     end
 
     def reorder_path
-      [:reorder, :admin, model_collection]
+      [:reorder, :admin, *model_collection_route]
     end
 
     def reorder_params
@@ -39,7 +39,7 @@ module Trek
     end
 
     def reorder_success_redirect
-      [:admin, model_collection]
+      [:admin, *model_collection_route]
     end
 
     def reorder_notice

data/app/controllers/concerns/trek/scopes.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Trek
+  module Scopes
+    extend ActiveSupport::Concern
+
+    def apply_scopes(scope, filters)
+      return scope if filters.blank?
+
+      filters.each do |filter, value|
+        next if value.blank?
+
+        scope = scope.public_send(filter) if scope.respond_to?(filter)
+      end
+
+      scope
+    end
+
+    def apply_scopes!
+      @unscoped_objects = @objects
+      @objects = apply_scopes(@objects, params[:scopes])
+      scope_counts
+    end
+
+    included do
+      helper_method :available_scopes
+      helper_method :scope_params
+      helper_method :unscoped_objects
+      helper_method :scope_counts
+    end
+
+    def unscoped_objects
+      @unscoped_objects || @objects
+    end
+
+    def scope_counts
+      @scope_counts ||= begin
+        Prosopite.pause if defined?(Prosopite)
+        available_scopes.index_with do |scope|
+          unscoped_objects.except(:limit, :offset).public_send(scope).count
+        end
+      ensure
+        Prosopite.resume if defined?(Prosopite)
+      end
+    end
+
+    def available_scopes
+      []
+    end
+
+    def scope_params
+      params[:scopes]&.permit(*available_scopes)
+    end
+  end
+end

data/app/views/trek/shared/_resource_heading.html.slim

@@ -4,7 +4,7 @@
 ) do |c|
   ruby:
     c.with_button(
-      href: [:admin, model_collection],
+      href: [:admin, *model_collection_route],
       text: t("admin.actions.cancel"),
     )
 

data/app/views/trek/shared/_resource_index_heading.html.slim

@@ -27,7 +27,7 @@
 
       if allowed_to?(:new?, model)
         c.with_button(
-          href: [:new, :admin, model_element],
+          href: [:new, :admin, *model_element_route],
           text: i18n_resource_label(:new, model),
         ) do |b|
           b.with_icon("trek/add")

data/lib/generators/trek/scaffold_generator.rb

@@ -32,13 +32,13 @@ module Trek
 
       def create_controller
         template "controllers/admin/scaffold_controller.rb",
-          "app/controllers/admin/#{plural_name}_controller.rb"
+          "app/controllers/admin/#{namespaced_plural}_controller.rb"
       end
 
       def create_views
         %w[index edit new _form show].each do |view|
           template "views/admin/scaffold/#{view}.html.slim",
-            "app/views/admin/#{plural_name}/#{view}.html.slim"
+            "app/views/admin/#{namespaced_plural}/#{view}.html.slim"
         end
       end
 
@@ -56,6 +56,12 @@ module Trek
             # post :reorder, on: :collection
           end
         RUBY
+
+        if model_namespaces.any?
+          # Wrap resources in nested namespaces for namespaced models
+          model_namespaces.each { |ns| route_code = "namespace :#{ns} do\n  #{route_code.gsub("\n", "\n  ")}\nend" }
+        end
+
         route route_code, namespace: :admin
       end
 
@@ -94,8 +100,8 @@ module Trek
       def cleanup
         return if I18n.available_locales.include?(:en)
 
-        File.delete(model_locale_file(:en))
-        File.delete(admin_locale_file(:en))
+        FileUtils.rm_f(model_locale_file(:en))
+        FileUtils.rm_f(admin_locale_file(:en))
       end
 
       private
@@ -147,11 +153,23 @@ module Trek
       end
 
       def model_locale_file(locale)
-        "config/locales/models/#{singular_name}.#{locale}.yml"
+        "config/locales/models/#{file_path}.#{locale}.yml"
       end
 
       def admin_locale_file(locale)
-        "config/locales/admin/#{singular_name}.#{locale}.yml"
+        "config/locales/admin/#{file_path}.#{locale}.yml"
+      end
+
+      # Returns namespace segments from file_path (e.g., ["missive"] for "missive/list")
+      def model_namespaces
+        file_path.split("/")[0...-1]
+      end
+
+      # Returns the pluralized path preserving namespaces (e.g., "missive/lists" for "missive/list")
+      def namespaced_plural
+        parts = file_path.split("/")
+        parts[-1] = parts[-1].pluralize
+        parts.join("/")
       end
     end
   end

data/lib/generators/trek/templates/controllers/admin/scaffold_controller.rb.tt

@@ -1,4 +1,7 @@
 module Admin
+<% model_namespaces.each do |ns| -%>
+  module <%= ns.camelize %>
+<% end -%>
   class <%= controller_class_name %>Controller < Trek::ResourceController
     # include Trek::Pagination
 
@@ -8,4 +11,7 @@ module Admin
       <%= class_name %>
     end
   end
+<% model_namespaces.each do |_ns| -%>
+  end
+<% end -%>
 end

data/lib/generators/trek/templates/controllers/admin/users_controller.rb

@@ -13,7 +13,7 @@ module Admin
 
     def success_redirect
       if allowed_to?(:index?, @object)
-        [:admin, model_collection]
+        [:admin, *model_collection_route]
       elsif allowed_to?(:show?, @object)
         [:admin, @object]
       else

data/lib/generators/trek/templates/locales/scaffold/admin.en.yml.tt

@@ -1,6 +1,6 @@
 en:
   admin:
-    <%= plural_name %>:
+    <%= namespaced_plural %>:
       create:
         success: <%= human_name %> added
       destroy:

data/lib/generators/trek/templates/locales/scaffold/admin.other.yml.tt

@@ -1,6 +1,6 @@
 <%= @locale %>:
   admin:
-    <%= plural_name %>:
+    <%= namespaced_plural %>:
       create:
         success:
       destroy:

data/lib/generators/trek/templates/locales/scaffold/model.en.yml.tt

@@ -1,11 +1,11 @@
 en:
   activerecord:
     models:
-      <%= singular_name %>:
+      <%= file_path %>:
         gender: 'n'
         one: <%= human_name %>
         other: <%= plural_name.humanize %>
     attributes:
-      <%= singular_name %>:<%- attributes.each do |attr| %>
+      <%= file_path %>:<%- attributes.each do |attr| %>
         <%= attr.name %>: <%= attr.name.humanize -%>
       <% end %>

data/lib/generators/trek/templates/locales/scaffold/model.other.yml.tt

@@ -1,12 +1,12 @@
 <%= @locale %>:
   activerecord:
     models:
-      <%= singular_name %>:
+      <%= file_path %>:
         gender: # "n", "m", "f"
         one:
         other:
     attributes:
-      <%= singular_name %>:
+      <%= file_path %>:
 <%- attributes.each do |attr| -%>
         <%= attr.name %>:
 <%- end -%>

data/lib/generators/trek/templates/policies/admin/scaffold_policy.rb.tt

@@ -1,5 +1,8 @@
 module Admin
-  class <%= class_name %>Policy < Trek::ResourcePolicy
+<% model_namespaces.each do |ns| -%>
+  module <%= ns.camelize %>
+<% end -%>
+  class <%= class_name.demodulize %>Policy < Trek::ResourcePolicy
     def index?
       user.privileged?
     end
@@ -36,4 +39,7 @@ module Admin
       relation.none
     end
   end
+<% model_namespaces.each do |_ns| -%>
+  end
+<% end -%>
 end

data/lib/generators/trek/templates/views/admin/fragments/_form.html.slim

@@ -19,7 +19,7 @@
   = render Trek::Form::ActionsComponent.new do |c|
     ruby:
       c.with_button(
-        href: [:admin, model_collection],
+        href: [:admin, *model_collection_route],
         text: t("admin.actions.cancel"),
       )
 

data/lib/generators/trek/templates/views/admin/fragments/index.html.slim

@@ -5,7 +5,7 @@
   ruby:
     if allowed_to?(:new?, model)
       c.with_button(
-        href: [:new, :admin, model_element],
+        href: [:new, :admin, *model_element_route],
         text: i18n_resource_label(:new, model),
       ) do |b|
         b.with_icon("trek/add")

data/lib/generators/trek/templates/views/admin/menu_nodes/_form.html.slim

@@ -8,7 +8,7 @@
   = render Trek::Form::ActionsComponent.new do |c|
     ruby:
       c.with_button(
-        href: [:admin, model_collection],
+        href: [:admin, *model_collection_route],
         text: t("admin.actions.cancel"),
       )
 

data/lib/generators/trek/templates/views/admin/pages/_form.html.slim

@@ -92,7 +92,7 @@
   = render Trek::Form::ActionsComponent.new do |c|
     ruby:
       c.with_button(
-        href: [:admin, model_collection],
+        href: [:admin, *model_collection_route],
         text: t("admin.actions.cancel"),
       )
 

data/lib/generators/trek/templates/views/admin/pages/index.html.slim

@@ -26,7 +26,7 @@
 
       if allowed_to?(:new?, model)
         c.with_button(
-          href: [:new, :admin, model_element],
+          href: [:new, :admin, *model_element_route],
           text: i18n_resource_label(:new, model),
         ) do |b|
           b.with_icon("trek/add")

data/lib/generators/trek/templates/views/admin/scaffold/_form.html.slim.tt

@@ -11,7 +11,7 @@
   = render Trek::Form::ActionsComponent.new do |c|
     ruby:
       c.with_button(
-        href: [:admin, model_collection],
+        href: [:admin, *model_collection_route],
         text: t("admin.actions.cancel"),
       )
 

data/lib/generators/trek/templates/views/admin/users/index.html.slim

@@ -5,7 +5,7 @@
   ruby:
     if allowed_to?(:new?, model)
       c.with_button(
-        href: [:new, :admin, model_element],
+        href: [:new, :admin, *model_element_route],
         text: i18n_resource_label(:new, model),
       ) do |b|
         b.with_icon("trek/add")

data/lib/trek/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Trek
-  VERSION = "0.1.19"
+  VERSION = "0.1.20"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etaminstudio/trek",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "description": "A modern CMS for Ruby on Rails",
   "main": "app/javascript/trek.js",
   "repository": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trek
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - Mohamed Bengrich
@@ -503,6 +503,10 @@ files:
 - app/components/trek/button_group_component/button_group_component.css
 - app/components/trek/button_group_component/button_group_component.js
 - app/components/trek/component.rb
+- app/components/trek/dashboard/analytics_component.rb
+- app/components/trek/dashboard/analytics_component/analytics_component.css
+- app/components/trek/dashboard/analytics_component/analytics_component.html.slim
+- app/components/trek/dashboard/analytics_component/analytics_component.js
 - app/components/trek/dashboard/section_component.rb
 - app/components/trek/dashboard/section_component/section_component.css
 - app/components/trek/dashboard/section_component/section_component.html.slim
@@ -638,6 +642,7 @@ files:
 - app/controllers/concerns/trek/pagination.rb
 - app/controllers/concerns/trek/redirections.rb
 - app/controllers/concerns/trek/reorderable.rb
+- app/controllers/concerns/trek/scopes.rb
 - app/controllers/trek/base_controller.rb
 - app/controllers/trek/panels/base_controller.rb
 - app/controllers/trek/panels/images_controller.rb