refactor: Clean up code (#43)

spec/blueprint/html/standard_elements_spec.cr

@@ -10,38 +10,34 @@ private NORMAL_ELEMENTS = %i[
 private VOID_ELEMENTS  = %i[area base br col embed hr img input link meta source track wbr]
 private EMPTY_ELEMENTS = %i[iframe portal]
 
-private macro define_dummy_class
-  private class DummyPage
-    include Blueprint::HTML
+private class DummyPage
+  include Blueprint::HTML
 
-    private def blueprint
-      {% for element in NORMAL_ELEMENTS %}
-        {{element.id}}
-        {{element.id}}(attribute: "test")
-        {{element.id}} { "content" }
-        {{element.id}}(attribute: "test") { "content" }
-      {% end %}
+  private def blueprint
+    {% for element in NORMAL_ELEMENTS %}
+      {{element.id}}
+      {{element.id}}(attribute: "test")
+      {{element.id}} { "content" }
+      {{element.id}}(attribute: "test") { "content" }
+    {% end %}
 
-      {% for element in VOID_ELEMENTS %}
-        {{element.id}}
-        {{element.id}}(attribute: "test")
-      {% end %}
+    {% for element in VOID_ELEMENTS %}
+      {{element.id}}
+      {{element.id}}(attribute: "test")
+    {% end %}
 
-      {% for element in EMPTY_ELEMENTS %}
-        {{element.id}}
-        {{element.id}}(attribute: "test")
-      {% end %}
+    {% for element in EMPTY_ELEMENTS %}
+      {{element.id}}
+      {{element.id}}(attribute: "test")
+    {% end %}
 
-      select_tag
-      select_tag(attribute: "test")
-      select_tag { "content" }
-      select_tag(attribute: "test") { "content" }
-    end
+    select_tag
+    select_tag(attribute: "test")
+    select_tag { "content" }
+    select_tag(attribute: "test") { "content" }
   end
 end
 
-define_dummy_class
-
 describe "Blueprint::HTML standard HTML elements" do
   it "defines all base HTML elements helper methods" do
     page = DummyPage.new

src/blueprint/html.cr

@@ -4,8 +4,8 @@ require "./html/attributes_parser"
 require "./html/builder"
 require "./html/content_capture"
 require "./html/element_registrar"
+require "./html/elements"
 require "./html/renderer"
-require "./html/standard_elements"
 require "./html/svg"
 require "./html/utils"
 

src/blueprint/html/svg.cr

@@ -1,13 +1,13 @@
 require "../svg/component"
 
 module Blueprint::HTML
-  def svg(**attributes, &)
+  private def svg(**attributes, &) : Nil
     render Blueprint::SVG::Component.new(**attributes) do |component|
       with component yield
     end
   end
 
-  def svg(**attributes)
+  private def svg(**attributes) : Nil
     svg(**attributes) { }
   end
 end

src/blueprint/svg/component.cr

@@ -3,7 +3,7 @@ struct Blueprint::SVG::Component(T)
 
   @attributes : T
 
-  def self.new(**kwargs)
+  def self.new(**kwargs) : Blueprint::SVG::Component
     new kwargs
   end
 
@@ -16,7 +16,7 @@ struct Blueprint::SVG::Component(T)
     @attributes = attributes
   end
 
-  def blueprint(&)
+  private def blueprint(&) : Nil
     element :svg, **@attributes do
       yield
     end