generic_form_builder 0.9.0 → 0.10.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    N2Q4ZTFiOTUzMTJiNDBiMTRjOTRmNDQ1YTE2YzJkYzZiYjA5ZjNlNA==
-  data.tar.gz: !binary |-
-    YWQ4YWVjZmVjZWYwNmIzYWEzYmE2NGIwMTI4ODYyYTQyOTBkODQ2OQ==
+SHA1:
+  metadata.gz: 3d15b6819643f21171da9a92b9533cc3728604e9
+  data.tar.gz: c399fa29b69c958c26805970cd2f00573d9a3e35
 SHA512:
-  metadata.gz: !binary |-
-    MzQyNTY0NWI3Mjc2NmQ1NTI2ODdiZjQ0NjVhZjJiZTJmMTUyOGVmYWRlMTky
-    ZmU5ZDYxNjc4ZDAxOTQ0ZDE1NDM5ZTU2YTBjMjFhYzFiMWE1NTZiMWJmN2Uy
-    MDJlYmUzZTE3Njk2YzExYjMwZTY2ZWU1ZDgyZWYyYWVjYTFmNDU=
-  data.tar.gz: !binary |-
-    N2JjYzhjNTcwY2YzM2UzYzAwMTIwZGVlMjlkMDRjYzJkNmM5MzU5Y2QzZmJk
-    YzVjZTEzMzdkYWJkMTFlNTg5ZjVjNjAyYzcyYzcyMTA0YjE0NGFmYWVkOTY3
-    MmE1ZWY4NzBlM2Q2NDQ5Y2JhOTcwZWJhNDY5ZDBlYjk3M2VlNTI=
+  metadata.gz: 371523458872f4cca8767d79c8e2aed8c8887b2b76b6c9767ffcba3720fa48394dfbc4bf0abae10320be29177b0258caa4fec267efe5309002d7a1e0882095d5
+  data.tar.gz: eadaf534d1782229706e15a12d8729e25aecca802fbdb0e1c2f17d3a67f8e5c09a4f4e249f6fe696e09cf6a96b44b5d2c25515b6b0bd0ea6a87d1457edabe76e

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.9.0'
+  s.version       = '0.10.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

@@ -14,7 +14,7 @@ class GenericFormBuilder < ActionView::Helpers::FormBuilder
       options, *args = args
       options ||= {}
       return super(field, *args) if options[:default_builder]
-      note   = content_tag(:span, options[:note], :class => 'note') if options[:note]
+      note   = note_html(options[:note])
       button = ' '+content_tag(:button, content_tag(:span, options[:button])) if options[:button]
 
       html_options = {}
@@ -31,21 +31,22 @@ class GenericFormBuilder < ActionView::Helpers::FormBuilder
   def select(field, collection, options = {}, html_options = {})
     return super if options[:default_builder]
     label_text = options[:label] || field.to_s.humanize
-    note       = content_tag(:span, options[:note], :class => 'note') if options[:note]
+    note       = note_html(options[:note])
     content_tag(:p, label(field, "#{label_text} #{errors_text(field)}") + note + super)
   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       = content_tag(:span, options[:note], :class => 'note') if options[:note]
+    note       = note_html(options[:note])
     content_tag(:p, label(field, "#{label_text} #{errors_text(field)}") + 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
-    content_tag(:p, label(field, super + " #{label_text} #{errors_text(field)}", :class => 'checkbox'))
+    note       = note_html(options[:note])
+    content_tag(:p, label(field, super + " #{label_text} #{errors_text(field)}" + note, :class => 'checkbox'))
   end
 
   def radio_button(field, value, options = {})
@@ -73,4 +74,17 @@ protected
     @object.errors[field].join(' and ')
   end
 
+  def note_html(note)
+    return unless note
+
+    if note.is_a?(Hash)
+      note_text = note.fetch(:text)
+      options = note.except(:text)
+    else
+      note_text = note
+    end
+
+    content_tag(:span, note_text, :class => (options[:class] || 'note'))
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: generic_form_builder
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Elliot Crosby-McCullough
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-21 00:00:00.000000000 Z
+date: 2014-11-11 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.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Generic Rails 3 form builder