relaton-bib 1.9.17 → 1.9.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ded29b18d5885c94c52574e378097809e1b26c450dd499ffe7ff8dee9448aa54
-  data.tar.gz: 856de0f36ac5cdc36d382e2b7ea5452bf0ea1ed8c6ba36078354c8442d28c5ae
+  metadata.gz: 974c021271bddc8c3ab783eae039697f62010c33f035e24b2bb96051a6138b8a
+  data.tar.gz: 71157a9ac56ec96549886354db9b6a301ead662e43ec8abefea1bdc27ec8539c
 SHA512:
-  metadata.gz: b293a0d4e1033e0beceb5d15120711a3725d81eb999cc63f3fdb75a751e75b24ba28b5b87b357ca2434bb4c39cf2ce4d73fe26bb2453d249cfa71a5a510405f1
-  data.tar.gz: 514b6dea9c2d98b34ba6a0b2ef574283619feeb198adc4b748b8bd3a818635870fc12ad478738a5120e55d22dc60c0f22702a1c1cf92ecb5fef023a6f9b38f74
+  metadata.gz: fec9fcd2fad29d5128b739fb478b0198bdeeb1a6ab2b9806d8dc73c51290ddcea19fe3481fdc5f104369c34f26fd6e7661a02d5927cf3eed7416b58516cbd915
+  data.tar.gz: 85890cd5bde2fee2e9fefe9188f4a892019b92414b235bbde5e91453b878b6bbe31d5d8d364939ec6662859c0ec0f9362836d938447ac0b2921fd2ce7863a40c

data/lib/relaton_bib/bibliographic_item.rb

@@ -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/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.17".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/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.17
+  version: 1.9.18
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-06 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