orthotypo 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2f6a258873f18c7dc354138d1c32a75eb53c185ff8df8352222d5ea67eff0cf
-  data.tar.gz: be6d6756ec6f2925304776c150448c0e34469a32b95e92cbf3e54b64a9f581ac
+  metadata.gz: b39450aef34318976f5708d105828cbc0792ff8d6c81a1f3c3eb51d2ce27713b
+  data.tar.gz: d2a701e7525d6babcf406c702fc1e181ecae671840344df66f0d3d02538a702a
 SHA512:
-  metadata.gz: 1138ac9e055c6b87db9117b6640bb32457dd20a35306e87da7665a5496485aa89a82e18f9bde2329c77533a64815cdfbfbd44bb6fa2d17c2f5b0f576f80adee0
-  data.tar.gz: fd5f3571d645b7facf19afa56d7c6700724dbe6d8f5372ce3bc8a68bfa14d346408cf7a64fe8c8b34fc3db5e5037f4173ed268651c8fdcde133e3a89a39e3542
+  metadata.gz: 8066e337bf64b472bf9610e5e96c41819c5e0148a8725d22781c3d26a987835cc098745f8f12de4d3f087d745186006f6fe11f8fd7daa64e870d0175e458f3f6
+  data.tar.gz: b9d9e4398cbc8e7516f6eb475abc0a22ae291b12b38706ed08bbc18e568abb415da8ec45ed7a6a3658a911efe68df0b6d15b0950b1f007d108dadf6de5ab1e0d

data/.circleci/config.yml

@@ -0,0 +1,18 @@
+version: 2.1
+orbs:
+  ruby: circleci/ruby@2.1.1
+jobs:
+  test:
+    docker:
+      - image: cimg/ruby:3.3
+    steps:
+      - checkout
+      - ruby/install-deps
+      - run:
+          name: Run tests
+          command: bundle exec rake
+workflows:
+  version: 2
+  deploy:
+    jobs:
+      - test

data/Gemfile

@@ -6,5 +6,4 @@ source "https://rubygems.org"
 gemspec
 
 gem "rake", "~> 13.0"
-
 gem "rubocop", "~> 1.21"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    orthotypo (1.0.2)
+    orthotypo (1.0.4)
       htmlentities
       nokogiri
 
@@ -18,6 +18,8 @@ GEM
       racc (~> 1.4)
     nokogiri (1.16.2-x86_64-darwin)
       racc (~> 1.4)
+    nokogiri (1.16.2-x86_64-linux)
+      racc (~> 1.4)
     parallel (1.24.0)
     parser (3.3.0.5)
       ast (~> 2.4.1)
@@ -42,8 +44,10 @@ GEM
     rspec-nc (0.3.0)
       rspec (>= 3)
       terminal-notifier (>= 1.4)
-    rspec-support (3.13.0)
-    rubocop (1.60.2)
+    rspec-support (3.13.1)
+    rspec_junit_formatter (0.6.0)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    rubocop (1.62.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -51,11 +55,11 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
     ruby-progressbar (1.13.0)
     terminal-notifier (2.0.0)
     unicode-display_width (2.5.0)
@@ -64,6 +68,7 @@ PLATFORMS
   arm64-darwin-22
   arm64-darwin-23
   x86_64-darwin-22
+  x86_64-linux
 
 DEPENDENCIES
   byebug
@@ -71,6 +76,7 @@ DEPENDENCIES
   rake (~> 13.0)
   rspec
   rspec-nc
+  rspec_junit_formatter
   rubocop (~> 1.21)
 
 BUNDLED WITH

data/lib/orthotypo/analyzer.rb

@@ -2,10 +2,12 @@ module Orthotypo
   class Analyzer
 
     def self.url?(string)
-      (string =~ /\A#{URI::DEFAULT_PARSER.regexp[:ABS_URI]}\z/) && 
-      (string =~ /\A(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?\z/ix) ? true : false
+      uri = URI.parse(string)
+      uri.class != URI::Generic
+    rescue URI::InvalidURIError
+      false
     end
-  
+
     def self.email?(string)
       string =~ /\A#{URI::MailTo::EMAIL_REGEXP}\z/ ? true : false
     end
@@ -13,6 +15,6 @@ module Orthotypo
     def self.precious?(string)
       email?(string) || url?(string)
     end
-    
+
   end
 end

data/lib/orthotypo/composer.rb

@@ -114,7 +114,7 @@ module Orthotypo
     end
 
     def preserve_precious_things
-      @precious_things = []
+      @precious_things = {}
       @nokogiri.traverse do |node|
         if node.text?
           has_leading_space = node.content.start_with? SPACE
@@ -143,16 +143,17 @@ module Orthotypo
 
     def store_precious_thing(string)
       # Create token identifier
-      token = "#{PRECIOUS_TOKEN}#{@precious_things.length}"
+      uid = SecureRandom.hex
+      token = "#{PRECIOUS_TOKEN}-#{uid}"
       # Store value
-      @precious_things << string
+      @precious_things[uid] = string
       # Return identifier
       token
     end
 
     def restore_precious_things
-      @precious_things.each_with_index do |value, index|
-        @ortho.gsub! "#{PRECIOUS_TOKEN}#{index}", value
+      @precious_things.each do |uid, value|
+        @ortho.gsub! "#{PRECIOUS_TOKEN}-#{uid}", value
       end
     end
 

data/lib/orthotypo/version.rb

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

data/lib/orthotypo.rb

@@ -2,6 +2,7 @@
 
 require "htmlentities"
 require "nokogiri"
+require "securerandom"
 require "uri"
 require_relative "orthotypo/analyzer"
 require_relative "orthotypo/composer"

data/orthotypo.gemspec

@@ -25,5 +25,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-nc"
+  spec.add_development_dependency "rspec_junit_formatter"
   spec.add_development_dependency "byebug"
 end

data/spec/analyzer_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 describe Orthotypo::Analyzer do
   it 'find urls' do
     expect(Orthotypo::Analyzer.url?("https://unsplash.com/@lusvardi?utm_source=osuny")).to be true
+    expect(Orthotypo::Analyzer.url?("https://hal.science/hal-02455856")).to be true
+    expect(Orthotypo::Analyzer.url?("mailto:test@example.com")).to be true
     expect(Orthotypo::Analyzer.url?("mot:")).to be false
   end
 end

data/spec/composer/fr_spec.rb

@@ -5,7 +5,7 @@ describe Orthotypo::Composer::Fr do
   it 'adds spaces before double punctuation marks' do
     expect("mot: suite".ortho).to(eq("mot : suite"))
     expect("é: suite".ortho).to(eq("é : suite"))
-    # Pas automatisable, parce que 11:20
+    # Pas automatisable, parce qu'on peut écrire une heure 11:20
     # expect("1: suite".ortho).to(eq("1 : suite"))
     expect("mot; suite".ortho).to(eq("mot ; suite"))
     expect("mot!".ortho).to(eq("mot !"))
@@ -27,11 +27,12 @@ describe Orthotypo::Composer::Fr do
 
   it 'fixes space after simple punctuation' do
     expect("mot,suite".ortho).to(eq("mot, suite"))
+    expect("84.Paris".ortho).to(eq("84.Paris"))
     expect("etudiant.gouv.fr".ortho).to(eq("etudiant.gouv.fr"))
     expect("4,5".ortho).to(eq("4,5"))
     expect("4.5".ortho).to(eq("4.5"))
-    # Le test suivant, on ne fait rien, on ne peut pas résoudre, car s'apparente au cas précédent.
-    expect("Il est né en 1984.5 maisons en paille".ortho).to(eq("Il est né en 1984.5 maisons en paille"))
+    # Le test suivant, on ne fait rien, on ne peut pas résoudre, car s'apparente au cas précédent (1984.5)
+    # expect("Il est né en 1984.5 maisons en paille".ortho).to(eq("Il est né en 1984. 5 maisons en paille"))
   end
 
   it 'fixes quotation marks' do
@@ -68,6 +69,10 @@ describe Orthotypo::Composer::Fr do
     expect("A parallel between wildlife and urban ensembles.\r\rShot during summer 2014 on our trip from north to south of Portugal.".ortho).to(eq("A parallel between wildlife and urban ensembles.<br><br>Shot during summer 2014 on our trip from north to south of Portugal."))
   end
 
+  it 'preserves URLs' do
+    expect("https://hal.science/hal-02455856".ortho).to(eq("https://hal.science/hal-02455856"))
+  end
+
   # https://www.scribbr.fr/elements-linguistiques/les-espaces/
   it 'tests de Justine Debret' do
     # FIXME
@@ -92,4 +97,12 @@ describe Orthotypo::Composer::Fr do
     # expect("Il en compte 1,000, 10,000, 36,742, 500,000, puis 1,000,000, 25,000,000, etc.".ortho).to(eq("Il en compte 1 000, 10 000, 36 742, 500 000, puis 1 000 000, 25 000 000, etc."))
     # expect("Le numéro gagnant est le 3 541 672.".ortho).to(eq("Le numéro gagnant est le 3541672."))
   end
+
+  it 'preserves all URLs' do
+    # Generates '<a href="https://example0.fr\">Example 0</a><a href="https://example1.fr\">Example 1</a><a href="https://example2.fr\">Example 2</a>...'
+    input = (0..12).map { |n|
+      "<a href=\"https://example#{n}.fr\">Example #{n}</a>"
+    }.join
+    expect(input.ortho).to(eq(input))
+  end
 end

data/spec/spec_helper.rb

@@ -1,2 +1,2 @@
 require 'byebug'
-require 'Orthotypo'
+require 'orthotypo'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthotypo
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Arnaud Levy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-15 00:00:00.000000000 Z
+date: 2024-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +103,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - CHANGELOG.md