roda-component 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a16bb2b329a369806cff4a67ac5988eac549382c
-  data.tar.gz: 4cf66e8d5cd2579d3949cb2629dc10eeef204dbd
+  metadata.gz: 2762210c34d25092f116906d5f179868ec7a015a
+  data.tar.gz: 90bfc66cfc6a1144f5c6deeeedfa19461efb7a6a
 SHA512:
-  metadata.gz: dd5d13d7a64980b0b8e894b2eb34674a349cd492e44efd2d3bdf7816ff7720e9f0acbcda0738a06f17af2467c958d3cc631fcd30bb588c6c19724a8d9f7732cc
-  data.tar.gz: 99af32ec110135bd65a7970600d62811490201879099baea649a6b2d40461c502a453b70d9d47b85a1b522c893d1497acf3d5bed3d6ad1aee0c7bd9a5dbaa094
+  metadata.gz: 438a6485163a5065b03ebf8e4438f362b4b73abfeda6652db9ddfbca3cdf2c2072ab0d58adf2762edcc4cd252fc1af3816307dc673fa61425c0cac0f6234b0ed
+  data.tar.gz: 7fc115845baaa1abfbd43458722b0160d885cb552e7153f290be24872a5c3a22ada9fc2428d9a7e9e767bac244371c41f34ab74ee9701763741554330691e58e

data/lib/roda/component/form.rb

@@ -125,6 +125,28 @@ class Roda
         end
       end
 
+      def model_attributes data = attributes
+        hash = {}
+
+        data.each do |k, v|
+          if klass = _form[k.to_s.to_sym]
+            data = data[k]
+
+            f = klass.new data
+            k = "#{k}_attributes"
+            data = f.attributes
+
+            hash[k] = model_attributes data
+          elsif v.is_a? Hash
+            hash[k] = model_attributes data[k]
+          else
+            hash[k] = v
+          end
+        end
+
+        hash
+      end
+
       def slice(*keys)
         Hash.new.tap do |atts|
           keys.each do |att|
@@ -134,6 +156,7 @@ class Roda
       end
 
       def display_errors options = {}
+        dom = options.delete(:dom) || _dom
         d_errors = errors
 
         if override_errors = options[:override_errors]
@@ -164,11 +187,10 @@ class Roda
               i != 0 ? "[#{field}]" : field
             end.join
 
-            field_error_dom = options.delete :tmpl
-            field_error_dom = DOM.new('<span class="field-error"><span>') unless field_error_dom
+            field_error_dom = DOM.new(`#{options[:tmpl].dom}[0].outerHTML` || '<span class="field-error"><span>')
             field_error_dom.html _error_name(key, error)
 
-            field = _dom.find("input[name='#{name}']")
+            field = dom.find("[name='#{name}']")
             field.before field_error_dom.dom
           end
         end

data/lib/roda/component/version.rb

@@ -1,5 +1,5 @@
 class Roda
   class Component
-    VERSION = "0.1.21"
+    VERSION = "0.1.22"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roda-component
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - cj