openstax_content 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 640f5b30f23af9597543e0e6239b3def597b456ae05b85c9657e6380d5ad6623
-  data.tar.gz: ba19461ea0e3700f2f8c752c4dcf2fe5808bf8a798b22707fec47d9857f081c8
+  metadata.gz: 3172a1f7fe5b47aa50f602f78991ee47d9ee4f6861e02e5becf8eb5077c83c30
+  data.tar.gz: d88d0221599583018bf2eba76e4781523c5855261d8c3f61d751c50d48620b85
 SHA512:
-  metadata.gz: a5589b01cfa98a740916cd47274171ada0265429960ca68657124f1d0c6c98e551542b3027db5278845e3ef10b9191d54b74d84cf4fd8db7355c28f2e3722d5e
-  data.tar.gz: 0e02160d69f9789030a33bd0f84da38eb0922bf3bb06c54fcc6740bdb7649ae1bbd72c62f130ce3e49947f73a711d477380c3e6eb36fc2b40c6a10ba0b344d58
+  metadata.gz: d41858c0fe490b46d3d441daa2a98294aa8262fa73c1ea703ccf136cc3fa233f50d470259de4a2186a60c50e5a3f0fe2282b97903182c5b5b4c9972d61bb7ee8
+  data.tar.gz: 12beea979dd0a43e019e88be1c0b53c940f8b6683d59ac3c74f42e0bbd9456cdb6824bdd75d60572787aeba3492acdfb918975d46aa1f9218f624b50bdcf437b

data/lib/openstax/content/abl.rb

@@ -6,8 +6,11 @@ class OpenStax::Content::Abl
   # If there are more than this number of archive versions still building, errors will happen
   DEFAULT_MAX_ARCHIVE_ATTEMPTS = 5
 
+  attr_reader :partial_data
+
   def initialize(url: nil)
     @url = url
+    @partial_data = false
   end
 
   def url
@@ -39,35 +42,34 @@ class OpenStax::Content::Abl
     end
   end
 
-  def each_book_with_previous_archive_version_fallback(max_attempts: DEFAULT_MAX_ARCHIVE_ATTEMPTS, &block)
+  def each_book_with_previous_archive_version_fallback(max_attempts: DEFAULT_MAX_ARCHIVE_ATTEMPTS, allow_partial_data: true, &block)
     raise ArgumentError, 'no block given' if block.nil?
     raise ArgumentError, 'given block must accept the book as its first argument' if block.arity == 0
 
     books = OpenStax::Content::Abl.new.books
-    attempt = 1
+    @partial_data = false
 
-    until books.empty?
+    books.each do |book|
+      attempt = 1
       previous_version = nil
       previous_archive = nil
-      retry_books = []
-
-      books.each do |book|
+      while attempt <= max_attempts
         begin
           block.call book
+          break
         rescue StandardError => exception
-          raise exception if attempt >= max_attempts
-
-          # Sometimes books in the latest archive fails to load (when the new version is still building)
-          # Retry with an earlier version of archive, if possible
-          previous_version ||= book.archive.previous_version
-
-          if previous_version.nil?
-            # There are no more earlier archive versions
-            raise exception
+          previous_version = book.archive.previous_version
+          if previous_version.nil? || attempt >= max_attempts
+            raise exception unless allow_partial_data
+            @partial_data = true
+            OpenStax::Content::logger.warn do
+              "Failed to process book: #{book.uuid}. " \
+              "Error: #{exception.class}: #{exception.message}"
+            end
+            break
           else
-            previous_archive ||= OpenStax::Content::Archive.new version: previous_version
-
-            retry_book = OpenStax::Content::Book.new(
+            previous_archive = OpenStax::Content::Archive.new version: previous_version
+            book = OpenStax::Content::Book.new(
               archive: previous_archive,
               uuid: book.uuid,
               version: book.version,
@@ -75,15 +77,21 @@ class OpenStax::Content::Abl
               min_code_version: book.min_code_version,
               committed_at: book.committed_at
             )
-
-            # If the book requires an archive version that hasn't finished building yet, don't include it
-            retry_books << retry_book if retry_book.valid?
+            # NOTE: This assumes that subsequent archive versions are invalid
+            # after finding one invalid archive versions
+            unless book.valid?
+              raise exception unless allow_partial_data
+              @partial_data = true
+              OpenStax::Content::logger.warn do
+                "Failed to process book: #{book.uuid}. " \
+                "Error: invalid book for archive version #{previous_version}"
+              end
+              break
+            end
           end
+          attempt += 1
         end
       end
-
-      books = retry_books
-      attempt += 1
     end
   end
 

data/lib/openstax/content/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Content
-    VERSION = '1.5.0'
+    VERSION = '1.6.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstax_content
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Dante Soares
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-02 00:00:00.000000000 Z
+date: 2026-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.21
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Ruby bindings to read and parse the OpenStax ABL and the content archive