Merge branch 'main' into nursing-internal-table-columns

Author: wilkus27

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 * Bake `TableColumns` in `nursing-internal`
+* Create `v4` of `introduction` order
+* Bake `unfolding-casestudy` note exercises in `nursing-internal`
 * Add translations for notes titles and eoc sections to `pl-marketing`
 * Create `V2` of `BakeChapterGlossary`
 * Change `note titles` in `information systems`

lib/kitchen/directions/bake_chapter_introductions/v2.rb

@@ -57,6 +57,12 @@ def order(options:, introduction_page:, chapter_intro_html:, title:)
           chapter_intro_html: chapter_intro_html,
           title: title
         )
+      when :v4
+        v4_introduction_order(
+          introduction_page: introduction_page,
+          chapter_intro_html: chapter_intro_html,
+          title: title
+        )
       end
     end
 
@@ -120,6 +126,27 @@ def v3_introduction_order(introduction_page:, chapter_intro_html:, title:)
       )
     end
 
+    def v4_introduction_order(introduction_page:, chapter_intro_html:, title:)
+      intro_content = introduction_page.search(
+        "> :not([data-type='metadata']):not(.splash):not(.has-splash):not(.meet-author)"
+      ).cut
+
+      meet_author_note = introduction_page.search('[data-type="note"].meet-author').cut
+
+      introduction_page.append(child:
+        <<~HTML
+          <div class="intro-body">
+            #{chapter_intro_html}
+            #{meet_author_note.paste}
+            <div class="intro-text">
+              #{title.paste}
+              #{intro_content.paste}
+            </div>
+          </div>
+        HTML
+      )
+    end
+
     def bake_title(introduction_page:)
       introduction_page.search(
         'div[data-type="description"], div[data-type="abstract"]'

lib/recipes/neuroscience/recipe.rb

@@ -20,6 +20,14 @@
 
   BakeUnitTitle.v1(book: book)
   BakeChapterTitle.v1(book: book)
+  BakeChapterIntroductions.v2(
+    book: book,
+    options: {
+      strategy: :add_objectives,
+      bake_chapter_outline: true,
+      introduction_order: :v4
+    }
+  )
 
   book.chapters.each do |chapter|
     BakeNonIntroductionPages.v1(chapter: chapter)
@@ -82,7 +90,6 @@
 
   BakeUnnumberedTables.v1(book: book)
   BakeTableColumns.v1(book: book)
-  BakeChapterIntroductions.v1(book: book)
   BakeIframes.v1(book: book)
   BakeFootnotes.v1(book: book)
   BakeIndex.v1(book: book)

lib/recipes/nursing-internal/recipe.rb

@@ -84,34 +84,16 @@
     BakeChapterReferences.v3(chapter: chapter, metadata_source: metadata)
 
     # Exercises
-    chapter.search('section.review-questions').injected_questions.each do |question|
-      BakeInjectedExerciseQuestion.v1(question: question, number: question.count_in(:chapter))
-      BakeFirstElements.v1(within: question)
-    end
-
-    chapter.search('section.check-understanding').injected_questions.each do |question|
-      BakeInjectedExerciseQuestion.v1(question: question, number: question.count_in(:chapter))
-      BakeFirstElements.v1(within: question)
-    end
-
-    chapter.search('section.critical-thinking').injected_questions.each do |question|
-      BakeInjectedExerciseQuestion.v1(question: question, number: question.count_in(:chapter))
-      BakeFirstElements.v1(within: question)
-    end
-
-    chapter.search('section.competency-based').injected_questions.each do |question|
-      BakeInjectedExerciseQuestion.v1(question: question, number: question.count_in(:chapter))
-      BakeFirstElements.v1(within: question)
-    end
-
-    chapter.search('section.reflection-questions').injected_questions.each do |question|
-      BakeInjectedExerciseQuestion.v1(question: question, number: question.count_in(:chapter))
-      BakeFirstElements.v1(within: question)
-    end
-
-    chapter.search('section.what-nurses-do').injected_questions.each do |question|
-      BakeInjectedExerciseQuestion.v1(question: question, number: question.count_in(:chapter))
-      BakeFirstElements.v1(within: question)
+    exercise_sections_or_notes = %w[
+      section.review-questions section.check-understanding section.critical-thinking
+      section.competency-based section.reflection-questions section.what-nurses-do
+      div[data-type="note"].unfolding-casestudy
+    ]
+    exercise_sections_or_notes.each do |selector|
+      chapter.search(selector).injected_questions.each do |question|
+        BakeInjectedExerciseQuestion.v1(question: question, number: question.count_in(:chapter))
+        BakeFirstElements.v1(within: question)
+      end
     end
 
     # Answer Key
@@ -121,6 +103,11 @@
       append_to: answer_key
     )
 
+    MoveSolutionsFromNumberedNote.v1(
+      chapter: chapter, append_to: answer_key_inner_container,
+      note_class: 'unfolding-casestudy'
+    )
+
     exercises = %w[review-questions check-understanding
                    reflection-questions critical-thinking
                    what-nurses-do competency-based]

spec/kitchen_spec/directions/bake_chapter_introductions/v2_spec.rb

@@ -131,6 +131,32 @@
     )
   end
 
+  let(:book_with_meet_author) do
+    book_containing(html:
+      <<~HTML
+        <div data-type="chapter">
+          <h1 data-type="document-title">Chapter 1 Title</h1>
+          <div class="introduction" data-type="page" id="testid1">
+            <div data-type="document-title">Introduction</div>
+            <figure class="splash">
+              <div data-type="title">Blood Pressure</div>
+              <figcaption>A proficiency in anatomy and physiology... (credit: Bryan Mason/flickr)</figcaption>
+              <span data-type="media" data-alt="This photo shows a nurse taking a woman’s...">
+              <img src="ccc4ed14-6c87-408b-9934-7a0d279d853a/100_Blood_Pressure.jpg" data-media-type="image/jpg" alt="This photo shows a nurse taking..." />
+              </span>
+            </figure>
+            <div data-type="note" class="meet-author">
+              <div data-type="title">Understanding the Marketplace</div>
+              <p>Welcome to Part II of Principles of Marketing...</p>
+            </div>
+            <p id="123">Though you may approach a course in anatomy and physiology...</p>
+            <p id="123">This chapter begins with an overview of anatomy and...</p>
+          </div>
+        </div>
+      HTML
+    )
+  end
+
   let(:book_with_intro_module_title_children) do
     book_containing(html:
       <<~HTML
@@ -213,6 +239,16 @@
     end
   end
 
+  context 'when v2 is called on book with meet author note' do
+    it 'bakes' do
+      described_class.v2(
+        book: book_with_meet_author,
+        options: { strategy: :default, bake_chapter_outline: true, introduction_order: :v4 }
+      )
+      expect(book_with_meet_author.body).to match_snapshot_auto
+    end
+  end
+
   context 'when v2 is called with strategy: add_objectives' do
     it 'works' do
       described_class.v2(