theoj 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79fae8106ae731512a668acc07f1b4e1c91a2669d0115d01d0ce3fb9ac352fe4
-  data.tar.gz: d9fa5696c4057c07d25af72a140c426bd204b8e0ae1bcf2b9c3ef1411616b00a
+  metadata.gz: 6862eb2fc9d140c509d46202caf2bbd5edd8aa8273ab5a97ed9cfabaa1bdef04
+  data.tar.gz: 674e699e2e66dbb855e2423a1b04f0ccb7efd10e8455c95caa01504186c1f324
 SHA512:
-  metadata.gz: 264f8d8407ea599bc876112b8126e3715981b199c6ea1d85ac23e4c8bf0962e5fef91645ebd5a9c602bf6ebbb4f30907a66f2fa6617b8e1c5d3dab20d78beb2e
-  data.tar.gz: 1d54e621585399d69363d5986e297f816b7fb5a878b32a88551fe49d0c6c6c5a5b1c79342508a9a74e65af085be05cf3c190a8fbd2cff0118ba5a945d15554c0
+  metadata.gz: 9ae854285d72cb34bedc7bacb4bf6f04c966d13c1cd3d133c73ffaa786fef0c7fdfe9c22924d988fe625f79da653748a53ad7026804ffff5542550cdc17edbc3
+  data.tar.gz: cf43d49f026b8e9498c26287c8a8afc1bfd8ae29dabfe58d5652b5783e0c9a4e6b12f8389e2c327ba09d92a782e521f7178441185842430ab93c1ba5d6d70adf

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.12.0 (2026-01-20)
+
+- Update name parsing to match JOSS' Pandoc pipeline
+
+## 1.11.1 (2025-07-16)
+
+- Remove code tags & html comments from title in submission metadata
+
 ## 1.11.0 (2025-06-21)
 
 - Remove support for Ruby 3.1

data/lib/theoj/author.rb

@@ -17,19 +17,51 @@ module Theoj
     end
 
     def given_name
-      @parsed_name.first
+      return nil if @given_names.to_s.strip.empty?
+
+      @given_names.to_s.split(/\s+/).first
     end
 
     def middle_name
-      @parsed_name.middle
+      return nil if @middle_names.to_s.strip.empty?
+
+      @middle_names
     end
 
     def last_name
-      @parsed_name.last
+      particle = @non_dropping_particle.to_s.strip.empty? ? @dropping_particle : @non_dropping_particle
+      name_parts = [particle, @surname, @suffix].map do |part|
+        part.to_s.strip
+      end.reject(&:empty?)
+
+      fallback = @surname || @literal_name
+
+      name_parts.empty? ? fallback : name_parts.join(" ")
+    end
+
+    def citation_last_name
+      return @literal_name unless @literal_name.to_s.strip.empty?
+
+      name_parts = [@non_dropping_particle, @surname, @suffix].map do |part|
+        part.to_s.strip
+      end.reject(&:empty?)
+
+      return @surname if name_parts.empty?
+
+      name_parts.join(" ")
     end
 
     def initials
-      [@parsed_name.first, @parsed_name.middle].compact.map {|v| v[0] + "."} * ' '
+      initials_parts = []
+      first_name = given_name.to_s
+      initials_parts << "#{first_name[0]}." unless first_name.empty?
+
+      middle_for_initials = @middle_names.to_s.strip.empty? ? @dropping_particle : @middle_names
+      unless middle_for_initials.to_s.strip.empty?
+        initials_parts.concat(middle_for_initials.split(/\s+/).map { |v| "#{v[0]}." })
+      end
+
+      initials_parts.compact.join(" ")
     end
 
     def to_h
@@ -46,24 +78,71 @@ module Theoj
 
     def parse_name(author_name)
       if author_name.is_a? Hash
-        g = author_name["given-names"] || author_name["given"] || author_name["first"] || author_name["firstname"]
-        m = author_name["dropping-particle"]
-        s = author_name["surname"] || author_name["family"]
-
-        g = strip_footnotes(g) unless g.nil?
-        s = strip_footnotes(s) unless s.nil?
-
-        @parsed_name = m.nil? ? Nameable::Latin.new(g, s) : Nameable::Latin.new(g, m, s)
+        name_parts = normalize_name_parts(author_name)
+        given_names = strip_footnotes(name_parts[:given_names])
+        dropping_particle = strip_footnotes(name_parts[:dropping_particle])
+        @dropping_particle = dropping_particle
+        @non_dropping_particle = strip_footnotes(name_parts[:non_dropping_particle])
+        display_particle = @non_dropping_particle || dropping_particle
+        @surname = strip_footnotes(name_parts[:surname])
+        @suffix = strip_footnotes(name_parts[:suffix])
+        literal_name = strip_footnotes(name_parts[:literal])
+        @literal_name = literal_name unless literal_name.to_s.strip.empty?
+        @middle_names = nil
+        @given_names = given_names
+
+        surname_with_particle = [@non_dropping_particle || @dropping_particle, @surname].compact.reject(&:empty?).join(" ")
+        name_hash = {
+          first: given_names,
+          middle: dropping_particle,
+          last: surname_with_particle,
+          suffix: @suffix
+        }
+
+        @parsed_name = Nameable::Latin.new(name_hash)
+        @name = @literal_name || build_display_name(given_names, display_particle, nil, @surname, @suffix)
       else
-        @parsed_name = Nameable::Latin.new.parse(strip_footnotes(author_name))
+        parsed_name = Nameable::Latin.new.parse(strip_footnotes(author_name))
+        @parsed_name = parsed_name
+        @given_names = parsed_name.first
+        @middle_names = parsed_name.middle
+        @surname = parsed_name.last
+        @suffix = parsed_name.suffix
+        @dropping_particle = nil
+        @non_dropping_particle = nil
+        @literal_name = nil
+        @name = build_display_name(@given_names, nil, nil, @surname, @suffix)
       end
+    end
 
-      @name = @parsed_name.to_nameable
+    def normalize_name_parts(author_hash)
+      {
+        literal: fetch_name_field(author_hash, %w[literal]),
+        given_names: fetch_name_field(author_hash, ["given-names", "given", "first", "firstname"]),
+        dropping_particle: fetch_name_field(author_hash, ["dropping-particle"]),
+        non_dropping_particle: fetch_name_field(author_hash, ["non-dropping-particle"]),
+        surname: fetch_name_field(author_hash, ["surname", "family"]),
+        suffix: fetch_name_field(author_hash, ["suffix"])
+      }
+    end
+
+    def fetch_name_field(name_hash, keys)
+      keys.map do |key|
+        name_hash[key] || name_hash[key.to_sym]
+      end.compact.first
+    end
+
+    def build_display_name(given_names, dropping_particle, non_dropping_particle, surname, suffix)
+      [given_names, dropping_particle, non_dropping_particle, surname, suffix].map do |part|
+        part.to_s.strip
+      end.reject(&:empty?).join(" ")
     end
 
     # Input: Arfon Smith^[Corresponding author: arfon@example.com]
     # Output: Arfon Smith
     def strip_footnotes(author_name)
+      return nil if author_name.nil?
+
       author_name.to_s[AUTHOR_FOOTNOTE_REGEX]
     end
 

data/lib/theoj/paper.rb

@@ -26,14 +26,14 @@ module Theoj
     end
 
     def citation_author
-      surname = authors.first.last_name
-      initials = authors.first.initials
+      first_author = authors.first
+      surname = first_author.citation_last_name.to_s
+      initials = first_author.initials
 
-      if authors.size > 1
-        return "#{surname} et al."
-      else
-        return "#{surname}, #{initials}"
-      end
+      return "#{surname} et al." if authors.size > 1
+      return surname if initials.to_s.strip.empty?
+
+      "#{surname}, #{initials}"
     end
 
     def title

data/lib/theoj/submission.rb

@@ -187,7 +187,7 @@ module Theoj
 
     def plaintext(t)
       parsed_title = Commonmarker.to_html(t.strip, options:{ render: { hardbreaks: false } })
-      parsed_title.gsub("\n", "").gsub(" ", " ").gsub(/\A<p>/, "").gsub(/<\/p>\z/, "").gsub("<span data-escaped-char>", "").gsub("<span>", "").gsub(/<\/span>/, "")
+      parsed_title.gsub("\n", "").gsub(" ", " ").gsub(/\A<p>/, "").gsub(/<\/p>\z/, "").gsub("<span data-escaped-char>", "").gsub("<span>", "").gsub(/<\/span>/, "").gsub("<code>", "").gsub(/<\/code>/, "").gsub("<!-- raw HTML omitted -->","")
     end
 
     def format_date(date_string)

data/lib/theoj/version.rb

@@ -1,3 +1,3 @@
 module Theoj
-  VERSION = "1.11.0"
+  VERSION = "1.12.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: theoj
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Juanjo Bazán
 bindir: bin
 cert_chain: []
-date: 2025-06-21 00:00:00.000000000 Z
+date: 2026-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -121,6 +121,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement