orthotypo 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd24cbdb2c5adaa4f6ecf91acf144025549b7599aeb0f944e3f1987331448450
-  data.tar.gz: 6d9a7bb478c4cc0b76722128a1065fc99666f7d1f284cc82cb6f26acfe89bf70
+  metadata.gz: 7d98147f241b463ded341c2d422bc85402af278c1dba5c8120fe25de1335addb
+  data.tar.gz: aada22cc0374ebd5fdeea55d1d8a0b4ce84734e965f303dec5e34be9edfe82ac
 SHA512:
-  metadata.gz: e51b243378c8d97df6fd3bfa7f59a7aeb7f516d3f54d82cce4eb0ae8d3c7b6a5893211c857c72f8c249a73e0333f3d187ddf4d6145a45ab6de5039633aeaf457
-  data.tar.gz: dc77c1043a6210122c48a8d5849d63df04247d3d957707469d9e3029ed0cf1a9bec745cd12115bb4563254abc6e227c74e13f02285fc0cada9a0d75ab0be2ad6
+  metadata.gz: b8a9e8e9d6ecd50bd27eb6309836508d23ed182437487dbf7f1d0130de29705aa2ef81fe7ae516dc976352a8f70d3c05146df1d74432fee615b1d47443118306
+  data.tar.gz: bf718bc6f49c667e203b529fad9a565c8f936ff74bd9cd54b56f60f32bd50c72e39f3a838beee66a315a53c6c1dcb13ff93266111ff1f569bbaaa69025923a38

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    orthotypo (1.0.0)
+    orthotypo (1.0.1)
       htmlentities
       nokogiri
 
@@ -9,24 +9,23 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    base64 (0.1.1)
     byebug (11.1.3)
     diff-lcs (1.5.0)
     htmlentities (4.3.4)
-    json (2.6.3)
+    json (2.7.1)
     language_server-protocol (3.17.0.3)
-    nokogiri (1.15.4-arm64-darwin)
+    nokogiri (1.16.0-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-darwin)
+    nokogiri (1.16.0-x86_64-darwin)
       racc (~> 1.4)
-    parallel (1.23.0)
-    parser (3.2.2.4)
+    parallel (1.24.0)
+    parser (3.3.0.2)
       ast (~> 2.4.1)
       racc
-    racc (1.7.1)
+    racc (1.7.3)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.8.2)
+    rake (13.1.0)
+    regexp_parser (2.9.0)
     rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -44,8 +43,7 @@ GEM
       rspec (>= 3)
       terminal-notifier (>= 1.4)
     rspec-support (3.12.1)
-    rubocop (1.57.0)
-      base64 (~> 0.1.1)
+    rubocop (1.59.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -53,10 +51,10 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
     terminal-notifier (2.0.0)

data/README.md

@@ -34,6 +34,21 @@ Ne pas endommager l'HTML et les HTML entities ( )
 S'adapter aux locales (détecter I18n)
 Permettre les configs
 
+## Tests
+
+```
+rake
+```
+
+```
+bundle exec rspec
+```
+
+Pour jouer un seul test : 
+```
+bundle exec rspec ./spec/composer/fr_spec.rb:56
+```
+
 ## Sources
 
 - https://fr.wikipedia.org/wiki/Code_typographique

data/lib/orthotypo/composer.rb

@@ -75,13 +75,11 @@ module Orthotypo
 
     def prepare_ortho
       @ortho = string.dup
-      # @ortho = html_entities.decode(@ortho) if contains_html_entities?
       @nokogiri = Nokogiri::HTML.fragment @ortho
     end
 
     def clean_ortho
       @ortho = @nokogiri.to_s
-      # @ortho = html_entities.encode(@ortho) if contains_html_entities?
     end
 
     def parse
@@ -98,7 +96,7 @@ module Orthotypo
       parse_pairs_with_no_space_around
       # Numbers
       parse_chars_in_numbers
-      # 
+      #
       clean_ortho
       restore_precious_things
     end
@@ -106,20 +104,40 @@ module Orthotypo
     def preserve_precious_things
       @precious_things = []
       @nokogiri.traverse do |node|
-        next unless node.text?
-        new_content = node.content.split(SPACE).map { |fragment|
-          if Analyzer::precious?(fragment)
-            token = "#{PRECIOUS_TOKEN}#{@precious_things.length}"
-            @precious_things << fragment
-            token
-          else
-            fragment
+        if node.text?
+          has_leading_space = node.content.start_with? SPACE
+          has_trailing_space = node.content.end_with? SPACE
+          node.content = node.content.split(SPACE).map { |fragment|
+            store_if_precious(fragment)  
+          }.join(SPACE)
+          node.content = SPACE + node.content if has_leading_space
+          node.content = node.content + SPACE if has_trailing_space
+        elsif node.element?
+          if node.name == 'a'
+            node.attributes.each do |key, attribute|
+              if attribute.name == 'href'
+                attribute.value = store_precious_thing(attribute.value)
+              end
+            end
           end
-        }.join(SPACE)
-        node.content = new_content
+        end
       end
     end
 
+    def store_if_precious(string)
+      Analyzer::precious?(string) ? store_precious_thing(string)
+                                  : string
+    end
+
+    def store_precious_thing(string)
+      # Create token identifier
+      token = "#{PRECIOUS_TOKEN}#{@precious_things.length}"
+      # Store value
+      @precious_things << string
+      # Return identifier
+      token
+    end
+
     def restore_precious_things
       @precious_things.each_with_index do |value, index|
         @ortho.gsub! "#{PRECIOUS_TOKEN}#{index}", value

data/lib/orthotypo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Orthotypo
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/composer/fr_spec.rb

@@ -53,6 +53,10 @@ describe Orthotypo::Composer::Fr do
     expect("10 octobre 2023 16:00".ortho).to(eq("10 octobre 2023 16:00"))
   end
 
+  it 'does well with HTML' do
+    expect("<p><a href=\"https://www.linkedin.com/in/marie-dewet-1397a094/\">Marie Dewet</a>, Co-fondatrice de <a href=\"https://www.linkedin.com/company/maisoncleo/\">MaisonCléo</a> nous apporte ses lumières.</p>".ortho).to(eq("<p><a href=\"https://www.linkedin.com/in/marie-dewet-1397a094/\">Marie Dewet</a>, Co-fondatrice de <a href=\"https://www.linkedin.com/company/maisoncleo/\">MaisonCléo</a> nous apporte ses lumières.</p>"))
+  end
+
   # https://www.scribbr.fr/elements-linguistiques/les-espaces/
   it 'tests de Justine Debret' do
     expect("Elle a vu son cousin,sa tante et son oncle.Ils allaient tous très bien.".ortho).to(eq("Elle a vu son cousin, sa tante et son oncle. Ils allaient tous très bien."))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthotypo
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Arnaud Levy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-23 00:00:00.000000000 Z
+date: 2024-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Pour un texte correctement typographié