muwu 3.2.0 → 4.0.0

data/lib/muwu/project_options_builder/project_option_validator_value.rb

@@ -4,7 +4,6 @@ module Muwu
 
     require 'iso-639'
 
-
     include Muwu
     include Helper
 
@@ -25,7 +24,6 @@ module Muwu
     end
 
 
-
     public
 
 
@@ -89,40 +87,26 @@ module Muwu
     end
 
 
-
     private
 
 
-    def validate_option_boolean
-      case @value_provided
-      when false, true
-        return @value_provided
-      when nil, '', 'nil'
-        return nil
-      else
-        @project.exceptions_add ProjectException::OptionValueNotUnderstood.new(@key_validated, @value_provided)
-        return nil
-      end
-    end
-
-
-    def validate_option_contents_section_numbers_receive_link
-      return validate_option_boolean
+    def validate_option_generate_navigators_automatically
+      return validation_for_boolean
     end
 
 
-    def validate_option_generate_navigators_automatically
-      return validate_option_boolean
+    def validate_option_generate_subcontents_automatically
+      return validation_for_boolean
     end
 
 
-    def validate_option_generate_subcontents_automatically
-      return validate_option_boolean
+    def validate_option_generate_topic_inner_identifiers
+      return validation_for_boolean
     end
 
 
     def validate_option_html_head_includes_metadata_tags
-      return validate_option_boolean
+      return validation_for_boolean
     end
 
 
@@ -143,26 +127,12 @@ module Muwu
 
 
     def validate_option_html_uses_javascript_navigation
-      return validate_option_boolean
+      return validation_for_boolean
     end
 
 
     def validate_option_markdown_allows_raw_html
-      return validate_option_boolean
-    end
-
-
-    def validate_option_markdown_renderer
-      value = value_provided_as_string
-      case value
-      when 'commonmarker'
-        return value
-      when 'motion-markdown-it', 'motion_markdown_it'
-        return 'motion-markdown-it'
-      else
-        @project.exceptions_add ProjectException::OptionValueNotUnderstood.new(@key_validated, @value_provided)
-        return nil
-      end
+      return validation_for_boolean
     end
 
 
@@ -190,31 +160,18 @@ module Muwu
     end
 
 
-    def validate_option_output_file_basename
-      case @value_provided
-      when String
-        return SanitizerHelper.sanitize_destination_file_basename(File.basename(@value_provided))
-      when nil
-        return nil
-      else
-        @project.exceptions_add ProjectException::OptionValueNotUnderstood.new(@key_validated, @value_provided)
-        return nil
-      end
-    end
-
-
     def validate_option_output_file_css_basename
-      return validate_option_output_file_basename
+      return validation_for_output_file_basename
     end
 
 
     def validate_option_output_file_html_basename
-      return validate_option_output_file_basename
+      return validation_for_output_file_basename
     end
 
 
     def validate_option_output_file_js_basename
-      return validate_option_output_file_basename
+      return validation_for_output_file_basename
     end
 
 
@@ -243,7 +200,7 @@ module Muwu
 
 
     def validate_option_render_punctuation_smart
-      return validate_option_boolean
+      return validation_for_boolean
     end
 
 
@@ -266,7 +223,7 @@ module Muwu
 
 
     def validate_option_render_section_numbers
-      return validate_option_boolean
+      return validation_for_boolean
     end
 
 
@@ -298,7 +255,7 @@ module Muwu
 
 
     def validate_option_render_punctuation_smart
-      return validate_option_boolean
+      return validation_for_boolean
     end
 
 
@@ -308,7 +265,33 @@ module Muwu
 
 
     def validate_option_warning_if_parent_heading_lacks_source
-      return validate_option_boolean
+      return validation_for_boolean
+    end
+
+
+    def validation_for_boolean
+      case @value_provided
+      when false, true
+        return @value_provided
+      when nil, '', 'nil'
+        return nil
+      else
+        @project.exceptions_add ProjectException::OptionValueNotUnderstood.new(@key_validated, @value_provided)
+        return nil
+      end
+    end
+
+
+    def validation_for_output_file_basename
+      case @value_provided
+      when String
+        return SanitizerHelper.sanitize_destination_file_basename(File.basename(@value_provided))
+      when nil
+        return nil
+      else
+        @project.exceptions_add ProjectException::OptionValueNotUnderstood.new(@key_validated, @value_provided)
+        return nil
+      end
     end
 
 

data/lib/muwu/render_concat/render_concat.rb

@@ -18,49 +18,49 @@ module Muwu
       puts "- Writing `#{@output_filename}`"
       File.open(destination, 'w') do |f|
         @manifest.text_blocks.each do |text|
-          text.sections.each do |text_item|
-            render_text_item(f, text_item)
+          text.sections.each do |topic|
+            render_topic(f, topic)
           end
         end
       end
     end
 
 
-    def render_text_item(f, text_item)
-      render_text_item_head(f, text_item)
-      render_text_item_source(f, text_item)
-      render_text_item_sections(f, text_item)
+    def render_topic(f, topic)
+      render_topic_head(f, topic)
+      render_topic_source(f, topic)
+      render_topic_sections(f, topic)
     end
 
 
-    def render_text_item_head(f, text_item)
-      f.puts '# ' + text_item.numbering.join('.')
-      if heading_origin_is_basename_or_outline(text_item)
-        f.puts '# ' + text_item.heading
+    def render_topic_head(f, topic)
+      f.puts '# ' + topic.numbering.join('.')
+      if heading_origin_is_basename_or_outline(topic)
+        f.puts '# ' + topic.heading
         f.puts "\n"
       end
     end
 
 
-    def render_text_item_sections(f, text_item)
-      if text_item.does_have_child_sections
-        text_item.sections.each do |ti|
-          render_text_item(f, ti)
+    def render_topic_sections(f, topic)
+      if topic.does_have_child_sections
+        topic.sections.each do |ti|
+          render_topic(f, ti)
         end
-        render_text_item_spacer(f, text_item)
+        render_topic_spacer(f, topic)
       end
     end
 
 
-    def render_text_item_source(f, text_item)
-      if text_item.source_file_does_exist
-        f.puts text_item.source.strip
+    def render_topic_source(f, topic)
+      if topic.source_file_does_exist
+        f.puts topic.source.strip
       end
-      render_text_item_spacer(f, text_item)
+      render_topic_spacer(f, topic)
     end
 
 
-    def render_text_item_spacer(f, text_item)
+    def render_topic_spacer(f, topic)
       f.puts "\n\n\n\n"
     end
 
@@ -69,8 +69,8 @@ module Muwu
     private
 
 
-    def heading_origin_is_basename_or_outline(text_item)
-      [:basename, :outline].include?(text_item.heading_origin)
+    def heading_origin_is_basename_or_outline(topic)
+      [:basename, :outline].include?(topic.heading_origin)
     end
 
 

data/lib/muwu/render_html_partial/js_library/navigation.js

@@ -72,7 +72,7 @@ Muwu.helper = {
   },
 
   parse_href: function(href) {
-    var _re = /(\w+[.]html)?(#{1})?(\w*)?/;
+    var _re = /(.*\w+[.]html)?(#{1})?([\w\d-]*)?/;
     var _hrefSplit = href.split(_re);
     var filename = _hrefSplit[1];
     var id = _hrefSplit[3];