yaks-html 0.8.0.alpha → 0.8.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3538bfad35c96b80a3735c177fe55f504412981b
-  data.tar.gz: f80c46102c2bb800b3aae0961cbd4e8305319a8c
+  metadata.gz: 2f4a1a3e001c86f0d5f082c13a303e78fdd77d55
+  data.tar.gz: 23735a387547e42f645f550351ea342c61d64157
 SHA512:
-  metadata.gz: 620402df5a28b62b9cce10223bbd0a7ceb568bc86f74c0d9073f89fcf650e5371d18acd7677e0804a91e9aa26df8033e4134212a29938cf4dd735ab7a7d0670a
-  data.tar.gz: b372e1aea24f91254704eb340d90e6600a35849090d158f9a9ff160eddcca10a8e5477e0679d3f75de699d117c9baea4f2fc51d7de9371ae9cf4057a49badb70
+  metadata.gz: eda417afcb0ba6373fd52fb4424496d7b225d9d82513cb4dbd31aa4fc78ff927736e03615ba3fac204866288d7c8da345d8052b937f8fe805b0dc7a843682d94
+  data.tar.gz: fafefd706104b3e43fa28353a2197fe65bcf5db32eb1cdb9ee99dc9098b2f461534d95681a205563b6fd626e704804e9d2ad6a37bdec5d3641d68e3022d6896e

data/lib/yaks/format/html.rb

@@ -3,7 +3,7 @@
 module Yaks
   class Format
     class HTML < self
-      include Adamantium
+      include Adamantium, Util
 
       register :html, :html, 'text/html'
 
@@ -85,19 +85,41 @@ module Yaks
         form = form.attr('action', form_control.action)      if form_control.action
         form = form.attr('enctype', form_control.media_type) if form_control.media_type
 
-        rows = form_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
+        rows = form_control.fields.map(&method(:render_field))
+
         form.content(H[:table, form_control.title || '', *rows, H[:tr, H[:td, H[:input, {type: 'submit'}]]]])
       end
+
+      def render_field(field)
+        return render_fieldset(field) if field.type == :fieldset
+        extra_info = reject_keys(field.to_h_compact, :type, :name, :value, :label, :options)
+        H[:tr,
+          H[:td,
+            H[:label, {for: field.name}, [field.label, field.required ? '*' : ''].join]],
+          H[:td,
+            case field.type
+            when /select/
+              H[:select, reject_keys(field.to_h_compact, :options), render_select_options(field.options)]
+            when /textarea/
+              H[:textarea, reject_keys(field.to_h_compact, :value), field.value || '']
+            when /legend/
+              H[:legend, field.to_h_compact]
+            else
+              H[:input, field.to_h_compact]
+            end],
+          H[:td, extra_info.empty? ? '' : extra_info.inspect]
+         ]
+      end
+
+      def render_fieldset(fieldset)
+        H[:fieldset, fieldset.fields.map(&method(:render_field))]
+      end
+
+      def render_select_options(options)
+        options.map do |o|
+          H[:option, reject_keys(o.to_h_compact, :label), o.label]
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaks-html
 version: !ruby/object:Gem::Version
-  version: 0.8.0.alpha
+  version: 0.8.0.beta1
 platform: ruby
 authors:
 - Arne Brasseur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaks
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0.alpha
+        version: 0.8.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0.alpha
+        version: 0.8.0.beta1
 - !ruby/object:Gem::Dependency
   name: hexp
   requirement: !ruby/object:Gem::Requirement