dynamic_form 1.0.0 → 1.1.1

data/.gitignore

@@ -1 +1,2 @@
-.bundle
+.bundle
+pkg

data/README.md

@@ -0,0 +1,57 @@
+DynamicForm
+===========
+
+DynamicForm holds a few helpers method to help you deal with your Rails3 models, they are:
+
+* `input(record, method, options = {})`
+* `form(record, options = {})`
+* `error_message_on(object, method, options={})`
+* `error_messages_for(record, options={})`
+
+It also adds `f.error_messages` and `f.error_messages_on` to your form builders.
+
+Read `/lib/action_view/helpers/dynamic_form.rb` for details of each method.
+
+---
+
+DynamicErrors
+=============
+
+DynamicForm also includes DynamicErrors, which is a port of the custom-err-messages plugin,
+but built to work with Rails3. It gives you the option to not have your custom validation
+error message prefixed with the attribute name. Ordinarily, if you have, say:
+
+    validates_acceptance_of :accepted_terms, :message => 'Please accept the terms of service'
+
+You'll get the following error message:
+
+    Accepted terms Please accept the terms of service
+
+This plugin allows you to omit the attribute name for specific messages. All you have to do
+is begin the message with a '^' character. Example:
+
+    validates_acceptance_of :accepted_terms, :message => '^Please accept the terms of service'
+    
+Nigel Ramsay added the ability to specify a proc to generate the message.
+
+    validates_presence_of :assessment_answer_option_id, 
+      :message => Proc.new { |aa| "#{aa.label} (#{aa.group_label}) is required" }
+
+    which gives an error message like: Rate (Accuracy) is required
+
+---
+
+Installation
+------------
+
+DynamicForm can be installed as a gem in your `Gemfile`:
+
+    gem 'dynamic_form'
+    
+or as a plugin by running this command:
+
+    rails plugin install git://codaset.com/joelmoss/dynamic-form.git
+
+---
+
+Copyright (c) 2010 David Heinemeier Hansson, released under the MIT license

data/Rakefile

@@ -6,7 +6,7 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "dynamic_form"
     gem.summary = %Q{DynamicForm holds a few helper methods to help you deal with your Rails3 models}
-    gem.description = %Q{DynamicForm holds a few helper methods to help you deal with your Rails3 models. It includes the stripped out methods from Rails 2; error_message_on and error_messages_for}
+    gem.description = %Q{DynamicForm holds a few helper methods to help you deal with your Rails3 models. It includes the stripped out methods from Rails 2; error_message_on and error_messages_for. It also brings in the functionality of the custom-err-messages plugin, which provides more flexibility over your model error messages.}
     gem.email = "joel@developwithstyle.com"
     gem.homepage = "http://codaset.com/joelmoss/dynamic-form"
     gem.authors = ["Joel Moss"]

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.1

data/dynamic_form.gemspec

@@ -5,29 +5,30 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dynamic_form}
-  s.version = "1.0.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Moss"]
   s.date = %q{2010-08-09}
-  s.description = %q{DynamicForm holds a few helper methods to help you deal with your Rails3 models. It includes the stripped out methods from Rails 2; error_message_on and error_messages_for}
+  s.description = %q{DynamicForm holds a few helper methods to help you deal with your Rails3 models. It includes the stripped out methods from Rails 2; error_message_on and error_messages_for. It also brings in the functionality of the custom-err-messages plugin, which provides more flexibility over your model error messages.}
   s.email = %q{joel@developwithstyle.com}
   s.extra_rdoc_files = [
-    "README"
+    "README.md"
   ]
   s.files = [
     ".gitignore",
      "Gemfile",
      "Gemfile.lock",
      "MIT-LICENSE",
-     "README",
+     "README.md",
      "Rakefile",
      "VERSION",
-     "dynamic-form.gemspec",
      "dynamic_form.gemspec",
      "init.rb",
      "lib/action_view/helpers/dynamic_form.rb",
      "lib/action_view/locale/en.yml",
+     "lib/active_model/dynamic_errors.rb",
+     "lib/active_model/locale/en.yml",
      "lib/dynamic_form.rb",
      "test/dynamic_form_i18n_test.rb",
      "test/dynamic_form_test.rb",

data/lib/active_model/dynamic_errors.rb

@@ -0,0 +1,47 @@
+module ActiveModel
+  class Errors
+    # Redefine the ActiveModel::Errors::full_messages method:
+    #  Returns all the full error messages in an array. 'Base' messages are handled as usual.
+    #  Non-base messages are prefixed with the attribute name as usual UNLESS 
+    # (1) they begin with '^' in which case the attribute name is omitted.
+    #     E.g. validates_acceptance_of :accepted_terms, :message => '^Please accept the terms of service'
+    # (2) the message is a proc, in which case the proc is invoked on the model object.
+    #     E.g. validates_presence_of :assessment_answer_option_id, 
+    #     :message => Proc.new { |aa| "#{aa.label} (#{aa.group_label}) is required" }
+    #     which gives an error message like:
+    #     Rate (Accuracy) is required
+    def full_messages
+      full_messages = []
+
+      each do |attribute, messages|
+        messages = Array.wrap(messages)
+        next if messages.empty?
+
+        if attribute == :base
+          messages.each {|m| full_messages << m }
+        else
+          attr_name = attribute.to_s.gsub('.', '_').humanize
+          attr_name = @base.class.human_attribute_name(attribute, :default => attr_name)
+          options = { :default => "%{attribute} %{message}", :attribute => attr_name }
+
+          messages.each do |m|
+            if m =~ /^\^/
+              options[:default] = "%{message}"
+              full_messages << I18n.t(:"errors.dynamic_format", options.merge(:message => m[1..-1]))
+            elsif m.is_a? Proc
+              options[:default] = "%{message}"
+              full_messages << I18n.t(:"errors.dynamic_format", options.merge(:message => m.call(@base)))
+            else
+              full_messages << I18n.t(:"errors.format", options.merge(:message => m))
+            end            
+          end
+        end
+      end
+
+      full_messages
+    end
+  end
+end
+
+require 'active_support/i18n'
+I18n.load_path << File.dirname(__FILE__) + '/locale/en.yml'

data/lib/active_model/locale/en.yml

@@ -0,0 +1,4 @@
+en:
+  errors:
+    # The default format to use in full dynamic error messages.
+    dynamic_format: "%{message}"

data/lib/dynamic_form.rb

@@ -1,3 +1,4 @@
+require "active_model/dynamic_errors"
 require 'action_view/helpers/dynamic_form'
 
 class ActionView::Base

data/test/dynamic_form_test.rb

@@ -369,4 +369,10 @@ class DynamicFormTest < ActionView::TestCase
 
     assert_dom_equal expected, output_buffer
   end
+  
+  def test_error_messages_without_prefixed_attribute_name
+    error = error_messages_for(@post)
+    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>1 error 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></ul></div>),
+      error
+  end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 0
-  - 0
-  version: 1.0.0
+  - 1
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Joel Moss
@@ -30,27 +30,28 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id001
-description: DynamicForm holds a few helper methods to help you deal with your Rails3 models. It includes the stripped out methods from Rails 2; error_message_on and error_messages_for
+description: DynamicForm holds a few helper methods to help you deal with your Rails3 models. It includes the stripped out methods from Rails 2; error_message_on and error_messages_for. It also brings in the functionality of the custom-err-messages plugin, which provides more flexibility over your model error messages.
 email: joel@developwithstyle.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.md
 files: 
 - .gitignore
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
-- README
+- README.md
 - Rakefile
 - VERSION
-- dynamic-form.gemspec
 - dynamic_form.gemspec
 - init.rb
 - lib/action_view/helpers/dynamic_form.rb
 - lib/action_view/locale/en.yml
+- lib/active_model/dynamic_errors.rb
+- lib/active_model/locale/en.yml
 - lib/dynamic_form.rb
 - test/dynamic_form_i18n_test.rb
 - test/dynamic_form_test.rb

data/README

@@ -1,13 +0,0 @@
-DynamicForm
-===========
-
-DynamicForm holds a few helpers method to help you deal with your models, they are:
-
-* input(record, method, options = {})
-* form(record, options = {})
-* error_message_on(object, method, options={})
-* error_messages_for(record, options={})
-
-It also adds f.error_messages and f.error_messages_on to your form builders.
-
-Copyright (c) 2010 David Heinemeier Hansson, released under the MIT license

data/dynamic-form.gemspec

@@ -1,58 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{dynamic-form}
-  s.version = "1.0.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Joel Moss"]
-  s.date = %q{2010-08-09}
-  s.description = %q{DynamicForm holds a few helper methods to help you deal with your Rails3 models. It includes the stripped out methods from Rails 2; error_message_on and error_messages_for}
-  s.email = %q{joel@developwithstyle.com}
-  s.extra_rdoc_files = [
-    "README"
-  ]
-  s.files = [
-    ".gitignore",
-     "Gemfile",
-     "Gemfile.lock",
-     "MIT-LICENSE",
-     "README",
-     "Rakefile",
-     "VERSION",
-     "dynamic-form.gemspec",
-     "init.rb",
-     "lib/action_view/helpers/dynamic_form.rb",
-     "lib/action_view/locale/en.yml",
-     "test/dynamic_form_i18n_test.rb",
-     "test/dynamic_form_test.rb",
-     "test/test_helper.rb"
-  ]
-  s.homepage = %q{http://codaset.com/joelmoss/dynamic-form}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{DynamicForm holds a few helper methods to help you deal with your Rails3 models}
-  s.test_files = [
-    "test/dynamic_form_i18n_test.rb",
-     "test/dynamic_form_test.rb",
-     "test/test_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<mocha>, [">= 0"])
-    else
-      s.add_dependency(%q<mocha>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<mocha>, [">= 0"])
-  end
-end
-