simple_form 1.0.4 → 1.1.0

data/README.rdoc

@@ -8,17 +8,16 @@ SimpleForm aims to be as flexible as possible while helping you with powerful co
 
 Install the gem:
 
-  gem install simple_form --version=1.0.2
-
-Configure simple_form gem inside your app:
-
-  config.gem 'simple_form'
+  sudo gem install simple_form --version=1.1
 
 Run the generator:
 
-  ruby script/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:
 
-And you're ready to go.
+  http://github.com/plataformatec/simple_form/tree/v1.0
 
 == Usage
 
@@ -158,8 +157,8 @@ Now we have the user form:
 
 Simple enough right? This is going to render a :select input for choosing the :company, and another :select input with :multiple option for the :roles. You can of course change it, to use radios and check boxes as well:
 
-    f.association :company, :as => :radio
-    f.association :roles, :as => :check_boxes
+  f.association :company, :as => :radio
+  f.association :roles, :as => :check_boxes
 
 And you will get a set of radios to select the company and another set of check boxes for the roles. Some options are available for refining the collection for associations: :conditions, :include, :joins, :order. These options are given straight to the find method. Here is an example of how to use these options:
 
@@ -176,34 +175,14 @@ The association helper just invokes input under the hood, so all options availab
 
 == Buttons
 
-All web forms need buttons, right? To help you with this, SimpleForm has a default button helper that acts as a wrapper for Rails helpers, creating submit texts using I18n. It's pretty straightforward:
+All web forms need buttons, right? SimpleForm wraps them in the DSL, acting like a proxy:
 
   <% simple_form_for @user do |f| -%>
     <p><%= f.input :name %></p>
     <p><%= f.button :submit %></p>
   <% end -%>
 
-This will create a input submit tag for you. If the resource @user is a new record, the button will have text 'Create User', otherwise 'Update User' is shown. If you are working with forms without objects, 'Submit User' would be shown. All those buttons labels can be configured using I18n through the keys :simple_form.buttons.create, :simple_form.buttons.update and :simple_form.buttons.submit.
-
-You can also pass the button text directly:
-
-  f.button :submit, 'Save User'
-  f.button :submit, :label => 'Save User'
-
-As button is just a wrapper, it is actually calling Rails helper :submit_tag with the provided text. That said, any other option you pass will be given to :submit_tag call:
-
-  f.button :submit, :confirm => 'Are you sure?'
-
-And if you want to use any other button tag, you just need to create a helper that ends with "_tag":
-
-  # inside ApplicationHelper for instance
-  def custom_submit_tag(text, options={})
-    # render submit tag here
-  end
-
-And you will able to use it with SimpleForm:
-
-  f.button :custom_submit
+The above will simply call submit. You choose to use it or not, it's just a question of taste.
 
 == Extra helpers
 
@@ -238,7 +217,7 @@ Creates a collection of radio inputs with labels associated (same API as collect
 Creates a collection of check boxes with labels associated (same API as collection_select):
 
   form_for @user do |f|
-    f.collection_check_boxes :options, [[true, 'Yes'] ,[false, 'No']], :first, :last
+    f.collection_check_box :options, [[true, 'Yes'] ,[false, 'No']], :first, :last
   end
 
   <input name="user[options][]" type="hidden" value="" />
@@ -256,6 +235,8 @@ SimpleForm comes with a lot of default mappings:
 
   boolean               check box               boolean
   string                text field              string
+  email                 email field             string
+  url                   url field               string
   password              password field          string with name matching "password"
   text                  text area               text
   file                  file field              string, responding to file methods
@@ -324,6 +305,10 @@ SimpleForm has several configuration values. You can read and change them in the
 
   ruby script/generate simple_form_install
 
+== TODO
+
+Please refer to TODO file.
+
 == Maintainers
 
 * José Valim (http://github.com/josevalim)

data/init.rb

@@ -1 +1 @@
-require 'simple_form'
+require 'simple_form'

data/lib/generators/simple_form_install/simple_form_install_generator.rb

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,11 @@
+<%% 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 %>

data/lib/{simple_form/locale → generators/simple_form_install/templates}/en.yml

@@ -2,10 +2,6 @@ en:
   simple_form:
     "yes": 'Yes'
     "no": 'No'
-    buttons:
-      create: 'Create %{model}'
-      update: 'Update %{model}'
-      submit: 'Submit %{model}'
     required:
       text: 'required'
       mark: '*'

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

@@ -5,16 +5,18 @@ 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 = [ :label, :input, :hint, :error ]
+  # config.components = [
+  #  SimpleForm::Components::Wrapper, SimpleForm::Components::Label,
+  #  SimpleForm::Components::Input, SimpleForm::Components::Hint,
+  #  SimpleForm::Components::Error
+  #]
 
-  # Default tag used on hints.
-  # config.hint_tag = :span
+  # 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
 
-  # Default tag used on errors.
-  # config.error_tag = :span
-
-  # You can wrap all inputs in a pre-defined tag.
-  # config.wrapper_tag = :div
+  # You can wrap all inputs in a pre-defined tag. By default is nil.
+  # config.wrapper_tag = nil
 
   # How the label text should be generated altogether with the required text.
   # config.label_text = lambda { |label, required| "#{required} #{label}" }
@@ -33,4 +35,7 @@ SimpleForm.setup do |config|
 
   # Default priority for country inputs.
   # config.country_priority = nil
+
+  # Default size for text inputs
+  # config.default_input_size = 50
 end

data/lib/simple_form.rb

@@ -1,6 +1,6 @@
+require 'action_view'
 require 'simple_form/action_view_extensions/form_helper'
 require 'simple_form/action_view_extensions/builder'
-require 'simple_form/action_view_extensions/instance_tag'
 
 module SimpleForm
   autoload :Components,  'simple_form/components'
@@ -9,11 +9,11 @@ module SimpleForm
   autoload :Inputs,      'simple_form/inputs'
   autoload :MapType,     'simple_form/map_type'
 
-  # Default tag used on hints.
+  # Default tag used in hints.
   mattr_accessor :hint_tag
   @@hint_tag = :span
 
-  # Default tag used on errors.
+  # Default tag used in errors.
   mattr_accessor :error_tag
   @@error_tag = :span
 
@@ -31,7 +31,7 @@ module SimpleForm
 
   # You can wrap all inputs in a pre-defined tag. By default is nil.
   mattr_accessor :wrapper_tag
-  @@wrapper_tag = nil
+  @@wrapper_tag = :div
 
   # How the label text should be generated altogether with the required text.
   mattr_accessor :label_text
@@ -49,6 +49,10 @@ module SimpleForm
   mattr_accessor :country_priority
   @@country_priority = nil
 
+  # Maximum size allowed for inputs.
+  mattr_accessor :default_input_size
+  @@default_input_size = 50
+
   # Default way to setup SimpleForm. Run script/generate simple_form_install
   # to create a fresh initializer with all configuration values.
   def self.setup

data/lib/simple_form/action_view_extensions/builder.rb

@@ -38,7 +38,7 @@ module SimpleForm
 
           result << radio_button(attribute, value, default_html_options) <<
                     label("#{attribute}_#{value}", text, :class => "collection_radio")
-        end
+        end.html_safe
       end
 
       # Creates a collection of check boxes for each item in the collection, associated
@@ -48,15 +48,15 @@ module SimpleForm
       # == Examples
       #
       #   form_for @user do |f|
-      #     f.collection_check_boxes :options, [[true, 'Yes'] ,[false, 'No']], :first, :last
+      #     f.collection_check_box :options, [[true, 'Yes'] ,[false, 'No']], :first, :last
       #   end
       #
       #   <input name="user[options][]" type="hidden" value="" />
       #   <input id="user_options_true" name="user[options][]" type="checkbox" value="true" />
-      #   <label class="collection_check_boxes" for="user_options_true">Yes</label>
+      #   <label class="collection_check_box" for="user_options_true">Yes</label>
       #   <input name="user[options][]" type="hidden" value="" />
       #   <input id="user_options_false" name="user[options][]" type="checkbox" value="false" />
-      #   <label class="collection_check_boxes" for="user_options_false">No</label>
+      #   <label class="collection_check_box" for="user_options_false">No</label>
       #
       # == Options
       #
@@ -78,7 +78,7 @@ module SimpleForm
 
           result << check_box(attribute, default_html_options, value, '') <<
                     label("#{attribute}_#{value}", text, :class => "collection_check_boxes")
-        end
+        end.html_safe
       end
 
       # Wrapper for using simple form inside a default rails form.
@@ -101,7 +101,7 @@ module SimpleForm
         # Generate default options for collection helpers, such as :checked and
         # :disabled.
         def default_html_options_for_collection(item, value, options, html_options) #:nodoc:
-          html_options.dup.tap do |default_html_options|
+          returning(html_options.dup) do |default_html_options|
             [:checked, :disabled].each do |option|
               next unless options[option]
 

data/lib/simple_form/components/labels.rb

@@ -28,7 +28,7 @@ module SimpleForm
       end
 
       def label_text
-        html_safe(SimpleForm.label_text.call(raw_label_text, required_label_text))
+        SimpleForm.label_text.call(raw_label_text, required_label_text)
       end
 
       def label_target
@@ -65,4 +65,4 @@ module SimpleForm
       end
     end
   end
-end
+end

data/lib/simple_form/form_builder.rb

@@ -7,7 +7,8 @@ module SimpleForm
     include SimpleForm::Inputs
 
     map_type :boolean, :password, :text, :file,   :to => SimpleForm::Inputs::MappingInput
-    map_type :string, :integer, :decimal, :float, :to => SimpleForm::Inputs::TextFieldInput
+    map_type :string, :email, :url,               :to => SimpleForm::Inputs::StringInput
+    map_type :integer, :decimal, :float,          :to => SimpleForm::Inputs::NumericInput
     map_type :select, :radio, :check_boxes,       :to => SimpleForm::Inputs::CollectionInput
     map_type :date, :time, :datetime,             :to => SimpleForm::Inputs::DateTimeInput
     map_type :country, :time_zone,                :to => SimpleForm::Inputs::PriorityInput
@@ -172,7 +173,7 @@ module SimpleForm
         klass.all(finders)
       end
 
-      input(attribute, options).tap { @reflection = nil }
+      returning(input(attribute, options)) { @reflection = nil }
     end
 
     # Creates a button:
@@ -181,48 +182,14 @@ module SimpleForm
     #     f.button :submit
     #   end
     #
-    # If the record is a new_record?, it will create a button with label "Create User",
-    # otherwise it will create with label "Update User". You can overwrite the label
-    # giving a second parameter or giving :label.
+    # It just acts as a proxy to method name given.
     #
-    #   f.button :submit, "Create a new user"
-    #   f.button :submit, :label => "Create a new user"
-    #
-    # button is actually just a wrapper that adds a default text, that said, f.button
-    # above is just calling:
-    #
-    #   submit_tag "Create a new user"
-    #
-    # All options given to button are given straight to submit_tag. That said, you can
-    # use :confirm normally:
-    #
-    #   f.button :submit, :confirm => "Are you sure?"
-    #
-    # And if you want to use image_submit_tag, just give it as an option:
-    #
-    #   f.button :image_submit, "/images/foo/bar.png"
-    #
-    # This comes with a bonus that any method added to your ApplicationController can
-    # be used by SimpleForm, as long as it ends with _tag. So is quite easy to customize
-    # your buttons.
-    #
-    def button(type, *args)
-      options = args.extract_options!
-      value   = args.first || options.delete(:label)
-      key     = @object ? (@object.new_record? ? :create : :update) : :submit
-
-      value ||= begin
-        model = if @object.class.respond_to?(:human_name)
-          @object.class.human_name
-        else
-          @object_name.to_s.humanize
-        end
-
-        I18n.t(:"simple_form.buttons.#{key}", :model => model, :default => "#{key.to_s.humanize} #{model}")
+    def button(type, *args, &block)
+      if respond_to?(:"#{type}_button")
+        send(:"#{type}_button", *args, &block)
+      else
+        send(type, *args, &block)
       end
-
-      options[:class] = "#{key} #{options[:class]}".strip
-      @template.send(:"#{type}_tag", value, options)
     end
 
     # Creates an error tag based on the given attribute, only when the attribute
@@ -304,6 +271,8 @@ module SimpleForm
             when /password/  then :password
             when /time_zone/ then :time_zone
             when /country/   then :country
+            when /email/     then :email
+            when /url/       then :url
           end
 
           match || input_type || file_method? || :string

data/lib/simple_form/inputs.rb

@@ -6,7 +6,8 @@ module SimpleForm
     autoload :DateTimeInput,   'simple_form/inputs/date_time_input'
     autoload :HiddenInput,     'simple_form/inputs/hidden_input'
     autoload :MappingInput,    'simple_form/inputs/mapping_input'
+    autoload :NumericInput,    'simple_form/inputs/numeric_input'
     autoload :PriorityInput,   'simple_form/inputs/priority_input'
-    autoload :TextFieldInput,  'simple_form/inputs/text_field_input'
+    autoload :StringInput,     'simple_form/inputs/string_input'
   end
 end

data/lib/simple_form/inputs/base.rb

@@ -39,8 +39,7 @@ module SimpleForm
           send(component)
         end
         content.compact!
-        content = html_safe(content.join)
-        html_safe(wrap(content))
+        wrap(content.join).html_safe
       end
 
     protected
@@ -65,17 +64,6 @@ module SimpleForm
         html_options
       end
 
-      # Ensure we make html safe only if it responds to it.
-      def html_safe(content)
-        if content.respond_to?(:html_safe)
-          content.html_safe
-        elsif content.respond_to?(:html_safe!)
-          content.html_safe!
-        else
-          content
-        end
-      end
-
       # Lookup translations for the given namespace using I18n, based on object name,
       # actual action and attribute name. Lookup priority as follows:
       #
@@ -116,4 +104,4 @@ module SimpleForm
       end
     end
   end
-end
+end

data/lib/simple_form/inputs/{text_field_input.rb → numeric_input.rb}

@@ -1,14 +1,14 @@
 module SimpleForm
   module Inputs
-    # Handles common text field inputs, as String, Numeric, Float and Decimal.
-    class TextFieldInput < Base
+    class NumericInput < Base
       def input
         @builder.text_field(attribute_name, input_html_options)
       end
 
       def input_html_options
         input_options = super
-        input_options[:maxlength] ||= column.limit if column
+        input_options[:class]  = "numeric #{input_options[:class]}"
+        input_options[:size] ||= SimpleForm.default_input_size
         input_options
       end
     end

data/lib/simple_form/inputs/string_input.rb

@@ -0,0 +1,24 @@
+module SimpleForm
+  module Inputs
+    class StringInput < Base
+      def input
+        @builder.text_field(attribute_name, input_html_options)
+      end
+
+      def input_html_options
+        input_options = super
+        input_options[:class]       = "string #{input_options[:class]}" unless input_type == :string
+        input_options[:size]      ||= [limit, SimpleForm.default_input_size].compact.min
+        input_options[:maxlength] ||= limit if limit
+        input_options[:type]      ||= input_type
+        input_options
+      end
+
+    protected
+
+      def limit
+        column && column.limit
+      end
+    end
+  end
+end

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "1.0.4".freeze
+  VERSION = "1.1.0".freeze
 end

data/test/action_view_extensions/form_helper_test.rb

@@ -34,17 +34,4 @@ class FormHelperTest < ActionView::TestCase
       assert f.instance_of?(SimpleForm::FormBuilder)
     end
   end
-
-  test 'remote form for yields an instance of FormBuilder' do
-    simple_remote_form_for :user do |f|
-      assert f.instance_of?(SimpleForm::FormBuilder)
-    end
-    assert_select "form[onsubmit]"
-  end
-
-  test 'pass options to simple remote form' do
-    simple_remote_form_for :user, :url => '/account', :html => { :id => 'my_form' } do |f| end
-    assert_select 'form#my_form'
-    assert_select 'form[action=/account]'
-  end
 end

data/test/form_builder_test.rb

@@ -79,12 +79,12 @@ class FormBuilderTest < ActionView::TestCase
 
   test 'builder should use integer text field for integer columns' do
     with_form_for @user, :age
-    assert_select 'form input#user_age.integer'
+    assert_select 'form input#user_age.numeric.integer'
   end
 
   test 'builder should generate decimal text field for decimal columns' do
     with_form_for @user, :credit_limit
-    assert_select 'form input#user_credit_limit.decimal'
+    assert_select 'form input#user_credit_limit.numeric.decimal'
   end
 
   test 'builder should generate password fields for columns that matches password' do
@@ -102,6 +102,16 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'form select#user_time_zone.time_zone'
   end
 
+  test 'builder should generate email fields for columns that matches email' do
+    with_form_for @user, :email
+    assert_select 'form input#user_email.string.email'
+  end
+
+  test 'builder should generate url fields for columns that matches url' do
+    with_form_for @user, :url
+    assert_select 'form input#user_url.string.url'
+  end
+
   test 'builder should generate date select for date columns' do
     with_form_for @user, :born_at
     assert_select 'form select#user_born_at_1i.date'
@@ -344,63 +354,13 @@ class FormBuilderTest < ActionView::TestCase
   # BUTTONS
   test 'builder should create buttons' do
     with_button_for :post, :submit
-    assert_select 'form input.submit[type=submit][value=Submit Post]'
+    assert_select 'form input[type=submit][value=Save Post]'
   end
 
-  test 'builder should create buttons for new records' do
+  test 'builder should create buttons for records' do
     @user.new_record!
     with_button_for @user, :submit
-    assert_select 'form input.create[type=submit][value=Create User]'
-  end
-
-  test 'builder should create buttons for existing records' do
-    with_button_for @user, :submit
-    assert_select 'form input.update[type=submit][value=Update User]'
-  end
-
-  test 'builder should create buttons using human_name' do
-    @user.class.expects(:human_name).returns("Usuario")
-    with_button_for @user, :submit
-   assert_select 'form input[type=submit][value=Update Usuario]'
-  end
-
-  test 'builder should create object buttons with localized labels' do
-    store_translations(:en, :simple_form => { :buttons => {
-        :create => "Criar %{model}", :update => "Atualizar %{model}" }}) do
-      with_button_for @user, :submit
-      assert_select 'form input[type=submit][value=Atualizar User]'
-
-      @user.new_record!
-      with_button_for @user, :submit
-      assert_select 'form input[type=submit][value=Criar User]'
-    end
-  end
-
-  test 'builder should create non object buttons with localized labels' do
-    store_translations(:en, :simple_form => { :buttons => { :submit => "Enviar %{model}" }}) do
-      with_button_for :post, :submit
-      assert_select 'form input[type=submit][value=Enviar Post]'
-    end
-  end
-
-  test 'builder forwards first options as button text' do
-    with_button_for :post, :submit, "Send it!"
-    assert_select 'form input[type=submit][value=Send it!]'
-  end
-
-  test 'builder forwards label option as button text' do
-    with_button_for :post, :submit, :label => "Send it!"
-    assert_select 'form input[type=submit][value=Send it!]'
-  end
-
-  test 'builder forwards all options except label to button' do
-    with_button_for :post, :submit, :class => "cool", :id => "super"
-    assert_select 'form input#super.submit.cool[type=submit]'
-  end
-
-  test 'builder calls any button tag' do
-    with_button_for :post, :image_submit, "/image/foo/bar"
-    assert_select 'form input[src=/image/foo/bar][type=image]'
+    assert_select 'form input[type=submit][value=Create User]'
   end
 
   # ASSOCIATIONS
@@ -426,7 +386,7 @@ class FormBuilderTest < ActionView::TestCase
       end
     end
 
-    assert_equal calls, 3
+    assert_equal 3, calls
   end
 
   # ASSOCIATIONS - BELONGS TO

data/test/inputs_test.rb

@@ -47,14 +47,19 @@ class InputTest < ActionView::TestCase
     assert_select 'input.decimal#user_age'
   end
 
-  test 'input should get options from column definition for string attributes' do
+  test 'input should use default text size for decimal attributes' do
+    with_input_for @user, :credit_limit, :decimal
+    assert_select 'input.decimal[size=50]'
+  end
+
+  test 'input should get maxlength from column definition for string attributes' do
     with_input_for @user, :name, :string
     assert_select 'input.string[maxlength=100]'
   end
-  
-  test 'input should get options from column definition for decimal attributes' do
-    with_input_for @user, :credit_limit, :decimal
-    assert_select 'input.decimal[maxlength=15]'
+
+  test 'input should get size from column definition for string attributes respecting maximum value' do
+    with_input_for @user, :name, :string
+    assert_select 'input.string[size=50]'
   end
 
   # MappingInput

data/test/support/models.rb

@@ -4,6 +4,8 @@ Column = Struct.new(:name, :type, :limit)
 Association = Struct.new(:klass, :name, :macro, :options)
 
 class Company < Struct.new(:id, :name)
+  extend ActiveModel::Naming
+
   def self.all(options={})
     all = (1..3).map{|i| Company.new(i, "Company #{i}")}
     return [all.first] if options[:conditions].present?
@@ -23,12 +25,16 @@ class Company < Struct.new(:id, :name)
 end
 
 class Tag < Company
+  extend ActiveModel::Naming
+
   def self.all(options={})
     (1..3).map{|i| Tag.new(i, "Tag #{i}")}
   end
 end
 
 class User < OpenStruct
+  extend ActiveModel::Naming
+
   # Get rid of deprecation warnings
   undef_method :id
 
@@ -40,7 +46,7 @@ class User < OpenStruct
     @new_record || false
   end
 
-  def company_attributes=(foo)
+  def company_attributes=(*)
   end
 
   def column_for_attribute(attribute)
@@ -71,10 +77,6 @@ class User < OpenStruct
     end
   end
 
-  def self.human_name
-    "User"
-  end
-
   def self.reflect_on_association(association)
     case association
       when :company

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'test/unit'
-require 'mocha'
 
+require 'active_model'
 require 'action_controller'
 require 'action_view/test_case'
 

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simple_form
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 4
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -16,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 -03:00
+date: 2010-02-07 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -29,14 +23,15 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- generators/simple_form_install/USAGE
-- generators/simple_form_install/simple_form_install_generator.rb
-- generators/simple_form_install/templates/simple_form.rb
 - 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/simple_form.rb
 - lib/simple_form/action_view_extensions/builder.rb
 - lib/simple_form/action_view_extensions/form_helper.rb
-- lib/simple_form/action_view_extensions/instance_tag.rb
 - lib/simple_form/components.rb
 - lib/simple_form/components/errors.rb
 - lib/simple_form/components/hints.rb
@@ -51,29 +46,12 @@ files:
 - lib/simple_form/inputs/date_time_input.rb
 - lib/simple_form/inputs/hidden_input.rb
 - lib/simple_form/inputs/mapping_input.rb
+- lib/simple_form/inputs/numeric_input.rb
 - lib/simple_form/inputs/priority_input.rb
-- lib/simple_form/inputs/text_field_input.rb
-- lib/simple_form/locale/en.yml
+- lib/simple_form/inputs/string_input.rb
 - lib/simple_form/map_type.rb
 - lib/simple_form/version.rb
 - README.rdoc
-- test/action_view_extensions/builder_test.rb
-- test/action_view_extensions/form_helper_test.rb
-- test/components/error_test.rb
-- test/components/hint_test.rb
-- test/components/label_test.rb
-- test/form_builder_test.rb
-- test/inputs_test.rb
-- test/simple_form_test.rb
-- test/support/country_select/init.rb
-- test/support/country_select/install.rb
-- test/support/country_select/lib/country_select.rb
-- test/support/country_select/uninstall.rb
-- test/support/misc_helpers.rb
-- test/support/mock_controller.rb
-- test/support/mock_response.rb
-- test/support/models.rb
-- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/plataformatec/simple_form
 licenses: []
@@ -84,27 +62,21 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Forms made easy!

data/generators/simple_form_install/simple_form_install_generator.rb

@@ -1,19 +0,0 @@
-class SimpleFormInstallGenerator < Rails::Generator::Base
-
-  def manifest
-    record do |m|
-      m.directory 'config/initializers'
-      m.template  'simple_form.rb', 'config/initializers/simple_form.rb'
-
-      m.directory 'config/locales'
-      m.template  locale_file, 'config/locales/simple_form.en.yml'
-    end
-  end
-
-  private
-
-    def locale_file
-      @locale_file ||= '../../../lib/simple_form/locale/en.yml'
-    end
-
-end

data/lib/simple_form/action_view_extensions/instance_tag.rb

@@ -1,37 +0,0 @@
-module SimpleForm
-  module ActionViewExtensions
-    module InstanceTag #:nodoc:
-      # Overwrite to_check_box_tag to make it available to work with :multiple => true
-      def to_check_box_tag(options = {}, checked_value = "1", unchecked_value = "0")
-        options = options.stringify_keys
-        options["type"]  = "checkbox"
-        options["value"] = checked_value
-
-        if options.has_key?("checked")
-          cv = options.delete "checked"
-          checked = cv == true || cv == "checked"
-        else
-          checked = self.class.check_box_checked?(value(object), checked_value)
-        end
-        options["checked"] = "checked" if checked
-
-        # The only part added to deal with multiple check box is this conditional.
-        if options["multiple"]
-          add_default_name_and_id_for_value(checked_value, options)
-          options.delete("multiple")
-        else
-          add_default_name_and_id(options)
-        end
-
-        hidden   = tag("input", "name" => options["name"], "type" => "hidden", "value" => options['disabled'] && checked ? checked_value : unchecked_value)
-        checkbox = tag("input", options)
-
-        result = hidden + checkbox
-        result.respond_to?(:html_safe) ? result.html_safe : result
-      end
-    end
-  end
-end
-
-ActionView::Helpers::InstanceTag.send :remove_method, :to_check_box_tag
-ActionView::Helpers::InstanceTag.send :include, SimpleForm::ActionViewExtensions::InstanceTag