relaton-iso 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cd1713b5b45deea5342727fdf5d4e0f21ad1f1c
-  data.tar.gz: 5e5da8b0e1906b439c778bb06b567b3ce761f9e7
+  metadata.gz: 66e86b23d321882dcc79e8f5fb47fbde454b238e
+  data.tar.gz: c9c1e37df8b4054e274ed5a77737a7e909380873
 SHA512:
-  metadata.gz: 5a3e1b124cd67b2379929846e672c4d67dec7f6f55626dfae20fec7f6e2553821fee93475575a8ed85b5cc1a7dcf6c5bfc3f8862d4b21ea77d2579faff180bd6
-  data.tar.gz: 2a17996edade8a727267264f78f10eb099eccbaf9418343a38cba8789fc75d20f950c9a9845490a77aef8208ba90aac50891e6e91ceac7eea5023f09b0b43bf2
+  metadata.gz: 6f70fc424d1fcbbd786b1389412a170f7e48d589cf030771ea6847824f8cf62b379f34ba22df82b94f7b5663981a166654eed16b08eeab69fc2cc14ee971fa15
+  data.tar.gz: e2fc938d41c9c1d8d59d81388d6b653757c66f4e2eb6158284f540a8394427bb68adc3d0fe342742a98ea11e9485a20ea70000f42566d72003d9773b365d8f47

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton-iso (0.6.3)
+    relaton-iso (0.6.4)
       relaton-iec (~> 0.4.0)
       relaton-iso-bib (~> 0.3.0)
 
@@ -36,13 +36,13 @@ GEM
       pry (~> 0.10)
     public_suffix (3.1.1)
     rake (10.5.0)
-    relaton-bib (0.3.4)
+    relaton-bib (0.3.5)
       addressable
       nokogiri (~> 1.10)
-    relaton-iec (0.4.2)
+    relaton-iec (0.4.3)
       addressable
       relaton-iso-bib (~> 0.3.0)
-    relaton-iso-bib (0.3.3)
+    relaton-iso-bib (0.3.4)
       isoics (~> 0.1.6)
       relaton-bib (~> 0.3.0)
       ruby_deep_clone (~> 0.8.0)

data/lib/relaton_iso/hit_collection.rb

@@ -27,10 +27,8 @@ module RelatonIso
       search << "docNumber=#{num}"
       search << "docPartNo=#{part}" if part
       q = search.join "&"
-      resp = http.get(
-        "/cms/render/live/en/sites/isoorg.advancedSearch.do?#{q}",
-        { 'Accept' => 'application/json, text/plain, */*' }
-      )
+      resp = http.get("/cms/render/live/en/sites/isoorg.advancedSearch.do?#{q}",
+        "Accept" => "application/json, text/plain, */*")
       return if resp.body.empty?
 
       json = JSON.parse resp.body
@@ -44,19 +42,6 @@ module RelatonIso
       end
     end
 
-    # @return [RelatonIso::HitCollection]
-    # def fetch
-    #   workers = RelatonBib::WorkersPool.new 4
-    #   workers.worker(&:fetch)
-    #   each do |hit|
-    #     workers << hit
-    #   end
-    #   workers.end
-    #   workers.result
-    #   @fetched = true
-    #   self
-    # end
-
     def to_s
       inspect
     end

data/lib/relaton_iso/iso_bibliography.rb

@@ -116,7 +116,7 @@ module RelatonIso
       end
 
       def try_stages(result, corr)
-        %w[NP WD CD DIS FDIS PRF IS].each do |st| # try stages
+        %w[NP WD CD DIS FDIS PRF IS AWI].each do |st| # try stages
           warn "Attempting #{st} stage retrieval"
           c = yield st
           res = search_code result, c, corr

data/lib/relaton_iso/scrapper.rb

@@ -26,21 +26,6 @@ module RelatonIso
     }.freeze
 
     class << self
-      # @param text [String]
-      # @return [Array<Hash>]
-      # def get(text)
-      #   iso_workers = RelatonBib::WorkersPool.new 4
-      #   iso_workers.worker { |hit| iso_worker(hit, iso_workers) }
-      #   algolia_workers = start_algolia_search(text, iso_workers)
-      #   iso_docs = iso_workers.result
-      #   algolia_workers.end
-      #   algolia_workers.result
-      #   iso_docs
-      # rescue
-      #   warn "Could not connect to http://www.iso.org"
-      #   []
-      # end
-
       # Parse page.
       # @param hit [Hash]
       # @return [Hash]
@@ -58,6 +43,7 @@ module RelatonIso
         RelatonIsoBib::IsoBibliographicItem.new(
           fetched: Date.today.to_s,
           docid: fetch_docid(doc),
+          docnumber: fetch_docnumber(doc),
           edition: edition,
           language: langs(doc).map { |l| l[:lang] },
           script: langs(doc).map { |l| script(l[:lang]) }.uniq,
@@ -203,6 +189,11 @@ module RelatonIso
         [RelatonBib::DocumentIdentifier.new(id: item_ref.text, type: "ISO")]
       end
 
+      def fetch_docnumber(doc)
+        id = doc.at("//nav[contains(@class, 'heading-condensed')]/h1")&.text
+        id&.match(/\d+/)&.to_s
+      end
+
       # @param doc [Nokogiri::HTML::Document]
       def fetch_structuredidentifier(doc)
         item_ref = doc.at("//nav[contains(@class, 'heading-condensed')]/h1")

data/lib/relaton_iso/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonIso
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler