dynamic_form 1.1.3 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: b0a342fb584e366ee3435e4d9e017602b9a68e5eb5a55e68f98289cc2de10e72
+  data.tar.gz: bfd5abc37fe514962445b6b2d7678296d9befab2dd130e2fc79572dfea773b7f
+SHA512:
+  metadata.gz: 7bdc76650d236b6f8074e4d92284c76f5b15a095ff2aff008ffb2ac620b707580ba5f3d1fdda75a7a45503cdfdd25d73e5871975165ba0c8e89acf090f51761a
+  data.tar.gz: 5e4935361a88e1e0290d681efe89206684101cc86788e431cdde2bb7ce4cea308a3120b43f107a8d907706a28f7b8a02f825a0b4ea19fcca228831d4907f3dec

data/README.md

@@ -8,7 +8,7 @@ DynamicForm holds a few helpers method to help you deal with your Rails3 models,
 * `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.
+It also adds `f.error_messages` and `f.error_message_on` to your form builders.
 
 Read `/lib/action_view/helpers/dynamic_form.rb` for details of each method.
 
@@ -50,7 +50,7 @@ DynamicForm can be installed as a gem in your `Gemfile`:
     
 or as a plugin by running this command:
 
-    rails plugin install git://codaset.com/joelmoss/dynamic-form.git
+    rails plugin install git://github.com/joelmoss/dynamic_form.git
 
 ---
 

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.1.4

data/dynamic_form.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dynamic_form}
-  s.version = "1.1.3"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Moss"]
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
      "test/dynamic_form_test.rb",
      "test/test_helper.rb"
   ]
-  s.homepage = %q{http://codaset.com/joelmoss/dynamic-form}
+  s.homepage = %q{http://github.com/joelmoss/dynamic_form}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
@@ -58,4 +58,3 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mocha>, [">= 0"])
   end
 end
-

data/init.rb

@@ -1 +1 @@
-require 'dynamic_form'
+require 'dynamic_form'

data/lib/action_view/helpers/dynamic_form.rb

@@ -212,7 +212,7 @@ module ActionView
           end
           options[:object_name] ||= params.first
 
-          I18n.with_options :locale => options[:locale], :scope => [:errors, :template] do |locale|
+          I18n.with_options :locale => options[:locale], :scope => [:activerecord, :errors, :template] do |locale|
             header_message = if options.include?(:header_message)
               options[:header_message]
             else
@@ -221,11 +221,11 @@ module ActionView
 
             message = options.include?(:message) ? options[:message] : locale.t(:body)
 
-            error_messages = objects.sum do |object|
+            error_messages = objects.map do |object|
               object.errors.full_messages.map do |msg|
                 content_tag(:li, msg)
               end
-            end.join.html_safe
+            end.inject(:+).join.html_safe
 
             contents = ''
             contents << content_tag(options[:header_tag] || :h2, header_message) unless header_message.blank?
@@ -267,7 +267,7 @@ module ActionView
             when :time
               to_time_select_tag(options)
             when :boolean
-              to_boolean_select_tag(options)
+              to_boolean_select_tag(options).html_safe
           end
         end
 

data/lib/action_view/locale/en.yml

@@ -1,8 +1,9 @@
 en:
-  errors:
-    template:
-      header:
-        one:    "1 error prohibited this %{model} from being saved"
-        other:  "%{count} errors prohibited this %{model} from being saved"
-      # The variable :count is also available
-      body: "There were problems with the following fields:"
+  activerecord:
+    errors:
+      template:
+        header:
+          one:    "1 error prohibited this %{model} from being saved"
+          other:  "%{count} errors prohibited this %{model} from being saved"
+        # The variable :count is also available
+        body: "There were problems with the following fields:"

data/lib/active_model/dynamic_errors.rb

@@ -13,27 +13,22 @@ module ActiveModel
     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 }
+      each do |error|
+        if error.attribute == :base
+          full_messages << error.message
         else
-          attr_name = attribute.to_s.gsub('.', '_').humanize
-          attr_name = @base.class.human_attribute_name(attribute, :default => attr_name)
+          attr_name = error.attribute.to_s.gsub('.', '_').humanize
+          attr_name = @base.class.human_attribute_name(error.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            
+          if error.message =~ /^\^/
+            options[:default] = "%{message}"
+            full_messages << I18n.t(:"errors.dynamic_format", **options.merge(:message => error.message[1..-1]))
+          elsif error.message.is_a? Proc
+            options[:default] = "%{message}"
+            full_messages << I18n.t(:"errors.dynamic_format", **options.merge(:message => error.message.call(@base)))
+          else
+            full_messages << I18n.t(:"errors.format", **options.merge(:message => error.message))
           end
         end
       end
@@ -44,4 +39,4 @@ module ActiveModel
 end
 
 require 'active_support/i18n'
-I18n.load_path << File.dirname(__FILE__) + '/locale/en.yml'
+I18n.load_path << File.dirname(__FILE__) + '/locale/en.yml'

data/test/dynamic_form_i18n_test.rb

@@ -16,27 +16,27 @@ class DynamicFormI18nTest < Test::Unit::TestCase
 
     stubs(:content_tag).returns 'content_tag'
 
-    I18n.stubs(:t).with(:'header', :locale => 'en', :scope => [:errors, :template], :count => 1, :model => '').returns "1 error prohibited this  from being saved"
-    I18n.stubs(:t).with(:'body', :locale => 'en', :scope => [:errors, :template]).returns 'There were problems with the following fields:'
+    I18n.stubs(:t).with(:'header', :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').returns "1 error prohibited this  from being saved"
+    I18n.stubs(:t).with(:'body', :locale => 'en', :scope => [:activerecord, :errors, :template]).returns 'There were problems with the following fields:'
   end
 
   def test_error_messages_for_given_a_header_option_it_does_not_translate_header_message
-    I18n.expects(:t).with(:'header', :locale => 'en', :scope => [:errors, :template], :count => 1, :model => '').never
+    I18n.expects(:t).with(:'header', :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').never
     error_messages_for(:object => @object, :header_message => 'header message', :locale => 'en')
   end
 
   def test_error_messages_for_given_no_header_option_it_translates_header_message
-    I18n.expects(:t).with(:'header', :locale => 'en', :scope => [:errors, :template], :count => 1, :model => '').returns 'header message'
+    I18n.expects(:t).with(:'header', :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').returns 'header message'
     error_messages_for(:object => @object, :locale => 'en')
   end
 
   def test_error_messages_for_given_a_message_option_it_does_not_translate_message
-    I18n.expects(:t).with(:'body', :locale => 'en', :scope => [:errors, :template]).never
+    I18n.expects(:t).with(:'body', :locale => 'en', :scope => [:activerecord, :errors, :template]).never
     error_messages_for(:object => @object, :message => 'message', :locale => 'en')
   end
 
   def test_error_messages_for_given_no_message_option_it_translates_message
-    I18n.expects(:t).with(:'body', :locale => 'en', :scope => [:errors, :template]).returns 'There were problems with the following fields:'
+    I18n.expects(:t).with(:'body', :locale => 'en', :scope => [:activerecord, :errors, :template]).returns 'There were problems with the following fields:'
     error_messages_for(:object => @object, :locale => 'en')
   end
 end

metadata

@@ -1,47 +1,40 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dynamic_form
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 3
-  version: 1.1.3
+version: !ruby/object:Gem::Version
+  version: 1.2.0
 platform: ruby
-authors: 
+authors:
 - Joel Moss
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2010-09-05 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2010-09-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mocha
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        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. It also brings in the functionality of the custom-err-messages plugin, which provides more flexibility over your model error messages.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+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: 
+extra_rdoc_files:
 - README.md
-files: 
-- .gitignore
+files:
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -58,41 +51,31 @@ files:
 - test/dynamic_form_i18n_test.rb
 - test/dynamic_form_test.rb
 - test/test_helper.rb
-has_rdoc: true
-homepage: http://codaset.com/joelmoss/dynamic-form
+homepage: http://github.com/joelmoss/dynamic_form
 licenses: []
-
-post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+metadata: {}
+post_install_message:
+rdoc_options:
+- "--charset=UTF-8"
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.7
-signing_key: 
+rubygems_version: 3.4.11
+signing_key:
 specification_version: 3
-summary: DynamicForm holds a few helper methods to help you deal with your Rails3 models
-test_files: 
+summary: DynamicForm holds a few helper methods to help you deal with your Rails3
+  models
+test_files:
 - test/dynamic_form_i18n_test.rb
 - test/dynamic_form_test.rb
 - test/test_helper.rb