devcenter-parser 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: 731e954adb885153b1d9f5cecb351e93af1c249d
-  data.tar.gz: bc8bca7b5de1f10ff4400b43da93c93b299bf352
+  metadata.gz: 51f55582e8c324f21c5d8f0995579fb2bf238344
+  data.tar.gz: fdc5d451987e9e746001ec43717e7d5aca2120e1
 SHA512:
-  metadata.gz: dbfa585bb7106530d36e94166f845acd49c96c952fab64a1a96e89eb0fc3d76772ff6537357047388d40596e264132d96eaa7d2c1a7f479c6d8f70676317b4da
-  data.tar.gz: 443d781a6d537f9612f8b8dcb4809a8d766f31c362f9826ecccb4c56892f11654a89a54c7461027405c5598afbe4ad25b012f3eeea41f1a67b40e2f901310627
+  metadata.gz: 995dbe71fc3e5c43ca0a063020b2cf54c00502cf1a6a8c56c9f711b3df1ac88776bbfdd5e1d59fe268cbb23c276a2e56375f9ade142b949c61820045cd36a49c
+  data.tar.gz: 6ada25e661ceba84df62f401948c457cccc2c66b56927dbcd281d57129c907ac523adae6f8aedd1d29500ccd08f9626df0c4eb501f4ceb019ad8bccc65b352f0

data/Rakefile

@@ -0,0 +1,9 @@
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/*_test.rb']
+  t.verbose = true
+end
+
+task :default => :test

data/lib/devcenter-parser/header_id_generator.rb

@@ -14,22 +14,34 @@ class HeaderIdGenerator
     @nodes_ids = @header_nodes.inject({}){ |hash, node| hash[node] = nil; hash }
 
     add_default_ids
-    prepend_parents_on_conflicts
-    append_numbers_on_conflicts
-
+    resolve_conflicts
     @nodes_ids.each{ |node, id| node['id'] = id }
   end
 
   private
 
+  def resolve_conflicts
+    return if conflicts(@nodes_ids).empty?
+
+    # { h4-node -> [h3-node, h2-node] }
+    @parents = @nodes_ids.keys.inject({}){ |hash, node| hash[node] = parent_header_nodes(node); hash }
+
+    prepend_parents_on_conflicts
+    append_numbers_on_conflicts
+  end
+
   # Parent != DOM nesting, but in the context of the content <h2></h2> ... <h3></h3>
 
-  def prepend_parents_on_conflicts
+  # Prepend parents recursively, one level at a time, until there are no conflicts or no changes in the result
+  def prepend_parents_on_conflicts(parent_index = 0)
+    original = @nodes_ids.dup
     conflicts(@nodes_ids).each do |node, id|
-      parent_contents = parent_header_nodes(node).map{ |parent_node| parent_node.content }
-      content = (parent_contents + [node.content]).join(' ')
-      @nodes_ids[node] = subheader_id(content.to_s)
+      if parent = @parents[node][parent_index]
+        new_id = subheader_id("#{subheader_id(parent.content)} #{@nodes_ids[node]}")
+        @nodes_ids[node] = new_id
+      end
     end
+    prepend_parents_on_conflicts(parent_index + 1) if original != @nodes_ids
   end
 
   def parent_header_nodes(node)
@@ -41,7 +53,7 @@ class HeaderIdGenerator
   # "h4" -> ["h2", "h3"]
   def parent_tags(tag)
     level = tag.gsub('h','').to_i
-    (2..level-1).map{ |n| "h#{n}" }
+    (2..level-1).map{ |n| "h#{n}" }.reverse
   end
 
 

data/lib/devcenter-parser/version.rb

@@ -1,3 +1,3 @@
 module DevcenterParser
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

data/test/header_id_generator_test.rb

@@ -22,19 +22,31 @@ describe 'HeaderIdGeneratorTest' do
 
 
   describe 'ensures that there are not collisions between ids in subheaders' do
-    it 'by prepending the id of the previous H2 if possible' do
+    it 'by prepending the id of the previous headers as long as necessary' do
       html = <<-HTML
 <h2>A</h2>
   <h3>B</h3>
     <h4>Z</h4>
+
 <h2>C</h2>
   <h3>B</h3>
     <h4>Z</h4>
+
+<h2>D</h2>
+  <h3>X</h3>
+    <h4>Z</h4>
+  <h3>Y</h3>
+    <h4>Z</h4>
+
       HTML
       result = result(html)
-      %w{ a c }.each{ |id| assert_id(result, 'h2', id) }
-      %w{ a-b c-b }.each{ |id| assert_id(result, 'h3', id) }
+      %w{ a c d }.each{ |id| assert_id(result, 'h2', id) }
+      %w{ a-b c-b x y }.each{ |id| assert_id(result, 'h3', id) }
       %w{ a-b-z c-b-z }.each{ |id| assert_id(result, 'h4', id) }
+
+%w{ d }.each{ |id| assert_id(result, 'h2', id) }
+%w{ x y }.each{ |id| assert_id(result, 'h3', id) }
+      %w{ x-z y-z }.each{ |id| assert_id(result, 'h4', id) }
     end
 
     it 'by appending numbers for those subheaders with same nesting level and parent header name' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devcenter-parser
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Heroku
@@ -90,6 +90,7 @@ files:
 - Gemfile
 - LICENSE
 - README.md
+- Rakefile
 - devcenter-parser.gemspec
 - lib/devcenter-parser.rb
 - lib/devcenter-parser/github_parser.rb