Merge pull request #423 from openstax/more-content-fixes

Content library and import updates

Author: Dantemss

Gemfile.lock

@@ -336,7 +336,7 @@ GEM
       roar
       roar-rails (>= 1)
       uber
-    openstax_content (1.3.0)
+    openstax_content (1.5.0)
       aws-sdk-s3
       faraday
       nokogiri

app/controllers/api/v1/books_controller.rb

@@ -18,7 +18,7 @@ class BooksController < OpenStax::Api::V1::ApiController
     def index
       OSU::AccessPolicy.require_action_allowed! :index, current_api_user, OpenStax::Content::Book
 
-      books = abl.approved_books(archive: archive).group_by(&:uuid).map do |uuid, books|
+      books = abl.books(archive: archive).group_by(&:uuid).map do |uuid, books|
         latest_book = books.sort_by(&:committed_at).last
 
         # We use book.slug.titleize here to avoid fetching all book ToCs,

app/models/publication.rb

@@ -236,7 +236,7 @@ def before_publication
     return if published_at.nil? || publishable.nil?
 
     catch(:abort) do
-        publishable.before_publication
+      publishable.before_publication
     end
 
     return if publishable.errors.empty?

app/models/publication_group.rb

@@ -1,6 +1,6 @@
 class PublicationGroup < ApplicationRecord
 
-  PUSLISHABLE_TYPES_WITH_DEFAULT_PUBLIC_SOLUTIONS = Set[ 'VocabTerm' ]
+  PUBLISHABLE_TYPES_WITH_DEFAULT_PUBLIC_SOLUTIONS = Set[ 'VocabTerm' ]
 
   has_many :publications, inverse_of: :publication_group, autosave: true
 
@@ -37,7 +37,7 @@ def set_nickname_to_nil_if_blank
   end
 
   def set_default_solutions_are_public_if_nil
-    self.solutions_are_public = PUSLISHABLE_TYPES_WITH_DEFAULT_PUBLIC_SOLUTIONS.include?(
+    self.solutions_are_public = PUBLISHABLE_TYPES_WITH_DEFAULT_PUBLIC_SOLUTIONS.include?(
       publishable_type
     ) if solutions_are_public.nil?
   end

app/routines/exercises/import/assessments.rb

@@ -69,15 +69,15 @@ def exec(filename:, book_uuid:)
               end
               raise ArgumentError, 'Could not find "Question Stem" column' if question_stem_index.nil?
 
-              uuid_index ||= headers.index do |header|
-                header == 'uuid' || header == 'page uuid' || header == 'section uuid'
+              uuid_index ||= headers.index { |header| header&.end_with?('uuid') && !header.include?('book') }
+              section_index ||= headers.index do |header|
+                header&.start_with?('section') && !header.include?('uuid') && !header.include?('name')
               end
-              section_index ||= headers.index { |header| header == 'section' || header == 'section number' }
               Rails.logger.warn { 'Could not find "UUID" or "Section" columns' } \
                 if uuid_index.nil? && section_index.nil?
 
               unless section_index.nil?
-                book = OpenStax::Content::Abl.new.approved_books.find { |book| book.uuid == book_uuid }
+                book = OpenStax::Content::Abl.new.books.find { |book| book.uuid == book_uuid }
                 raise ArgumentError, "Could not find book with UUID #{book_uuid} in the ABL" if book.nil?
                 book.all_pages.each { |page| page_uuid_by_book_location[page.book_location] = page.uuid }
               end
@@ -158,7 +158,15 @@ def exec(filename:, book_uuid:)
               exercise.publication.authors << Author.new(user: author)
               exercise.publication.copyright_holders << CopyrightHolder.new(user: copyright_holder)
 
-              exercise.publication.publication_group.nickname = row[nickname_index] unless nickname_index.nil?
+              unless nickname_index.nil? || row[nickname_index].blank?
+                existing_pg = PublicationGroup.find_by(nickname: row[nickname_index])
+
+                if existing_pg.nil?
+                  exercise.publication.publication_group.nickname = row[nickname_index]
+                else
+                  exercise.publication.publication_group = existing_pg
+                end
+              end
 
               exercise.stimulus = parse(row[background_index], exercise) unless background_index.nil?
             else

app/routines/find_book.rb

@@ -11,7 +11,7 @@ def exec(uuid:, archive_version: nil)
       archive_version ||= s3.ls.last
     end
     archive = OpenStax::Content::Archive.new(version: archive_version)
-    book = OpenStax::Content::Abl.new.approved_books(archive: archive).find do |book|
+    book = OpenStax::Content::Abl.new.books(archive: archive).find do |book|
       book.uuid == uuid
     end
 

config/secrets.yml

@@ -22,7 +22,7 @@ development:
       url: <%= ENV['OPENSTAX_ACCOUNTS_URL'] || 'http://localhost:2999' %>
       stub: <%= ENV['OPENSTAX_ACCOUNTS_STUB'] %>
     content:
-      abl_url: <%= ENV['OPENSTAX_CONTENT_ABL_URL'] || 'https://raw.githubusercontent.com/openstax/content-manager-approved-books/main/approved-book-list.json' %>
+      abl_url: <%= ENV['OPENSTAX_CONTENT_ABL_URL'] || 'https://corgi.ce.openstax.org/api/abl/' %>
       archive_path: <%= ENV['OPENSTAX_CONTENT_ARCHIVE_PATH'] || 'apps/archive' %>
       bucket_name: <%= ENV['OPENSTAX_CONTENT_BUCKET_NAME'] %>
       domain: <%= ENV['OPENSTAX_CONTENT_DOMAIN'] || 'openstax.org' %>
@@ -51,7 +51,7 @@ test:
       url: http://localhost:2999
       stub: true
     content:
-      abl_url: https://raw.githubusercontent.com/openstax/content-manager-approved-books/main/approved-book-list.json
+      abl_url: https://corgi.ce.openstax.org/api/abl/
       archive_path: apps/archive
       bucket_name: <%= ENV['OPENSTAX_CONTENT_BUCKET_NAME'] || 'not-a-real-bucket' %>
       domain: openstax.org

lib/content.rb

@@ -4,53 +4,6 @@ def self.slugs_by_page_uuid
     # Otherwise we load it from the cache (Redis in actual servers) until the ABL changes
     RequestStore.store[:slugs_by_page_uuid] ||= Rails.cache.fetch(
       "slugs_by_page_uuid/#{OpenStax::Content::Abl.new.digest}"
-    ) do
-      {}.tap do |hash|
-        books = OpenStax::Content::Abl.new.approved_books
-
-        until books.empty?
-          previous_version = nil
-          previous_archive = nil
-          retry_books = []
-
-          books.each do |book|
-            begin
-              pages = book.all_pages
-            rescue StandardError => exception
-              # Sometimes books in the ABL fail to load
-              # Retry with an earlier version of archive, if possible
-              previous_version ||= book.archive.previous_version
-
-              if previous_version.nil?
-                raise exception
-              else
-                previous_archive ||= OpenStax::Content::Archive.new version: previous_version
-
-                retry_book = OpenStax::Content::Book.new(
-                  archive: previous_archive,
-                  uuid: book.uuid,
-                  version: book.version,
-                  slug: book.slug,
-                  style: book.style,
-                  min_code_version: book.min_code_version,
-                  committed_at: book.committed_at
-                )
-
-                retry_books << retry_book if retry_book.valid? && Rails.env.production?
-              end
-            else
-              pages.each do |page|
-                hash[page.uuid] ||= []
-                hash[page.uuid] << { book: book.slug, page: page.slug }
-              end
-            end
-          end
-
-          books = retry_books
-        end
-
-        hash.each { |uuid, slugs| slugs.uniq! }
-      end
-    end
+    ) { OpenStax::Content::Abl.new.slugs_by_page_uuid }
   end
 end

lib/openstax_kramdown.rb

@@ -41,7 +41,7 @@ def handle_html_start_tag(line, &block)
       last_el = @tree.children.last
       next unless last_el.type == :html_element && last_el.value == 'img' && last_el.attr['src']
 
-      uri = URI.parse(last_el.attr['src'].strip)
+      uri = URI.parse(ActionController::Base.helpers.strip_tags(last_el.attr['src'].strip))
       contents = Net::HTTP.get(uri)
 
       bucket_name = s3_secrets[:uploads_bucket_name]