simple_form 1.1.3 → 1.2.0

data/README.rdoc

@@ -10,9 +10,13 @@ Install the gem:
 
   sudo gem install simple_form
 
+Add it to your Gemfile:
+
+  gem "simple_form"
+
 Run the generator:
 
-  rails generate simple_form_install
+  rails generate simple_form:install
 
 And you are ready to go. Since this branch is aims Rails 3 support,
 if you want to use it with Rails 2.3 you should check this branch:
@@ -294,7 +298,7 @@ There are other options that can be configured through I18n API, such as require
 
 SimpleForm has several configuration values. You can read and change them in the initializer created by SimpleForm, so if you haven't executed the command below yet, please do:
 
-  ruby script/generate simple_form_install
+  rails generate simple_form:install
 
 == TODO
 

data/lib/generators/simple_form/install_generator.rb

@@ -0,0 +1,23 @@
+module SimpleForm
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      desc "Copy SimpleForm default files"
+
+      def self.source_root
+        @_source_root = File.expand_path('../templates', __FILE__)
+      end
+
+      def copy_initializers
+        copy_file 'simple_form.rb', 'config/initializers/simple_form.rb'
+      end
+
+      def copy_locale_file
+        copy_file 'en.yml', 'config/locales/simple_form.en.yml'
+      end
+
+      def copy_scaffold_template
+        copy_file '_form.html.erb', 'lib/templates/erb/scaffold/_form.html.erb'
+      end
+    end
+  end
+end

data/lib/generators/simple_form/templates/_form.html.erb

@@ -0,0 +1,23 @@
+<%%= simple_form_for(@<%= singular_name %>) do |f| %>
+  <%% if @<%= singular_name %>.errors.any? %>
+    <div id="error_explanation">
+      <h2><%%= pluralize(@<%= singular_name %>.errors.count, "error") %> prohibited this <%= singular_name %> from being saved:</h2>
+
+      <ul>
+      <%% @<%= singular_name %>.errors.full_messages.each do |msg| %>
+        <li><%%= msg %></li>
+      <%% end %>
+      </ul>
+    </div>
+  <%% end %>
+
+  <div class="inputs">
+  <%- attributes.each do |attribute| -%>
+    <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %>
+  <%- end -%>
+  </div>
+
+  <div class="actions">
+    <%%= f.button :submit %>
+  </div>
+<%% end %>

data/lib/generators/{simple_form_install → simple_form}/templates/simple_form.rb

@@ -5,18 +5,16 @@ SimpleForm.setup do |config|
   # remove any of them, change the order, or even add your own components in the
   # stack. By inheriting your component from SimpleForm::Components::Base you'll
   # have some extra helpers for free.
-  # config.components = [
-  #  SimpleForm::Components::Wrapper, SimpleForm::Components::Label,
-  #  SimpleForm::Components::Input, SimpleForm::Components::Hint,
-  #  SimpleForm::Components::Error
-  #]
-
-  # Default tag used in components (hints and errors basically). When using one
-  # of these components, this tag will be used to render it.
-  # config.component_tag = :span
-
-  # You can wrap all inputs in a pre-defined tag. By default is nil.
-  # config.wrapper_tag = nil
+  # config.components = [ :label, :input, :hint, :error ]
+
+  # Default tag used on hints.
+  # config.hint_tag = :span
+
+  # Default tag used on errors.
+  # config.error_tag = :span
+
+  # You can wrap all inputs in a pre-defined tag.
+  # config.wrapper_tag = :div
 
   # How the label text should be generated altogether with the required text.
   # config.label_text = lambda { |label, required| "#{required} #{label}" }

data/lib/simple_form.rb

@@ -9,11 +9,11 @@ module SimpleForm
   autoload :Inputs,      'simple_form/inputs'
   autoload :MapType,     'simple_form/map_type'
 
-  # Default tag used in hints.
+  # Default tag used on hints.
   mattr_accessor :hint_tag
   @@hint_tag = :span
 
-  # Default tag used in errors.
+  # Default tag used on errors.
   mattr_accessor :error_tag
   @@error_tag = :span
 

data/lib/simple_form/action_view_extensions/builder.rb

@@ -30,15 +30,15 @@ module SimpleForm
       #                 item or an array of items.
       #
       def collection_radio(attribute, collection, value_method, text_method, options={}, html_options={})
-        collection.inject('') do |result, item|
+        collection.map do |item|
           value = item.send value_method
           text  = item.send text_method
 
           default_html_options = default_html_options_for_collection(item, value, options, html_options)
 
-          result << radio_button(attribute, value, default_html_options) <<
-                    label("#{attribute}_#{value}", text, :class => "collection_radio")
-        end.html_safe
+          radio_button(attribute, value, default_html_options) <<
+            label("#{attribute}_#{value}", text, :class => "collection_radio")
+        end.join.html_safe
       end
 
       # Creates a collection of check boxes for each item in the collection, associated
@@ -69,16 +69,16 @@ module SimpleForm
       #                 item or an array of items.
       #
       def collection_check_boxes(attribute, collection, value_method, text_method, options={}, html_options={})
-        collection.inject('') do |result, item|
+        collection.map do |item|
           value = item.send value_method
           text  = item.send text_method
 
           default_html_options = default_html_options_for_collection(item, value, options, html_options)
           default_html_options[:multiple] = true
 
-          result << check_box(attribute, default_html_options, value, '') <<
-                    label("#{attribute}_#{value}", text, :class => "collection_check_boxes")
-        end.html_safe
+          check_box(attribute, default_html_options, value, '') <<
+            label("#{attribute}_#{value}", text, :class => "collection_check_boxes")
+        end.join.html_safe
       end
 
       # Wrapper for using simple form inside a default rails form.

data/lib/simple_form/components/labels.rb

@@ -53,7 +53,6 @@ module SimpleForm
       end
 
       # First check human attribute name and then labels.
-      # TODO Remove me in Rails > 2.3.5
       def label_translation #:nodoc:
         default = if object.class.respond_to?(:human_attribute_name)
           object.class.human_attribute_name(reflection_or_attribute_name.to_s)

data/lib/simple_form/components/wrapper.rb

@@ -14,7 +14,7 @@ module SimpleForm
       end
 
       def wrapper_html_options
-        html_options_for(:wrapper, input_type, required_class)
+        html_options_for(:wrapper, "input", input_type, required_class)
       end
     end
   end

data/lib/simple_form/inputs/base.rb

@@ -34,7 +34,7 @@ module SimpleForm
       end
 
       def render
-        content = SimpleForm.components.map do |component|
+        content = components_list.map do |component|
           next if options[component] == false
           send(component)
         end
@@ -44,8 +44,18 @@ module SimpleForm
 
     protected
 
+      def components_list
+        SimpleForm.components
+      end
+
       def attribute_required?
-        options[:required] != false
+        if options.key?(:required)
+          options[:required]
+        elsif defined?(object.class.validators_on)
+          object.class.validators_on(attribute_name).any? { |v| v.kind == :presence }
+        else
+          true
+        end
       end
 
       def required_class

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "1.1.3".freeze
+  VERSION = "1.2.0".freeze
 end

data/test/components/label_test.rb

@@ -94,13 +94,27 @@ class LabelTest < ActionView::TestCase
     with_label_for @user, :created_at, :datetime
     assert_select 'label.datetime'
   end
+  
+  test 'label should obtain required from ActiveModel::Validations when it is included' do
+    with_label_for @validating_user, :name, :string
+    assert_select 'label.required'
+    with_label_for @validating_user, :status, :string
+    assert_select 'label.optional'
+  end
+  
+  test 'label should allow overriding required when ActiveModel::Validations is included' do
+    with_label_for @validating_user, :name, :string, :required => false
+    assert_select 'label.optional'
+    with_label_for @validating_user, :status, :string, :required => true
+    assert_select 'label.required'
+  end
 
-  test 'label should be required by default' do
+  test 'label should be required by default when ActiveModel::Validations is not included' do
     with_label_for @user, :name, :string
     assert_select 'label.required'
   end
 
-  test 'label should be able to disable required' do
+  test 'label should be able to disable required when ActiveModel::Validations is not included' do
     with_label_for @user, :name, :string, :required => false
     assert_no_select 'label.required'
   end

data/test/form_builder_test.rb

@@ -229,12 +229,27 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'span.error#cool', "can't be blank"
   end
 
-  test 'builder input should be required by default' do
+  # REQUIRED AND PRESENCE VALIDATION 
+  test 'builder input should obtain required from ActiveModel::Validations when it is included' do
+    with_form_for @validating_user, :name
+    assert_select 'input.required#validating_user_name'
+    with_form_for @validating_user, :status
+    assert_select 'input.optional#validating_user_status'
+  end
+  
+  test 'builder input should allow overriding required when ActiveModel::Validations is included' do
+    with_form_for @validating_user, :name, :required => false
+    assert_select 'input.optional#validating_user_name'
+    with_form_for @validating_user, :status, :required => true
+    assert_select 'input.required#validating_user_status'
+  end
+  
+  test 'builder input should be required by default when ActiveModel::Validations is not included' do
     with_form_for @user, :name
     assert_select 'input.required#user_name'
   end
-
-  test 'builder input should allow disabling required' do
+  
+  test 'builder input should allow disabling required when ActiveModel::Validations is not included' do
     with_form_for @user, :name, :required => false
     assert_no_select 'input.required'
     assert_select 'input.optional#user_name'
@@ -252,10 +267,10 @@ class FormBuilderTest < ActionView::TestCase
   test 'builder wrapping tag adds default css classes' do
     swap SimpleForm, :wrapper_tag => :p do
       with_form_for @user, :name
-      assert_select 'form p.required.string'
+      assert_select 'form p.input.required.string'
 
       with_form_for @user, :age, :required => false
-      assert_select 'form p.optional.integer'
+      assert_select 'form p.input.optional.integer'
     end
   end
 
@@ -333,9 +348,14 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'label.string[for=user_name]', /Name/
   end
 
+  test 'builder should add a required class to label if the attribute is required' do
+    with_label_for @validating_user, :name
+    assert_select 'label.string[for=validating_user_name]', /Name/
+  end
+
   test 'builder should allow passing options to label tag' do
     with_label_for @user, :name, :label => 'My label', :id => 'name_label'
-    assert_select 'label.string.required#name_label', /My label/
+    assert_select 'label.string#name_label', /My label/
   end
 
   test 'builder should fallback to default label when string is given' do

data/test/support/mock_controller.rb

@@ -5,6 +5,10 @@ class MockController
     @action_name || "edit"
   end
 
+  def _router
+    self
+  end
+
   def url_for(*args)
     "http://example.com"
   end

data/test/support/models.rb

@@ -100,3 +100,8 @@ class User < OpenStruct
     }
   end
 end
+
+class ValidatingUser < User
+  include ActiveModel::Validations
+  validates :name, :presence => true
+end

data/test/test_helper.rb

@@ -55,6 +55,13 @@ class ActionView::TestCase
       :description => 'Hello!',
       :created_at => Time.now
     }.merge(options))
+    
+    @validating_user = ValidatingUser.new({
+      :id => 1,
+      :name => 'New in Simple Form!',
+      :description => 'Hello!',
+      :created_at => Time.now
+    }.merge(options))
   end
 
   def protect_against_forgery?
@@ -66,4 +73,5 @@ class ActionView::TestCase
   end
   alias :users_path :user_path
   alias :super_user_path :user_path
+  alias :validating_user_path :user_path
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
-  - 3
-  version: 1.1.3
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-03 00:00:00 +02:00
+date: 2010-05-24 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -29,11 +29,11 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - init.rb
-- lib/generators/simple_form_install/USAGE
-- lib/generators/simple_form_install/simple_form_install_generator.rb
-- lib/generators/simple_form_install/templates/_form.html.erb
-- lib/generators/simple_form_install/templates/en.yml
-- lib/generators/simple_form_install/templates/simple_form.rb
+- lib/generators/simple_form/USAGE
+- lib/generators/simple_form/install_generator.rb
+- lib/generators/simple_form/templates/_form.html.erb
+- lib/generators/simple_form/templates/en.yml
+- lib/generators/simple_form/templates/simple_form.rb
 - lib/simple_form.rb
 - lib/simple_form/action_view_extensions/builder.rb
 - lib/simple_form/action_view_extensions/form_helper.rb

data/lib/generators/simple_form_install/simple_form_install_generator.rb

@@ -1,19 +0,0 @@
-class SimpleFormInstallGenerator < Rails::Generators::Base
-  desc "Copy SimpleForm default files"
-
-  def self.source_root
-    @_source_root = File.expand_path('../templates', __FILE__)
-  end
-
-  def copy_initializers
-    copy_file 'simple_form.rb', 'config/initializers/simple_form.rb'
-  end
-
-  def copy_locale_file
-    copy_file 'en.yml', 'config/locales/simple_form.en.yml'
-  end
-
-  def copy_scaffold_template
-    copy_file '_form.html.erb', 'lib/templates/erb/scaffold/_form.html.erb'
-  end
-end

data/lib/generators/simple_form_install/templates/_form.html.erb

@@ -1,11 +0,0 @@
-<%% simple_form_for(@<%= singular_name %>) do |f| %>
-  <div class="inputs">
-  <%- attributes.each do |attribute| -%>
-    <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %>
-  <%- end -%>
-  </div>
-
-  <div class="actions">
-    <%%= f.button :submit %>
-  </div>
-<%% end %>