trek 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc939de6d6cc669e8faa27134dd868b9523bafa0236e1cf025673e0abb84d833
-  data.tar.gz: 6abb5b7e49ee16d38619f6831d62dda2a05871b09a81f9ea8d44021254a91774
+  metadata.gz: 8ce09d92a68c4819bcee3c5161b1fd0b94cc70c5b9f0b2b27078d2dd25304f0a
+  data.tar.gz: ac8267f5c9835457b0ba96d64efc70bf07dd33b5d0e35d0e3e17187ea5820ea7
 SHA512:
-  metadata.gz: 69f4c70a9471eb21966c377cb419e98a314ecac4aeac31dc1f78501e8241450870de557ab77eadc2acc11fa5532193b8db3646406b8dbdee7780355c1e255483
-  data.tar.gz: 0c71c307f076c1c601ac37a1b016cc2508fcc78b56fbd114fd7769dce928581ff0daffb22c2f62c011e85fb6a9b8cf6445616c7d47b793538af516f15d01f781
+  metadata.gz: 1e5b14288cf402157249b544f6931253594f1fce504d40a20af920ae3c116f339a877a11db59c34371cce3fb9d689b9153c165d60194783a72c4bae5e539aa65
+  data.tar.gz: 8b98e40d589b12ff0debc7d5b822aaaefe525427d24c08c9c178194ab9aa988a7df96ef919e1cd21d788146a72c0a166a2d71e04f2e8e7f981e7a0d144d22b9f

data/Gemfile.lock

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

data/README.md

@@ -192,7 +192,7 @@ Then, whenever you change the files in Trek, you'll have to restart the Rails se
 
 When you're done, disable the local version:
 
-    bundle config --delete local.trek
+    bundle config unset --local local.trek
 
 Don't forget to revert to a released verion in your `Gemfile`:
 

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

@@ -33,12 +33,12 @@ table .root {
   --icon-size: 1.6rem;
 
   align-items: center;
+  aspect-ratio: 16/9;
   background-color: var(--slate-3);
   border: 1px solid var(--slate-a3);
   border-radius: 0.2rem;
   color: var(--slate-8);
   display: flex;
-  aspect-ratio: 16/9;
   justify-content: center;
   margin-right: 2rem;
   overflow: hidden;

data/app/components/trek/search_component/search_component.css

@@ -2,6 +2,7 @@
 .root {
   align-items: center;
   display: flex;
+  margin-bottom: 2.4rem;
 }
 
 .label {
@@ -14,6 +15,7 @@
   border-radius: 0.8rem;
   display: flex;
   transition: border-color 0.2s ease-in-out;
+  width: 36rem;
 }
 
 .wrapper:focus-within {
@@ -25,8 +27,10 @@
   background: transparent;
   border: 0;
   color: var(--slate-11);
+  flex-grow: 1;
   font-size: 1.6rem;
   font-weight: var(--regular);
+  margin-right: 1rem;
   padding: 1rem 2rem;
   transition: color 0.2s ease-in-out;
 }
@@ -42,15 +46,14 @@
   appearance: none;
   background-color: transparent;
   border: none;
-  border-radius: 0.8rem;
+  border-radius: 0 0.8rem 0.8rem 0;
   color: var(--slate-11);
   cursor: pointer;
   display: inline-flex;
   font-size: 1.6rem;
   font-weight: var(--regular);
   line-height: 1.25;
-  margin-left: 1rem;
-  padding: 1rem 2rem;
+  padding: 1rem 1.4rem;
   text-decoration: none;
   transition: background-color 0.2s ease-in-out, border-color 0.2s ease-in-out,
     color 0.2s ease-in-out;
@@ -59,4 +62,26 @@
 .button:hover {
   background-color: var(--accent-3);
   border-color: var(--accent-5);
+  color: var(--accent-11);
+}
+
+.reset {
+  --icon-size: 1.6rem;
+
+  align-items: center;
+  appearance: none;
+  background-color: transparent;
+  border: none;
+  border-radius: 0;
+  color: var(--slate-11);
+  cursor: pointer;
+  display: inline-flex;
+  padding: 1rem 1.4rem;
+  text-decoration: none;
+  transition: background-color 0.2s ease-in-out, color 0.2s ease-in-out;
+}
+
+.reset:hover {
+  background-color: var(--accent-3);
+  color: var(--accent-11);
 }

data/app/components/trek/search_component/search_component.html.slim

@@ -7,5 +7,8 @@
       value=value
       class=class_for("input")
     )
+    - if value.present?
+      = link_to action, class: class_for("reset"), title: t(".reset")
+        = render Trek::IconComponent.new("trek/close")
     button(class=class_for("button") type="submit" title=t(".search"))
       = render Trek::IconComponent.new("trek/search")

data/config/locales/trek.en.yml

@@ -229,6 +229,7 @@ en:
     list_component:
       empty: No item.
     search_component:
+      reset: Reset search
       search: Search
   user:
     locale:

data/config/locales/trek.fr.yml

@@ -233,6 +233,7 @@ fr:
     list_component:
       empty: Aucun élément
     search_component:
+      reset: Réinitialiser la recherche
       search: Rechercher
   user:
     locale:

data/lib/trek/typography_formatter.rb

@@ -1,16 +1,18 @@
 module Trek
-  # `TypographyFormatter` formats strings to enforce typography rules.
-  # For now, only French typography rules about non-breaking spaces
-  # and ellipsis are implemented.
+  # `TypographyFormatter` formats strings to enforce French typography rules.
   #
   # Supports both plain strings and ProseMirror JSONB hashes. When given
   # a Hash, it walks the node tree and formats only `text` node values
   # in place, leaving the structure intact.
   class TypographyFormatter
     NBSP = [160].pack("U*").freeze
-    NBSP_BEFORE_CHARS = %w[: ; % € \$ °C °F » ! \? –].freeze
-    NBSP_AFTER_CHARS = %w[«].freeze
-    NBSP_BEFORE_UNITS = %w[g h ha kg km Ko ko kW L l m min ml Mo mo s].freeze
+    NNBSP = [8239].pack("U*").freeze # U+202F narrow no-break space
+    SPACE_BEFORE_CHARS = [
+      [NBSP, %w[: % € \$ » – —]],
+      [NNBSP, %w[; ! \?]]
+    ].freeze
+    NBSP_AFTER_CHARS = %w[« – —].freeze
+    NBSP_BEFORE_UNITS = %w[°C °F g h ha kg km Ko ko kW L l m min ml Mo mo s].freeze
 
     def initialize(input)
       @source = input
@@ -36,6 +38,8 @@ module Trek
       remove_double_spaces
       add_nbsp
       replace_ellipsis
+      replace_apostrophes
+      remove_spaces_before_attached_punctuation
     end
 
     def format_prosemirror_node(node)
@@ -62,15 +66,19 @@ module Trek
     end
 
     def add_nbsp
-      add_nbsp_before_chars
+      add_nbsp_after_numero
       add_nbsp_before_units
+      add_nbsp_before_degree
+      add_space_before_chars
       add_nbsp_after_chars
       add_nbsp_between_digits
     end
 
-    def add_nbsp_before_chars
-      regexp = /(?<=\S)(\p{Zs}?(#{NBSP_BEFORE_CHARS.join("|")}))/
-      @output.gsub!(regexp, "#{NBSP}\\2")
+    def add_space_before_chars
+      SPACE_BEFORE_CHARS.each do |space, chars|
+        regexp = /(?<=\S)(\p{Zs}?(#{chars.join("|")}))/
+        @output.gsub!(regexp, "#{space}\\2")
+      end
     end
 
     def add_nbsp_before_units
@@ -79,10 +87,18 @@ module Trek
     end
 
     def add_nbsp_after_chars
-      regexp = /((#{NBSP_AFTER_CHARS.join("|")})\p{Zs}?)\b/
+      regexp = /((#{NBSP_AFTER_CHARS.join("|")})\p{Zs}?)(?=\w)/
       @output.gsub!(regexp, "\\2#{NBSP}")
     end
 
+    def add_nbsp_before_degree
+      @output.gsub!(/(\d)\p{Zs}?(°)(?!\w)/, "\\1#{NBSP}\\2")
+    end
+
+    def add_nbsp_after_numero
+      @output.gsub!(/(?i)(n°)\p{Zs}?(?=\d)/, "\\1#{NBSP}")
+    end
+
     def add_nbsp_between_digits
       regexp = /(\d)\p{Zs}(\d)/
       @output.gsub!(regexp, "\\1#{NBSP}\\2")
@@ -91,5 +107,13 @@ module Trek
     def replace_ellipsis
       @output.gsub!("...", "…")
     end
+
+    def replace_apostrophes
+      @output.gsub!(/(?<=\w)'(?=\w)/, "\u2019")
+    end
+
+    def remove_spaces_before_attached_punctuation
+      @output.gsub!(/\p{Zs}+([.,])/, "\\1")
+    end
   end
 end

data/lib/trek/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etaminstudio/trek",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "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.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Mohamed Bengrich