generic_form_builder 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 3d15b6819643f21171da9a92b9533cc3728604e9
-  data.tar.gz: c399fa29b69c958c26805970cd2f00573d9a3e35
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MjgxNTYzOGIzNjVkNGUwY2Q4MzA3ZjY4MzZkODY4MTliNTQ3MTRlNA==
+  data.tar.gz: !binary |-
+    OTM2OGY3MjI1MWE1N2U4MTc4MDliOTk2MTIxMGJkYzUwYWQ0YjU1YQ==
 SHA512:
-  metadata.gz: 371523458872f4cca8767d79c8e2aed8c8887b2b76b6c9767ffcba3720fa48394dfbc4bf0abae10320be29177b0258caa4fec267efe5309002d7a1e0882095d5
-  data.tar.gz: eadaf534d1782229706e15a12d8729e25aecca802fbdb0e1c2f17d3a67f8e5c09a4f4e249f6fe696e09cf6a96b44b5d2c25515b6b0bd0ea6a87d1457edabe76e
+  metadata.gz: !binary |-
+    YTFjOGJiNTUwZjU5NzYzMzU4ZTRhMWNlOTc4ZGI3NWUwMDI1NzJkYWUxYjY0
+    MjJmNzBhYzgyZmQwNzcxYmY4YmIzZWI0ZTJlZjQ3ZTg0ZDM1NGQ2NmM3MTVj
+    YTJhMDQyYmFhMjEyYWNmMWUyN2Y1MGFmZThmMGQzNWY0N2IzNWQ=
+  data.tar.gz: !binary |-
+    OGQzOGQ4NGZhZmJkMzU1NjllMDUxNTVjYTQzY2QyZmFmZjUwNTNlODA4ZGIz
+    ODdkN2M4MmNmYjBhYTk5YTU0NTVhMjg5ZGJjZmY1N2JmMTFmZDFiOWEwZWRk
+    NGNkZjNjMmMzMjA2MzNjMWU5NzVmOTNiYjBjZjk3NTVhZmMyM2Q=

data/generic_form_builder.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name          = "generic_form_builder"
-  s.version       = '0.10.0'
+  s.version       = '0.11.0'
   s.platform      = Gem::Platform::RUBY
   s.authors       = ["Elliot Crosby-McCullough", "George Brocklehurst", "Elise Huard", "Tom Stuart"]
   s.email         = ["elliot.cm@gmail.com"]

data/lib/generic_form_builder.rb

@@ -20,11 +20,10 @@ class GenericFormBuilder < ActionView::Helpers::FormBuilder
       html_options = {}
 
       if any_errors?(field)
-        errors = ' '+content_tag(:span, errors_text(field), :class => "error")
         html_options.merge!('class' => 'errors')
       end
 
-      content_tag(:p, label(field, "#{options[:label] || field.to_s.humanize}#{errors}".try(:html_safe)) + note + super(field, options, *args) + button.try(:html_safe), html_options)
+      content_tag(:p, label(field, "#{options[:label] || field.to_s.humanize} #{errors_text(field)}".try(:html_safe)) + note + super(field, options, *args) + button.try(:html_safe), html_options)
     end
   end
 
@@ -32,28 +31,32 @@ class GenericFormBuilder < ActionView::Helpers::FormBuilder
     return super if options[:default_builder]
     label_text = options[:label] || field.to_s.humanize
     note       = note_html(options[:note])
-    content_tag(:p, label(field, "#{label_text} #{errors_text(field)}") + note + super)
+    p_html_options = {}
+    if any_errors?(field)
+      p_html_options.merge!('class' => 'errors')
+    end
+    content_tag(:p, label(field, "#{label_text} #{errors_text(field)}".try(:html_safe)) + note + super, p_html_options)
   end
 
   def collection_select(field, collection, value_method, name_method, options = {}, html_options = {})
     return super(field, collection, value_method, name_method) if options[:default_builder]
     label_text = options[:label] || field.to_s.humanize
     note       = note_html(options[:note])
-    content_tag(:p, label(field, "#{label_text} #{errors_text(field)}") + note + super(field, collection, value_method, name_method))
+    content_tag(:p, label(field, "#{label_text} #{errors_text(field)}".try(:html_safe)) + note + super(field, collection, value_method, name_method))
   end
 
   def check_box(field, options = {})
     return super if options[:default_builder]
     label_text = options[:label] || field.to_s.humanize
     note       = note_html(options[:note])
-    content_tag(:p, label(field, super + " #{label_text} #{errors_text(field)}" + note, :class => 'checkbox'))
+    content_tag(:p, label(field, super + " #{label_text} #{errors_text(field)}".try(:html_safe) + note, :class => 'checkbox'))
   end
 
   def radio_button(field, value, options = {})
     return super if options[:default_builder]
     label_text = options.delete(:label) || field.to_s.humanize
     tag_type = options.delete(:tag_type) || :li
-    content_tag(tag_type, label("#{field}_#{value.to_s.downcase.gsub(' ', '_')}", super + " #{label_text} #{errors_text(field)}", :class => 'radio', :onclick => ""))
+    content_tag(tag_type, label("#{field}_#{value.to_s.downcase.gsub(' ', '_')}", super + " #{label_text} #{errors_text(field)}".try(:html_safe), :class => 'radio', :onclick => ""))
   end
 
   def buttons(options = {})
@@ -71,7 +74,7 @@ protected
 
   def errors_text(field)
     return '' unless any_errors?(field)
-    @object.errors[field].join(' and ')
+    content_tag(:span, @object.errors[field].join(' and '), :class => "error")
   end
 
   def note_html(note)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: generic_form_builder
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Elliot Crosby-McCullough
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -32,17 +32,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Generic Rails 3 form builder