Merge pull request #422 from openstax/raise-fixes

Miscellaneous fixes from RAISE imports

Author: Dantemss

app/routines/exercises/import/assessments.rb

@@ -69,15 +69,17 @@ def exec(filename:, book_uuid:)
               end
               raise ArgumentError, 'Could not find "Question Stem" column' if question_stem_index.nil?
 
-              uuid_index ||= headers.index { |header| header == 'uuid' || header == 'page uuid' }
-              section_index ||= headers.index { |header| header == 'section' }
+              uuid_index ||= headers.index do |header|
+                header == 'uuid' || header == 'page uuid' || header == 'section uuid'
+              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.all_pages.each { |page| page_uuid_by_book_location[page.book_location] = page.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
 
               nickname_index ||= headers.index { |header| header&.include?('nickname') }
@@ -168,7 +170,6 @@ def exec(filename:, book_uuid:)
             exercise.questions << question
 
             stem = Stem.new(content: parse(row[question_stem_index], exercise))
-            stem.stylings << Styling.new(style: ::Style::MULTIPLE_CHOICE)
             question.stems << stem
 
             unless detailed_solution_index.nil? || row[detailed_solution_index].blank?
@@ -179,7 +180,12 @@ def exec(filename:, book_uuid:)
               question.collaborator_solutions << solution
             end
 
-            next if correct_answer_index.nil? || row[correct_answer_index].blank?
+            if correct_answer_index.nil? || row[correct_answer_index].blank?
+              stem.stylings << Styling.new(style: ::Style::FREE_RESPONSE)
+              next
+            end
+
+            stem.stylings << Styling.new(style: ::Style::MULTIPLE_CHOICE)
 
             correct_answer = row[correct_answer_index].downcase.strip.each_byte.first - 97
             answer_choice_indices.each_with_index do |row_index, answer_index|

config/secrets.yml

@@ -77,8 +77,6 @@ test:
       region: us-east-1
       exports_bucket_name: not-a-real-bucket
       uploads_bucket_name: not-a-real-bucket
-      access_key_id: NOTAREALKEY
-      secret_access_key: NOTAREALSECRET
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.
@@ -121,5 +119,3 @@ production:
       region: <%= ENV['AWS_S3_REGION'] %>
       exports_bucket_name: <%= ENV['AWS_S3_EXPORTS_BUCKET_NAME'] %>
       uploads_bucket_name: <%= ENV['AWS_S3_UPLOADS_BUCKET_NAME'] %>
-      access_key_id: <%= ENV['AWS_S3_ACCESS_KEY_ID'] %>
-      secret_access_key: <%= ENV['AWS_S3_SECRET_ACCESS_KEY'] %>

lib/openstax_kramdown.rb

@@ -16,10 +16,7 @@ def region
   end
 
   def s3_client
-    @s3_client ||= Aws::S3::Client.new(
-      region: region,
-      credentials: Aws::Credentials.new(s3_secrets[:access_key_id], s3_secrets[:secret_access_key])
-    )
+    @s3_client ||= Aws::S3::Client.new(region: region)
   end
 
   def add_text(text, tree = @tree, type = @text_type)
@@ -44,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'])
+      uri = URI.parse(last_el.attr['src'].strip)
       contents = Net::HTTP.get(uri)
 
       bucket_name = s3_secrets[:uploads_bucket_name]
@@ -58,6 +55,8 @@ def handle_html_start_tag(line, &block)
 
       last_el.attr['src'] = "https://s3.#{region}.amazonaws.com/#{bucket_name}/#{key}"
 
+      next if @options[:attachable].attachments.any? { |attachment| attachment.asset == last_el.attr['src'] }
+
       @options[:attachable].attachments << Attachment.new(asset: last_el.attr['src'])
     end
   end