From e506e60f6add331f70a2e698d85da47211a19f89 Mon Sep 17 00:00:00 2001 From: Lucas Mazza Date: Tue, 24 Jan 2012 16:54:28 -0200 Subject: [PATCH] add SimpleForm.default_wrapper --- .../templates/config/initializers/simple_form.rb.tt | 2 ++ lib/simple_form.rb | 3 +++ lib/simple_form/form_builder.rb | 2 +- test/generators/simple_form_generator_test.rb | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/generators/simple_form/templates/config/initializers/simple_form.rb.tt b/lib/generators/simple_form/templates/config/initializers/simple_form.rb.tt index 468c3b8f..c1d9d83d 100644 --- a/lib/generators/simple_form/templates/config/initializers/simple_form.rb.tt +++ b/lib/generators/simple_form/templates/config/initializers/simple_form.rb.tt @@ -49,6 +49,8 @@ SimpleForm.setup do |config| # Check the Bootstrap docs (http://twitter.github.com/bootstrap) # to learn about the different styles for forms and inputs, # buttons and other elements. + config.default_wrapper :bootstrap + config.wrappers :bootstrap, :tag => 'fieldset', :class => 'control-group', :error_class => 'error' do |b| b.use :placeholder b.use :label, :class => 'control-label' diff --git a/lib/simple_form.rb b/lib/simple_form.rb index 76d332ed..fd1a64b2 100644 --- a/lib/simple_form.rb +++ b/lib/simple_form.rb @@ -113,6 +113,9 @@ module SimpleForm @@button_class = 'button' ## WRAPPER CONFIGURATION + # The default wrapper to be used by the FormBuilder. + mattr_accessor :default_wrapper + @@default_wrapper = :default @@wrappers = {} # Retrieves a given wrapper diff --git a/lib/simple_form/form_builder.rb b/lib/simple_form/form_builder.rb index 3eb9f873..d9b67d70 100644 --- a/lib/simple_form/form_builder.rb +++ b/lib/simple_form/form_builder.rb @@ -32,7 +32,7 @@ module SimpleForm def initialize(*) #:nodoc: super @defaults = options[:defaults] - @wrapper = SimpleForm.wrapper(options[:wrapper] || :default) + @wrapper = SimpleForm.wrapper(options[:wrapper] || SimpleForm.default_wrapper) end # Basic input helper, combines all components in the stack to generate diff --git a/test/generators/simple_form_generator_test.rb b/test/generators/simple_form_generator_test.rb index 4f49c20a..02ee2f63 100644 --- a/test/generators/simple_form_generator_test.rb +++ b/test/generators/simple_form_generator_test.rb @@ -17,7 +17,7 @@ class SimpleFormGeneratorTest < Rails::Generators::TestCase test 'generates the simple_form initializer with the bootstrap wrappers' do run_generator %w(--bootstrap) - assert_file 'config/initializers/simple_form.rb', /config\.wrappers :bootstrap/ + assert_file 'config/initializers/simple_form.rb', /config\.wrappers :bootstrap/, /config\.default_wrapper :bootstrap/ end %W(erb haml slim).each do |engine|