lib/yaks/format/html.rb in yaks-html-0.6.1 vs lib/yaks/format/html.rb in yaks-html-0.6.2

@@ -24,12 +24,13 @@
 
       def render_resource(resource, templ = section('resource'))
         templ
           .replace('.type') { |header| header.content(resource.type.to_s + (resource.collection? ? ' collection' : '')) }
           .replace('.attribute', &render_attributes(resource.attributes))
-          .replace('.link', &render_links(resource.links))
-          .replace('.subresources') {|table| resource.subresources.empty? ? [] : render_subresources(resource.subresources, templ).call(table) }
+          .replace('.links') {|links| resource.links.empty? ? [] : links.replace('.link', &render_links(resource.links)) }
+          .replace('.controls') {|div| render_controls(resource.controls).call(div) }
+          .replace('.subresource') {|sub_templ| render_subresources(resource, templ, sub_templ) }
       end
 
       def render_attributes(attributes)
         ->(templ) do
           attributes.map do |key, value|
@@ -50,21 +51,52 @@
               .replace('.templated') {|x| x.content(link.templated?.inspect) }
           end
         end
       end
 
-      def render_subresources(subresources, templ)
+      def render_subresources(resource, templ, sub_templ)
         templ = templ.replace('h1,h2,h3,h4') {|h| h.set_tag("h#{h.tag[/\d/].to_i.next}") }
-        ->(wrap) do
-          wrap.replace('.subresource') { |row|
-            subresources.map do |rel, resources|
-              row
-                .replace('.rel a') {|a| a.attr('href', rel.to_s).content(rel.to_s) }
-                .replace('.value') {|x| x.content(resources.map { |resource| render_resource(resource, templ) })}
-            end
-          }
+        if resource.collection?
+          resource.map do |r|
+            render_resource(r, templ)
+          end
+        else
+          resource.subresources.map do |rel, resources|
+            sub_templ
+              .replace('.rel a') {|a| a.attr('href', rel.to_s).content(rel.to_s) }
+              .replace('.value') {|x| x.content(resources.map { |resource| render_resource(resource, templ) })}
+          end
         end
       end
 
+
+      def render_controls(controls)
+        ->(div) do
+          div.content(
+            controls.map(&method(:render_control))
+          )
+        end
+      end
+
+      def render_control(control)
+        form = H[:form]
+        form = form.attr('name', control.name)          if control.name
+        form = form.attr('method', control.method)      if control.method
+        form = form.attr('action', control.href)        if control.href
+        form = form.attr('enctype', control.media_type) if control.media_type
+
+        rows = control.fields.map do |field|
+          H[:tr,
+            H[:td, H[:label, {for: field.name}, field.label || '']],
+            H[:td, case field.type
+                   when /\A(button|checkbox|file|hidden|image|password|radio|reset|submit|text)\z/
+                     H[:input, type: field.type, value: field.value, name: field.name]
+                   when /textarea/
+                     H[:textarea, { name: field.name },  field.value || '']
+                   end]
+           ]
+        end
+        form.content(H[:table, control.title || '', *rows, H[:tr, H[:td, H[:input, {type: 'submit'}]]]])
+      end
     end
   end
 end