generic_form_builder 0.11.0 → 0.12.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjgxNTYzOGIzNjVkNGUwY2Q4MzA3ZjY4MzZkODY4MTliNTQ3MTRlNA==
+    NGI4Njc5YjcwNjk0NTQyYTk1Y2I2N2QwZDE3NjJmYmNkNGUzZWM0OQ==
   data.tar.gz: !binary |-
-    OTM2OGY3MjI1MWE1N2U4MTc4MDliOTk2MTIxMGJkYzUwYWQ0YjU1YQ==
+    MjVjZWUxZDQ5ODM4ODEyY2MyMjg1NTRkZTY3MzRlYjQwNGQ2Mzc3NA==
 SHA512:
   metadata.gz: !binary |-
-    YTFjOGJiNTUwZjU5NzYzMzU4ZTRhMWNlOTc4ZGI3NWUwMDI1NzJkYWUxYjY0
-    MjJmNzBhYzgyZmQwNzcxYmY4YmIzZWI0ZTJlZjQ3ZTg0ZDM1NGQ2NmM3MTVj
-    YTJhMDQyYmFhMjEyYWNmMWUyN2Y1MGFmZThmMGQzNWY0N2IzNWQ=
+    M2VjNzY3N2NmNmI3NGViMDJlNzE3ZGQ5MGMwMjlkYTgzZjhlODczNzlhN2Ez
+    NGU5MGE2YTZiMDQ3MWNhNzhjNjY2ODc5YmUzY2YwNjFkOGVjMTJmZjZkZDNk
+    YzVjZjk2Yjc2MjU4MDQ0ZTg1Yjg5NGFkZDY4M2U2ZGM2YzY1OWI=
   data.tar.gz: !binary |-
-    OGQzOGQ4NGZhZmJkMzU1NjllMDUxNTVjYTQzY2QyZmFmZjUwNTNlODA4ZGIz
-    ODdkN2M4MmNmYjBhYTk5YTU0NTVhMjg5ZGJjZmY1N2JmMTFmZDFiOWEwZWRk
-    NGNkZjNjMmMzMjA2MzNjMWU5NzVmOTNiYjBjZjk3NTVhZmMyM2Q=
+    ZDBlYjAzOTI3MGJjYjEzNzdhN2UzNDRjNjUzYTIyNjc3NmZkMGRkZDc3Nzcx
+    NjRhMWMzNzU1YzQ2NjZlMmY5MzkyYzQ0YzllMTBiNWViZDI3MDUwOTQxYzJj
+    MzA0YTgxMjViMzIwNmVhNzFiNjBmOTJkNzBiYjE5NjgzYTA0Y2Y=

data/.gitignore

@@ -0,0 +1 @@
+*.gem

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.11.0'
+  s.version       = '0.12.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

@@ -1,7 +1,7 @@
 class GenericFormBuilder < ActionView::Helpers::FormBuilder
   include ActionView::Helpers::TagHelper, ActionView::Helpers::UrlHelper
 
-  %w[
+  STANDARD_FIELDS = %w[
     text_field
     password_field
     text_area
@@ -9,7 +9,9 @@ class GenericFormBuilder < ActionView::Helpers::FormBuilder
     file_field
     number_field
     date_field
-  ].each do |method|
+  ].freeze
+
+  STANDARD_FIELDS.each do |method|
     define_method(method.to_sym) do |field, *args|
       options, *args = args
       options ||= {}
@@ -17,13 +19,18 @@ class GenericFormBuilder < ActionView::Helpers::FormBuilder
       note   = note_html(options[:note])
       button = ' '+content_tag(:button, content_tag(:span, options[:button])) if options[:button]
 
-      html_options = {}
+      wrapper_html_options = options.delete(:wrapper_html_options) || {}
 
       if any_errors?(field)
-        html_options.merge!('class' => 'errors')
+        wrapper_html_options.merge!('class' => 'errors')
       end
 
-      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)
+      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),
+      wrapper_html_options)
     end
   end
 
@@ -60,10 +67,19 @@ class GenericFormBuilder < ActionView::Helpers::FormBuilder
   end
 
   def buttons(options = {})
-    buttons  = content_tag(:button, content_tag(:span, options[:submit_text] || 'Save'), :type => 'submit')
-    buttons << link_to('Cancel', options[:cancel_link], :class => 'cancel button') if options[:cancel_link]
-
-    content_tag(:div, buttons, :class => 'actions')
+    options = {
+      cancel_class: ["cancel", "button"],
+      wrapper_class: ["actions"]
+    }.merge(options)
+
+    buttons  = content_tag(:button,
+                  content_tag(:span, options[:submit_text] || 'Save'),
+                  type: 'submit',
+                  class: options[:button_class]
+                )
+    buttons << link_to('Cancel', options[:cancel_link], class: options[:cancel_class]) if options[:cancel_link]
+
+    content_tag(:div, buttons, class: options[:wrapper_class])
   end
 
 protected

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: generic_form_builder
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Elliot Crosby-McCullough
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -20,6 +20,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - README.md
 - generic_form_builder.gemspec
 - lib/generic_form_builder.rb