relaton-bib 1.3.0 → 1.5.pre1

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.3.0".freeze
+  VERSION = "1.5.pre1".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -20,7 +20,7 @@ module RelatonBib
       # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
 
       # @return [Hash]
-      def item_data(bibitem) # rubocop:disable Metrics/CyclomaticComplexity
+      def item_data(bibitem) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         ext = bibitem.at "//ext"
         {
           id: bibitem[:id]&.empty? ? nil : bibitem[:id],
@@ -75,7 +75,7 @@ module RelatonBib
       end
 
       def fetch_note(item)
-        item.xpath("./note").map do |n|
+        bnotes = item.xpath("./note").map do |n|
           BiblioNote.new(
             content: n.text,
             type: n[:type],
@@ -84,6 +84,7 @@ module RelatonBib
             script: n[:script]
           )
         end
+        BiblioNoteCollection.new bnotes
       end
 
       def fetch_language(item)
@@ -98,7 +99,7 @@ module RelatonBib
         end
       end
 
-      def fetch_series(item) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/MethodLength
+      def fetch_series(item) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/AbcSize,Metrics/MethodLength,Metrics/PerceivedComplexity
         item.xpath("./series").reduce([]) do |mem, sr|
           abbr = sr.at "abbreviation"
           abbreviation = abbr &&
@@ -164,10 +165,15 @@ module RelatonBib
         end
       end
 
+      # @param item [Nokogiri::XML::Element]
+      # @return [RelatonBib::TypedTitleStringCollection]
       def fetch_titles(item)
-        item.xpath("./title").map { |t| ttitle t }
+        ttl = item.xpath("./title").map { |t| ttitle t }
+        TypedTitleStringCollection.new ttl
       end
 
+      # @param title [Nokogiri::XML::Element]
+      # @return [RelatonBib::TypedTitleString]
       def ttitle(title)
         return unless title
 
@@ -202,7 +208,9 @@ module RelatonBib
                                   abbreviation: elm[:abbreviation])
       end
 
-      def fetch_dates(item) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+      # @param node [Nokogiri::XML::Elemen]
+      # @return [Array<RelatonBib::BibliographicDate>]
+      def fetch_dates(item) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         item.xpath("./date").reduce([]) do |a, d|
           type = d[:type].to_s.empty? ? "published" : d[:type]
           if (on = d.at("on"))
@@ -222,14 +230,15 @@ module RelatonBib
         identifier = org.xpath("./identifier").map do |i|
           OrgIdentifier.new(i[:type], i.text)
         end
+        subdiv = org.xpath("subdivision").map &:text
         Organization.new(name: names,
                          abbreviation: org.at("abbreviation")&.text,
-                         subdivision: org.at("subdivision")&.text,
+                         subdivision: subdiv,
                          url: org.at("uri")&.text,
                          identifier: identifier)
       end
 
-      def get_person(person) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity
+      def get_person(person) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         affiliations = person.xpath("./affiliation").map do |a|
           org = a.at "./organization"
           desc = a.xpath("./description").map do |e|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.pre1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-19 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -248,7 +248,7 @@ homepage: https://github.com/relaton/relaton-bib
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -259,12 +259,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: 'RelatonBib: Ruby XMLDOC impementation.'
 test_files: []