openstax_kitchen 6.0.0 → 9.0.0

data/lib/kitchen/directions/move_solutions_to_answer_key/strategies/calculus.rb

@@ -4,11 +4,11 @@ module Kitchen::Directions::MoveSolutionsToAnswerKey
   module Strategies
     class Calculus
       def bake(chapter:, append_to:)
-        checkpoint_solutions = chapter.search('.checkpoint [data-type="solution"]').cut
+        checkpoint_solutions = chapter.search('div.checkpoint div[data-type="solution"]').cut
         append_solution_area(I18n.t(:checkpoint), checkpoint_solutions, append_to)
 
-        chapter.search('.section-exercises').each do |section|
-          section_solutions = section.search('[data-type="solution"]').cut
+        chapter.search('section.section-exercises').each do |section|
+          section_solutions = section.search('div[data-type="solution"]').cut
           section_title = I18n.t(
             :section_exercises,
             number: "#{chapter.count_in(:book)}.#{section.count_in(:chapter)}"
@@ -16,8 +16,8 @@ module Kitchen::Directions::MoveSolutionsToAnswerKey
           append_solution_area(section_title, section_solutions, append_to)
         end
 
-        chapter.search('.review-exercises').each do |section|
-          section_solutions = section.search('[data-type="solution"]').cut
+        chapter.search('section.review-exercises').each do |section|
+          section_solutions = section.search('div[data-type="solution"]').cut
           append_solution_area(I18n.t(:review_exercises), section_solutions, append_to)
         end
       end

data/lib/kitchen/directions/move_solutions_to_answer_key/strategies/default.rb

@@ -10,8 +10,8 @@ module Kitchen::Directions::MoveSolutionsToAnswerKey
       protected
 
       def bake_section(chapter:, append_to:)
-        @classes.each do |klass|
-          chapter.search(".#{klass} [data-type='solution']").each do |solution|
+        @selectors.each do |selector|
+          chapter.search("#{selector} div[data-type='solution']").each do |solution|
             append_to.add_child(solution.cut.to_s)
           end
         end
@@ -20,7 +20,7 @@ module Kitchen::Directions::MoveSolutionsToAnswerKey
       # This method helps to obtain more strategy-specific params through
       # "strategy_options: {blah1: 1, blah2: 2}"
       def initialize(strategy_options)
-        @classes = strategy_options[:classes] || (raise 'missing classes for strategy')
+        @selectors = strategy_options[:selectors] || (raise 'missing selectors for strategy')
       end
     end
   end

data/lib/kitchen/element_base.rb

@@ -602,9 +602,9 @@ module Kitchen
         attributes.each do |k, v|
           new_node[k.to_s.gsub(/([^_])_([^_])/, '\1-\2').gsub('__', '_')] = v
         end
-        new_node.children = children.to_s
+        new_node.children = children
         yield Element.new(node: new_node, document: document, short_type: nil) if block_given?
-      end.to_s
+      end
 
       self
     end

data/lib/kitchen/example_element.rb

@@ -28,7 +28,7 @@ module Kitchen
     # @return [ElementEnumerator]
     #
     def titles
-      search("span[data-type='title']")
+      search("[data-type='title']")
     end
 
   end

data/lib/kitchen/i18n_string.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Kitchen
+  # Compare one string with another
+  #
+  # Returns 0 if first string equals second,
+  # 1 if first string is greater than the second
+  # and -1 if first string is less than the second.
+  #
+  class I18nString < String
+
+    def <=>(other)
+      I18n.sort_strings(self, other)
+    end
+  end
+end

data/lib/kitchen/patches/array.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# Monkey patches for +Array+
+#
+class Array
+
+  # Receives a string to add as prefix in each item and returns
+  # a new array with the concatenaded strings
+  #
+  # @return [Array<String>]
+  #
+  def prefix(string)
+    map { |item| "#{string}#{item}" }
+  end
+end

data/lib/kitchen/templates/eoc_section_template.xhtml.erb

@@ -0,0 +1,11 @@
+<% main_title_tag = @in_composite_chapter ? 'h3' : 'h2' %>
+<div class="os-eoc os-<%=@container_class_type%>-container" data-type="composite-page" data-uuid-key="<%= @uuid_key %>">
+  <<%= main_title_tag %> data-type="<%= @in_composite_chapter ? 'title' : 'document-title' %>">
+    <span class="os-text"><%= @title %></span>
+  </<%= main_title_tag %>>
+  <div data-type="metadata" style="display: none;">
+    <h1 data-type="document-title" itemprop="name"><%= @title %></h1>
+    <%= @metadata.paste %>
+  </div>
+  <%= @content %>
+</div>

data/lib/kitchen/templates/eoc_section_template_old.xhtml.erb

@@ -0,0 +1,11 @@
+<% main_title_tag = @in_composite_chapter ? 'h3' : 'h2' %>
+<div class="os-eoc os-<%=@klass%>-container" data-type="composite-page" data-uuid-key="<%=@uuid_prefix%><%=@klass%>">
+  <<%= main_title_tag %> data-type="<%= @in_composite_chapter ? 'title' : 'document-title' %>">
+    <span class="os-text"><%= @title %></span>
+  </<%= main_title_tag %>>
+  <div data-type="metadata" style="display: none;">
+    <h1 data-type="document-title" itemprop="name"><%= @title %></h1>
+    <%= @metadata.paste %>
+  </div>
+  <%= @content %>
+</div>

data/lib/kitchen/version.rb

@@ -3,5 +3,5 @@
 # A library for modifying the structure of OpenStax book XML.
 #
 module Kitchen
-  VERSION = '6.0.0'
+  VERSION = '9.0.0'
 end

data/lib/locales/en.yml

@@ -18,16 +18,18 @@ en:
   references: References
   answer_key_title: Answer Key
   eoc_chapter_review: Chapter Review
-  eoc_key_terms_title: Key Terms
-  eoc_summary_title: Summary
   eoc_exercises_title: Exercises
   eoc_composite_metadata_title: Chapter Review
   eoc_solutions_title: Solutions
-  eoc_key_concepts: Key Concepts
-  eoc_key_equations: Key Equations
   eoc_suggested_reading: Suggestions for Further Study
-  eoc_further_research_title: Further Research
   eob_index_title: Index
   eob_index_symbols_group: Symbols
   review_exercises: Review Exercises
   section_exercises: ! 'Section %{number} Exercises'
+  eoc:
+    glossary: Key Terms
+    key-equations: Key Equations
+    summary: Summary
+    further-research: Further Research
+    key-concepts: Key Concepts
+    references: References

data/lib/locales/es.yml

@@ -16,18 +16,20 @@ es:
   learning_objectives: Objetivos De Aprendizaje
   stepwise_step_label: Paso
   references: Referencias
-  answer_key_title: Respuestas Clave
+  answer_key_title: Clave de Respuestas
   eoc_chapter_review: Revisión Del Capítulo
-  eoc_key_terms_title: Términos Clave
-  eoc_summary_title: Resumen
   eoc_exercises_title: Ejercicios
   eoc_composite_metadata_title: Revisión Del Capítulo
   eoc_solutions_title: Soluciones
   eoc_key_concepts: Conceptos Clave
-  eoc_key_equations: Ecuaciones Clave
   eoc_suggested_reading: Sugerencias Para Estudios Adicionales
-  eoc_further_research_title: Investigación Adicional
   eob_index_title: Índice
   eob_index_symbols_group: Símbolos
   review_exercises: Ejercicios De Repaso
   section_exercises: ! 'Sección %{number} Ejercicios'
+  eoc:
+    glossary: Términos Clave
+    key-equations: Ecuaciones Clave
+    summary: Resumen
+    further-research: Investigación Adicional
+    references: Referencias

data/lib/locales/pl.yml

@@ -16,10 +16,13 @@ pl:
   stepwise_step_label: Krok
   answer_key_title: Rozwiązania zadań
   eoc_chapter_review: Podsumowanie rozdziału
-  key_terms_title: Kluczowe pojęcia
   eoc_solutions_title: Rozwiązania
-  eoc_summary_title: Podsumowanie
-  eoc_key_equations: Najważniejsze wzory
   eob_index_title: Skorowidz rzeczowy
   eob_index_symbols_group: Symbole
+  references: Bibliografia
+  eoc:
+    glossary: Kluczowe pojęcia
+    key-equations: Najważniejsze wzory
+    summary: Podsumowanie
+    references: Bibliografia
 

data/lib/openstax_kitchen.rb

@@ -41,6 +41,7 @@ require 'kitchen/pantry'
 require 'kitchen/counter'
 require 'kitchen/selector'
 require 'kitchen/id_tracker'
+require 'kitchen/i18n_string'
 
 require 'kitchen/element_enumerator_base'
 require 'kitchen/element_enumerator_factory'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstax_kitchen
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 9.0.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2021-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -263,6 +263,7 @@ files:
 - lib/kitchen/directions/bake_checkpoint.rb
 - lib/kitchen/directions/bake_composite_chapters.rb
 - lib/kitchen/directions/bake_composite_pages.rb
+- lib/kitchen/directions/bake_eoc_section_content/remove_section_title.rb
 - lib/kitchen/directions/bake_equations.rb
 - lib/kitchen/directions/bake_example.rb
 - lib/kitchen/directions/bake_figure.rb
@@ -276,6 +277,7 @@ files:
 - lib/kitchen/directions/bake_index/main.rb
 - lib/kitchen/directions/bake_index/v1.rb
 - lib/kitchen/directions/bake_index/v1.xhtml.erb
+- lib/kitchen/directions/bake_inline_lists.rb
 - lib/kitchen/directions/bake_link_placeholders.rb
 - lib/kitchen/directions/bake_math_in_paragraph.rb
 - lib/kitchen/directions/bake_non_introduction_pages.rb
@@ -297,6 +299,7 @@ files:
 - lib/kitchen/directions/bake_preface/v1.rb
 - lib/kitchen/directions/bake_references/main.rb
 - lib/kitchen/directions/bake_references/v1.rb
+- lib/kitchen/directions/bake_references/v2.rb
 - lib/kitchen/directions/bake_stepwise.rb
 - lib/kitchen/directions/bake_suggested_reading.rb
 - lib/kitchen/directions/bake_theorem/main.rb
@@ -311,7 +314,11 @@ files:
 - lib/kitchen/directions/chapter_review_container/chapter_review.xhtml.erb
 - lib/kitchen/directions/chapter_review_container/main.rb
 - lib/kitchen/directions/chapter_review_container/v1.rb
+- lib/kitchen/directions/eoc_composite_page_container/main.rb
+- lib/kitchen/directions/eoc_composite_page_container/v1.rb
 - lib/kitchen/directions/eoc_section_title_link_snippet.rb
+- lib/kitchen/directions/move_custom_section_to_eoc_container/main.rb
+- lib/kitchen/directions/move_custom_section_to_eoc_container/v1.rb
 - lib/kitchen/directions/move_exercises_to_eoc/main.rb
 - lib/kitchen/directions/move_exercises_to_eoc/v1.rb
 - lib/kitchen/directions/move_exercises_to_eoc/v2.rb
@@ -337,6 +344,7 @@ files:
 - lib/kitchen/exercise_element_enumerator.rb
 - lib/kitchen/figure_element.rb
 - lib/kitchen/figure_element_enumerator.rb
+- lib/kitchen/i18n_string.rb
 - lib/kitchen/id_tracker.rb
 - lib/kitchen/metadata_element.rb
 - lib/kitchen/metadata_element_enumerator.rb
@@ -347,6 +355,7 @@ files:
 - lib/kitchen/page_element.rb
 - lib/kitchen/page_element_enumerator.rb
 - lib/kitchen/pantry.rb
+- lib/kitchen/patches/array.rb
 - lib/kitchen/patches/i18n.rb
 - lib/kitchen/patches/integer.rb
 - lib/kitchen/patches/nokogiri.rb
@@ -364,7 +373,8 @@ files:
 - lib/kitchen/table_element.rb
 - lib/kitchen/table_element_enumerator.rb
 - lib/kitchen/templates/eob_section_title_template.xhtml.erb
-- lib/kitchen/templates/eoc_section_title_template.xhtml.erb
+- lib/kitchen/templates/eoc_section_template.xhtml.erb
+- lib/kitchen/templates/eoc_section_template_old.xhtml.erb
 - lib/kitchen/term_element.rb
 - lib/kitchen/term_element_enumerator.rb
 - lib/kitchen/type_casting_element_enumerator.rb

data/lib/kitchen/templates/eoc_section_title_template.xhtml.erb

@@ -1,10 +0,0 @@
-<div class="os-eoc os-<%=@klass%>-container" data-type="composite-page" data-uuid-key="<%=@uuid_prefix%><%=@klass%>">
-  <<%= @in_composite_chapter ? 'h3' : 'h2' %> data-type="<%= @in_composite_chapter ? 'title' : 'document-title' %>">
-    <span class="os-text"><%= @title %></span>
-  </<%= @in_composite_chapter ? 'h3' : 'h2' %>>
-  <div data-type="metadata" style="display: none;">
-    <h1 data-type="document-title" itemprop="name"><%= @in_composite_chapter ? I18n.t(:eoc_composite_metadata_title) : @title %></h1>
-    <%= @metadata.paste %>
-  </div>
-  <%= @content %>
-</div>