relaton-iso 1.13.5 → 1.13.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 545043eab945ec715dbf08c77dbd3c07379b87d0c06c317431223a97cb0b7816
-  data.tar.gz: 8f7594c2399682c780e47eb4e770deb19d48a17ffd5c21efc1938a463768eb25
+  metadata.gz: 64446d11a9b8ff146087a41ea017e7df943c1d4453ce213aa0ce9a15afd9fa12
+  data.tar.gz: 557da1af0ed0723f8e48bf21e447937b70888294c514a2e6df970a99d662dfaf
 SHA512:
-  metadata.gz: 15b2628861c98f99a4879ec5d4c94f52d6551cdd20b322127d9ec4f42e2370e6f85350b95a257ecaaa49843bd29975a74e33fadff12bcbacc594d5ab3dd00d75
-  data.tar.gz: d5491c7ac248b6e3ba7bee7dbd2c32527103a3ede84dc14bfc67d29597c35e735ea47b5beed488f104ae3e9a46e28201aad0bc2667a85203a95d9bb9c9486c6e
+  metadata.gz: 831fad8c654c5342b588f7fc6d4c504ce1459b68fe050d3a3d1508288f540d6c9979c09b2c5dd1fbdd472cbe632d8a639942b17854a808ed9a7e13a60d50d733
+  data.tar.gz: 9452ff39391c29dae9daf6a4efe25a7afbd9a65b17ebef8174ab6544cb67667b593646ef2dfdf393dfff42336f3d1ccb07fa909a1b05a71f1f10cfd367ecfc08

data/lib/relaton_iso/document_identifier.rb

@@ -1,7 +1,7 @@
 module RelatonIso
   class DocumentIdentifier < RelatonBib::DocumentIdentifier
     def id
-      id_str = @id.to_s.sub(/\sED\d+/, "")
+      id_str = @id.to_s.sub(/\sED\d+/, "").squeeze(" ").sub(/^ISO\/\s/, "ISO ") # workarounds for pubid gem bugs
       if @all_parts
         if type == "URN"
           return "#{@id.urn}:ser"

data/lib/relaton_iso/hit.rb

@@ -6,11 +6,26 @@ module RelatonIso
     # @return [RelatonIsoBib::IsoBibliographicItem]
     attr_writer :fetch, :pubid
 
+    # Update edition for pubid when provided in Bibliographic Item
+    def update_edition(bibliographic_item)
+      if bibliographic_item.edition
+        # add edition to base document if available
+        if pubid.base
+          pubid.base.edition = bibliographic_item.edition.content
+        else
+          pubid.edition = bibliographic_item.edition.content
+        end
+      end
+    end
+
     # Parse page.
     # @param lang [String, nil]
     # @return [RelatonIso::IsoBibliographicItem]
     def fetch(lang = nil)
       @fetch ||= Scrapper.parse_page self, lang
+      # update edition for pubid using fetched data
+      update_edition(@fetch)
+      @fetch
     end
 
     # @return [Integer]

data/lib/relaton_iso/iso_bibliography.rb

@@ -117,7 +117,10 @@ module RelatonIso
 
         # filter by year
         hits = hit_collection.select do |hit|
-          if hit.pubid.year.to_s == year.to_s
+          if (hit.pubid.base.nil? && hit.pubid.year.to_s == year.to_s) ||
+            (!hit.pubid.base.nil? && hit.pubid.base.year.to_s == year.to_s)
+            true
+          elsif (!hit.pubid.base.nil? && hit.pubid.year.to_s == year.to_s)
             true
           elsif hit.pubid.year.nil? && hit.hit[:year].to_s == year
             hit.pubid.year = year

data/lib/relaton_iso/scrapper.rb

@@ -62,7 +62,6 @@ module RelatonIso
         # Fetch edition.
         edition = doc.at("//div[div[.='Edition']]/text()[last()]")
           &.text&.match(/\d+$/)&.to_s
-        hit.pubid.edition = edition if edition
 
         titles, abstract, langs = fetch_titles_abstract(doc, lang)
 
@@ -98,7 +97,7 @@ module RelatonIso
       # @return [Array<RelatonBib::DocumentIdentifier>]
       #
       def fetch_relaton_docids(doc, pubid)
-        pubid.urn_stage = stage_code(doc).to_f
+        pubid.stage = Pubid::Iso::Stage.new(harmonized_code: stage_code(doc))
         [
           RelatonIso::DocumentIdentifier.new(id: pubid, type: "ISO", primary: true),
           RelatonIso::DocumentIdentifier.new(id: pubid, type: "URN"),
@@ -226,7 +225,7 @@ module RelatonIso
       end
 
       def stage_code(doc)
-        doc.at("//ul[@class='dropdown-menu']/li[@class='active']"\
+        doc.at("//ul[@class='dropdown-menu']/li[@class='active']" \
                "/a/span[@class='stage-code']").text
       end
 

data/lib/relaton_iso/version.rb

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

data/relaton_iso.gemspec

@@ -39,7 +39,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "algolia"
-  spec.add_dependency "pubid-core", "1.2.1"
-  spec.add_dependency "pubid-iso", "~> 0.2.0"
+  spec.add_dependency "pubid-iso", "~> 0.3.0"
   spec.add_dependency "relaton-iso-bib", "~> 1.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso
 version: !ruby/object:Gem::Version
-  version: 1.13.5
+  version: 1.13.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-22 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -178,34 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pubid-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: pubid-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: relaton-iso-bib
   requirement: !ruby/object:Gem::Requirement