relaton-bipm 1.14.2 → 1.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eba1bdf78beca2e7a36717565c644e97c59f1c83a9c3357967ae121321e8a7a2
-  data.tar.gz: 34abb5dc4b173daaaec433f928b98ab51c8009480b85d554e3f968c6e2b8bd44
+  metadata.gz: 34d720b316dbd942e2c5d630d2ae0f07b74331e4ef07f68715e84304bad0fb13
+  data.tar.gz: 38d36e34b998db6e4fa9e9f1a6e5306fadacea45b9a878cd14629eaaca2ef50d
 SHA512:
-  metadata.gz: 7bad79524f1203e310be0c2539862323ecd5caa3b971b4aed21bab5cae82f4bba786b35389659f2709e9047ab8c6da9cf4b297ff5c735db2585508d1fd3ed410
-  data.tar.gz: 865ee3c035f133d44c4f59b7ced2ab00d1d3a44375a808a2b87dbbe78be16fd33e2dee57f338f50249c4d0acccd7e2fbc3e18b582882af819b2d7ca829c0f4fd
+  metadata.gz: a22261617d5c3de8aad7ed410091331698630f958332c5feb0b215b9fafe9167015530e9e6ecb71046307a6775aa7a2a0a71dd4c12e4f982cb0bd259e021a267
+  data.tar.gz: 376bb090dd4d273b8039357d78280c9bc4f1555918920a55b22ec72cb8be87c4ce0a8469254ffc000256fa95069a271b65b978dc767d735acd4b3e141c5dea24

data/Gemfile

@@ -3,5 +3,11 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in relaton_bipm.gemspec
 gemspec
 
+gem "byebug"
+gem "pry-byebug"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
+gem "ruby-jing"
+gem "simplecov"
+gem "vcr"
+gem "webmock"

data/README.adoc

@@ -70,22 +70,35 @@ Allowed document names are:
 
 ==== Reference structure for Metrologia documents
 
-`BIPM Metrologia {JOURNAL} {VOLUME} {ISSUE} {PAGE}`
+`BIPM Metrologia {JOURNAL} {VOLUME} {ISSUE}`
 
-- `{JOURNAL}` - number of journal, required
-- `{VOLUME}` - number of volume, optional
-- `{ISSUE}` - number of issue, optional
-- `{PAGE}` - number of page, optional
+- `{JOURNAL}` - journal number, required
+- `{VOLUME}` - volume number, optional
+- `{ISSUE}` - issue number, optional
 
 ==== Reference structures for CCTF (CCDS), CGPM, CIPM documents
 
 ===== Basic pattern
 
 ----
-Long: {group name} -- {type} {number} ({year})
-Short: {group name} -- {type-abbrev} {number} ({year}, {lang})
+Long:
+{group name} -- {type} {number} ({year})
+{group name} {type} {number} ({year})
+{group name} {type} {year}-{zero_leading_number}
+
+Short:
+{group name} -- {type-abbrev} {number} ({year}, {lang})
+{group name} {type-abbrev} {number} ({year}, {lang})
 ----
 
+`group name` - a name of the group, required. A full list of group names is available https://github.com/metanorma/bipm-editor-guides/blob/main/sources/bipm-outcomes-en.adoc#appendix-a-bipm-groups-and-codes[here].
+`type` - a type of document, required. A list of types is: Resolution (Résolution), Recommendation (Recommandation), Decision (Décision), Meeting (Réunion), Declaration (Déclaration).
+`type-abbrev` - an abbreviation of the type, required. A list of abbreviations: RES (Resolution), REC (Recommendation), DECN (Decision).
+`number` - a number of the document, optional. Can be with part, e.g. `1-2`.
+`zero_leading_number` - a number of the document with a leading zero, required. Can be used when a document has a 1 or 2 digits number. It's `00` for documents without a number.
+`year` - a year of the document, optional.
+`lang` - a language of the document, optional. Can be `EN` or `FR`.
+
 ===== Special case pattern
 
 The basic pattern works fine for all, except for these 2 cases:
@@ -295,7 +308,7 @@ bib.link
  #<RelatonBib::TypedUri:0x00007fa6d6a29250 @content=#<Addressable::URI:0xc2b0 URI:https://doi.org/10.1088/0026-1394/29/6/001>, @type="doi">]
 ----
 
-=== Create bibliographic item from XML
+=== Create a bibliographic item from XML
 
 [source,ruby]
 ----
@@ -304,7 +317,7 @@ RelatonBipm::XMLParser.from_xml File.read('spec/fixtures/bipm_item.xml')
 ...
 ----
 
-=== Create bibliographic item from YAML
+=== Create a bibliographic item from YAML
 [source,ruby]
 ----
 hash = YAML.load_file 'spec/fixtures/bipm_item.yml'

data/grammars/basicdoc.rng

@@ -522,7 +522,6 @@
       <value>tip</value>
       <value>important</value>
       <value>caution</value>
-      <value>statement</value>
     </choice>
   </define>
   <define name="figure">

data/grammars/biblio.rng

@@ -216,6 +216,9 @@
       <optional>
         <ref name="fullname"/>
       </optional>
+      <zeroOrMore>
+        <ref name="credential"/>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="affiliation"/>
       </zeroOrMore>
@@ -232,6 +235,11 @@
       <ref name="FullNameType"/>
     </element>
   </define>
+  <define name="credential">
+    <element name="credential">
+      <text/>
+    </element>
+  </define>
   <define name="FullNameType">
     <choice>
       <group>
@@ -305,7 +313,9 @@
       <zeroOrMore>
         <ref name="affiliationdescription"/>
       </zeroOrMore>
-      <ref name="organization"/>
+      <optional>
+        <ref name="organization"/>
+      </optional>
     </element>
   </define>
   <define name="affiliationname">
@@ -1316,7 +1326,7 @@
       <value>commentaryOf</value>
       <value>hasCommentary</value>
       <value>related</value>
-      <value>complements</value>
+      <value>hasComplement</value>
       <value>complementOf</value>
       <value>obsoletes</value>
       <value>obsoletedBy</value>

data/lib/relaton_bipm/bipm_bibliography.rb

@@ -3,14 +3,6 @@ require "mechanize"
 module RelatonBipm
   class BipmBibliography
     GH_ENDPOINT = "https://raw.githubusercontent.com/relaton/relaton-data-bipm/master/".freeze
-    IOP_DOMAIN = "https://iopscience.iop.org".freeze
-    TRANSLATIONS = {
-      "Déclaration" => "Declaration",
-      "Réunion" => "Meeting",
-      "Recommandation" => "Recommendation",
-      "Résolution" => "Resolution",
-      "Décision" => "Decision",
-    }.freeze
 
     class << self
       # @param text [String]
@@ -18,7 +10,6 @@ module RelatonBipm
       def search(text, _year = nil, _opts = {}) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         warn "[relaton-bipm] (\"#{text}\") fetching..."
         ref = text.sub(/^BIPM\s/, "")
-        # item = ref.match?(/^Metrologia/i) ? get_metrologia(ref, magent) : get_bipm(ref, magent)
         item = get_bipm(ref, magent)
         unless item
           warn "[relaton-bipm] (\"#{text}\") not found."
@@ -26,7 +17,6 @@ module RelatonBipm
         end
 
         warn("[relaton-bipm] (\"#{text}\") found #{item.docidentifier[0].id}")
-        item.fetched = Date.today.to_s
         item
       rescue Mechanize::ResponseCodeError => e
         raise RelatonBib::RequestError, e.message unless e.response_code == "404"
@@ -49,295 +39,28 @@ module RelatonBipm
         a
       end
 
-      # @param ref [String]
+      # @param reference [String]
       # @param agent [Mechanize]
       # @return [RelatonBipm::BipmBibliographicItem]
-      def get_bipm(ref, agent) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-        # rf = ref.sub(/(?:(\d{1,2})\s)?\(?(\d{4})(?!-)\)?/) do
-        #   "#{$2}-#{$1.to_s.rjust(2, '0')}"
-        # end
-        ref.sub!("CCDS", "CCTF")
-        # TRANSLATIONS.each { |fr, en| rf.sub! fr, en }
-        path = Index.new.search ref
-        return unless path
+      def get_bipm(reference, agent) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        ref_id = Id.new reference
+        index = Relaton::Index.find_or_create :BIPM, url: "#{GH_ENDPOINT}index2.zip"
+        rows = index.search { |r| ref_id == r[:id] }
+        return unless rows.any?
 
-        url = "#{GH_ENDPOINT}#{path}"
+        url = "#{GH_ENDPOINT}#{rows.first[:file]}"
         resp = agent.get url
-        check_response resp
         return unless resp.code == "200"
 
         yaml = RelatonBib.parse_yaml resp.body, [Date]
-        # yaml["fetched"] = Date.today.to_s
+        yaml["fetched"] = Date.today.to_s
         bib_hash = HashConverter.hash_to_bib yaml
         BipmBibliographicItem.new(**bib_hash)
       end
 
-      # @param ref [String]
-      # @param agent [Mechanize]
-      # @return [RelatonBipm::BipmBibliographicItem]
-      def get_metrologia(ref, agent)
-        agent.redirect_ok = false
-        ref_arr = ref.split
-        case ref_arr.size
-        when 1 then get_journal agent
-        when 2 then get_volume ref_arr[1], agent
-        when 3 then get_issue(*ref_arr[1..2], agent)
-        when 4 then get_article_from_issue(*ref_arr[1..3], agent)
-        end
-      end
-
-      # @param agent [Mechanize]
-      # @return [RelatonBipm::BipmBibliographicItem]
-      def get_journal(agent)
-        url = "#{IOP_DOMAIN}/journal/0026-1394"
-        rsp = agent.get url
-        check_response rsp
-        rel = rsp.xpath('//select[@id="allVolumesSelector"]/option').map do |v|
-          { type: "partOf", bibitem: journal_rel(v) }
-        end
-        did = doc_id []
-        bibitem(formattedref: fref(did.id), docid: [did], link: blink(url), relation: rel)
-      end
-
-      # @param elm [Nokogiri::XML::Element]
-      def journal_rel(elm)
-        vol = elm[:value].split("/").last
-        did = doc_id [vol]
-        url = IOP_DOMAIN + elm[:value]
-        BipmBibliographicItem.new(formattedref: fref(did.id), docid: [did], link: blink(url))
-      end
-
-      # @param vol [String]
-      # @param agent [Mechanize]
-      # @return [RelatonBipm::BipmBibliographicItem]
-      def get_volume(vol, agent)
-        url = "#{IOP_DOMAIN}/volume/0026-1394/#{vol}"
-        rsp = agent.get url
-        check_response rsp
-        rel = rsp.xpath('//li[@itemprop="hasPart"]').map do |i|
-          { type: "partOf", bibitem: volume_rel(i, vol) }
-        end
-        did = doc_id [vol]
-        bibitem(formattedref: fref(did.id), docid: [did], link: blink(url), date: bdate(rsp), relation: rel,
-                extent: btextent(vol), series: series)
-      end
-
-      def volume_rel(elm, vol) # rubocop:disable Metrics/AbcSize
-        a = elm.at 'a[@itemprop="issueNumber"]'
-        ish = a[:href].split("/").last
-        url = IOP_DOMAIN + a[:href]
-        docid = doc_id [vol, ish]
-        t = elm.at "p"
-        title_fref = t ? { title: titles(t.text) } : { formattedref: fref(docid.id) }
-        BipmBibliographicItem.new(**title_fref, docid: [docid], link: blink(url))
-      end
-
-      # @param title [String]
-      # @return [RelatonBib::TypedTitleStringCollection]
-      def titles(title)
-        RelatonBib::TypedTitleString.from_string title, "en", "Latn", "text/html"
-      end
-
-      # @param vol [String]
-      # @param ish [String]
-      # @param agent [Mechanize]
-      # @return [RelatonBipm::BipmBibliographicItem]
-      def get_issue(vol, ish, agent) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-        url = issue_url vol, ish
-        rsp = agent.get url
-        check_response rsp
-        rel = rsp.xpath('//div[@class="art-list-item-body"]').map do |a|
-          { type: "partOf", bibitem: issue_rel(a, vol, ish) }
-        end
-        did = doc_id [vol, ish]
-        title_fref = { title: issue_title(rsp) }
-        title_fref[:formattedref] = fref did.id unless title_fref[:title].any?
-        bibitem(**title_fref, link: blink(url), relation: rel, docid: [did],
-                              date: bdate(rsp), extent: btextent(vol, ish), series: series)
-      end
-
-      # @param ref [String]
-      # @return [RelatonBib::FormattedRef]
-      def fref(ref)
-        RelatonBib::FormattedRef.new content: ref, language: "en", script: "Latn"
-      end
-
-      # @param rsp [Mechanize::Page]
-      # @return [RelatonBib::TypedTitleStringCollection]
-      def issue_title(rsp)
-        t = rsp.at('//div[@id="wd-jnl-issue-title"]/h4')
-        return RelatonBib::TypedTitleStringCollection.new [] unless t
-
-        titles(t.text)
-      end
-
-      # @oaran vol [String]
-      # @param ish [String]
-      # @return [String]
-      def issue_url(vol, ish)
-        "#{IOP_DOMAIN}/issue/0026-1394/#{vol}/#{ish}"
-      end
-
-      # @param elm [Nokogiri::XML::Element]
-      # @param vol [String]
-      # @param ish [String]
-      # @return [RelatonBipm::BipmBibliographicItem]
-      def issue_rel(elm, vol, ish)
-        art = elm.at('div[@class="indexer"]').text
-        ref = elm.at('div/a[@class="art-list-item-title"]')
-        title = titles ref.text.strip
-        docid = doc_id [vol, ish, art]
-        link = blink IOP_DOMAIN + ref[:href]
-        BipmBibliographicItem.new(title: title, docid: [docid], link: link)
-      end
-
-      # @param content [RelatonBib::TypedTitleString]
-      # @return [RelatonBib::TypedTitleString]
-      def btitle(content)
-        RelatonBib::TypedTitleString.new type: "main", content: content, language: "en", script: "Latn"
-      end
-
-      # @param url [String]
-      # @return [String]
-      def blink(url)
-        [RelatonBib::TypedUri.new(type: "src", content: url)]
-      end
-
-      # @param rsp [Mechanize::Page]
-      # @return [Array<RelatonBib::BibliographicDate>]
-      def bdate(rsp)
-        date = rsp.at('//p[@itemprop="issueNumber"]|//h2[@itemprop="volumeNumber"]').text.split(", ").last
-        on = date.match?(/^\d{4}$/) ? date : Date.parse(date).strftime("%Y-%m")
-        [RelatonBib::BibliographicDate.new(type: "published", on: on)]
-      end
-
-      # @param args [Array<String>]
-      # @return [RelatonBib::DocumentIdentifier]
-      def doc_id(args)
-        id = args.clone.unshift "Metrologia"
-        RelatonBib::DocumentIdentifier.new(type: "BIPM", id: id.join(" "), primary: true)
-      end
-
-      # @param vol [String]
-      # @param ish [String]
-      # @param art [String]
-      # @param agent [Mechanize]
-      # @return [RelatonBipm::BipmBibliographicItem]
-      def get_article_from_issue(vol, ish, art, agent) # rubocop:disable Metrics/MethodLength
-        url = issue_url vol, ish
-        rsp = agent.get url
-        check_response rsp
-        link = rsp.at("//div[@class='indexer'][.='#{art}']/../div/a")
-        unless link
-          arts = rsp.xpath("//div[@class='indexer']").map(&:text)
-          warn "[relaton-bipm] No article is available at the specified start page \"#{art}\" in issue \"BIPM Metrologia #{vol} #{ish}\"."
-          warn "[relaton-bipm] Available articles in the issue start at the following pages: (#{arts.join(', ')})"
-          return
-        end
-
-        get_article link[:href], vol, ish, agent
-      end
-
-      # @param path [String]
-      # @param vol [String]
-      # @param ish [String]
-      # @param agent [Mechanize]
-      # @return [RelatonBipm::BipmBibliographicItem]
-      def get_article(path, vol, ish, agent) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-        agent.agent.allowed_error_codes = [403]
-        rsp = agent.get path
-        check_response rsp
-        title = rsp.at("//h1[@itemprop='headline']").children.to_xml
-        url = rsp.uri
-        bib = rsp.link_with(text: "BibTeX").href
-        rsp = agent.get bib
-        check_response rsp
-        bt = BibTeX.parse(rsp.body).first
-        bibitem(
-          docid: btdocid(bt), title: titles(title), date: btdate(bt),
-          abstract: btabstract(bt), doctype: bt.type.to_s, series: series,
-          link: btlink(bt, url), contributor: btcontrib(bt),
-          extent: btextent(vol, ish, bt.pages.to_s)
-        )
-      end
-
-      # @param args [Hash]
-      # @return [RelatonBipm::BipmBibliographicItem]
-      def bibitem(**args)
-        BipmBibliographicItem.new(
-          type: "article", language: ["en"], script: ["Latn"], **args,
-        )
-      end
-
-      # @return [Array<RelatonBib::Series>]
-      def series
-        [RelatonBib::Series.new(title: btitle("Metrologia"))]
-      end
-
-      # @param bibtex [BibTeX::Entry]
-      # @return [Array<RelatonBib::DocumentIdentifier>]
-      def btdocid(bibtex)
-        id = "#{bibtex.journal} #{bibtex.volume} #{bibtex.number} #{bibtex.pages.match(/^\d+/)}"
-        [
-          RelatonBib::DocumentIdentifier.new(type: "BIPM", id: id, primary: true),
-          RelatonBib::DocumentIdentifier.new(type: "DOI", id: bibtex.doi),
-        ]
-      end
-
-      # @param bibtex [BibTeX::Entry]
-      # @return [Array<RelatonBib::FormattedString>]
-      def btabstract(bibtex)
-        [RelatonBib::FormattedString.new(content: bibtex.abstract.to_s, language: "en", script: "Latn")]
-      end
-
-      # @param bibtex [BibTeX::Entry]
-      # @param ref [URI]
-      # @return [Array<RelatonBib::TypedUri>]
-      def btlink(bibtex, ref)
-        [
-          RelatonBib::TypedUri.new(type: "src", content: ref.to_s),
-          RelatonBib::TypedUri.new(type: "doi", content: bibtex.url.to_s),
-        ]
-      end
-
-      # @param bibtex [BibTeX::Entry]
-      # @return [Array<RelatonBib::BibliographicDate>]
-      def btdate(bibtex)
-        on = Date.new(bibtex.year.to_i, bibtex.month_numeric)
-        [RelatonBib::BibliographicDate.new(type: "published", on: on)]
-      end
-
-      # @param bibtex [BibTeX::Entry]
-      # @return [Array<Hash>]
-      def btcontrib(bibtex) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-        contribs = []
-        if bibtex.publisher && !bibtex.publisher.empty?
-          org = RelatonBib::Organization.new name: bibtex.publisher.to_s
-          contribs << { entity: org, role: [{ type: "publisher" }] }
-        end
-        return contribs unless bibtex.author && !bibtex.author.empty?
-
-        bibtex.author.split(" and ").inject(contribs) do |mem, name|
-          cname = RelatonBib::LocalizedString.new name, "en", "Latn"
-          name = RelatonBib::FullName.new completename: cname
-          author = RelatonBib::Person.new name: name
-          mem << { entity: author, role: [{ type: "author" }] }
-        end
-      end
-
-      #
-      # @param vol [String] volume
-      # @param ish [String] issue
-      # @param pgs [String] pages
-      #
-      # @return [Array<RelatonBib::BibItemLocality>]
-      #
-      def btextent(vol, ish = nil, pgs = nil)
-        ext = [RelatonBib::Locality.new("volume", vol)]
-        ext << RelatonBib::Locality.new("issue", ish) if ish
-        ext << RelatonBib::Locality.new("page", *pgs.split("--")) if pgs
-        ext
-      end
+      # def match_item(ids, ref_id)
+      #   ids.find { |id| Id.new(id) == ref_id }
+      # end
 
       # @param ref [String] the BIPM standard Code to look up (e..g "BIPM B-11")
       # @param year [String] not used
@@ -346,28 +69,6 @@ module RelatonBipm
       def get(ref, year = nil, opts = {})
         search(ref, year, opts)
       end
-
-      private
-
-      #
-      # Check HTTP response. Warn and rise error if response is not 200
-      #   or redirect to CAPTCHA.
-      #
-      # @param [Mechanize] rsp response
-      #
-      # @raise [RelatonBib::RequestError] if response is not 200
-      #
-      def check_response(rsp) # rubocop:disable Metrics/AbcSize
-        if rsp.code == "302"
-          warn "[relaton-bipm] This source employs anti-DDoS measures that unfortunately affects automated requests."
-          warn "[relaton-bipm] Please visit this link in your browser to resolve the CAPTCHA, then retry: #{rsp.uri}"
-          # warn "[relaton-bipm] #{rsp.uri} is redirected to #{rsp.header['location']}"
-          raise RelatonBib::RequestError, "cannot access #{rsp.uri}"
-        elsif rsp.code != "200" && rsp.code != "403"
-          warn "[read_bipm] can't acces #{rsp.uri} #{rsp.code}"
-          raise RelatonBib::RequestError, "cannot acces #{rsp.uri} #{rsp.code}"
-        end
-      end
     end
   end
 end

data/lib/relaton_bipm/bipm_si_brochure_parser.rb

@@ -6,7 +6,7 @@ module RelatonBipm
     # @param [RelatonBipm::DataFetcher] data_fetcher data fetcher
     #
     def initialize(data_fetcher)
-      @data_fetcher = data_fetcher
+      @data_fetcher = WeakRef.new data_fetcher
     end
 
     #
@@ -27,7 +27,7 @@ module RelatonBipm
       # puts "Ls #{Dir['bipm-si-brochure/*']}"
       # puts "Ls #{Dir['bipm-si-brochure/site/*']}"
       # puts "Ls #{Dir['bipm-si-brochure/site/documents/*']}"
-      Dir["bipm-si-brochure/site/documents/*.rxl"].each do |f|
+      Dir["bipm-si-brochure/_site/documents/*.rxl"].each do |f|
         puts "Parsing #{f}"
         docstd = Nokogiri::XML File.read f
         doc = docstd.at "/bibdata"
@@ -35,7 +35,10 @@ module RelatonBipm
         fix_si_brochure_id hash1
         basename = File.join @data_fetcher.output, File.basename(f).sub(/(?:-(?:en|fr))?\.rxl$/, "")
         outfile = "#{basename}.#{@data_fetcher.ext}"
-        @data_fetcher.index[[hash1["docnumber"] || basename]] = outfile
+        key = hash1["docnumber"] || basename
+        @data_fetcher.index[[key]] = outfile
+        @data_fetcher.index_new.add_or_update [key], outfile
+        @data_fetcher.index2.add_or_update Id.new(key).normalized_hash, outfile
         hash = if File.exist? outfile
                  warn_duplicate = false
                  hash2 = YAML.load_file outfile

data/lib/relaton_bipm/data_fetcher.rb

@@ -1,6 +1,6 @@
 module RelatonBipm
   class DataFetcher
-    attr_reader :output, :format, :ext, :files, :index
+    attr_reader :output, :format, :ext, :files, :index, :index_new, :index2
 
     #
     # Initialize fetcher
@@ -15,6 +15,8 @@ module RelatonBipm
       @files = []
       @index_path = "index.yaml"
       @index = File.exist?(@index_path) ? YAML.load_file(@index_path) : {}
+      @index_new = Relaton::Index.find_or_create :BIPM, file: "index-bipm.yaml"
+      @index2 = Relaton::Index.find_or_create :BIPM, file: "index2.yaml"
     end
 
     #
@@ -45,7 +47,9 @@ module RelatonBipm
       when "bipm-si-brochure" then BipmSiBrochureParser.parse(self)
       when "rawdata-bipm-metrologia" then RawdataBipmMetrologia::Fetcher.fetch(self)
       end
-      File.write @index_path, @index.to_yaml, encoding: "UTF-8"
+      File.write @index_path, index.to_yaml, encoding: "UTF-8"
+      index_new.save
+      index2.save
     end
 
     #

data/lib/relaton_bipm/data_outcomes_parser.rb

@@ -7,13 +7,21 @@ module RelatonBipm
       "Statement" => "DECL",
     }.freeze
 
+    TRANSLATIONS = {
+      "Déclaration" => "Declaration",
+      "Réunion" => "Meeting",
+      "Recommandation" => "Recommendation",
+      "Résolution" => "Resolution",
+      "Décision" => "Decision",
+    }.freeze
+
     #
     # Create data-outcomes parser
     #
     # @param [RelatonBipm::DataFetcher] data_fetcher data fetcher
     #
     def initialize(data_fetcher)
-      @data_fetcher = data_fetcher
+      @data_fetcher = WeakRef.new data_fetcher
     end
 
     #
@@ -68,20 +76,10 @@ module RelatonBipm
     # @param [String] dir output directory
     #
     def fetch_meeting(en_file, body, type, dir) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-      en = RelatonBib.parse_yaml File.read(en_file, encoding: "UTF-8"), [Date]
-      en_md = en["metadata"]
-      fr_file = en_file.sub "en", "fr"
-      fr = RelatonBib.parse_yaml File.read(fr_file, encoding: "UTF-8"), [Date]
-      fr_md = fr["metadata"]
-      gh_src = "https://raw.githubusercontent.com/metanorma/bipm-data-outcomes/"
-      src_en = gh_src + en_file.split("/")[-3..].unshift("main").join("/")
-      src_fr = gh_src + fr_file.split("/")[-3..].unshift("main").join("/")
-      src = [
-        { type: "src", content: src_en, language: "en", script: "Latn" },
-        { type: "src", content: src_fr, language: "fr", script: "Latn" },
-      ]
+      _, en, fr_file, fr = read_files en_file
+      en_md, fr_md, num, part = meeting_md en, fr
+      src = meeting_links en_file, fr_file
 
-      /^(?<num>\d+)(?:-_(?<part>\d+))?-\d{4}$/ =~ en_md["url"].split("/").last
       file = "#{num}.#{@data_fetcher.ext}"
       path = File.join dir, file
       hash = bibitem body: body, type: type, en: en_md, fr: fr_md, num: num, src: src, pdf: en["pdf"]
@@ -111,6 +109,40 @@ module RelatonBipm
       fetch_resolution body: body, en: en, fr: fr, dir: dir, src: src, num: num
     end
 
+    #
+    # Read English and French files
+    #
+    # @param [String] en_file Path to English file
+    #
+    # @return [Array<Hash, String, nil>] English / French metadata and file path
+    #
+    def read_files(en_file)
+      fr_file = en_file.sub "en", "fr"
+      [en_file, fr_file].map do |file|
+        if File.exist? file
+          data = RelatonBib.parse_yaml(File.read(file, encoding: "UTF-8"), [Date])
+          path = file
+        end
+        [path, data]
+      end.flatten
+    end
+
+    def meeting_md(eng, frn)
+      en_md = eng["metadata"]
+      num, part = en_md["identifier"].to_s.split("-")
+      [en_md, frn&.dig("metadata"), num, part]
+    end
+
+    def meeting_links(en_file, fr_file)
+      gh_src = "https://raw.githubusercontent.com/metanorma/bipm-data-outcomes/"
+      { "en" => en_file, "fr" => fr_file }.map do |lang, file|
+        next unless file
+
+        src = gh_src + file.split("/")[-3..].unshift("main").join("/")
+        { type: "src", content: src, language: lang, script: "Latn" }
+      end.compact
+    end
+
     #
     # Parse BIPM resolutions and write them to YAML files
     #
@@ -207,6 +239,9 @@ module RelatonBipm
       end
       key << item.docidentifier.detect { |i| i.language == "fr" }.id
       @data_fetcher.index[key] = path
+      @data_fetcher.index_new.add_or_update key, path
+      key2 = Id.new(item.docnumber).normalized_hash
+      @data_fetcher.index2.add_or_update key2, path
     end
 
     #
@@ -342,8 +377,7 @@ module RelatonBipm
       docnum = create_docnum args[:body], args[:type], args[:num], args[:en]["date"]
       hash = { title: [], type: "proceedings", doctype: args[:type],
                place: [RelatonBib::Place.new(city: "Paris")] }
-      hash[:title] << create_title(args[:en]["title"], "en") if args[:en]["title"]
-      hash[:title] << create_title(args[:fr]["title"], "fr") if args[:fr]["title"]
+      hash[:title] = create_titles args.slice(:en, :fr)
       hash[:date] = [{ type: "published", on: args[:en]["date"] }]
       hash[:docid] = create_docids docnum
       hash[:docnumber] = docnum # .sub(" --", "").sub(/\s\(\d{4}\)/, "")
@@ -356,6 +390,12 @@ module RelatonBipm
       hash
     end
 
+    def create_titles(data)
+      data.each_with_object([]) do |(lang, md), mem|
+        mem << create_title(md["title"], lang.to_s) if md && md["title"]
+      end
+    end
+
     #
     # Create links
     #
@@ -364,12 +404,13 @@ module RelatonBipm
     # @return [Array<Hash>] Array of links
     #
     def create_links(**args)
-      links = [
-        { type: "citation", content: args[:en]["url"], language: "en", script: "Latn" },
-        { type: "citation", content: args[:fr]["url"], language: "fr", script: "Latn" },
-      ]
+      links = args.slice(:en, :fr).each_with_object([]) do |(lang, md), mem|
+        next unless md && md["url"]
+
+        mem << { type: "citation", content: md["url"], language: lang.to_s, script: "Latn" }
+      end
       RelatonBib.array(args[:pdf]).each { |pdf| links << { type: "pdf", content: pdf } }
-      links += args[:src] if args[:src]&.any?
+      links += args[:src] if args[:src]
       links
     end
 
@@ -454,8 +495,8 @@ module RelatonBipm
     # @return [RelatonBib::DocumentIdentifier] french document ID
     #
     def create_docid_fr(en_id)
-      tr = BipmBibliography::TRANSLATIONS.detect { |_, v| en_id.include? v }
-      id = en_id.sub tr[1], tr[0]
+      tr = TRANSLATIONS.detect { |_, v| en_id.include? v }
+      id = tr ? en_id.sub(tr[1], tr[0]) : en_id
       make_docid(id: id, type: "BIPM", primary: true, language: "fr", script: "Latn")
     end
 

data/lib/relaton_bipm/id_parser.rb

@@ -0,0 +1,134 @@
+module RelatonBipm
+  class Id
+    class Parser < Parslet::Parser
+      rule(:space) { match("\s").repeat(1) }
+      rule(:space?) { space.maybe }
+      rule(:comma) { str(",") >> space? }
+      rule(:lparen) { str("(") }
+      rule(:rparen) { str(")") }
+      rule(:slash) { str("/") }
+
+      rule(:delimeter) { str("--") >> space }
+      rule(:delimeter?) { delimeter.maybe }
+
+      rule(:lang) { comma >> match["A-Z"].repeat(2, 2).as(:lang) }
+      rule(:lang?) { lang.maybe }
+
+      rule(:number) { match["0-9-"].repeat(1).as(:number) >> space? }
+      rule(:number?) { number.maybe }
+
+      rule(:year) { match["0-9"].repeat(4, 4).as(:year) }
+      rule(:year_paren) { lparen >> year >> lang? >> rparen }
+      rule(:num_year) { number? >> year_paren }
+      rule(:year_num) { year >> str("-") >> number }
+      rule(:num_and_year) { num_year | year_num | number }
+
+      rule(:sect) { lparen >> match["IVX"].repeat >> rparen }
+      rule(:suff) { match["a-zA-Z-"].repeat(1) }
+      rule(:cgmp) { str("CGPM") }
+      rule(:cipm) { str("CIPM") >> (str(" MRA") | match["A-Z-"]).maybe }
+      rule(:cc) { str("CC") >> suff >> sect.maybe }
+      rule(:jc) { str("JC") >> suff }
+      rule(:cec) { str("CEC") }
+      rule(:wgms) { str("WG-MS") }
+      rule(:group) { (cgmp | cipm | cc | jc | cec | wgms).as(:group) }
+
+      rule(:type) { match["[:alpha:]"].repeat(1).as(:type) >> space }
+
+      rule(:type_group) { type >> group >> slash >> num_and_year }
+      rule(:group_type) { group >> space >> delimeter? >> type >> num_and_year }
+      rule(:outcome) { group_type | type_group }
+
+      rule(:append) { comma >> str("Appendix") >> space >> number }
+      rule(:brochure) { str("SI").as(:group) >> space >> str("Brochure").as(:type) >> append.maybe }
+
+      rule(:metrologia) { str("Metrologia").as(:group) >> (space >> match["a-zA-Z0-9\s"].repeat(1).as(:number)).maybe }
+
+      rule(:result) { outcome | brochure | metrologia }
+
+      root :result
+    end
+
+    TYPES = {
+      "Resolution" => "RES",
+      "Résolution" => "RES",
+      "Recommendation" => "REC",
+      "Recommandation" => "REC",
+      "Decision" => "DECN",
+      "Décision" => "DECN",
+      "Declaration" => "Déclaration",
+      "Réunion" => "Meeting",
+    }.freeze
+
+    # @return [Hash] the parsed id components
+    attr_accessor :id
+
+    #
+    # Create a new Id object
+    #
+    # @param [String] id id string
+    #
+    def initialize(id)
+      @id = Parser.new.parse(id)
+    rescue Parslet::ParseFailed => e
+      warn "[relaton-bipm] Incorrect reference: #{id}"
+      # warn "[relaton-bipm] #{e.parse_failure_cause.ascii_tree}"
+      raise RelatonBib::RequestError, e
+    end
+
+    #
+    # Compare two Id objects
+    #
+    # @param [RelatonBipm::Id, Hash] other the other Id object
+    #
+    # @return [Boolean] true if the two Id objects are equal
+    #
+    def ==(other)
+      other_hash = other.is_a?(Id) ? other.normalized_hash : other
+      hash = normalized_hash
+      hash.delete(:year) unless other_hash[:year]
+      other_hash.delete(:year) unless hash[:year]
+      hash.delete(:lang) unless other_hash[:lang]
+      other_hash.delete(:lang) unless hash[:lang]
+      hash == other_hash
+    end
+
+    #
+    # Transform ID parts.
+    # Traslate type into abbreviation, remove leading zeros from number
+    #
+    # @return [Hash] the normalized ID parts
+    #
+    def normalized_hash # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+      @normalized_hash ||= begin
+        hash = { group: id[:group].to_s.sub("CCDS", "CCTF") }
+        hash[:type] = normalized_type if id[:type]
+        norm_num = normalized_number
+        hash[:number] = norm_num unless norm_num.nil? || norm_num.empty?
+        hash[:year] = id[:year].to_s if id[:year]
+        hash[:lang] = id[:lang].to_s if id[:lang]
+        hash
+      end
+    end
+
+    #
+    # Translate type into abbreviation
+    #
+    # @return [String] the normalized type
+    #
+    def normalized_type
+      TYPES[id[:type].to_s] || id[:type].to_s
+    end
+
+    #
+    # Remove leading zeros from number
+    #
+    # @return [String, nil] the normalized number
+    #
+    def normalized_number
+      return unless id[:number]
+
+      id[:number].to_s.sub(/^0+/, "")
+    end
+  end
+end

data/lib/relaton_bipm/rawdata_bipm_metrologia/article_parser.rb

@@ -21,6 +21,7 @@ module RelatonBipm
       #
       def initialize(doc)
         @doc = doc
+        @meta = @doc.at("./front/article-meta")
       end
 
       #
@@ -39,9 +40,9 @@ module RelatonBipm
       # @return [Array<RelatonBib::DocumentIdentifier>] array of document identifiers
       #
       def parse_docid
-        pubid = "#{journal_title} #{volume_issue_page.join(' ')}"
+        pubid = "#{journal_title} #{volume_issue_article}"
         primary_id = create_docid pubid, "BIPM", true
-        @doc.xpath("./front/article-meta/article-id[@pub-id-type='doi']")
+        @meta.xpath("./article-id[@pub-id-type='doi']")
           .each_with_object([primary_id]) do |id, m|
           m << create_docid(id.text, id["pub-id-type"])
         end
@@ -52,17 +53,15 @@ module RelatonBipm
       #
       # @return [Array<String>] array of volume, issue and page
       #
-      def volume_issue_page
-        @volume_issue_page ||= begin
-          volume = @doc.at("./front/article-meta/volume").text
-          issue = @doc.at("./front/article-meta/issue").text
-          # page = @doc.at("./front/article-meta/fpage")&.text || manuscript
-          [volume, issue, article]
-        end
+      def volume_issue_article
+        volume = @meta.at("./volume").text
+        issue = @meta.at("./issue").text
+        # page = @doc.at("./front/article-meta/fpage")&.text || manuscript
+        [volume, issue, article].join(" ")
       end
 
       def article
-        @doc.at("./front/article-meta/article-id[@pub-id-type='manuscript']").text.match(/[^_]+$/).to_s
+        @meta.at("./article-id[@pub-id-type='manuscript']").text.match(/[^_]+$/).to_s
       end
 
       #
@@ -93,9 +92,11 @@ module RelatonBipm
       # @return [Array<RelatonBib::TypedTitleString>] array of title strings
       #
       def parse_title
-        @doc.xpath("./front/article-meta/title-group/article-title").map do |t|
+        @meta.xpath("./title-group/article-title").map do |t|
+          next if t.text.empty?
+
           RelatonBib::TypedTitleString.new content: t.text, language: t[:"xml:lang"], script: "Latn"
-        end
+        end.compact
       end
 
       #
@@ -104,7 +105,7 @@ module RelatonBipm
       # @return [Array<RelatonBib::Contributor>] array of contributors
       #
       def parse_contributor
-        @doc.xpath("./front/article-meta/contrib-group/contrib").map do |c|
+        @meta.xpath("./contrib-group/contrib").map do |c|
           entity = create_person(c) || create_organization(c)
           RelatonBib::ContributionInfo.new(entity: entity, role: [type: c[:"contrib-type"]])
         end
@@ -130,7 +131,7 @@ module RelatonBipm
       #
       def affiliation(contrib) # rubocop:disable Metrics/AbcSize
         contrib.xpath("./xref[@ref-type='aff']").map do |x|
-          a = @doc.at("./front/article-meta/contrib-group/aff[@id='#{x[:rid]}']/label/following-sibling::node()")
+          a = @meta.at("./contrib-group/aff[@id='#{x[:rid]}']/label/following-sibling::node()")
           parts = a.text.split(", ")
           orgname = parts[0..-3].join(", ")
           city, country = parts[-2..]
@@ -195,7 +196,7 @@ module RelatonBipm
       # @return [Array<String, Object>] string date or whatever block returns
       #
       def dates
-        @doc.xpath("./front/article-meta/pub-date").map do |d|
+        @meta.xpath("./pub-date").map do |d|
           month = date_part(d, "month")
           day = date_part(d, "day")
           date = "#{d.at('./year').text}-#{month}-#{day}"
@@ -216,7 +217,7 @@ module RelatonBipm
       # @return [Array<RelatonBib::CopyrightAssociation>] array of copyright associations
       #
       def parse_copyright
-        @doc.xpath("./front/article-meta/permissions").each_with_object([]) do |l, m|
+        @meta.xpath("./permissions").each_with_object([]) do |l, m|
           from = l.at("./copyright-year")
           next unless from
 
@@ -235,7 +236,7 @@ module RelatonBipm
       # @return [Array<RelatonBib::FormattedString>] array of abstracts
       #
       def parse_abstract
-        @doc.xpath("./front/article-meta/abstract").map do |a|
+        @meta.xpath("./abstract").map do |a|
           RelatonBib::FormattedString.new(
             content: a.inner_html, language: a[:"xml:lang"], script: ["Latn"], format: "text/html",
           )
@@ -286,9 +287,18 @@ module RelatonBipm
       # @return [Array<RelatonBib::Extent>] array of extents
       #
       def parse_extent
-        %w[volume issue page].map.with_index do |t, i|
-          RelatonBib::Locality.new t, volume_issue_page[i]
+        @meta.xpath("./volume|./issue|./fpage").map do |e|
+          if e.name == "fpage"
+            type = "page"
+            to = @meta.at("./lpage")&.text
+          else
+            type = e.name
+          end
+          RelatonBib::Locality.new type, e.text, to
         end
+        # %w[volume issue page].map.with_index do |t, i|
+        #   RelatonBib::Locality.new t, volume_issue_page[i]
+        # end
       end
 
       def parse_type

data/lib/relaton_bipm/rawdata_bipm_metrologia/fetcher.rb

@@ -12,7 +12,7 @@ module RelatonBipm
 
       # @param data_fetcher [RelatonBipm::DataFetcher]
       def initialize(data_fetcher)
-        @data_fetcher = data_fetcher
+        @data_fetcher = WeakRef.new data_fetcher
       end
 
       #
@@ -28,13 +28,16 @@ module RelatonBipm
       #
       # Fetch articles from rawdata-bipm-metrologia and save to files
       #
-      def fetch_articles # rubocop:disable Metrics/AbcSize
+      def fetch_articles # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         Dir["#{DIR}/**/*.xml"].each do |path|
           doc = Nokogiri::XML File.read(path, encoding: "UTF-8")
           item = ArticleParser.parse doc.at("/article")
           file = "#{item.docidentifier.first.id.downcase.gsub(' ', '-')}.#{@data_fetcher.ext}"
           out_path = File.join(@data_fetcher.output, file)
           @data_fetcher.index[[item.docidentifier.first.id]] = out_path
+          @data_fetcher.index_new.add_or_update [item.docidentifier.first.id], out_path
+          key = Id.new(item.docidentifier.first.id).normalized_hash
+          @data_fetcher.index2.add_or_update key, out_path
           @data_fetcher.write_file out_path, item
         end
       end
@@ -67,7 +70,7 @@ module RelatonBipm
       # @overload set(volume)
       #   @param [String] volume volume number
       #
-      def fetch_metrologia(*args)
+      def fetch_metrologia(*args) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         id = identifier(*args)
         item = BipmBibliographicItem.new(
           type: "article", formattedref: formattedref(id), docid: docidentifier(id),
@@ -77,6 +80,8 @@ module RelatonBipm
         file = "#{id.downcase.gsub(' ', '-')}.#{@data_fetcher.ext}"
         path = File.join(@data_fetcher.output, file)
         @data_fetcher.index[[id]] = path
+        @data_fetcher.index_new.add_or_update [id], path
+        @data_fetcher.index2.add_or_update Id.new(id).normalized_hash, path
         @data_fetcher.write_file path, item
       end
 

data/lib/relaton_bipm/version.rb

@@ -1,3 +1,3 @@
 module RelatonBipm
-  VERSION = "1.14.2".freeze
+  VERSION = "1.14.3".freeze
 end

data/lib/relaton_bipm.rb

@@ -1,6 +1,9 @@
 require "zip"
 require "fileutils"
+require "parslet"
 require "relaton_bib"
+require "relaton/index"
+require "relaton_bipm/id_parser"
 require "relaton_bipm/version"
 require "relaton_bipm/editorial_group"
 require "relaton_bipm/committee"
@@ -13,7 +16,6 @@ require "relaton_bipm/bipm_bibliographic_item"
 require "relaton_bipm/bipm_bibliography"
 require "relaton_bipm/hash_converter"
 require "relaton_bipm/xml_parser"
-require "relaton_bipm/index"
 require "relaton_bipm/data_fetcher"
 require "relaton_bipm/data_outcomes_parser"
 require "relaton_bipm/bipm_si_brochure_parser"

data/relaton_bipm.gemspec

@@ -32,17 +32,13 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "byebug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "ruby-jing"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "vcr"
-  spec.add_development_dependency "webmock"
 
   spec.add_dependency "faraday", "~> 1.0"
   spec.add_dependency "mechanize", "~> 2.8.0"
+  spec.add_dependency "parslet", "~> 2.0.0"
   spec.add_dependency "relaton-bib", "~> 1.14.0"
+  spec.add_dependency "relaton-index", "~> 0.1.0"
   spec.add_dependency "rubyzip", "~> 2.3.0"
   spec.add_dependency "serrano", "~> 1.0"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bipm
 version: !ruby/object:Gem::Version
-  version: 1.14.2
+  version: 1.14.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-16 00:00:00.000000000 Z
+date: 2023-03-26 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -39,117 +25,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-jing
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: vcr
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: mechanize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 2.8.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: parslet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: mechanize
+  name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
-  name: relaton-bib
+  name: relaton-index
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -216,7 +160,7 @@ files:
 - lib/relaton_bipm/document_relation.rb
 - lib/relaton_bipm/editorial_group.rb
 - lib/relaton_bipm/hash_converter.rb
-- lib/relaton_bipm/index.rb
+- lib/relaton_bipm/id_parser.rb
 - lib/relaton_bipm/processor.rb
 - lib/relaton_bipm/rawdata_bipm_metrologia/article_parser.rb
 - lib/relaton_bipm/rawdata_bipm_metrologia/fetcher.rb

data/lib/relaton_bipm/index.rb

@@ -1,68 +0,0 @@
-module RelatonBipm
-  class Index
-    #
-    # Initialize index
-    #
-    def initialize
-      read_index_file || get_index_from_gh
-    end
-
-    #
-    # Search index entry
-    #
-    # @param [String] ref reference
-    #
-    # @return [String] path to document file
-    #
-    def search(ref)
-      @index.detect { |key, _| key.include? ref }&.last
-    end
-
-    private
-
-    #
-    # Create dir if need and return path to index file
-    #
-    # @return [String] path to index file
-    #
-    def path
-      @path ||= begin
-        dir = File.join Dir.home, ".relaton", "bipm"
-        FileUtils.mkdir_p dir
-        File.join dir, "index.yaml"
-      end
-    end
-
-    #
-    # Read index from file if it exists and not outdated
-    #
-    # @return [Hash, nil] index content
-    #
-    def read_index_file
-      return if !File.exist?(path) || File.ctime(path).to_date < Date.today
-
-      @index = RelatonBib.parse_yaml File.read(path, encoding: "UTF-8")
-    end
-
-    #
-    # Save index to file
-    #
-    # @return [<Type>] <description>
-    #
-    def save_index_file
-      File.write path, @index.to_yaml, encoding: "UTF-8"
-    end
-
-    #
-    # Get index from a GitHub repository
-    #
-    # @return [Hash] index content
-    #
-    def get_index_from_gh # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-      resp = Zip::InputStream.new URI("#{BipmBibliography::GH_ENDPOINT}index.zip").open
-      zip = resp.get_next_entry
-      @index = RelatonBib.parse_yaml zip.get_input_stream.read
-      save_index_file
-    end
-  end
-end