lib/yaks/format/halo.rb in yaks-0.7.5 vs lib/yaks/format/halo.rb in yaks-0.7.6

@@ -20,10 +20,20 @@
           result[control.name] = serialize_control(control)
         end
       end
 
       def serialize_control(control)
-        control.to_h.merge(fields: control.fields.map(&:to_h))
+        raw = control.to_h
+        raw[:href]  = raw.delete(:action)
+        raw[:fields] = control.fields.map(&:to_h)
+        raw[:fields].each do |field|
+          if field[:options].empty?
+            field.delete(:options)
+          else
+            field[:options] || field[:options].map(&:to_h)
+          end
+        end
+        raw
       end
     end
   end
 end