relaton-bib 1.13.2 → 1.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61c7501f15c50370c99043dafc2950b2bb5314725abae9e2c58fc4c2959ee5ac
-  data.tar.gz: b9bc6f11bd966f6155145cb9f9cc22a9ce1873b549ace92b356c29566ab02139
+  metadata.gz: ca70214e52f3a00a9388de24a1e07fa6464e0cb23831fd14775ce0e29c929fdf
+  data.tar.gz: 33cafac4c23e9dc57f102982bffbea20c25420f89471f164a0f875e4e6a74e26
 SHA512:
-  metadata.gz: f8f4bdccc1d8d2de570471187b5484d49f18b4b58b1f3c87b91dc97ffbe69a277ed890261ca6cbbe298fb2f61f56ca827cb814e70a18015943e63e6d23209305
-  data.tar.gz: d343cbca3b0c3c22e3775c13573c0e06b553f557aa03b592cb249c863f23ecde405c794f0cdd594bdc292e9639d56a21a28ffdec50ee9d1c8a3b6a430056274a
+  metadata.gz: d5eb2c4f5b7c13337a0e1f560d69ad140f91ea49405c3a4d876110bcdab32e532043a65187ca5fa6973c6cb0cf0240c285430a58d32338d186da882632194b2d
+  data.tar.gz: 3fd3d4b199c1c190c4920c7daba0e73979a6e82ee24648a84ab3057e2cee08345db9cc929ba324773a55d0e1fe4160ca5af2320a2e297c52dfcbace78bbcd282

data/lib/relaton_bib/bibliographic_item.rb

@@ -207,7 +207,11 @@ module RelatonBib
         warn %{[relaton-bib] document type "#{args[:type]}" is invalid.}
       end
 
-      @title = TypedTitleStringCollection.new(args[:title])
+      @title = if args[:title].is_a?(TypedTitleStringCollection)
+                 args[:title]
+               else
+                 TypedTitleStringCollection.new(args[:title])
+               end
 
       @date = (args[:date] || []).map do |d|
         d.is_a?(Hash) ? BibliographicDate.new(**d) : d
@@ -368,7 +372,7 @@ module RelatonBib
     def to_hash # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
       hash = {}
       hash["id"] = id if id
-      hash["title"] = single_element_array(title) if title&.any?
+      hash["title"] = title.to_hash if title&.any?
       hash["link"] = single_element_array(link) if link&.any?
       hash["type"] = type if type
       hash["docid"] = single_element_array(docidentifier) if docidentifier&.any?
@@ -604,10 +608,8 @@ module RelatonBib
       end
     end
 
-    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-
     # @param [BibTeX::Entry]
-    def bibtex_author(item) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+    def bibtex_author(item) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity, Metrics/MethodLength, Metrics/AbcSize
       authors = contributor.select do |c|
         c.entity.is_a?(Person) && c.role.map(&:type).include?("author")
       end.map &:entity
@@ -624,7 +626,7 @@ module RelatonBib
     end
 
     # @param [BibTeX::Entry]
-    def bibtex_contributor(item) # rubocop:disable Metrics/CyclomaticComplexity
+    def bibtex_contributor(item) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/MethodLength
       contributor.each do |c|
         rls = c.role.map(&:type)
         if rls.include?("publisher") then item.publisher = c.entity.name
@@ -638,7 +640,6 @@ module RelatonBib
         end
       end
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     # @param [BibTeX::Entry]
     def bibtex_note(item) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/AbcSize
@@ -724,16 +725,12 @@ module RelatonBib
       end
     end
 
-    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-    # rubocop:disable Style/NestedParenthesizedCalls, Metrics/BlockLength
-
     # @param opts [Hash]
     # @option opts [Nokogiri::XML::Builder] :builder XML builder
     # @option opts [Boolean] bibdata
     # @option opts [Symbol, nil] :date_format (:short), :full
     # @option opts [String] :lang language
-    def render_xml(**opts)
+    def render_xml(**opts) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
       root = opts[:bibdata] ? :bibdata : :bibitem
       xml = opts[:builder].send(root) do |builder|
         builder.fetched fetched if fetched
@@ -791,7 +788,6 @@ module RelatonBib
       xml[:type] = type if type
       xml
     end
-    # rubocop:enable Style/NestedParenthesizedCalls, Metrics/BlockLength
 
     #
     # Render BibXML (RFC, BCP)
@@ -799,7 +795,7 @@ module RelatonBib
     # @param [Nokogiri::XML::Builder] builder
     # @param [Boolean] include_bibdata
     #
-    def render_bibxml(builder, include_keywords)
+    def render_bibxml(builder, include_keywords) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       target = link.detect { |l| l.type.casecmp("src").zero? } ||
         link.detect { |l| l.type.casecmp("doi").zero? }
       bxml = if docnumber&.match(/^BCP/) || (docidentifier.detect(&:primary)&.id ||
@@ -831,7 +827,7 @@ module RelatonBib
     # @param [Nokogiri::XML::Builder] builder
     # @param [Boolean] include_keywords
     #
-    def render_bibxml_ref(builder, include_keywords)
+    def render_bibxml_ref(builder, include_keywords) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
       builder.reference(**ref_attrs) do |xml|
         if title.any? || contributor.any? || date.any? || abstract.any? ||
             editorialgroup&.technical_committee&.any? ||
@@ -861,7 +857,7 @@ module RelatonBib
     #
     # @return [Hash<Symbol=>String>] attributes
     #
-    def ref_attrs
+    def ref_attrs # rubocop:disable Metrics/AbcSize
       discopes = %w[anchor docName number]
       attrs = docidentifier.each_with_object({}) do |di, h|
         next unless discopes.include?(di.scope)
@@ -912,7 +908,7 @@ module RelatonBib
     #
     # @param [Nokogiri::XML::Builder] builder xml builder
     #
-    def render_date(builder)
+    def render_date(builder) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
       dt = date.detect { |d| d.type == "published" }
       return unless dt
 
@@ -933,7 +929,7 @@ module RelatonBib
     #
     # @param [Nokogiri::XML::Builder] builder xml builder
     #
-    def render_seriesinfo(builder)
+    def render_seriesinfo(builder) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       docidentifier.each do |di|
         if BibXMLParser::SERIESINFONAMES.include? di.type
           builder.seriesInfo(name: di.type, value: di.id)
@@ -954,7 +950,7 @@ module RelatonBib
     #
     # @param [Nokogiri::XML::Builder] builder xml builder
     #
-    def render_authors(builder)
+    def render_authors(builder) # rubocop:disable Metrics/AbcSize
       contributor.each do |c|
         builder.author do |xml|
           xml.parent[:role] = "editor" if c.role.detect { |r| r.type == "editor" }
@@ -972,7 +968,7 @@ module RelatonBib
     # @param [Nokogiri::XML::Builder] builder xml builder
     # @param [RelatonBib::ContributionInfo] contrib contributor
     #
-    def render_address(builder, contrib)
+    def render_address(builder, contrib) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       # addr = contrib.entity.contact.reject do |cn|
       #   cn.is_a?(Address) && cn.postcode.nil?
       # end
@@ -1012,7 +1008,7 @@ module RelatonBib
     # @param [Nokogiri::XML::Builder] builder xml builder
     # @param [RelatonBib::Person] person person
     #
-    def render_person(builder, person)
+    def render_person(builder, person) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       render_organization builder, person.affiliation.first&.organization
       if person.name.completename
         builder.parent[:fullname] = person.name.completename.content
@@ -1042,9 +1038,7 @@ module RelatonBib
     # @param [Nokogiri::XML::Builder] builder xml builder
     # @param [RelatonBib::Organization] org organization
     #
-    def render_organization(builder, org)
-      # return unless org
-
+    def render_organization(builder, org) # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
       ab = org&.abbreviation&.content
       on = org&.name&.first&.content
       orgname = if BibXMLParser::ORGNAMES.key?(ab) then ab
@@ -1053,7 +1047,5 @@ module RelatonBib
       o = builder.organization orgname
       o[:abbrev] = ab if ab
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   end
 end

data/lib/relaton_bib/hash_converter.rb

@@ -83,7 +83,7 @@ module RelatonBib
 
         ret[:title] = RelatonBib.array(ret[:title])
           .reduce(TypedTitleStringCollection.new) do |m, t|
-          if t.is_a?(Hash) then m << t
+          if t.is_a?(Hash) then m << TypedTitleString.new(**t)
           else
             m + TypedTitleString.from_string(t)
           end
@@ -146,13 +146,16 @@ module RelatonBib
       def docid_hash_to_bib(ret) # rubocop:disable Metrics/AbcSize
         return unless ret[:docid]
 
-        ret[:docid] = RelatonBib.array(ret[:docid])
-        ret[:docid]&.each_with_index do |id, i|
+        ret[:docid] = RelatonBib.array(ret[:docid]).map do |id|
           id[:type] ||= id[:id].match(/^\w+(?=\s)/)&.to_s
-          ret[:docid][i] = DocumentIdentifier.new(**id)
+          create_docid(**id)
         end
       end
 
+      def create_docid(**args)
+        DocumentIdentifier.new(**args)
+      end
+
       def version_hash_to_bib(ret)
         return unless ret[:version]
 

data/lib/relaton_bib/hit.rb

@@ -7,7 +7,7 @@ module RelatonBib
     attr_reader :hit
 
     # @param hit [Hash]
-    # @param hit_collection [RelatonIso::HitCollection, RelatonNist:HitCollection]
+    # @param hit_collection [RelatonBib::HitCollection]
     def initialize(hit, hit_collection = nil)
       @hit            = hit
       @hit_collection = hit_collection
@@ -20,11 +20,11 @@ module RelatonBib
 
     # @return [String]
     def inspect
-      "<#{self.class}:#{format('%<id>#.14x', id: object_id << 1)} "\
-                              "@text=\"#{@hit_collection&.text}\" "\
-                                    "@fetched=\"#{!@fetch.nil?}\" "\
-                    "@fullIdentifier=\"#{@fetch&.shortref(nil)}\" "\
-                    "@title=\"#{@hit[:code]}\">"
+      "<#{self.class}:#{format('%<id>#.14x', id: object_id << 1)} " \
+        "@text=\"#{@hit_collection&.text}\" " \
+        "@fetched=\"#{!@fetch.nil?}\" " \
+        "@fullIdentifier=\"#{@fetch&.shortref(nil)}\" " \
+        "@title=\"#{@hit[:code]}\">"
     end
 
     def fetch

data/lib/relaton_bib/localized_string.rb

@@ -78,18 +78,13 @@ module RelatonBib
     def encode(cnt) # rubocop:disable Metrics/MethodLength
       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]
-        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}#{encode(rest)}"
-      else
-        escp cnt
-      end
+      parts = cnt.scan(%r{
+        <(?<tago>\w+)(?<attrs>[^>]*)> | # tag open
+        </(?<tagc>\w+)> | # tag close
+        (?<cmt><!--.*?-->) | # comment
+        (?<cnt>.+?)(?=<|$) # content
+        }x)
+      scan_xml parts
     end
 
     #
@@ -100,23 +95,32 @@ module RelatonBib
     # @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, 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
-        if tago == tagc
-          "<#{tago}#{attrs}>#{escp(cnt1)}#{inr}#{escp(cnt2)}</#{tagc}>"
-        else
-          "#{escp("<#{tago}>#{cnt1}")}#{inr}#{escp("#{cnt2}</#{tagc}>")}"
-        end
-      end + scan_xml(parts)
+      return "" unless parts.any?
+
+      out = ""
+      while parts.any? && (parts.first[3] || parts.first[4])
+        _, _, _, cmt, cnt = parts.shift
+        out += "#{cmt}#{escp(cnt)}"
+      end
+      unless out.empty?
+        out += scan_xml(parts) if parts.any? && parts.first[0]
+        return out
+      end
+
+      tago, attrs, tagc, = parts.shift
+      out = if tago && attrs && attrs[-1] == "/"
+              "<#{tago}#{attrs}>"
+            elsif tago
+              inr = scan_xml parts
+              _, _, tagc, = parts.shift
+              if tago == tagc
+                "<#{tago}#{attrs}>#{inr}</#{tagc}>"
+              else
+                "#{escp("<#{tago}#{attrs}>")}#{inr}#{escp("</#{tagc}>")}"
+              end
+            end
+      out += scan_xml(parts) if parts.any? && (parts.first[0] || parts.first[3] || parts.first[4])
+      out
     end
 
     #

data/lib/relaton_bib/typed_title_string.rb

@@ -26,8 +26,8 @@ module RelatonBib
     end
 
     # @return [RelatonBib::TypedTitleStringCollection]
-    def select
-      TypedTitleStringCollection.new(titles.select { |t| yield t })
+    def select(&block)
+      TypedTitleStringCollection.new titles.select(&block)
     end
 
     # @param init [Array, Hash]
@@ -62,6 +62,10 @@ module RelatonBib
       tl.each { |t| opts[:builder].title { t.to_xml opts[:builder] } }
     end
 
+    def to_hash
+      @array.map(&:to_hash)
+    end
+
     #
     # Add main title ot bibtex entry
     #

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.13.2".freeze
+  VERSION = "1.13.3".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -376,7 +376,7 @@ module RelatonBib
       # @return [Array<RelatonBib::FormattedString>]
       def fetch_abstract(item)
         item.xpath("./abstract").map do |a|
-          c = a.inner_html(encoding: "utf-8").strip
+          c = a.children.to_xml(encoding: "utf-8").strip
           FormattedString.new(content: c, language: a[:language],
                               script: a[:script], format: a[:format])
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.13.2
+  version: 1.13.3
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-09 00:00:00.000000000 Z
+date: 2022-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -280,7 +280,7 @@ homepage: https://github.com/relaton/relaton-bib
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -295,8 +295,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: 'RelatonBib: Ruby XMLDOC impementation.'
 test_files: []