relaton-bib 1.7.5 → 1.9.0

data/lib/relaton_bib/ics.rb

@@ -1,11 +1,14 @@
 module RelatonBib
   class ICS
     # @return [String]
-    attr_reader :code, :text
+    attr_reader :code
+
+    # @return [String, nil]
+    attr_reader :text
 
     # @param code [String]
-    # @param text [String]
-    def initialize(code:, text:)
+    # @param text [String, nil]
+    def initialize(code:, text: nil)
       @code = code
       @text = text
     end
@@ -14,23 +17,25 @@ module RelatonBib
     def to_xml(builder)
       builder.ics do |b|
         b.code code
-        b.text_ text
+        b.text_ text if text
       end
     end
 
     # @return [Hash]
     def to_hash
-      { "code" => code, "text" => text }
+      hash = { "code" => code }
+      hash["text"] = text if text
+      hash
     end
 
     # @param prefix [String]
     # @param count [Integer] number of ics
     # @return [String]
     def to_asciibib(prefix = "", count = 1)
-      pref = prefix.empty? ? "ics" : prefix + ".ics"
+      pref = prefix.empty? ? "ics" : "#{prefix}.ics"
       out = count > 1 ? "#{pref}::\n" : ""
       out += "#{pref}.code:: #{code}\n"
-      out += "#{pref}.text:: #{text}\n"
+      out += "#{pref}.text:: #{text}\n" if text
       out
     end
   end

data/lib/relaton_bib/localized_string.rb

@@ -18,12 +18,8 @@ module RelatonBib
     # @param language [String] language code Iso639
     # @param script [String] script code Iso15924
     def initialize(content, language = nil, script = nil) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
-      if content.is_a? Array
-        inv = content.reject { |c| c.is_a?(LocalizedString) || c.is_a?(Hash) }
-      end
-      unless content.is_a?(String) || inv&.none? && content.any?
-        klass = content.is_a?(Array) ? inv.first.class : content.class
-        raise ArgumentError, "invalid LocalizedString content type: #{klass}"
+      if content.is_a?(Array) && content.none?
+        raise ArgumentError, "LocalizedString content is empty"
       end
       @language = language.is_a?(String) ? [language] : language
       @script = script.is_a?(String) ? [script] : script
@@ -31,6 +27,8 @@ module RelatonBib
                    content.map do |c|
                      if c.is_a?(Hash)
                        LocalizedString.new c[:content], c[:language], c[:script]
+                     elsif c.is_a?(String)
+                       LocalizedString.new c
                      else c
                      end
                    end

data/lib/relaton_bib/organization.rb

@@ -5,8 +5,8 @@ require "relaton_bib/contributor"
 module RelatonBib
   # Organization identifier.
   class OrgIdentifier
-    ORCID = "orcid"
-    URI   = "uri"
+    # ORCID = "orcid"
+    # URI   = "uri"
 
     # @return [String]
     attr_reader :type
@@ -14,12 +14,12 @@ module RelatonBib
     # @return [String]
     attr_reader :value
 
-    # @param type [String] "orcid" or "uri"
+    # @param type [String]
     # @param value [String]
     def initialize(type, value)
-      unless [ORCID, URI].include? type
-        raise ArgumentError, 'Invalid type. It should be "orsid" or "uri".'
-      end
+      # unless [ORCID, URI].include? type
+      #   raise ArgumentError, 'Invalid type. It should be "orsid" or "uri".'
+      # end
 
       @type  = type
       @value = value
@@ -40,7 +40,7 @@ module RelatonBib
     # @return [String]
     def to_asciibib(prefix = "", count = 1)
       pref = prefix.empty? ? prefix : prefix + "."
-      out = count > 1 ? "#{pref}identifier::\m" : ""
+      out = count > 1 ? "#{pref}identifier::\n" : ""
       out += "#{pref}identifier.type:: #{type}\n"
       out += "#{pref}identifier.value:: #{value}\n"
       out
@@ -119,7 +119,7 @@ module RelatonBib
     # @return [String]
     def to_asciibib(prefix = "", count = 1) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength
       pref = prefix.sub /\*$/, "organization"
-      out = count > 1 ? "#{pref}::\m" : ""
+      out = count > 1 ? "#{pref}::\n" : ""
       name.each { |n| out += n.to_asciibib "#{pref}.name", name.size }
       out += abbreviation.to_asciibib "#{pref}.abbreviation" if abbreviation
       subdivision.each do |sd|

data/lib/relaton_bib/person.rb

@@ -102,15 +102,17 @@ module RelatonBib
 
   # Person identifier type.
   module PersonIdentifierType
-    ISNI = "isni"
-    URI  = "uri"
+    ISNI  = "isni"
+    ORCID = "orcid"
+    URI   = "uri"
 
     # Checks type.
     # @param type [String]
     # @raise [ArgumentError] if type isn't "isni" or "uri"
     def self.check(type)
-      unless [ISNI, URI].include? type
-        raise ArgumentError, 'Invalid type. It should be "isni" or "uri".'
+      unless [ISNI, ORCID, URI].include? type
+        raise ArgumentError, 'Invalid type. It should be "isni", "orcid", "\
+          "or "uri".'
       end
     end
   end
@@ -118,6 +120,7 @@ module RelatonBib
   # Person identifier.
   class PersonIdentifier
     # @return [RelatonBib::PersonIdentifierType::ISNI,
+    #   RelatonBib::PersonIdentifierType::ORCID,
     #   RelatonBib::PersonIdentifierType::URI]
     attr_accessor :type
 
@@ -125,6 +128,7 @@ module RelatonBib
     attr_accessor :value
 
     # @param type [RelatonBib::PersonIdentifierType::ISNI,
+    #   RelatonBib::PersonIdentifierType::ORCID,
     #   RelatonBib::PersonIdentifierType::URI]
     # @param value [String]
     def initialize(type, value)

data/lib/relaton_bib/series.rb

@@ -5,7 +5,7 @@ module RelatonBib
   # Series class.
   #
   class Series
-    TYPES = %w[main alt].freeze
+    # TYPES = %w[main alt].freeze
 
     # @return [String, NilClass] allowed values: "main" or "alt"
     attr_reader :type
@@ -56,9 +56,9 @@ module RelatonBib
         raise ArgumentError, "argument `title` or `formattedref` should present"
       end
 
-      if args[:type] && !TYPES.include?(args[:type])
-        warn "[relaton-bib] Series type is invalid: #{args[:type]}"
-      end
+      # if args[:type] && !TYPES.include?(args[:type])
+      #   warn "[relaton-bib] Series type is invalid: #{args[:type]}"
+      # end
 
       @type         = args[:type] # if %w[main alt].include? args[:type]
       @title        = args[:title]

data/lib/relaton_bib/typed_uri.rb

@@ -10,7 +10,7 @@ module RelatonBib
 
     # @param type [String, NilClass] src/obp/rss
     # @param content [String]
-    def initialize(type: nil, content:)
+    def initialize(content:, type: nil)
       @type    = type
       @content = Addressable::URI.parse content if content
     end

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.7.5".freeze
+  VERSION = "1.9.0".freeze
 end

data/lib/relaton_bib/workgroup.rb

@@ -1,45 +1,57 @@
 module RelatonBib
   class WorkGroup
     # @return [String]
-    attr_reader :content
+    attr_reader :name
 
     # @return [Integer, nil]
     attr_reader :number
 
     # @return [String, nil]
-    attr_reader :type
+    attr_reader :identifier, :prefix, :type
 
-    # @param content [String]
+    # @param name [String]
+    # @param identifier [String, nil]
+    # @param prefix [String, nil]
     # @param number [Integer, nil]
     # @param type [String, nil]
-    def initialize(content:, number: nil, type: nil)
-      @content = content
+    def initialize(name:, identifier: nil, prefix: nil, number: nil, type: nil)
+      @identifier = identifier
+      @prefix = prefix
+      @name = name
       @number = number
       @type = type
     end
 
     # @param builder [Nokogiri::XML::Builder]
-    def to_xml(builder)
-      builder.text content
+    def to_xml(builder) # rubocop:disable Metrics/AbcSize
+      builder.text name
       builder.parent[:number] = number if number
       builder.parent[:type] = type if type
+      builder.parent[:identifier] = identifier if identifier
+      builder.parent[:prefix] = prefix if prefix
     end
 
     # @return [Hash]
     def to_hash
-      hash = { "content" => content }
+      hash = { "name" => name }
       hash["number"] = number if number
       hash["type"] = type if type
+      hash["identifier"] = identifier if identifier
+      hash["prefix"] = prefix if prefix
       hash
     end
 
-    # @param prefix [String]
+    # @param prfx [String]
+    # @param count [Integer]
     # @return [String]
-    def to_asciibib(prefix = "")
-      pref = prefix.empty? ? prefix : prefix + "."
-      out = "#{pref}content:: #{content}\n"
+    def to_asciibib(prfx = "", count = 1) # rubocop:disable Metrics/CyclomaticComplexity
+      pref = prfx.empty? ? prfx : "#{prfx}."
+      out = count > 1 ? "#{pref}::\n" : ""
+      out += "#{pref}name:: #{name}\n"
       out += "#{pref}number:: #{number}\n" if number
       out += "#{pref}type:: #{type}\n" if type
+      out += "#{pref}identifier:: #{identifier}\n" if identifier
+      out += "#{pref}prefix:: #{prefix}\n" if prefix
       out
     end
   end

data/lib/relaton_bib/xml_parser.rb

@@ -52,6 +52,7 @@ module RelatonBib
           license: bibitem.xpath("license").map(&:text),
           validity: fetch_validity(bibitem),
           doctype: ext&.at("doctype")&.text,
+          subdoctype: ext&.at("subdoctype")&.text,
           editorialgroup: fetch_editorialgroup(ext),
           ics: fetch_ics(ext),
           structuredidentifier: fetch_structuredidentifier(ext),
@@ -81,7 +82,7 @@ module RelatonBib
             type: n[:type],
             format: n[:format],
             language: n[:language],
-            script: n[:script]
+            script: n[:script],
           )
         end
         BiblioNoteCollection.new bnotes
@@ -201,7 +202,7 @@ module RelatonBib
         DocumentStatus.new(
           stage: stg ? stage(stg) : status.text,
           substage: stage(status.at("substage")),
-          iteration: status.at("iteration")&.text
+          iteration: status.at("iteration")&.text,
         )
       end
 
@@ -262,7 +263,7 @@ module RelatonBib
               city: c.at("./city")&.text,
               state: c.at("./state")&.text,
               country: c.at("./country")&.text,
-              postcode: c.at("./postcode")&.text
+              postcode: c.at("./postcode")&.text,
             )
           else
             Contact.new(type: c.name, value: c.text)
@@ -290,7 +291,7 @@ module RelatonBib
           name: name,
           affiliation: affiliations,
           contact: contact,
-          identifier: identifier
+          identifier: identifier,
         )
       end
 
@@ -358,7 +359,7 @@ module RelatonBib
             description: relation_description(rel),
             bibitem: bib_item(item_data(rel.at("./bibitem"))),
             locality: localities(rel),
-            source_locality: source_localities(rel)
+            source_locality: source_localities(rel),
           )
         end
       end
@@ -376,7 +377,7 @@ module RelatonBib
       # @param item_hash [Hash]
       # @return [RelatonBib::BibliographicItem]
       def bib_item(item_hash)
-        BibliographicItem.new **item_hash
+        BibliographicItem.new(**item_hash)
       end
 
       # @param rel [Nokogiri::XML::Element]
@@ -398,7 +399,7 @@ module RelatonBib
         klass.new(
           loc[:type],
           LocalizedString.new(loc.at("./referenceFrom").text),
-          ref_to
+          ref_to,
         )
       end
 
@@ -436,8 +437,10 @@ module RelatonBib
         return unless ext && (eg = ext.at "editorialgroup")
 
         eg = eg.xpath("technical-committee").map do |tc|
-          wg = WorkGroup.new(content: tc.text, number: tc[:number]&.to_i,
-                             type: tc[:type])
+          wg = WorkGroup.new(
+            name: tc.text, number: tc[:number]&.to_i, type: tc[:type],
+            identifier: tc[:identifier], prefix: tc[:prefix]
+          )
           TechnicalCommittee.new wg
         end
         EditorialGroup.new eg if eg.any?
@@ -468,7 +471,7 @@ module RelatonBib
             supplementtype: si.at("supplementtype")&.text,
             supplementnumber: si.at("supplementnumber")&.text,
             language: si.at("language")&.text,
-            year: si.at("year")&.text
+            year: si.at("year")&.text,
           )
         end
         StructuredIdentifierCollection.new sids

data/lib/relaton_bib.rb

@@ -39,11 +39,11 @@ module RelatonBib
 
   # @param array [Array]
   # @return [Array<String>, String]
-  def single_element_array(array) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+  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
+      array.first.is_a?(String) ? array[0] : array.first&.to_hash
     end
   end
 end

data/relaton-bib.gemspec

@@ -21,14 +21,12 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_development_dependency "byebug"
-  # ec.add_development_dependency "debase"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  # spec.add_development_dependency "ruby-debug-ide"
   spec.add_development_dependency "ruby-jing"
   spec.add_development_dependency "simplecov"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.9.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -226,14 +226,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: 'RelatonBib: Ruby XMLDOC impementation.'