relaton-bib 1.12.6 → 1.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff390021e9158da2d1167e55d988d5dd920c7c9deba9e37838435c7f903d8852
-  data.tar.gz: a0fd8d9929ff51df3604243e9dc28770d3b38721950e1886dc6995a90fa95b4c
+  metadata.gz: be4b986a04f391a2e552c13d8ee897e73c398f3acb27deda3bb203da627f585b
+  data.tar.gz: 05540e11934396b938df0c902d926c37b1c49c8aa215b7888827bb42d19d4042
 SHA512:
-  metadata.gz: ec5005c4ae8ed03918f6933ed7329990977ab1347eb57626dfdaa1a9dddbd60eada93dc5dfdb365bb1ae06aaf60b8f7fd23ab75837022cbd1f3b6ce4009b797c
-  data.tar.gz: 864a6000626e238808513075dc9343debc59a9440e5806092c4af5e90e38e8927e62b3767903e1fc6b65611c8af60e6c4c8b5cb697c91d666f7662501ce0b7ec
+  metadata.gz: f82094e85351832f3738216ce8ba72c68f7f26e9bcd7379cbe49b2e9a2bc0318ce1d4507462d3dbfed61ba57fc9bc692daf4998cbc84fb3bc2f54a14bed7e72a
+  data.tar.gz: 66de7c5f7b612c203694d6adacb0fdbf09dd34380f24bfe6e3d298f50d61d52af844f2803f8e75644839ce0b256726db55fc9058a649f9f42c8c3198f6e279ab

data/lib/relaton_bib/localized_string.rb

@@ -68,14 +68,17 @@ module RelatonBib
     # @return [String] encoded content
     #
     def encode(cnt) # rubocop:disable Metrics/MethodLength
-      regex = /(?<prf>.*?)(?<xml><(?<tag>\w+)>.*<\/\k<tag>>)(?<sfx>.*)/m
+      return unless cnt
+
+      # regex = /(?<prf>.*?)(?<xml><(?<tag>\w+)>.*<\/\k<tag>>)(?<sfx>.*)/m
+      regex = /(?<prf>.*?)(?<xml><(?<tag>\w+)[^>]*(?:>.*<\/\k<tag>)?>)(?<rest>.*)/m
       if cnt.match(regex)
         prf = Regexp.last_match(:prf).lstrip
         xml = Regexp.last_match[:xml]
-        sfx = Regexp.last_match(:sfx).rstrip
-        parts = xml.scan(/\s*<(?<tago>\w+)>(?<cnt1>.*?)(?=<\/?\w+>)|(?<cnt2>.*?)<\/(?<tagc>\w+)>/)
+        rest = Regexp.last_match(:rest).rstrip
+        parts = xml.scan(/\s*<(?<tago>\w+)(?<attrs>[^>]*)>(?:(?<cnt1>.*?)(?=<\/\w+>|<\w+[^>]*>))?|(?<cnt2>.*?)<\/(?<tagc>\w+)>/)
         out = scan_xml parts
-        "#{escp(prf)}#{out}#{escp(sfx)}"
+        "#{escp(prf)}#{out}#{encode(rest)}"
       else
         escp cnt
       end
@@ -84,22 +87,24 @@ module RelatonBib
     #
     # Scan XML and escape HTML entities.
     #
-    # @param [Array<Array<String,nik>>] parts XML parts
+    # @param [Array<Array<String,nil>>] parts XML parts
     #
     # @return [String] output string
     #
     def scan_xml(parts) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
       return "" unless parts.any? && parts.first[0]
 
-      tago, cnt1, = parts.shift
-      if tago && tago == parts.first[3]
-        _, _, cnt2, tagc = parts.shift
-        "<#{tago}>#{escp(cnt1)}#{escp(cnt2)}</#{tagc}>"
+      tago, attrs, cnt1, = parts.shift
+      if tago && tago == parts.first&.last
+        _, _, _, cnt2, tagc = parts.shift
+        "<#{tago}#{attrs}>#{escp(cnt1)}#{escp(cnt2)}</#{tagc}>"
+      elsif tago && attrs && attrs[-1] == "/"
+        "<#{tago}#{attrs}>"
       elsif tago
         inr = scan_xml parts
-        _, _, cnt2, tagc = parts.shift
+        _, _, _, cnt2, tagc = parts.shift
         if tago == tagc
-          "<#{tago}>#{escp(cnt1)}#{inr}#{escp(cnt2)}</#{tagc}>"
+          "<#{tago}#{attrs}>#{escp(cnt1)}#{inr}#{escp(cnt2)}</#{tagc}>"
         else
           "#{escp("<#{tago}>#{cnt1}")}#{inr}#{escp("#{cnt2}</#{tagc}>")}"
         end

data/lib/relaton_bib/typed_title_string.rb

@@ -68,7 +68,7 @@ module RelatonBib
     # @param [BibTeX::Entry] item bibtex entry
     #
     def to_bibtex(item)
-      tl = titles.detect { |t| t.type == "main" }
+      tl = titles.detect { |t| t.type == "main" } || titles.first
       return unless tl
 
       item.title = tl.title.content

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.12.6".freeze
+  VERSION = "1.12.7".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -472,7 +472,7 @@ module RelatonBib
         return unless ident
 
         FormattedRef.new(
-          content: ident&.text, format: ident[:format],
+          content: ident.children.to_s, format: ident[:format],
           language: ident[:language], script: ident[:script]
         )
       end

data/lib/relaton_bib.rb

@@ -40,7 +40,8 @@ module RelatonBib
     #
     # @param [String] date date string
     # @param [String] format format string
-    # @param [Boolean] str return string or Date if true
+    # @param [Boolean] str return string if true in other case return Date
+    # @param [String, nil] outformat output format
     #
     # @return [Date, String] date object or formatted date string
     #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.12.6
+  version: 1.12.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-11 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug