muwu 4.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e6d222cd47218dfdadbdebbeec54a34e9a21d3fd712ea8d41167a3e4202fa76
-  data.tar.gz: 68fa281753870cecb29570f3f56897ebb8f764a6f793a4600a55c04b54d42144
+  metadata.gz: 4ac0e19a295355e6ff874c375f90d4ad726202b1b0233180180ce19210d097f9
+  data.tar.gz: 0b0503893e8a2731a5b9ccb73105d40eb1365190d9291f93e93c7368a0da38ef
 SHA512:
-  metadata.gz: 610febd5bb1e383bf2c185b4861a0029d30566e2bd445bdac8ee0c381e4b073142f9c805d0275e439c7be6d9d6217270418d2dcc5765bdf1d6584dae03a61a50
-  data.tar.gz: d5bf793b752727bc8dc9d527645996fd32dadf42a74041852ea123f7b1df39b43dac2a4ca9553bf40cd704f9d8cffc2f39714e1678d91271a2953bda73631c4d
+  metadata.gz: e56dbd4b69207106cbc8e746256918cce305e43668ffb7d884a90186ef874be3946574122c539588182dc4834bac5ffd3c1af266c9a8346d004e81be0e50d820
+  data.tar.gz: b56e9b4fa50bc60a561f36ab8c7f08edfc8cfee754e129432270fd9711c6a0c28ce4063ae63170ad4591b22015a3dbf52b16753ab61ff58021977a78b4841bcc

data/lib/muwu/helper/html_href_helper.rb

@@ -7,17 +7,17 @@ module Muwu
 
 
       def id_contents_item(topic)
-        hyphenate(['contents', topic.text_root_name, topic.id])
+        hyphenate(['contents', topic.text_root_name, topic.numbering_for_display])
       end
 
 
       def id_subcontents_item(topic)
-        hyphenate(['subcontents', topic.text_root_name, topic.id])
+        hyphenate(['subcontents', topic.text_root_name, topic.numbering_for_display])
       end
 
 
       def id_topic_header(topic)
-        hyphenate(['text', topic.text_root_name, topic.id])
+        hyphenate(['text', topic.text_root_name, topic.numbering_for_display])
       end
 
 

data/lib/muwu/manifest_task/topic.rb

@@ -34,11 +34,27 @@ module Muwu
       public
 
 
+      def depth
+        numbering.length
+      end
+
+
       def does_have_subtopics
         is_parent_heading && (@subtopics.length >= 1)
       end
 
 
+      def is_distinct
+        if project.options.topic_depth_max == nil
+          true
+        elsif depth <= project.options.topic_depth_max
+          true
+        elsif depth > project.options.topic_depth_max
+          false
+        end
+      end
+
+
       def is_not_parent_heading
         is_parent_heading == false
       end
@@ -65,9 +81,9 @@ module Muwu
 
 
       def numbering_to_depth_max
-        if @project.options.render_sections_distinctly_depth_max
+        if @project.options.topic_depth_max
           index_min = 0
-          index_max = @project.options.render_sections_distinctly_depth_max - 1
+          index_max = @project.options.topic_depth_max - 1
           if index_max >= index_min
             @numbering[index_min..index_max]
           else
@@ -79,6 +95,11 @@ module Muwu
       end
 
 
+      def numbering_for_display
+        numbering_to_depth_max.join('.')
+      end
+
+
       def project_directory
         @project.working_directory
       end

data/lib/muwu/project_options/project_options.rb

@@ -48,6 +48,11 @@ module Muwu
     public
 
 
+    def topic_depth_max
+      render_sections_distinctly_depth_max
+    end
+
+
     def set_option(key, value)
       if Default::PROJECT_OPTIONS.has_key?(key)
         key_ivsym = "@#{key.to_s}"

data/lib/muwu/render_html_partial/render_contents.rb

@@ -12,7 +12,6 @@ module Muwu
       attr_accessor(
         :destination,
         :html_attr_id,
-        :item_depth_max,
         :project,
         :topics,
         :text_root_name,
@@ -65,7 +64,7 @@ module Muwu
 
 
       def render_ol_li(topic)
-        if task_depth_is_within_range(topic)
+        if topic.is_distinct
           html_id = Helper::HrefHelper.id_contents_item(topic)
           if topic.is_parent_heading
             write_tag_li_open(html_id)
@@ -105,7 +104,7 @@ module Muwu
 
 
       def render_table_tr(topic)
-        if task_depth_is_within_range(topic)
+        if topic.is_distinct
           html_id = Helper::HrefHelper.id_contents_item(topic)
           write_tag_tr_open(html_id)
           @destination.margin_indent do
@@ -354,19 +353,6 @@ module Muwu
       end
 
 
-      def task_depth_is_within_range(topic)
-        result = nil
-        if @item_depth_max == nil
-          result = true
-        elsif topic.topic_depth <= @item_depth_max
-          result = true
-        elsif topic.topic_depth > @item_depth_max
-          result = false
-        end
-        result
-      end
-
-
     end
   end
 end

data/lib/muwu/render_html_partial/render_subcontents.rb

@@ -9,7 +9,6 @@ module Muwu
       attr_accessor(
         :destination,
         :html_attr_id,
-        :item_depth_max,
         :project,
         :sections,
         :text_root_block,
@@ -61,7 +60,7 @@ module Muwu
 
 
       def render_ol_li(topic)
-        if task_depth_is_within_range(topic)
+        if topic.is_distinct
           html_id = Helper::HrefHelper.id_subcontents_item(topic)
           if topic.is_parent_heading
             write_tag_li_open(html_id)
@@ -106,7 +105,7 @@ module Muwu
 
 
       def render_table_tr(topic)
-        if task_depth_is_within_range(topic)
+        if topic.is_distinct
           html_id = Helper::HrefHelper.id_subcontents_item(topic)
           write_tag_tr_open(html_id)
           @destination.margin_indent do
@@ -355,19 +354,6 @@ module Muwu
       end
 
 
-      def task_depth_is_within_range(topic)
-        result = nil
-        if @item_depth_max == nil
-          result = true
-        elsif topic.topic_depth <= @item_depth_max
-          result = true
-        elsif topic.topic_depth > @item_depth_max
-          result = false
-        end
-        result
-      end
-
-
     end
   end
 end

data/lib/muwu/render_html_partial/render_topic.rb

@@ -191,7 +191,7 @@ module Muwu
                 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}"
+              node['data-topic-id-class'] = "#{@id}-#{node.name}"
             end
           end
         end

data/lib/muwu/render_html_partial_builder/render_contents_builder.rb

@@ -33,7 +33,6 @@ module Muwu
         phase_1_set_text_root_name
         phase_2_set_destination
         phase_2_set_html_attr_id
-        phase_2_set_item_depth_max
         phase_2_set_project
         phase_2_set_topics
         phase_2_set_will_render_section_numbers
@@ -55,11 +54,6 @@ module Muwu
       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

data/lib/muwu/render_html_partial_builder/render_subcontents_builder.rb

@@ -32,7 +32,6 @@ module Muwu
         @text_root_name = task_subcontents.text_root_name
         set_destination
         set_html_attr_id
-        set_item_depth_max
         set_project
         set_text_root_blocks
         set_will_render_section_numbers
@@ -49,11 +48,6 @@ module Muwu
       end
 
 
-      def set_item_depth_max
-        @renderer.item_depth_max = @project.options.render_sections_distinctly_depth_max
-      end
-
-
       def set_project
         @renderer.project = @project
       end

data/lib/muwu/render_html_partial_builder/render_topic_builder.rb

@@ -103,12 +103,12 @@ module Muwu
 
 
       def phase_1_set_depth
-        @renderer.depth = @manifest_topic.topic_depth
+        @renderer.depth = @manifest_topic.depth
       end
 
 
       def phase_1_set_numbering_as_text
-        @renderer.numbering_as_text = @manifest_topic.numbering.join('.')
+        @renderer.numbering_as_text = @manifest_topic.numbering_for_display
       end
 
 

data/lib/muwu/render_inspector/render_inspector.rb

@@ -199,7 +199,7 @@ module Muwu
     def render_inspector_manifest_task_topic(topic)
       puts_line [
         indent("| Topic #{topic.id}"),
-        topic.numbering.inspect,
+        topic.numbering_for_display,
         topic.heading.inspect,
         topic.source_filename,
         ('!!' if topic.source_file_does_not_exist)

data/lib/muwu.rb

@@ -1,6 +1,6 @@
 module Muwu
 
-  VERSION = '4.0.0'
+  VERSION = '5.0.0'
 
   GEM_HOME_LIB = File.absolute_path(File.join(File.dirname(__FILE__)))
   GEM_HOME_LIB_MUWU = File.absolute_path(File.join(GEM_HOME_LIB, 'muwu'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: muwu
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Eli Harrison