relaton-bib 1.0.4 → 1.2.2

data/lib/relaton_bib/technical_committee.rb

@@ -0,0 +1,25 @@
+require "relaton_bib/workgroup"
+
+module RelatonBib
+  class TechnicalCommittee
+    # @return [RelatonBib::WorkGroup]
+    attr_reader :workgroup
+
+    # @param workgroup [RelatonBib::WorkGroup]
+    def initialize(workgroup)
+      @workgroup = workgroup
+    end
+
+    # @param builder [Nokogiri::XML::Builder]
+    def to_xml(builder)
+      builder.send "technical-committee" do |b|
+        workgroup.to_xml b
+      end
+    end
+
+    # @return [Hash]
+    def to_hash
+      workgroup.to_hash
+    end
+  end
+end

data/lib/relaton_bib/typed_title_string.rb

@@ -1,14 +1,12 @@
 module RelatonBib
   class TypedTitleString
-    # TITLE_TYPES = %w[alternative original unofficial subtitle main].freeze
-
     # @return [String]
     attr_reader :type
 
     # @return [RelatonBib::FormattedString]
     attr_reader :title
 
-    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    # rubocop:disable Metrics/MethodLength
 
     # @param type [String]
     # @param title [RelatonBib::FormattedString, Hash]
@@ -16,10 +14,6 @@ module RelatonBib
     # @param language [String]
     # @param script [String]
     def initialize(**args)
-      # if args[:type] && !TITLE_TYPES.include?(args[:type])
-      #   warn %{[relaton-bib] title type "#{args[:type]}" is invalid.}
-      # end
-
       unless args[:title] || args[:content]
         raise ArgumentError, %{Keyword "title" or "content" should be passed.}
       end
@@ -35,7 +29,43 @@ module RelatonBib
         @title = FormattedString.new(fsargs)
       end
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+    # rubocop:enable Metrics/MethodLength
+
+    # @param title [String]
+    # @return [Array<self>]
+    def self.from_string(title, lang = nil, script = nil)
+      types = %w[title-intro title-main title-part]
+      ttls = split_title(title)
+      tts = ttls.map.with_index do |p, i|
+        new type: types[i], content: p, language: lang, script: script if p
+      end.compact
+      tts << new(type: "main", content: ttls.compact.join(" - "),
+                 language: lang, script: script)
+    end
+
+    # @param title [String]
+    # @return [Array<String, nil>]
+    def self.split_title(title)
+      ttls = title.sub(/\w\.Imp\s?\d+\u00A0:\u00A0/, "").split " - "
+      case ttls.size
+      when 0, 1 then [nil, ttls.first.to_s, nil]
+      else intro_or_part ttls
+      # when 2, 3 then intro_or_part ttls
+      # else [ttls[0], ttls[1], ttls[2..-1].join(" -- ")]
+      end
+    end
+
+    # @param ttls [Array<String>]
+    # @return [Array<Strin, nil>]
+    def self.intro_or_part(ttls)
+      if /^(Part|Partie) \d+:/ =~ ttls[1]
+        [nil, ttls[0], ttls[1..-1].join(" -- ")]
+      else
+        parts = ttls.slice(2..-1)
+        part = parts.join " -- " if parts.any?
+        [ttls[0], ttls[1], part]
+      end
+    end
 
     # @param builder [Nokogiri::XML::Builder]
     def to_xml(builder)

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.0.4".freeze
+  VERSION = "1.2.2".freeze
 end

data/lib/relaton_bib/workgroup.rb

@@ -0,0 +1,36 @@
+module RelatonBib
+  class WorkGroup
+    # @return [String]
+    attr_reader :content
+
+    # @return [Integer, nil]
+    attr_reader :number
+
+    # @return [String, nil]
+    attr_reader :type
+
+    # @param content [String]
+    # @param number [Integer, nil]
+    # @param type [String, nil]
+    def initialize(content:, number: nil, type: nil)
+      @content = content
+      @number = number
+      @type = type
+    end
+
+    # @param builder [Nokogiri::XML::Builder]
+    def to_xml(builder)
+      builder.text content
+      builder.parent[:number] = number if number
+      builder.parent[:type] = type if type
+    end
+
+    # @return [Hash]
+    def to_hash
+      hash = { "content" => content }
+      hash["number"] = number if number
+      hash["type"] = type if type
+      hash
+    end
+  end
+end

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
@@ -244,14 +249,9 @@ module RelatonBib
         end
 
         cn = person.at "./name/completename"
-        cname = if cn
-                  LocalizedString.new(cn.text, cn[:language], cn[:script])
-                else
-                  nil
-                end
-
+        cname = cn && LocalizedString.new(cn.text, cn[:language], cn[:script])
         sn = person.at "./name/surname"
-        sname = sn ? LocalizedString.new(sn.text, sn[:language], sn[:script]) : nil
+        sname = sn && LocalizedString.new(sn.text, sn[:language], sn[:script])
 
         name = FullName.new(
           completename: cname, surname: sname,
@@ -291,25 +291,24 @@ module RelatonBib
       # @return [Array<RelatonBib::FormattedString>]
       def fetch_abstract(item)
         item.xpath("./abstract").map do |a|
-          FormattedString.new(
-            content: a.text, language: a[:language], script: a[:script], format: a[:format]
-          )
+          FormattedString.new(content: a.text, language: a[:language],
+                              script: a[:script], format: a[:format])
         end
       end
 
       # @param item [Nokogiri::XML::Element]
-      # @return [RelatonBib::CopyrightAssociation]
+      # @return [Array<RelatonBib::CopyrightAssociation>]
       def fetch_copyright(item)
-        cp     = item.at("./copyright") || return
-        org    = cp&.at("owner/organization")
-        name   = org&.at("name")&.text
-        abbr   = org&.at("abbreviation")&.text
-        url    = org&.at("uri")&.text
-        entity = Organization.new(name: name, abbreviation: abbr, url: url)
-        from   = cp.at("from")&.text
-        to     = cp.at("to")&.text
-        owner  = ContributionInfo.new entity: entity
-        CopyrightAssociation.new(owner: owner, from: from, to: to)
+        item.xpath("./copyright").map do |cp|
+          owner = cp.xpath("owner").map do |o|
+            ContributionInfo.new entity: get_org(o.at("organization"))
+          end
+          from = cp.at("from")&.text
+          to   = cp.at("to")&.text
+          scope = cp.at("scope")&.text
+          CopyrightAssociation.new(owner: owner, from: from, to: to,
+                                   scope: scope)
+        end
       end
 
       # @param item [Nokogiri::XML::Element]
@@ -357,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
@@ -365,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),
@@ -397,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.0.4
+  version: 1.2.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2020-06-29 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