govuk_elements_form_builder 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b788800d15d8ae1a07b12e3582f03a1b5a6f5cba
-  data.tar.gz: 97aea32625fa53528d7650eb02438e3370855dce
+  metadata.gz: 2fd74da74ab30234815107cffece6456ee7aa1c8
+  data.tar.gz: 0033ba79bac042304bd9d54d3223300c8299f550
 SHA512:
-  metadata.gz: 427bb61c76c85ccdfd06771bd0bd7165591cba1cd3bc5f8d69fb74cf0eb9bf9a7d25793b4fd9f76986625ef66ff55776eb1f446071a529c2713c6df29a3e69ac
-  data.tar.gz: b7a125879ee2b133bf44b56c236455826b6b81d534964e9f64ed972272d5e126b91afc13192f79ada47218f4a5e3ed5f12d9de804a351c3a9f47f99e548aeba2
+  metadata.gz: eefccc8724fe53d9c0d0b18c9b0fc6248510e62fafb91d2c22aae4877381a7d5d27473f04a818f47872d880fdb24e3fdd5866d71f0de619fdae2871f90c6a375
+  data.tar.gz: 998622aee024ff43f0777839a41ae4ceab91548acea038436733df4f60f5794d59a853b0fe0fb36dcd57e494fc95a59173af868d348eb7ce642025392863b070

data/app/helpers/govuk_elements_errors_helper.rb

@@ -22,10 +22,13 @@ module GovukElementsErrorsHelper
     attributes(object).any? { |child| errors_exist?(child) }
   end
 
-  def self.attributes object
+  def self.attributes object, parent_object=nil
+    return [] if object == parent_object
+    parent_object ||= object
+
     child_objects = attribute_objects object
-    nested_child_objects = child_objects.map { |o| attributes(o) }
-    (child_objects + nested_child_objects).flatten
+    nested_child_objects = child_objects.map { |o| attributes(o, parent_object) }
+    (child_objects + nested_child_objects).flatten - [object]
   end
 
   def self.attribute_objects object
@@ -35,21 +38,47 @@ module GovukElementsErrorsHelper
       compact
   end
 
-  def self.child_to_parent object, parents={}
+  def self.array_to_parent list, object, child_to_parents={}, parent_object
+    list.each do |child|
+      child_to_parents[child] = object
+      child_to_parent child, child_to_parents, parent_object
+    end
+  end
+
+  def self.child_to_parent object, child_to_parents={}, parent_object=nil
+    return child_to_parents if object == parent_object
+    parent_object ||= object
+
     attribute_objects(object).each do |child|
-      parents[child] = object
-      child_to_parent child, parents
+      if child.is_a?(Array)
+        array_to_parent(child, object, child_to_parents, parent_object)
+      else
+        child_to_parents[child] = object
+        child_to_parent child, child_to_parents, parent_object
+      end
     end
-    parents
+
+    child_to_parents
   end
 
   def self.instance_variable object, var
     field = var.to_s.sub('@','').to_sym
-    object.send(field) if object.respond_to?(field)
+    if object.respond_to?(field)
+      child = object.send(field)
+      if respond_to_errors?(child) || child.is_a?(Array)
+        child
+      else
+        nil
+      end
+    end
+  end
+
+  def self.respond_to_errors? object
+    object && object.respond_to?(:errors)
   end
 
   def self.errors_present? object
-    object && object.respond_to?(:errors) && object.errors.present?
+    respond_to_errors?(object) && object.errors.present?
   end
 
   def self.children_with_errors object
@@ -128,8 +157,8 @@ module GovukElementsErrorsHelper
   def self.parents_list object, child_to_parents
     if parent = child_to_parents[object]
       [].tap do |parents|
-        while parent
-          parents.unshift parent
+        while parent && !parents.include?(parent)
+          parents.unshift parent # prepends parent to front of parents
           parent = child_to_parents[parent]
         end
       end

data/lib/govuk_elements_form_builder/form_builder.rb

@@ -208,7 +208,9 @@ module GovukElementsFormBuilder
     end
 
     def error_for? attribute
-      errors.messages.key?(attribute) && !errors.messages[attribute].empty?
+      object.respond_to?(:errors) &&
+      errors.messages.key?(attribute) &&
+      !errors.messages[attribute].empty?
     end
 
     private_class_method def self.object_attribute_for field, object_name

data/lib/govuk_elements_form_builder/version.rb

@@ -1,3 +1,3 @@
 module GovukElementsFormBuilder
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_elements_form_builder
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Alistair Laing
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails