relaton-bib 1.13.8 → 1.13.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 566350d7e96478f76484698d7b249e2fc7e22a454a3b2e9572d23b4ddac14723
-  data.tar.gz: 53be5f2b3ee6967f22e654aae40133cbdba560ad176bbfc4c8c0f5cee541385c
+  metadata.gz: b689b96d8bc90ca647a1e11528aea5b02ae148d5a2b319a44f5739567312dc61
+  data.tar.gz: aafa8e3c0c37a5d1719b69bd9fdef15060176408790c9f742d8c48a209781391
 SHA512:
-  metadata.gz: 0fbbf49b3d1cb2cd5a4e1b423f547cf03d4a9d2c8d9178b15e4089d384e8c42f15de338f9a8991c1cd9fd83e9a2ac1c1783b11b7d1f7fbd30d8b53e7652db077
-  data.tar.gz: 011acbf178b30a5b62f9180f229e49ee4c804e75cba490df2802bad897261a6fed9e1d3a40c6cbd78554375de7884c1447afbdc02e48570976f439244edbaedd
+  metadata.gz: 4a39467d46ffcb67009b4c1e048ef6b11fcfec9c45db3c570b4759600bb920da2bb9060dc0e6c32f313c96fb2e66720cc7c7cdb93ad587542547af4da4b9631b
+  data.tar.gz: c1cfb779ede8f36cb8502fea7a074cbb8e530c41df10b6d827175dec6392810be15ebbd37bfda667250541a5f2571dbb4ab8aea2419af0b99914bf182b887a39

data/README.adoc

@@ -103,7 +103,7 @@ item.to_xml
     </bibitem>"
 ----
 
-Default root element is `bibitem`. With argument `bibdata: true` the XML wrapped with `bibdata` element.
+The default root element is `bibitem`. With argument `bibdata: true` the XML wrapped with `bibdata` element.
 
 [source,ruby]
 ----
@@ -117,7 +117,7 @@ item.to_xml bibdata: true
 
 ==== Date format
 
-By default date elements are formatted as year (yyyy). Option `:date_format` allows to output date elements in `:short` (yyyy-mm) and `:full` (yyyy-mm-dd) additiona formats.
+By default date elements are formatted as a year (yyyy). Option `:date_format` allows to output date elements in `:short` (yyyy-mm) and `:full` (yyyy-mm-dd) additional formats.
 
 [source,ruby]
 ----
@@ -249,7 +249,7 @@ id:: ISOTC211
 fetched:: 2020-08-19
 title::
 title.type:: title-main
-title.conten:: Geographic information
+title.content:: Geographic information
 title.format:: text/plain
 ...
 ----

data/grammars/biblio.rng

@@ -854,6 +854,12 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="language"/>
+    </optional>
+    <optional>
+      <attribute name="script"/>
+    </optional>
     <data type="anyURI"/>
   </define>
   <define name="DateType">
@@ -882,6 +888,7 @@
       <value>vote-started</value>
       <value>vote-ended</value>
       <value>announced</value>
+      <value>stable-until</value>
     </choice>
   </define>
   <define name="bdate">

data/lib/relaton_bib/bibliographic_item.rb

@@ -1039,18 +1039,18 @@ module RelatonBib
     # @param [Nokogiri::XML::Builder] builder xml builder
     # @param [RelatonBib::Organization] org organization
     #
-    def render_organization(builder, org, role = []) # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/AbcSize
-      ab = org&.abbreviation&.content
-      on = org&.name&.first&.content
-      orgname = if BibXMLParser::ORGNAMES.key?(ab) then ab
-                else BibXMLParser::ORGNAMES.key(on) || on || ab
+    def render_organization(builder, org, _role = []) # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/AbcSize
+      abbrev = org&.abbreviation&.content
+      orgname = org&.name&.first&.content
+      orgname = if BibXMLParser::ORGNAMES.key?(abbrev) then abbrev
+                else BibXMLParser::ORGNAMES.key(orgname) || orgname || abbrev
                 end
-      if role.detect { |r| r.description.detect { |d| d.content == "BibXML author" } }
-        builder.parent[:fullname] = orgname
-      else
-        o = builder.organization orgname
-        o[:abbrev] = ab if ab
-      end
+      # if role.detect { |r| r.description.detect { |d| d.content == "BibXML author" } }
+      #   builder.parent[:fullname] = orgname
+      # else
+      org = builder.organization orgname
+      org[:abbrev] = abbrev if abbrev
+      # end
     end
   end
 end

data/lib/relaton_bib/bibxml_parser.rb

@@ -224,11 +224,18 @@ module RelatonBib
       end.compact
     end
 
+    #
+    # Parse organization from author element
+    #
+    # @param [Nokogiri::XML::Element] contrib author element
+    #
+    # @return [Hash] contribution info
+    #
     def full_name_org(contrib)
-      return unless FULLNAMEORG.include? contrib[:fullname]
+      return unless self::FULLNAMEORG.include? contrib[:fullname]
 
       role = contributor_role(contrib)
-      role[:description] = ["BibXML author"]
+      # role[:description] = ["BibXML author"]
       { entity: new_org(contrib[:fullname]), role: [role] }
     end
 
@@ -244,7 +251,6 @@ module RelatonBib
         contact: contacts(author.at("./address")),
       )
       { entity: entity, role: [contributor_role(author)] }
-      # end
     end
 
     # @param contrib [Nokogiri::XML::Element]

data/lib/relaton_bib/formatted_string.rb

@@ -21,8 +21,8 @@ module RelatonBib
       #   raise ArgumentError, %{Format "#{format}" is invalid.}
       # end
 
-      super(content, language, script)
       @format = format
+      super(content, language, script)
     end
 
     # @param builder [Nokogiri::XML::Builder]
@@ -107,5 +107,22 @@ module RelatonBib
       out += "#{pref}format:: #{format}\n" if format
       out
     end
+
+    #
+    # Remove HTML tags except <em>, <strong>, <stem>, <sup>, <sub>, <tt>, <br>, <p>.
+    # Replace <i> with <em>, <b> with <strong>.
+    #
+    # @param [String] str content
+    #
+    # @return [String] cleaned content
+    #
+    def cleanup(str)
+      return str unless format == "text/html"
+
+      str.gsub(/<i>/, "<em>").gsub(/<\/i>/, "</em>")
+        .gsub(/<b>/, "<strong>").gsub(/<\/b>/, "</strong>")
+        .gsub(/<(?!\/?(em|strong|stem|sup|sub|tt|br\s?\/|p))[^\s!]\/?.*?>/, "")
+        # .gsub(/<\w+\s.+?>/, "")
+    end
   end
 end

data/lib/relaton_bib/localized_string.rb

@@ -33,7 +33,7 @@ module RelatonBib
                      else c
                      end
                    end
-                 else content
+                 else cleanup content
                  end
     end
 
@@ -127,5 +127,16 @@ module RelatonBib
       else count > 1 ? "#{prefix}::\n" : ""
       end
     end
+
+    #
+    # Should be implemented in subclass.
+    #
+    # @param [String] str content
+    #
+    # @return [String] cleaned content
+    #
+    def cleanup(str)
+      str
+    end
   end
 end

data/lib/relaton_bib/typed_uri.rb

@@ -3,15 +3,19 @@ require "addressable"
 module RelatonBib
   # Typed URI
   class TypedUri
-    # @return [Symbol] :src/:obp/:rss
-    attr_reader :type
+    # @return [String, nil]
+    attr_reader :type, :language, :script
     # @retutn [Addressable::URI]
     attr_reader :content
 
-    # @param type [String, NilClass] src/obp/rss
-    # @param content [String]
-    def initialize(content:, type: nil)
+    # @param content [String] URL
+    # @param type [String, nil] src/obp/rss
+    # @param language [String, nil] language code Iso639 (optional) (default: nil)
+    # @param script [String, nil] script code Iso15924 (optional) (default: nil)
+    def initialize(content:, type: nil, language: nil, script: nil)
       @type    = type
+      @language = language
+      @script  = script
       @content = Addressable::URI.parse content if content
     end
 
@@ -24,12 +28,16 @@ module RelatonBib
     def to_xml(builder)
       doc = builder.uri content.to_s
       doc[:type] = type if type
+      doc[:language] = language if language
+      doc[:script] = script if script
     end
 
     # @return [Hash]
     def to_hash
       hash = { "content" => content.to_s }
       hash["type"] = type.to_s if type
+      hash["language"] = language if language
+      hash["script"] = script if script
       hash
     end
 
@@ -41,6 +49,8 @@ module RelatonBib
       out = count > 1 ? "#{pref}::\n" : ""
       out += "#{pref}.type:: #{type}\n" if type
       out += "#{pref}.content:: #{content}\n"
+      out += "#{pref}.language:: #{language}\n" if language
+      out += "#{pref}.script:: #{script}\n" if script
       out
     end
   end

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.13.8".freeze
+  VERSION = "1.13.10".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -10,7 +10,7 @@ module RelatonBib
         if bibitem
           bib_item item_data(bibitem)
         else
-          warn "[relaton-bib] WARNING: can't find bibitem or bibdata element "\
+          warn "[relaton-bib] WARNING: can't find bibitem or bibdata element " \
                "in the XML"
         end
       end
@@ -23,8 +23,8 @@ module RelatonBib
       def item_data(bibitem) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         ext = bibitem.at "//ext"
         {
-          id: bibitem[:id]&.empty? ? nil : bibitem[:id],
-          type: bibitem[:type]&.empty? ? nil : bibitem[:type],
+          id: bibitem[:id].nil? || bibitem[:id].empty? ? nil : bibitem[:id],
+          type: bibitem[:type].nil? || bibitem[:type].empty? ? nil : bibitem[:type],
           fetched: bibitem.at("./fetched")&.text,
           title: fetch_titles(bibitem),
           formattedref: fref(bibitem),
@@ -141,7 +141,7 @@ module RelatonBib
             organization: sr.at("organization")&.text,
             abbreviation: abbreviation, from: sr.at("from")&.text,
             to: sr.at("to")&.text, number: sr.at("number")&.text,
-            partnumber: sr.at("partnumber")&.text, run: sr.at("run")&.text,
+            partnumber: sr.at("partnumber")&.text, run: sr.at("run")&.text
           )
         end
       end
@@ -160,9 +160,6 @@ module RelatonBib
       def fetch_extent(item)
         item.xpath("./extent").reduce([]) do |a, ex|
           a + localities(ex)
-          # Locality.new(
-          #   ex[:type], ex.at("referenceFrom")&.text, ex.at("referenceTo")&.text
-          # )
         end
       end
 
@@ -401,7 +398,8 @@ module RelatonBib
       # @return [Arra<RelatonBib::TypedUri>]
       def fetch_link(item)
         item.xpath("./uri").map do |l|
-          TypedUri.new type: l[:type], content: l.text
+          TypedUri.new(type: l[:type], content: l.text, language: l[:language],
+                       script: l[:script])
         end
       end
 
@@ -412,7 +410,7 @@ module RelatonBib
       def fetch_relations(item, klass = DocumentRelation)
         item.xpath("./relation").map do |rel|
           klass.new(
-            type: rel[:type]&.empty? ? nil : rel[:type],
+            type: rel[:type].nil? || rel[:type].empty? ? nil : rel[:type],
             description: relation_description(rel),
             bibitem: bib_item(item_data(rel.at("./bibitem"))),
             locality: localities(rel),
@@ -453,7 +451,7 @@ module RelatonBib
       # Create Locality object from Nokogiri::XML::Element
       #
       # @param loc [Nokogiri::XML::Element]
-      # @param klass [RelatonBib::Locality.class, RelatonBib::LocalityStack.class]
+      # @param klass [RelatonBib::Locality, RelatonBib::LocalityStack]
       #
       # @return [RelatonBib::Locality]
       def locality(loc, klass = Locality)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.13.8
+  version: 1.13.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-21 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug