openstax_kitchen 12.0.0 → 12.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddc1370c1b05b52bdf0df2f0a7cd4624b1725f39aae33f57f9715e091a358f8d
-  data.tar.gz: fcd328b3dd9c091f2461e3acd22db036c02c4005bb5c8f31071096ed96461179
+  metadata.gz: 28254d4a9107528ff5dbebacc82e5cc3cbf20e71fcc9d8303c2f41fd90d2d4be
+  data.tar.gz: 2c71714f62fe45ea772614d5c72f6a95ce59deebc63e1259b182e25d70481400
 SHA512:
-  metadata.gz: fd04ee2890144c697d9ab1ff10f97b9593f594eca116856bc6f26edb51f28e6330a0daca42c23e29d7bc08f2d336e764c957dcf93d6f638a22be1572a3ab939c
-  data.tar.gz: bb270311e092585ef966c4f2ba76d8847d7fbaedaae9c102274363ac5c21bbf411a6af5ebd7689c6b8ffd02d81ea46b586cd2273eab26320f21c559d28019bcb
+  metadata.gz: dfaf9123a29ef2bedddb524ed7758b1092c88c6cbc850aeee0d4530633783ab2cbec39b68f3b5fc391219f344f191c4714f779ef8efc57c7f35c47d075eb813e
+  data.tar.gz: c686d00ca4305b0f90f23c4ba2cfb3151a5c0384f7979e82fe16d5432a9e79b32705822aeae244601343d3620e053247b848edf78631c59f93a920e312d7951d

data/CHANGELOG.md

@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [12.1.0] - 2021-09-24
+
+* Fix `BakeExample#titles_to_rename` to exclude exercise titles (patch)
+* Modify `BakeFigure` to bake unnumbered figures with caption (minor)
+* Fix `NoteElement#title` to be more specific about finding the title (patch)
+* Adds `data-type="slug"` to `metadata_lement` `children_to_keep` method, updates spec helper `metadata_element` and related spec files(minor)
+
 ## [12.0.0] - 2021-09-21
 
 * Fixes `BakeStepwise` to skip nested lists (patch)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    openstax_kitchen (12.0.0)
+    openstax_kitchen (12.1.0)
       activesupport
       i18n
       nokogiri

data/lib/kitchen/directions/bake_figure.rb

@@ -4,10 +4,11 @@ module Kitchen
   module Directions
     module BakeFigure
       def self.v1(figure:, number:, cases: false)
-        return if figure.has_class?('unnumbered') && !figure.has_class?('splash')
+        return if figure.has_class?('unnumbered') && !figure.has_class?('splash') && !figure.caption
 
         figure.wrap(%(<div class="os-figure#{' has-splash' if figure.has_class?('splash')}">))
-        if figure.has_class?('unnumbered') && figure.has_class?('splash')
+
+        if figure.has_class?('unnumbered') && (figure.caption || figure.has_class?('splash'))
           caption = figure.caption&.cut
           figure.append(sibling:
             <<~HTML

data/lib/kitchen/element_base.rb

@@ -211,6 +211,14 @@ module Kitchen
       self[:id] = value
     end
 
+    # Returns the element's data-type
+    #
+    # @return [String]
+    #
+    def data_type
+      self[:'data-type']
+    end
+
     # A way to set values and chain them
     #
     # @param property [String, Symbol] the name of the property to set

data/lib/kitchen/example_element.rb

@@ -33,7 +33,8 @@ module Kitchen
           title.parent.has_class?('os-caption-container') || \
           title.parent.has_class?('os-caption') || \
           title.parent.name == 'caption' || \
-          title.parent[:'data-type'] == 'note'
+          title.parent.data_type == 'note' || \
+          title.parent.data_type == 'exercise'
         end
       )
     end

data/lib/kitchen/figure_element.rb

@@ -53,7 +53,7 @@ module Kitchen
     # @return [Boolean]
     #
     def figure_to_bake?
-      return false if subfigure? || (has_class?('unnumbered') && !has_class?('splash'))
+      return false if subfigure? || (has_class?('unnumbered') && !has_class?('splash') && !caption)
 
       true
     end

data/lib/kitchen/metadata_element.rb

@@ -27,7 +27,12 @@ module Kitchen
     # @return [ElementEnumerator]
     #
     def children_to_keep
-      search(%w(span[data-type='revised'] div.authors div.publishers div.print-style div.permissions
+      search(%w(span[data-type='revised']
+                span[data-type='slug']
+                div.authors
+                div.publishers
+                div.print-style
+                div.permissions
                 div[data-type='subject']))
     end
   end

data/lib/kitchen/note_element.rb

@@ -29,16 +29,24 @@ module Kitchen
     #
     def title
       block_error_if(block_given?)
-      note_body = first('div.os-note-body')
-      first_child = note_body ? note_body.element_children[0] : element_children[0]
+      # An element with data-type="title" is ambiguous; it is only the note's title if:
+      # 1. it is the note body's first child
+      # 2. it is the first child's first child and the first child is a paragraph
+      first_child = first_note_body_child
+      first_grandchild = first_child&.element_children&.[](0) if first_child.name == 'p'
 
-      if first_child[:'data-type'] == 'title'
+      if first_child.data_type == 'title'
         first_child
-      elsif first_child&.element_children&.[](0)&.[](:'data-type') == 'title'
-        first_child.element_children[0]
+      elsif first_grandchild&.data_type == 'title'
+        first_grandchild
       end
     end
 
+    def first_note_body_child
+      note_body = first('div.os-note-body')
+      note_body ? note_body.element_children[0] : element_children[0]
+    end
+
     # Returns true if the note's title is autogenerated
     #
     # @return [Boolean]

data/lib/kitchen/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstax_kitchen
 version: !ruby/object:Gem::Version
-  version: 12.0.0
+  version: 12.1.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-21 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -461,7 +461,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: OpenStax content baking library