relaton-bib 1.9.14 → 1.9.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2b90151346cbb5d5f53a8125ff301d62115f730a521d13b53d363ba6876339a
-  data.tar.gz: e42718acaca9c77fb47278f03fa5a7f616da09da3ab53d30447e70c45167355b
+  metadata.gz: 974c021271bddc8c3ab783eae039697f62010c33f035e24b2bb96051a6138b8a
+  data.tar.gz: 71157a9ac56ec96549886354db9b6a301ead662e43ec8abefea1bdc27ec8539c
 SHA512:
-  metadata.gz: d84d64063570dcf4e8f4b60a0b5e9df6cca896fa1be79a308e5001099671b1e0a748851d9633d07d2b4ad3ab2318e632d8747cb8f90dfa87d9194153cbbb0cfa
-  data.tar.gz: 7f7d753a7a88138ecb17ef255d64cee353d43b59339825602cf20ddd5ea76c5d2b096b6e75198112792ba17f8c4e985f85eeab01fee0e892c0b1ec1e1e504f7a
+  metadata.gz: fec9fcd2fad29d5128b739fb478b0198bdeeb1a6ab2b9806d8dc73c51290ddcea19fe3481fdc5f104369c34f26fd6e7661a02d5927cf3eed7416b58516cbd915
+  data.tar.gz: 85890cd5bde2fee2e9fefe9188f4a892019b92414b235bbde5e91453b878b6bbe31d5d8d364939ec6662859c0ec0f9362836d938447ac0b2921fd2ce7863a40c

data/lib/relaton_bib/bibliographic_item.rb

@@ -818,7 +818,7 @@ module RelatonBib
       return attrs if attrs.any?
 
       docidentifier.first&.tap do |di|
-        return { anchor: di.id }
+        return { anchor: di.id.gsub(" ", ".") }
       end
     end
 
@@ -935,8 +935,15 @@ module RelatonBib
     def render_organization(builder, org)
       return unless org
 
-      o = builder.organization org.name.first&.content
-      o[:abbrev] = org.abbreviation.content if org.abbreviation
+      ab = org.abbreviation&.content
+      on = org.name.first&.content
+      orgname = if ab == "IEEE" || on == "Istitute of Electrical and Electronics Engineers"
+                  "IEEE"
+                elsif ab == "W3C" || on == "World Wide Web Consortium" then "W3C"
+                else on || ab
+                end
+      o = builder.organization orgname
+      o[:abbrev] = ab if ab
     end
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity

data/lib/relaton_bib/bibxml_parser.rb

@@ -82,7 +82,9 @@ module RelatonBib
       type_match = id&.match(/^(3GPP|W3C|[A-Z]{2,})(?:\.(?=[A-Z])|(?=\d))/)
       type = self::FLAVOR || (type_match && type_match[1])
       if id
-        pid = id.sub(/^(3GPP|W3C|[A-Z]{2,})\.?/, '\1 ')
+        /^(?<pref>I-D|3GPP|W3C|[A-Z]{2,})[._]?(?<num>.+)/ =~ id
+        num.sub!(/^-?0+/, "") if %w[RFC BCP FYI STD].include?(pref)
+        pid = pref ? "#{pref} #{num}" : id
         ret << DocumentIdentifier.new(type: type, id: pid)
       end
       %w[anchor docName number].each do |atr|

data/lib/relaton_bib/document_identifier.rb

@@ -9,7 +9,7 @@ module RelatonBib
 
     # @param id [String]
     # @param type [String, NilClass]
-    # @param scoope [String, NilClass]
+    # @param scope [String, NilClass]
     def initialize(id:, type: nil, scope: nil)
       @id    = id
       @type  = type

data/lib/relaton_bib/document_relation.rb

@@ -36,7 +36,7 @@ module RelatonBib
     attr_reader :source_locality
 
     # @param type [String]
-    # @parma description [RelatonBib::FormattedString, NilClass]
+    # @param description [RelatonBib::FormattedString, NilClass]
     # @param bibitem [RelatonBib::BibliographicItem,
     #   RelatonIso::IsoBibliographicItem]
     # @param locality [Array<RelatonBib::Locality, RelatonBib::LocalityStack>]

data/lib/relaton_bib/document_status.rb

@@ -68,7 +68,7 @@ module RelatonBib
       # @return [String, NilClass]
       attr_reader :abbreviation
 
-      # @parma value [String]
+      # @param value [String]
       # @param abbreviation [String, NilClass]
       def initialize(value:, abbreviation: nil)
         @value = value

data/lib/relaton_bib/localized_string.rb

@@ -56,10 +56,14 @@ module RelatonBib
       else
         builder.parent["language"] = language.join(",") if language&.any?
         builder.parent["script"]   = script.join(",") if script&.any?
-        builder.parent << content # .encode(xml: :text)
+        builder.parent << escaped_content # .encode(xml: :text)
       end
     end
 
+    def escaped_content
+      content.encode("UTF-8") # .gsub(/&/, "&amp;").gsub(/"/, "&quot;").gsub(/'/, "&apos;")
+    end
+
     # @return [Hash]
     def to_hash # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
       if content.is_a? String
@@ -77,7 +81,7 @@ module RelatonBib
     # @param count [Integer] number of elements
     # @return [String]
     def to_asciibib(prefix = "", count = 1, has_attrs = false) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
-      pref = prefix.empty? ? prefix : prefix + "."
+      pref = prefix.empty? ? prefix : "#{prefix}."
       if content.is_a? String
         unless language&.any? || script&.any? || has_attrs
           return "#{prefix}:: #{content}\n"

data/lib/relaton_bib/structured_identifier.rb

@@ -70,17 +70,18 @@ module RelatonBib
 
     # rubocop:disable Metrics/MethodLength
 
-    # @param type [String, NilClass]
-    # @param agency [Array<String>]
-    # @parma class [Stirng, NilClass]
-    # @parma docnumber [String]
-    # @param partnumber [String, NilClass]
-    # @param edition [String, NilClass]
-    # @param version [String, NilClass]
-    # @param supplementtype [String, NilClass]
-    # @param supplementnumber [String, NilClass]
-    # @param language [String, NilClass]
-    # @param year [String, NilClass]
+    # @param docnumber [String]
+    # @param args [Hash]
+    # @option args [String, nil] :type
+    # @option args [Array<String>] :agency
+    # @option args [Stirng, nil] :class
+    # @option args [String, nil] :partnumber
+    # @option args [String, nil] :edition
+    # @option args [String, nil] :version
+    # @option args [String, nil] :supplementtype
+    # @option args [String, nil] :supplementnumber
+    # @option args [String, nil] :language
+    # @option args [String, nil] :year
     def initialize(docnumber:, **args)
       @type = args[:type]
       @agency = args[:agency]

data/lib/relaton_bib/typed_uri.rb

@@ -15,7 +15,7 @@ module RelatonBib
       @content = Addressable::URI.parse content if content
     end
 
-    # @parma url [String]
+    # @param url [String]
     def content=(url)
       @content = Addressable::URI.parse url
     end

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.9.14".freeze
+  VERSION = "1.9.18".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -11,7 +11,7 @@ module RelatonBib
           bib_item item_data(bibitem)
         else
           warn "[relaton-bib] WARNING: can't find bibitem or bibdata element "\
-          "in the XML"
+               "in the XML"
         end
       end
 
@@ -320,7 +320,8 @@ module RelatonBib
       # @return [Array<RelatonBib::FormattedString>]
       def fetch_abstract(item)
         item.xpath("./abstract").map do |a|
-          FormattedString.new(content: a.children.to_s, language: a[:language],
+          c = a.children.to_s
+          FormattedString.new(content: c, language: a[:language],
                               script: a[:script], format: a[:format])
         end
       end

data/lib/relaton_bib.rb

@@ -42,10 +42,10 @@ module RelatonBib
   # @param array [Array]
   # @return [Array<String>, String]
   def single_element_array(array)
-    if array.size > 1
-      array.map { |e| e.is_a?(String) ? e : e.to_hash }
-    else
-      array.first.is_a?(String) ? array[0] : array.first&.to_hash
-    end
+    # if array.size > 1
+    array.map { |e| e.is_a?(String) ? e : e.to_hash }
+    # else
+    #   array.first.is_a?(String) ? array[0] : array.first&.to_hash
+    # end
   end
 end

data/relaton-bib.gemspec

@@ -36,5 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "addressable"
   spec.add_dependency "bibtex-ruby"
   spec.add_dependency "iso639"
-  spec.add_dependency "nokogiri"
+  spec.add_dependency "nokogiri", "~> 1.12.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.9.14
+  version: 1.9.18
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-29 00:00:00.000000000 Z
+date: 2022-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -182,16 +182,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.5
 description: 'RelatonBib: Ruby XMLDOC impementation.'
 email:
 - open.source@ribose.com