relaton-iso 2.0.0.pre.alpha.3 → 2.0.0.pre.alpha.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4e9325119df51d5aea288a6d612d7353107a25ac3030715dcf910ffaea13c26
-  data.tar.gz: e8167236cafc25b54a3a4d8d4bcee86dca7326103aec873e3534bf896e9c7498
+  metadata.gz: db5f86dd933721ca9fb4b0da9000e420f96cbf3bf0899520859e2f7789791420
+  data.tar.gz: 5d5bf96408c996c7289aadc14d5993d5fa12c3a1d15f013110545b44de4a0e5c
 SHA512:
-  metadata.gz: 9166abf7a46ec9604872543c9e572eebb03c34146635c156393cdd4e27c684a94e657daec4f55a889e928e38453fa1c690b6bc13549c7a67f80c6d7a9de447ae
-  data.tar.gz: 1a57e63a6faca62cf6ed1b6a6d0e346ae783f30d9d2bf48ef833cdeb6282f04b07e2af468183cedd0bf5367b12d71daeb9e5aad0574207c746d6c1cd6bcb0ca0
+  metadata.gz: 4ca11e7589947364be4a08be23a2bc64b4e1a75e90dbb058a8509133b60f5fdd501de1af9b707beb03d3843436d0ffbe24c27d9d32af3c9d88a08aa3b4ad2fc3
+  data.tar.gz: 499048e6a3c826a7e0bc9ea419d8f926a374538a04d109df94b51e66cf51cf55ec04bf1acba862b9df1615056f85bfe1d17d104a48f0b255a54797675ac8d3c4

data/lib/relaton/iso/bibliography.rb

@@ -59,7 +59,10 @@ module Relaton
         Util.info "Found: `#{response_pubid}`", key: query_pubid.to_s
         get_all = (query_pubid.root.year && opts[:keep_year].nil?) || opts[:keep_year] || opts[:all_parts] ||
           opts[:publication_date_before] || opts[:publication_date_after]
-        return ret if get_all
+        if get_all
+          filter_relations_by_date(ret, opts) if date_filter
+          return ret
+        end
 
         ret.to_most_recent_reference
       rescue ::Pubid::Core::Errors::ParseError
@@ -118,6 +121,45 @@ module Relaton
 
       private
 
+      # Filter out relations whose referenced document falls outside the date range.
+      # @param item [Relaton::Iso::ItemData]
+      # @param opts [Hash]
+      def filter_relations_by_date(item, opts)
+        return unless item.relation&.any?
+
+        item.relation.reject! { |rel| relation_outside_date_range?(rel, opts) }
+      end
+
+      # Check if a relation's bibitem date falls outside the given date range.
+      # @param rel [Relaton::Iso::Relation]
+      # @param opts [Hash]
+      # @return [Boolean]
+      def relation_outside_date_range?(rel, opts)
+        rel_date = relation_date(rel)
+        return false unless rel_date
+
+        return true if opts[:publication_date_before] && rel_date >= opts[:publication_date_before]
+        return true if opts[:publication_date_after] && rel_date < opts[:publication_date_after]
+
+        false
+      end
+
+      # Extract a Date from the relation's bibitem using circulated/published date or docidentifier year.
+      # @param rel [Relaton::Iso::Relation]
+      # @return [Date, nil]
+      def relation_date(rel)
+        bib = rel.bibitem
+        date_entry = bib.date&.find { |d| d.type == "circulated" } ||
+                     bib.date&.find { |d| d.type == "published" }
+        return date_entry.at.to_date if date_entry&.at
+
+        docid = bib.docidentifier&.find(&:primary)&.content || bib.formattedref
+        return unless docid
+
+        year = docid.to_s[/:(\d{4})/, 1]
+        Date.new(year.to_i, 1, 1) if year
+      end
+
       # Find the best match among hits using date filters.
       # @param hits [Relaton::Iso::HitCollection]
       # @param pubid [Pubid::Iso::Identifier]

data/lib/relaton/iso/version.rb

@@ -2,6 +2,6 @@
 
 module Relaton
   module Iso
-    VERSION = "2.0.0-alpha.3"
+    VERSION = "2.0.0-alpha.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.3
+  version: 2.0.0.pre.alpha.4
 platform: ruby
 authors:
 - Ribose Inc.