muwu 3.2.0 → 4.0.0

data/lib/muwu/render_html_partial/render_title.rb

@@ -2,15 +2,15 @@ module Muwu
   module RenderHtmlPartial
     class Title
 
-  
+
       include Muwu
-      
-      
+
+
       attr_accessor(
         :destination,
         :metadata
       )
-  
+
 
       def render
         @destination.margin_to_zero
@@ -21,17 +21,17 @@ module Muwu
         end
         @destination.margin_to_zero
       end
-  
-    
+
+
       def render_title_metadata
-        @destination.margin_indent do 
+        @destination.margin_indent do
           @metadata.each_pair do |key, value|
             write_tag_h1(key, value)
           end
         end
       end
-  
-  
+
+
       def write_tag_div_close
         @destination.write_line tag_div_close
       end
@@ -40,32 +40,32 @@ module Muwu
       def write_tag_div_open
         @destination.write_line tag_div_open
       end
-  
+
 
       def write_tag_h1(key, value)
         @destination.write_line tag_h1(key, value)
       end
-  
-  
+
+
 
       private
-          
+
 
       def tag_h1(key, value)
-        "<h1 data-metadata_key='#{key.downcase}'>#{value}</h1>"
+        "<h1 data-title-attr='#{key.downcase}'>#{value}</h1>"
       end
-  
-  
+
+
       def tag_div_close
         "</div>"
       end
-  
-  
+
+
       def tag_div_open
-        "<div class='title'>"
-      end            
+        "<div data-document-block='title'>"
+      end
+
 
-  
     end
   end
 end

data/lib/muwu/render_html_partial/{render_text_item.rb → render_topic.rb}

@@ -1,33 +1,35 @@
 module Muwu
   module RenderHtmlPartial
-    class TextItem
+    class Topic
 
 
       include Muwu
 
-
       require 'commonmarker'
+      require 'nokogiri'
 
 
       attr_accessor(
+        :commonmarker_options,
+        :depth,
         :destination,
         :distinct,
         :does_have_source_text,
         :end_links,
+        :generate_inner_identifiers,
         :heading,
         :heading_origin,
-        :html_attr_id,
+        :html_id,
+        :id,
         :is_parent_heading,
-        :markup_renderer,
         :numbering,
+        :numbering_as_text,
         :project,
-        :section_depth,
-        :section_number_as_attr,
-        :section_number_as_text,
-        :sections,
         :source_filename_absolute,
         :source_filename_relative,
-        :subsections_are_distinct,
+        :source_relative_segments,
+        :subtopics,
+        :subtopics_are_distinct,
         :text_root_name,
         :will_render_section_number
       )
@@ -39,11 +41,11 @@ module Muwu
           render_section_number
           render_heading
           render_text
-          if (@is_parent_heading == true) && (@subsections_are_distinct == true)
+          if (@is_parent_heading == true) && (@subtopics_are_distinct == true)
             render_end_links
-            render_sections
-          elsif (@is_parent_heading == true) && (@subsections_are_distinct == false)
-            render_sections
+            render_subtopics
+          elsif (@is_parent_heading == true) && (@subtopics_are_distinct == false)
+            render_subtopics
             render_end_links
           elsif (@is_parent_heading == false)
             render_end_links
@@ -83,10 +85,10 @@ module Muwu
       end
 
 
-      def render_sections
+      def render_subtopics
         @destination.padding_vertical(1) do
-          @sections.each do |section|
-            section.render
+          @subtopics.each do |subtopic|
+            subtopic.render
           end
         end
       end
@@ -140,11 +142,10 @@ module Muwu
 
 
       def write_text_source_to_html
-        @destination.write_inline source_to_html
+        @destination.write_inline source_convert_to_html
       end
 
 
-
       private
 
 
@@ -160,13 +161,49 @@ module Muwu
       end
 
 
-      def source_to_html
-        @markup_renderer.render(@source_filename_absolute)
+      def source_convert_to_html
+        case File.extname(@source_filename_absolute).downcase
+        when '.md'
+          source_html_parse(source_html_from_md)
+        end
+      end
+
+
+      def source_html_from_md
+        Commonmarker.to_html(File.read(@source_filename_absolute), options: @commonmarker_options, plugins: { syntax_highligher: nil })
+      end
+
+
+      def source_html_parse(source_html)
+        fragment = Nokogiri::HTML5.fragment(source_html)
+        fragment.css('a.anchor[aria-hidden]').each { |node| node.remove }
+        starting_heading = nil
+        if fragment.children.any? && fragment.children.first.name =~ /\Ah\d{1}\z/i
+          starting_heading = fragment.first_element_child.remove
+          starting_heading['data-topic'] = 'section-heading'
+          starting_heading['data-depth'] = @depth
+        end
+        if @generate_inner_identifiers
+          %w(blockquote dd dl dt h1 h2 h3 h4 h5 h6 li ol p pre table td tr ul).each do |element|
+            fragment.css(element).each do |node|
+              data_source_class = []
+              @source_relative_segments.each_index do |i|
+                data_source_class << "#{source_relative_segments[i]}-#{node.name}"
+              end
+              node['data-topic-source-class'] = data_source_class.join(' ')
+              node['data-topic-id-class'] = "#{id}-#{node.name}"
+            end
+          end
+        end
+        if starting_heading
+          fragment.children.first.previous = starting_heading
+        end
+        fragment.to_html
       end
 
 
       def tag_nav_a(name, href)
-        "<a class='document_link' href='#{href}'>[#{name}]</a>"
+        "<a class='document_link' data-topic='navigation-link' href='#{href}'>[#{name}]</a>"
       end
 
 
@@ -181,7 +218,7 @@ module Muwu
 
 
       def tag_nav_end_links_open
-        "<nav class='document_links'>"
+        "<nav data-topic='navigation'>"
       end
 
 
@@ -191,7 +228,7 @@ module Muwu
 
 
       def tag_heading
-        "<h1>#{@heading}</h1>"
+        "<div data-topic='section-heading' data-depth='#{@depth}'>#{@heading}</div>"
       end
 
 
@@ -201,17 +238,7 @@ module Muwu
 
 
       def tag_section_open
-        "<section data-section_depth='#{@section_depth}' data-section_number='#{@section_number_as_text}' data-source='#{@source_filename_relative}' id='#{@html_attr_id}'>"
-      end
-
-
-      def tag_section_with_source_open
-        "<section data-section_depth='#{@section_depth}' data-section_number='#{@section_number_as_text}' data-source='#{@source_filename_relative}' id='#{@html_attr_id}'>"
-      end
-
-
-      def tag_section_without_source_open
-        "<section data-section_depth='#{@section_depth}' data-section_number='#{@section_number_as_text}' id='#{@html_attr_id}'>"
+        "<section data-document-block='topic' data-topic-depth='#{@depth}' data-section-number='#{@numbering_as_text}' data-source='#{@source_filename_relative}' id='#{@html_id}'>"
       end
 
 
@@ -221,7 +248,7 @@ module Muwu
 
 
       def tag_span_section_number
-        "<h1 class='section_number'>#{@section_number_as_text}</h1>"
+        "<div data-topic='section-number' data-depth='#{@depth}'>#{@numbering_as_text}</div>"
       end
 
 

data/lib/muwu/render_html_partial_builder/render_contents_builder.rb

@@ -7,9 +7,9 @@ module Muwu
 
 
       attr_accessor(
-        :task_contents,
         :project,
         :renderer,
+        :task_contents,
         :text_root_name
       )
 
@@ -32,11 +32,10 @@ module Muwu
         @text_root_name = task_contents.text_root_name
         phase_1_set_text_root_name
         phase_2_set_destination
-        phase_2_set_href_helper
         phase_2_set_html_attr_id
         phase_2_set_item_depth_max
         phase_2_set_project
-        phase_2_set_sections
+        phase_2_set_topics
         phase_2_set_will_render_section_numbers
       end
 
@@ -51,28 +50,23 @@ module Muwu
       end
 
 
-      def phase_2_set_href_helper
-        @renderer.href_helper = Helper::HtmlHrefHelper.new(@task_contents)
-      end
-      
-      
       def phase_2_set_html_attr_id
-        @renderer.html_attr_id = ['contents', @text_root_name].join('_')
+        @renderer.html_attr_id = ['contents', @text_root_name].join('-')
       end
 
 
       def phase_2_set_item_depth_max
         @renderer.item_depth_max = @project.options.render_sections_distinctly_depth_max
       end
-      
-      
+
+
       def phase_2_set_project
         @renderer.project = @project
       end
-      
-      
-      def phase_2_set_sections
-        @renderer.sections = determine_sections
+
+
+      def phase_2_set_topics
+        @renderer.topics = determine_topics
       end
 
 
@@ -83,18 +77,18 @@ module Muwu
 
 
       private
-      
-      
-      def determine_sections
-        determine_text_root_blocks.map { |trb| trb.sections }.flatten
+
+
+      def determine_topics
+        determine_text_root_blocks.map { |trb| trb.topics }.flatten
       end
-      
-      
+
+
       def determine_text_root_blocks
         @task_contents.text_blocks_by_name(@text_root_name)
       end
-      
-      
+
+
     end
   end
 end

data/lib/muwu/render_html_partial_builder/render_subcontents_builder.rb

@@ -31,7 +31,6 @@ module Muwu
         @task_subcontents = task_subcontents
         @text_root_name = task_subcontents.text_root_name
         set_destination
-        set_href_helper
         set_html_attr_id
         set_item_depth_max
         set_project
@@ -45,13 +44,8 @@ module Muwu
       end
 
 
-      def set_href_helper
-        @renderer.href_helper = Helper::HtmlHrefHelper.new(@task_subcontents)
-      end
-
-
       def set_html_attr_id
-        @renderer.html_attr_id = ['subcontents'].join('_')
+        @renderer.html_attr_id = 'subcontents'
       end
 
 
@@ -63,7 +57,7 @@ module Muwu
       def set_project
         @renderer.project = @project
       end
-      
+
 
       def set_text_root_blocks
         @renderer.text_root_blocks = @task_subcontents.text_root_blocks
@@ -73,7 +67,7 @@ module Muwu
       def set_text_root_name
         @renderer.text_root_name = @text_root_name
       end
-      
+
 
       def set_will_render_section_numbers
         @renderer.will_render_section_numbers = @project.options.render_section_numbers

data/lib/muwu/render_html_partial_builder/render_text_builder.rb

@@ -31,7 +31,7 @@ module Muwu
         set_destination
         set_project
         set_text_root_name
-        set_sections
+        set_topics
         finally_set_html_attr_id
       end
 
@@ -56,8 +56,8 @@ module Muwu
       end
 
 
-      def set_sections
-        @renderer.sections = determine_sections
+      def set_topics
+        @renderer.topics = determine_topics
       end
 
 
@@ -65,18 +65,18 @@ module Muwu
       private
 
 
-      def determine_sections
-        sections = []
-        @manifest_text.sections.each do |section|
-          sections << build_text_item(section)
+      def determine_topics
+        topics = []
+        @manifest_text.topics.each do |topic|
+          topics << build_topic(topic)
         end
-        sections
+        topics
       end
 
 
-      def build_text_item(text_item)
-        RenderHtmlPartialBuilder::TextItemBuilder.build do |b|
-          b.build_from_manifest_text_item(text_item)
+      def build_topic(topic)
+        RenderHtmlPartialBuilder::TopicBuilder.build do |b|
+          b.build_from_manifest_topic(topic)
         end
       end