Bit more cleanup

bridgetownrb · Nov 3, 2023 · 2a159dc · 2a159dc
1 parent 9e5db9d
commit 2a159dc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/lib/lifeform/form.rb b/lib/lifeform/form.rb
@@ -204,7 +204,7 @@ def template(&block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComple
     def auto_render_fields = html_map(self.class.fields) { |k, _v| render(field(k)) }
 
     def render(field_object)
-      field_object.render_in(self)
+      field_object.render_in(helpers || self)
     end
   end
 end
diff --git a/lib/lifeform/helpers.rb b/lib/lifeform/helpers.rb
@@ -38,6 +38,14 @@ def attribute_segment(attr, value)
       "#{attr}=#{value.to_s.encode(xml: :attr)}"
     end
 
+    def attrs(callback)
+      attrs_string = attributes_from_options(callback.() || {})
+
+      attrs_string = " #{attrs_string}" unless attrs_string.blank?
+
+      attrs_string
+    end
+
     # Below is verbatim copied over from Bridgetown
     # TODO: extract both out to a shared gem
 

diff --git a/lib/lifeform/renderable.rb b/lib/lifeform/renderable.rb
@@ -4,18 +4,6 @@ module Lifeform
   module Renderable
     include Lifeform::Helpers
 
-    def attrs(callback)
-      attrs_string = attributes_from_options(callback.() || {})
-
-      attrs_string = " #{attrs_string}" unless attrs_string.blank?
-
-      attrs_string
-    end
-
-    def tag(tag, content, **options)
-      "<#{tag}#{attrs -> { options }}>#{text -> { content }}</#{tag}>"
-    end
-
     def render_in(view_context, &block)
       @_view_context = view_context
       template(&block).to_s.strip