Ticket #7312: active_record_helper_error_messages_on.diff

test/template/active_record_helper_test.rb

@@ -35 +35 @@
-    @post = Post.new    
-    def @post.errors
-      Class.new {
-
+
+
+
+
+
+
+
+
+
+
-        def empty?() false end 
-        def count() 1 end 
-        def full_messages() [ "Author name can't be empty" ] end
@@ -179 +188 @@
-    assert error_message_on(:post, :author_name)
-  end
-  
+  
+  
+  def test_error_messages_on
+    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><ul><li>Author name can't be empty</li><li>Author name another message</li></ul></div>), error_messages_on("post", "author_name")
+  end
+  
-  def test_error_messages_for_many_objects
-    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li><li>User email can't be empty</li></ul></div>), error_messages_for("post", "user")
-

lib/action_view/helpers/active_record_helper.rb

@@ -91 +91 @@
-          ''
-        end
-      end
+      
+      
+      
+      
+      # Returns a string with a div containing all of the error messages for the object and method located as instance variables by the names
+      # given.  This method mimics the output of +error_messages_for+, and is meant to be used in leau of +error_message_on+.
+      #
+      # This div can be tailored by the following options:
+      #
+      # * <tt>id</tt> - The id of the error div (default: errorExplanation)
+      # * <tt>class</tt> - The class of the error div (default: errorExplanation)
+      # * <tt>method_name</tt> - The object name to use in the header, or
+      # any text that you prefer. If <tt>method_name</tt> is not set, the name of
+      # the method will be used.
+      #
+      # Specifying one object:
+      # 
+      #   error_messages_on 'user', 'login'
+      #
+      #
+      # NOTE: This is a pre-packaged presentation of the errors with embedded strings and a certain HTML structure. If what
+      # you need is significantly different from the default presentation, it makes plenty of sense to access the object.errors
+      # instance yourself and set it up. View the source of this method to see how easy it is.
+      def error_messages_on(object, method, options = {})
+        html = {}
+        options.stringify_keys!
+        ['id', 'class'].each do |key|
+          if options.include?(key)
+            value = options[key]
+            html[key] = value unless value.blank?
+          else
+            html[key] = 'errorExplanation'
+          end
+        end
+        name = options['method_name'] ||= method.to_s.humanize.capitalize
+        if (obj = instance_variable_get("@#{object}")) && (errors = obj.errors.on(method))
+          [errors].flatten!
+        content_tag(:div,
+          content_tag(:ul, errors.map {|msg| content_tag(:li, "#{name} #{msg}") }),
+          html
+        )
+        else 
+          ''
+        end
+      end
+      
+      
-
-      # Returns a string with a div containing all of the error messages for the objects located as instance variables by the names
-      # given.  If more than one object is specified, the errors for the objects are displayed in the order that the object names are