Delete dead code

lib/build.rb

@@ -41,17 +41,6 @@ def data
     @data ||= BuildData.new(dehydrated_targets, data_sets)
   end
 
-  def includables
-    @includables ||= {
-      "Text" => Includable::Text,
-      "DataDump" => Includable::DataDump,
-      "Index" => Includable::Index,
-      "PageDefaults" => Includable::PageDefaults,
-      "PostFooter" => Includable::PostFooter,
-      "SixWords" => Includable::SixWords
-    }
-  end
-
   def write
     hydrated_targets.map(&:write)
   end

lib/html_target.rb

@@ -14,7 +14,6 @@ def hydrate
     hydrator =
       MagicCommentHydrator.new(
         content: content,
-        includables: Build.includables,
         data: Build.data.for_current_page(data)
       )
     self.class.new(content: hydrator.hydrate.content, path: path, data: data)

lib/magic_comment_hydrator.rb

@@ -1,64 +1,57 @@
 class MagicCommentHydrator
   attr_reader :content
-  attr_reader :includables
   attr_reader :data
 
-  def initialize(content:, includables:, data:)
+  def initialize(content:, data:)
     @content = content
-    @includables = includables
     @data = data
   end
 
   def hydrate
-    next_magic_comment.present? ? self.next.hydrate : self
+    next_magic_element.present? ? self.next.hydrate : self
   end
 
-  def next_magic_comment
-    magic_comment_regex = /<!--(Include|IncludeInHeader)::(.*?)-->/m
+  def next_magic_element
     eval_ruby_regex = %r{<(eval-ruby)>(.*?)</eval-ruby>}m
     include_in_header_regex =
       %r{<(include-in-header)>(.*?)</include-in-header>}m
-    content.match(magic_comment_regex) || content.match(eval_ruby_regex) ||
-      content.match(include_in_header_regex)
+    content.match(eval_ruby_regex) || content.match(include_in_header_regex)
   end
 
   def next
-    fail "No more hyddrating to do!" if next_magic_comment.nil?
+    fail "No more hydrating to do!" if next_magic_element.nil?
 
-    current_magic_comment = next_magic_comment
-
-    insert_at =
-      case current_magic_comment[1]
-      when "IncludeInHeader", "include-in-header"
-        content.index("</head>")
-      when "Include", "eval-ruby"
-        content.index(current_magic_comment[0])
-      else
-        fail "Don't know how to handle #{current_magic_comment[1]}"
-      end
+    entire_magic_element = next_magic_element[0]
+    magic_element_name = next_magic_element[1]
+    magic_element_children = next_magic_element[2]
 
     replacement =
-      case current_magic_comment[1]
+      case magic_element_name
       when "eval-ruby"
-        begin
-          eval(current_magic_comment[2]).to_s.strip
-        end
+        eval(magic_element_children).to_s.strip
       when "include-in-header"
-        current_magic_comment[2].to_s.strip
-      when "IncludeInHeader", "Include"
-        includable, maybe_string = current_magic_comment[2].split(/\s/m, 2)
+        magic_element_children.to_s.strip
+      else
+        fail "Don't know how to handle #{magic_element_name}"
+      end
 
-        includables
-          .fetch(includable)
-          .new(string: maybe_string.to_s.strip, data: data)
-          .render
-          .to_s
+    insert_at =
+      case magic_element_name
+      when "include-in-header"
+        content.index("</head>")
+      when "eval-ruby"
+        content.index(entire_magic_element)
       else
-        fail "Don't know how to handle #{current_magic_comment[1]}"
+        fail "Don't know how to handle #{magic_element_name}"
       end
 
+    if insert_at > content.index(entire_magic_element)
+      fail "Magic element cannot appear before the targeted replacement position, yet"
+    end
+
     next_content =
-      content.sub(current_magic_comment[0], "").insert(insert_at, replacement)
-    self.class.new(content: next_content, includables: includables, data: data)
+      content.sub(entire_magic_element, "").insert(insert_at, replacement)
+
+    self.class.new(content: next_content, data: data)
   end
 end

test/magic_comment_hydrator_test.rb

@@ -25,8 +25,7 @@ def test_everything
         content: CONTENT,
         data: {
           "Fetch this!" => "Return that!"
-        },
-        includables: []
+        }
       )
     result = hydrator.hydrate