relaton-bib 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf4e678a0c2415cdcc4e408a4247bf6cf8437524
-  data.tar.gz: 3e1042828c36498972abde6f0c43bfbd28d19f77
+  metadata.gz: 74853979be6433fe1cfa7326ef1cdc2a4894b0b7
+  data.tar.gz: 448612aa38f9c3f4ab9bfe4e345bb8f12a9d09fc
 SHA512:
-  metadata.gz: 81d865c1e88a8b0996406586fc663148573aba25f24eb0ecbdbfbc98df1f47a7b93cfba477963e259f700170f70b3294a2a9ca9c0f8a193ba6a561e546b693ea
-  data.tar.gz: f8119c6d775bf3247a8d028ca2e26ae2e466b484f5ec53232834ff122d5b91c1a81f3ca90b47d471c862f85d3364b5d4ca54d0d939d8c9de77d674fd90295578
+  metadata.gz: 7f37e2b4de8e9ba2585f56e02368d88f1fd7516d040f4495b221e3d39c9a5d001e3a2b79bbe6f228a58bcdf3f59b8114f1a55191cb3e6fc35cafa68d97b972d4
+  data.tar.gz: 7b65f1eec49d175efea99f893ca72827550e707246352bbb62eefd54b8da5346de4ea06b9732b6fdd4bbc977ea5a5a0fa71e4241e80f4393160320f4495e7a85

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton-bib (0.1.5)
+    relaton-bib (0.1.6)
       addressable
       nokogiri (~> 1.8.4)
 

data/lib/relaton_bib/bibliographic_date.rb

@@ -6,7 +6,7 @@ module RelatonBib
   # Bibliographic date.
   class BibliographicDate
     TYPES = %w[published accessed created implemented obsoleted confirmed
-               updated issued].freeze
+               updated issued transmitted copied unchanged circulated].freeze
 
     # @return [String]
     attr_reader :type
@@ -24,7 +24,7 @@ module RelatonBib
     # @param from [String]
     # @param to [String]
     def initialize(type:, on: nil, from: nil, to: nil)
-      raise ArgumentError, "expected :on or :form argument" unless on || from
+      raise ArgumentError, "expected :on or :from argument" unless on || from
 
       raise ArgumentError, %{Type "#{type}" is ivalid.} unless TYPES.include?(type)
 

data/lib/relaton_bib/bibliographic_item.rb

@@ -19,6 +19,7 @@ require "relaton_bib/document_relation"
 require "relaton_bib/bib_item_locality"
 require "relaton_bib/xml_parser"
 require "relaton_bib/biblio_note"
+require "relaton_bib/workers_pool"
 
 
 module RelatonBib
@@ -97,7 +98,7 @@ module RelatonBib
     # @!attribute [r] abstract
     #   @return [Array<RelatonBib::FormattedString>]
 
-    # @return [RelatonBib::DocumentStatus]
+    # @return [RelatonBib::DocumentStatus, NilClass]
     attr_reader :status
 
     # @return [RelatonBib::CopyrightAssociation]
@@ -175,7 +176,7 @@ module RelatonBib
     #
     # @param relations [Array<Hash>]
     # @option relations [String] :type
-    # @option relations [RelatonBib::BibliographicItem] :bibitem
+    # @option relations [RelatonBib::BibliographicItem, RelatonIso::IsoBibliographicItem] :bibitem
     # @option relations [Array<RelatonBib::BibItemLocality>] :bib_locality
     def initialize(**args)
       if args[:type] && !TYPES.include?(args[:type])
@@ -209,10 +210,10 @@ module RelatonBib
                      end
       end
 
-      @id             = args[:id] || args[:docid]&.first&.id&.strip&.gsub(/\s/, "")
+      @docidentifier  = args[:docid] || []
+      @id             = args[:id] || makeid(nil, false)
       @formattedref   = args[:formattedref] if title.empty?
       @type           = args[:type]
-      @docidentifier  = args[:docid] || []
       @docnumber      = args[:docnumber]
       @edition        = args[:edition]
       @version        = args[:version]
@@ -248,10 +249,12 @@ module RelatonBib
       return nil if attribute && !@id_attribute
 
       id ||= @docidentifier.reject { |i| i.type == "DOI" }[0]
+      return unless id
+
       # contribs = publishers.map { |p| p&.entity&.abbreviation }.join '/'
       # idstr = "#{contribs}#{delim}#{id.project_number}"
       # idstr = id.project_number.to_s
-      idstr = id.id.gsub(/:/, "-")
+      idstr = id.id.gsub(/:/, "-").gsub /\s/, ""
       # if id.part_number&.size&.positive? then idstr += "-#{id.part_number}"
       idstr.strip
     end

data/lib/relaton_bib/document_identifier.rb

@@ -14,6 +14,27 @@ module RelatonBib
       @type = type
     end
 
+    # in docid manipulations, assume ISO as the default: id-part:year
+    def remove_part
+      case @type
+      when "Chinese Standard" then @id.sub!(/\.\d+/, "")
+      else
+        @id.sub!(/-\d+/, "")
+      end
+    end
+
+    def remove_date
+      case @type
+      when "Chinese Standard" then @id.sub!(/-[12]\d\d\d/, "")
+      else
+        @id.sub!(/:[12]\d\d\d/, "")
+      end
+    end
+
+    def all_parts
+      @id += " (all parts)"
+    end
+
     #
     # Add docidentifier xml element
     #
@@ -23,4 +44,4 @@ module RelatonBib
       builder.docidentifier(id, type: type)
     end
   end
-end
+end

data/lib/relaton_bib/document_relation.rb

@@ -39,6 +39,7 @@ module RelatonBib
     # @param builder [Nokogiri::XML::Builder]
     def to_xml(builder, **opts)
       opts.delete :bibdata
+      opts.delete :note
       builder.relation(type: type) do
         bibitem.to_xml(builder, **opts)
         bib_locality.each do |l|

data/lib/relaton_bib/typed_title_string.rb

@@ -8,6 +8,8 @@ module RelatonBib
     # @return [RelatonBib::FormattedString]
     attr_reader :title
 
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+
     # @param type [String]
     # @param title [RelatonBib::FormattedString, Hash]
     # @param content [String]
@@ -24,13 +26,14 @@ module RelatonBib
 
       @type = args[:type]
 
-      # if args[:title]
-      #   @title = args[:title]
-      # else
-      fsargs = args.select { |k, _v| %i[content language script format].include? k }
-      @title = args.fetch :title, FormattedString.new(fsargs)
-      # end
+      if args[:title]
+        @title = args[:title]
+      else
+        fsargs = args.select { |k, _v| %i[content language script format].include? k }
+        @title = FormattedString.new(fsargs)
+      end
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     # @param builder [Nokogiri::XML::Builder]
     def to_xml(builder)

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "0.1.5".freeze
+  VERSION = "0.1.6".freeze
 end

data/lib/relaton_bib/workers_pool.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module RelatonBib
+  # Workers poll.
+  class WorkersPool
+    attr_accessor :nb_hits
+
+    def initialize(num_workers = 2)
+      @num_workers = num_workers < 2 ? 2 : num_workers
+      @queue = SizedQueue.new(num_workers * 2)
+      @result = []
+      @nb_hits = 0
+    end
+
+    def worker(&block)
+      @threads = Array.new @num_workers do
+        Thread.new do
+          until (item = @queue.pop) == :END
+            @result << yield(item) if block
+          end
+        end
+      end
+    end
+
+    def result
+      @threads.each(&:join)
+      @result
+    end
+
+    def <<(item)
+      @queue << item
+      self
+    end
+
+    def end
+      @num_workers.times { @queue << :END }
+    end
+
+    def size
+      @result.size
+    end
+  end
+end

data/lib/relaton_bib/xml_parser.rb

@@ -11,10 +11,13 @@ module RelatonBib
 
       private
 
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+
+      # @return [Hash]
       def item_data(bibitem)
         {
-          id: bibitem[:id],
-          type: bibitem[:type],
+          id: bibitem[:id]&.empty? ? nil : bibitem[:id],
+          type: bibitem[:type]&.empty? ? nil : bibitem[:type],
           fetched: bibitem.at("./fetched")&.text,
           titles: fetch_titles(bibitem),
           formattedref: fref(bibitem),
@@ -41,6 +44,7 @@ module RelatonBib
           validity: fetch_validity(bibitem),
         }
       end
+      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
       def fetch_version(item)
         version = item.at "./version"
@@ -63,18 +67,23 @@ module RelatonBib
         end
       end
 
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+
       def fetch_series(item)
         item.xpath("./series").map do |sr|
           abbr = sr.at "abbreviation"
           abbreviation = abbr ? LocalizedString.new(abbr.text, abbr[:language], abbr[:script]) : nil
-          Series.new(type: sr[:type], formattedref: fref(sr),
-            title: ttitle(sr.at "title"), place: sr.at("place")&.text,
-            organization: sr.at("organization")&.text, abbreviation: abbreviation,
-            from: sr.at("from")&.text, to: sr.at("to")&.text, number: sr.at("number")&.text,
+          Series.new(
+            type: sr[:type], formattedref: fref(sr),
+            title: ttitle(sr.at("title")), place: sr.at("place")&.text,
+            organization: sr.at("organization")&.text,
+            abbreviation: abbreviation, from: sr.at("from")&.text,
+            to: sr.at("to")&.text, number: sr.at("number")&.text,
             partnumber: sr.at("partnumber")&.text
           )
         end
       end
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
       def fetch_medium(item)
         medium = item.at("./medium")
@@ -111,23 +120,12 @@ module RelatonBib
         Validity.new begins: begins, ends: ends, revision: revision
       end
 
-      # def get_id(did)
-      #   did.text.match(/^(?<project>.*?\d+)(?<hyphen>-)?(?(<hyphen>)(?<part>\d*))/)
-      # end
-
+      # @param item [Nokogiri::XML::Element]
+      # @return [Array<RelatonBib::DocumentIdentifier>]
       def fetch_docid(item)
-        ret = []
-        item.xpath("./docidentifier").each do |did|
-          #did = doc.at('/bibitem/docidentifier')
-          # type = did.at("./@type")
-          # if did.text == "IEV" then
-          #   ret << DocumentIdentifier.new(id: "IEV",  nil)
-          # else
-            # id = get_id did
-          ret << DocumentIdentifier.new(id: did.text, type: did[:type])
-          # end
+        item.xpath("./docidentifier").map do |did|
+          DocumentIdentifier.new(id: did.text, type: did[:type])
         end
-        ret
       end
 
       def fetch_titles(item)
@@ -155,10 +153,10 @@ module RelatonBib
       end
 
       def fetch_dates(item)
-        item.xpath('./date').map do |d|
+        item.xpath("./date").map do |d|
           RelatonBib::BibliographicDate.new(
-            type: d[:type], on: d.at('on')&.text, from: d.at('from')&.text,
-            to: d.at('to')&.text
+            type: d[:type], on: d.at("on")&.text, from: d.at("from")&.text,
+            to: d.at("to")&.text
           )
         end
       end
@@ -253,7 +251,7 @@ module RelatonBib
       def fetch_copyright(item)
         cp     = item.at("./copyright") || return
         org    = cp&.at("owner/organization")
-        name   = org&.at("name").text
+        name   = org&.at("name")&.text
         abbr   = org&.at("abbreviation")&.text
         url    = org&.at("uri")&.text
         entity = Organization.new(name: name, abbreviation: abbr, url: url)
@@ -280,7 +278,7 @@ module RelatonBib
             )
           end
           DocumentRelation.new(
-            type: rel[:type],
+            type: rel[:type]&.empty? ? nil : rel[:type],
             bibitem: BibliographicItem.new(item_data(rel.at("./bibitem"))),
             bib_locality: localities,
           )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-17 00:00:00.000000000 Z
+date: 2019-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -178,6 +178,7 @@ files:
 - 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/xml_parser.rb
 - relaton-bib.gemspec
 homepage: https://github.com/metanorma/relaton-item