trek 0.1.11 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3358d8b92a863e10db5e015d6747fc1973249b9cf266f245bcee6fea5e11ada2
-  data.tar.gz: 84b609db2a23b60cd98868334cbf59142a1581b72e1d20c3088f342b80daa539
+  metadata.gz: 55936551def2bb25e098d7f095626b1c65851faced1f73d8421337b660c35dfc
+  data.tar.gz: a55b3f4506ed2cb97258790e8a67194b32a5c409c311625d92aacc7c5bfe78d6
 SHA512:
-  metadata.gz: d38576c0fe0adb84d673cc6ec7d66e2524619d09e1586f70072a3892ca9fe124b7b42d4534100f594588ab5655d218f48b476669b828fcc81bc209510e6b6f84
-  data.tar.gz: 2247bc4a71af0581c7b9779fda55ff39065566945153852238fc870a13668e7eb77deaa1fcd58eb086818d0ea6933718c26749e90c29d0e35a0ddf8f80a6e0ac
+  metadata.gz: 4eed1f56dace0fc8327f31f86294e2e1a3d394b25bcd662298191d4fd9f1c6a08442088c81cb7889e827ca66e9137c8f4498d6c9d614671daa78da6f4fd2fdc1
+  data.tar.gz: '06689e0c0b07925a1095ac88d17dc0eba1b0f4db8cbb9664162fc259fb58d795b71653c1f1cc3307fa420bd287d7f78983ce5efa73f412e23d5e98c71cbb3964'

data/.stylelintrc.json

@@ -1,6 +1,10 @@
 {
   "extends": ["stylelint-config-standard"],
-  "ignoreFiles": ["app/assets/builds/**/*.css", "node_modules/**/*.css", "vendor/**/*.css"],
+  "ignoreFiles": [
+    "app/assets/builds/**/*.css",
+    "node_modules/**/*.css",
+    "vendor/**/*.css"
+  ],
   "plugins": ["stylelint-order"],
   "rules": {
     "custom-property-pattern": "^[a-z0-9A-]+$",
@@ -8,6 +12,7 @@
     "order/properties-alphabetical-order": true,
     "selector-class-pattern": "^[a-z0-9-]+$",
     "selector-pseudo-class-no-unknown": null,
-    "selector-id-pattern": "^[a-z0-9-]+$"
+    "selector-id-pattern": "^[a-z0-9-]+$",
+    "import-notation": "string"
   }
 }

data/.yarnrc.yml

@@ -3,7 +3,7 @@ nodeLinker: node-modules
 npmScopes:
   etaminstudio:
     npmAlwaysAuth: true
-    npmAuthToken: "${NPM_TOKEN-fallback}"
+    npmAuthToken: "${NPM_AUTH_TOKEN-fallback}"
     npmPublishRegistry: "https://git.etaminstud.io/api/v4/projects/229/packages/npm/"
 
 plugins:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trek (0.1.11)
+    trek (0.1.13)
       action_policy (~> 0.6)
       actioncable
       acts_as_list (~> 1.1)
@@ -204,7 +204,7 @@ GEM
       zeitwerk (~> 2.6)
     erb (6.0.1)
     erubi (1.13.1)
-    faraday (2.14.0)
+    faraday (2.14.1)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -245,7 +245,7 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
-    json (2.18.0)
+    json (2.18.1)
     jwt (3.1.2)
       base64
     kaminari (1.2.2)

data/Makefile

@@ -0,0 +1,12 @@
+.PHONY: all
+
+release:
+	@read -p "New version (current: $$(sed -n 's/.*VERSION = "\(.*\)"/\1/p' lib/trek/version.rb)): " version; \
+	if [ -z "$$version" ]; then echo "Version cannot be empty"; exit 1; fi; \
+	sed -i '' "s/VERSION = \".*\"/VERSION = \"$$version\"/" lib/trek/version.rb; \
+	sed -i '' "s/\"version\": \".*\"/\"version\": \"$$version\"/" package.json; \
+	bundle; \
+	git add -A; \
+	git commit -m "Version $$version"; \
+	bundle exec rake release; \
+	yarn npm publish

data/README.md

@@ -205,14 +205,13 @@ When you're done, disable the local package:
 
 ### Publishing a new version
 
-To release a new version, update the version number in `version.rb` and `package.json`, then run `bundle`, commit the changes and follow the steps below.
+    make release
 
-#### Gem
+This will:
 
-Run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-#### NPM package with Yarn
-
-Generate a [personal token](https://git.etaminstud.io/-/user_settings/personal_access_tokens) with the `api` scope and run:
-
-    NPM_TOKEN=YOUR_PERSONAL_TOKEN yarn npm publish
+1. Prompt for the new version number (showing the current version)
+2. Update the version in `lib/trek/version.rb` and `package.json`
+3. Run `bundle` to update the lockfile
+4. Commit all changes with message "Version X.Y.Z"
+5. Run `bundle exec rake release` (creates git tag, pushes commits/tag, pushes gem to [rubygems.org](https://rubygems.org))
+6. Run `yarn npm publish` (publishes the npm package). This requires a [personal token](https://git.etaminstud.io/-/user_settings/personal_access_tokens) with the `api` scope to be present in `NPM_AUTH_TOKEN`,

data/app/assets/stylesheets/trek/_colors.css

@@ -1,29 +1,29 @@
-@import url("@radix-ui/colors/amber.css");
-@import url("@radix-ui/colors/amber-dark.css");
-@import url("@radix-ui/colors/blue.css");
-@import url("@radix-ui/colors/blue-dark.css");
-@import url("@radix-ui/colors/cyan.css");
-@import url("@radix-ui/colors/cyan-dark.css");
-@import url("@radix-ui/colors/grass.css");
-@import url("@radix-ui/colors/grass-dark.css");
-@import url("@radix-ui/colors/lime.css");
-@import url("@radix-ui/colors/lime-dark.css");
-@import url("@radix-ui/colors/mint.css");
-@import url("@radix-ui/colors/mint-dark.css");
-@import url("@radix-ui/colors/purple.css");
-@import url("@radix-ui/colors/purple-dark.css");
-@import url("@radix-ui/colors/sky.css");
-@import url("@radix-ui/colors/sky-dark.css");
-@import url("@radix-ui/colors/slate.css");
-@import url("@radix-ui/colors/slate-alpha.css");
-@import url("@radix-ui/colors/slate-dark.css");
-@import url("@radix-ui/colors/slate-dark-alpha.css");
-@import url("@radix-ui/colors/teal.css");
-@import url("@radix-ui/colors/teal-dark.css");
-@import url("@radix-ui/colors/tomato.css");
-@import url("@radix-ui/colors/tomato-dark.css");
-@import url("@radix-ui/colors/violet.css");
-@import url("@radix-ui/colors/violet-dark.css");
+@import "@radix-ui/colors/amber.css";
+@import "@radix-ui/colors/amber-dark.css";
+@import "@radix-ui/colors/blue.css";
+@import "@radix-ui/colors/blue-dark.css";
+@import "@radix-ui/colors/cyan.css";
+@import "@radix-ui/colors/cyan-dark.css";
+@import "@radix-ui/colors/grass.css";
+@import "@radix-ui/colors/grass-dark.css";
+@import "@radix-ui/colors/lime.css";
+@import "@radix-ui/colors/lime-dark.css";
+@import "@radix-ui/colors/mint.css";
+@import "@radix-ui/colors/mint-dark.css";
+@import "@radix-ui/colors/purple.css";
+@import "@radix-ui/colors/purple-dark.css";
+@import "@radix-ui/colors/sky.css";
+@import "@radix-ui/colors/sky-dark.css";
+@import "@radix-ui/colors/slate.css";
+@import "@radix-ui/colors/slate-alpha.css";
+@import "@radix-ui/colors/slate-dark.css";
+@import "@radix-ui/colors/slate-dark-alpha.css";
+@import "@radix-ui/colors/teal.css";
+@import "@radix-ui/colors/teal-dark.css";
+@import "@radix-ui/colors/tomato.css";
+@import "@radix-ui/colors/tomato-dark.css";
+@import "@radix-ui/colors/violet.css";
+@import "@radix-ui/colors/violet-dark.css";
 
 :root {
   --white: #fff;

data/app/assets/stylesheets/trek/base.css

@@ -1,6 +1,6 @@
-@import url("./_colors.css");
-@import url("./_fonts.css");
-@import url("./_utilities.css");
+@import "./_colors.css";
+@import "./_fonts.css";
+@import "./_utilities.css";
 
 html {
   box-sizing: border-box; /* natural box layout model to all elements */

data/app/components/trek/form/content_editor_component/content_editor_component.css

@@ -142,7 +142,7 @@
   width: 2rem;
 }
 
-@svg-load arrow-bar-left url("admin/arrow-bar-left.svg") {
+@svg-load arrow-bar-left url("trek/arrow-bar-left.svg") {
 }
 
 .content-image[data-size="larger"]::before {
@@ -150,7 +150,7 @@
   margin-right: 1rem;
 }
 
-@svg-load arrow-bar-right url("admin/arrow-bar-right.svg") {
+@svg-load arrow-bar-right url("trek/arrow-bar-right.svg") {
 }
 
 .content-image[data-size="larger"]::after {

data/app/components/trek/form/content_editor_component/content_editor_component.html.slim

@@ -202,9 +202,9 @@ div(
     )
 
     = form.text_area method_name,
-                    value: content_json,
-                    data: stimulus_target_hash("editorJson"),
-                    style: "display: none"
+                     value: content_json,
+                     data: stimulus_target_hash("editorJson"),
+                     style: "display: none"
 
     - if floating
       div(

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

@@ -40,7 +40,8 @@ module Trek
       end
 
       def content_json
-        form.object.public_send(method_name)
+        value = form.object.public_send(method_name)
+        value.is_a?(Hash) ? value.to_json : value
       end
 
       def turbo_frame_id

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

@@ -26,6 +26,7 @@
   border-radius: 0.2rem;
   color: var(--slate-8);
   display: flex;
+  flex-shrink: 0;
   height: 5rem;
   justify-content: center;
   margin-right: 2rem;
@@ -58,6 +59,7 @@
   font-size: 0.8em;
   letter-spacing: 0.01rem;
   text-transform: uppercase;
+  white-space: nowrap;
 }
 
 .dot {

data/app/models/concerns/trek/contentable.rb

@@ -5,7 +5,7 @@ module Trek
     def parsed_content
       return if content.blank?
 
-      JSON.parse(content)
+      content.is_a?(Hash) ? content : JSON.parse(content)
     end
 
     def formatted_content
@@ -14,8 +14,27 @@ module Trek
       Prosemirror.new.format_content(parsed_content)
     end
 
+    def content_text
+      return if content.blank?
+
+      extract_text(parsed_content)
+    end
+
     def prosemirror_content?
-      content&.starts_with?("{\"type\":\"doc\"")
+      case content
+      when Hash then content["type"] == "doc"
+      when String then content.start_with?('{"type":"doc"')
+      else false
+      end
+    end
+
+    private
+
+    def extract_text(node)
+      return node["text"].to_s if node["type"] == "text"
+      return "" unless node["content"]
+
+      node["content"].map { |child| extract_text(child) }.join
     end
   end
 end

data/app/models/concerns/trek/pages/pathable.rb

@@ -9,7 +9,9 @@ module Trek
           optional: true,
           inverse_of: :current_page
         has_many :paths,
+          ->(page) { order(Arel.sql("page_paths.id = #{page.current_path_id&.to_i} DESC"), path: :asc) },
           class_name: "PagePath",
+          inverse_of: :page,
           dependent: :destroy
 
         after_save_commit :save_path

data/config/locales/trek.fr.yml

@@ -39,16 +39,18 @@ fr:
       logout: Se déconnecter
       manage: Gérer
       new_resource:
-        "n": Nouveau %{resource}
+        "n": Nouveau ou nouvelle %{resource}
         f: Nouvelle %{resource}
         m: Nouveau %{resource}
         m_alt: Nouvel %{resource}
       reorder_resource:
+        "n": Réorganiser les %{resources}
         f: Réorganiser les %{resources}
         m: Réorganiser les %{resources}
         m_alt: Réorganiser les %{resources}
       replace: Remplacer
       search_resource:
+        "n": Rechercher un·e %{resources}
         f: Rechercher une %{resource}
         m: Rechercher un %{resource}
         m_alt: Rechercher un %{resource}

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

@@ -17,7 +17,7 @@ module Admin
     end
 
     def reorder?
-      user.admin? || user.editor?
+      false
     end
 
     def permitted_attributes

data/lib/generators/trek/templates/policies/admin/tag_category_policy.rb

@@ -1,11 +1,39 @@
 module Admin
   class TagCategoryPolicy < Trek::ResourcePolicy
     def index?
-      user.admin? || user.editor?
+      user.privileged?
+    end
+
+    def create?
+      user.privileged?
+    end
+
+    def manage?
+      user.privileged?
     end
 
     def destroy?
-      user.admin? && record.tags.empty?
+      user.privileged? && record.tags.empty?
+    end
+
+    def reorder?
+      false
+    end
+
+    def permitted_attributes
+      if user.privileged?
+        %i[name key position]
+      else
+        []
+      end
+    end
+
+    # Scoping
+    # See https://actionpolicy.evilmartians.io/#/scoping
+    relation_scope do |relation|
+      next relation if user.privileged?
+
+      relation.none
     end
   end
 end

data/lib/generators/trek/templates/policies/admin/tag_policy.rb

@@ -1,9 +1,39 @@
-class Admin::TagPolicy < ApplicationPolicy
-  def index?
-    user.admin? || user.editor?
-  end
+module Admin
+  class TagPolicy < Trek::ResourcePolicy
+    def index?
+      user.privileged?
+    end
+
+    def create?
+      user.privileged?
+    end
+
+    def manage?
+      user.privileged?
+    end
+
+    def destroy?
+      user.privileged? && record.taggables.empty?
+    end
+
+    def reorder?
+      false
+    end
+
+    def permitted_attributes
+      if user.privileged?
+        %i[name key category_id]
+      else
+        []
+      end
+    end
+
+    # Scoping
+    # See https://actionpolicy.evilmartians.io/#/scoping
+    relation_scope do |relation|
+      next relation if user.privileged?
 
-  def destroy?
-    user.admin? && record.taggables.empty?
+      relation.none
+    end
   end
 end

data/lib/trek/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etaminstudio/trek",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "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.11
+  version: 0.1.13
 platform: ruby
 authors:
 - Mohamed Bengrich
@@ -459,6 +459,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
+- Makefile
 - README.md
 - Rakefile
 - app/assets/icons/trek/add.svg
@@ -909,7 +910,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.4
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A modern CMS for Ruby on Rails
 test_files: []