relaton-bib 1.1.0 → 1.1.1

data/lib/relaton_bib/xml_parser.rb

@@ -20,6 +20,7 @@ module RelatonBib
 
       # @return [Hash]
       def item_data(bibitem)
+        ext = bibitem.at "//ext"
         {
           id: bibitem[:id]&.empty? ? nil : bibitem[:id],
           type: bibitem[:type]&.empty? ? nil : bibitem[:type],
@@ -49,6 +50,10 @@ module RelatonBib
           keyword: bibitem.xpath("keyword").map(&:text),
           license: bibitem.xpath("license").map(&:text),
           validity: fetch_validity(bibitem),
+          doctype: ext&.at("doctype")&.text,
+          editorialgroup: fetch_editorialgroup(ext),
+          ics: fetch_ics(ext),
+          structuredidentifier: fetch_structuredidentifier(ext),
         }
       end
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
@@ -351,7 +356,7 @@ module RelatonBib
           if lc[:type]
             LocalityStack.new [locality(lc)]
           else
-            LocalityStack.new lc.xpath("./locality").map { |l| locality l }
+            LocalityStack.new(lc.xpath("./locality").map { |l| locality l })
           end
         end
       end
@@ -359,7 +364,7 @@ module RelatonBib
       # @param loc [Nokogiri::XML::Element]
       # @return [RelatonBib::Locality]
       def locality(loc, klass = Locality)
-        ref_to = (rt = loc.at("./referenceTo")) ? LocalizedString.new(rt.text) : nil
+        ref_to = (rt = loc.at("./referenceTo")) && LocalizedString.new(rt.text)
         klass.new(
           loc[:type],
           LocalizedString.new(loc.at("./referenceFrom").text),
@@ -391,6 +396,53 @@ module RelatonBib
           language: ident[:language], script: ident[:script]
         )
       end
+
+      # @param ext [Nokogiri::XML::Element]
+      # @return [RelatonBib::EditorialGroup, nil]
+      def fetch_editorialgroup(ext)
+        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])
+          TechnicalCommittee.new wg
+        end
+        EditorialGroup.new eg if eg.any?
+      end
+
+      def fetch_ics(ext)
+        return [] unless ext
+
+        ext.xpath("ics").map do |ics|
+          ICS.new code: ics.at("code").text, text: ics.at("text").text
+        end
+      end
+
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+
+      # @param ext [Nokogiri::XML::Element]
+      # @return [RelatonBib::StructuredIdentifierCollection]
+      def fetch_structuredidentifier(ext)
+        return unless ext
+
+        sids = ext.xpath("structuredidentifier").map do |si|
+          StructuredIdentifier.new(
+            type: si[:type],
+            agency: si.xpath("agency").map(&:text),
+            class: si.at("class")&.text,
+            docnumber: si.at("docnumber")&.text,
+            partnumber: si.at("partnumber")&.text,
+            edition: si.at("edition")&.text,
+            version: si.at("version")&.text,
+            supplementtype: si.at("supplementtype")&.text,
+            supplementnumber: si.at("supplementnumber")&.text,
+            language: si.at("language")&.text,
+            year: si.at("year")&.text,
+          )
+        end
+        StructuredIdentifierCollection.new sids
+      end
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-03 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -201,6 +201,10 @@ files:
 - bin/rspec
 - bin/setup
 - docs/hash.adoc
+- grammars/basicdoc.rng
+- grammars/biblio.rng
+- grammars/isodoc.rng
+- grammars/reqt.rng
 - lib/relaton_bib.rb
 - lib/relaton_bib/bib_item_locality.rb
 - lib/relaton_bib/biblio_note.rb
@@ -217,22 +221,27 @@ files:
 - lib/relaton_bib/document_relation.rb
 - lib/relaton_bib/document_relation_collection.rb
 - lib/relaton_bib/document_status.rb
+- lib/relaton_bib/editorial_group.rb
 - lib/relaton_bib/formatted_ref.rb
 - lib/relaton_bib/formatted_string.rb
 - lib/relaton_bib/hash_converter.rb
 - lib/relaton_bib/hit.rb
 - lib/relaton_bib/hit_collection.rb
+- lib/relaton_bib/ics.rb
 - lib/relaton_bib/localized_string.rb
 - lib/relaton_bib/medium.rb
 - lib/relaton_bib/organization.rb
 - lib/relaton_bib/person.rb
 - lib/relaton_bib/place.rb
 - lib/relaton_bib/series.rb
+- lib/relaton_bib/structured_identifier.rb
+- lib/relaton_bib/technical_committee.rb
 - lib/relaton_bib/typed_title_string.rb
 - lib/relaton_bib/typed_uri.rb
 - lib/relaton_bib/validity.rb
 - lib/relaton_bib/version.rb
 - lib/relaton_bib/workers_pool.rb
+- lib/relaton_bib/workgroup.rb
 - lib/relaton_bib/xml_parser.rb
 - relaton-bib.gemspec
 homepage: https://github.com/relaton/relaton-bib