simple_form 1.1.1 → 1.1.2

data/lib/simple_form/inputs/string_input.rb

@@ -7,10 +7,14 @@ module SimpleForm
 
       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
+
+        unless input_type == :string
+          input_options[:type] ||= input_type
+          input_options[:class]  = "string #{input_options[:class]}"
+        end
+
         input_options
       end
 
@@ -21,4 +25,4 @@ module SimpleForm
       end
     end
   end
-end
+end

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "1.1.1".freeze
+  VERSION = "1.1.2".freeze
 end

data/test/inputs_test.rb

@@ -29,22 +29,22 @@ class InputTest < ActionView::TestCase
   # TextFieldInput
   test 'input should map text field to string attribute' do
     with_input_for @user, :name, :string
-    assert_select 'input[name=\'user[name]\'][id=user_name][value=New in Simple Form!]'
+    assert_select 'input[name=\'user[name]\'][id=user_name][value=New in Simple Form!][type=text]'
   end
 
   test 'input should generate an integer text field for integer attributes ' do
     with_input_for @user, :age, :integer
-    assert_select 'input.integer#user_age'
+    assert_select 'input[type=text].integer#user_age'
   end
   
   test 'input should generate a float text field for float attributes ' do
     with_input_for @user, :age, :float
-    assert_select 'input.float#user_age'
+    assert_select 'input[type=text].float#user_age'
   end
   
   test 'input should generate a decimal text field for decimal attributes ' do
     with_input_for @user, :age, :decimal
-    assert_select 'input.decimal#user_age'
+    assert_select 'input[type=text].decimal#user_age'
   end
 
   test 'input should use default text size for decimal attributes' do

data/test/support/models.rb

@@ -19,8 +19,8 @@ class Company < Struct.new(:id, :name)
     (a || {}).merge(b || {})
   end
 
-  def new_record?
-    false
+  def persisted?
+    true
   end
 end
 
@@ -42,8 +42,8 @@ class User < OpenStruct
     @new_record = true
   end
 
-  def new_record?
-    @new_record || false
+  def persisted?
+    !(@new_record || false)
   end
 
   def company_attributes=(*)

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: simple_form
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-19 00:00:00 +01:00
+date: 2010-03-16 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -65,18 +70,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Forms made easy!
@@ -89,10 +96,6 @@ test_files:
 - 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

data/test/support/country_select/init.rb

@@ -1 +0,0 @@
-require 'country_select'

data/test/support/country_select/install.rb

@@ -1,2 +0,0 @@
-# Install hook code here
-puts "The list of countries provided by this plugin may offend some users. Please review it carefully before you use it"

data/test/support/country_select/lib/country_select.rb

@@ -1,84 +0,0 @@
-# CountrySelect
-module ActionView
-  module Helpers
-    module FormOptionsHelper
-      # Return select and option tags for the given object and method, using country_options_for_select to generate the list of option tags.
-      def country_select(object, method, priority_countries = nil, options = {}, html_options = {})
-        InstanceTag.new(object, method, self, options.delete(:object)).to_country_select_tag(priority_countries, options, html_options)
-      end
-      # Returns a string of option tags for pretty much any country in the world. Supply a country name as +selected+ to
-      # have it marked as the selected option tag. You can also supply an array of countries as +priority_countries+, so
-      # that they will be listed above the rest of the (long) list.
-      #
-      # NOTE: Only the option tags are returned, you have to wrap this call in a regular HTML select tag.
-      def country_options_for_select(selected = nil, priority_countries = nil)
-        country_options = ""
-
-        if priority_countries
-          country_options += options_for_select(priority_countries, selected)
-          country_options += "<option value=\"\" disabled=\"disabled\">-------------</option>\n"
-        end
-
-        return country_options + options_for_select(COUNTRIES, selected)
-      end
-      # All the countries included in the country_options output.
-      COUNTRIES = ["Afghanistan", "Aland Islands", "Albania", "Algeria", "American Samoa", "Andorra", "Angola",
-        "Anguilla", "Antarctica", "Antigua And Barbuda", "Argentina", "Armenia", "Aruba", "Australia", "Austria",
-        "Azerbaijan", "Bahamas", "Bahrain", "Bangladesh", "Barbados", "Belarus", "Belgium", "Belize", "Benin",
-        "Bermuda", "Bhutan", "Bolivia", "Bosnia and Herzegowina", "Botswana", "Bouvet Island", "Brazil",
-        "British Indian Ocean Territory", "Brunei Darussalam", "Bulgaria", "Burkina Faso", "Burundi", "Cambodia",
-        "Cameroon", "Canada", "Cape Verde", "Cayman Islands", "Central African Republic", "Chad", "Chile", "China",
-        "Christmas Island", "Cocos (Keeling) Islands", "Colombia", "Comoros", "Congo",
-        "Congo, the Democratic Republic of the", "Cook Islands", "Costa Rica", "Cote d'Ivoire", "Croatia", "Cuba",
-        "Cyprus", "Czech Republic", "Denmark", "Djibouti", "Dominica", "Dominican Republic", "Ecuador", "Egypt",
-        "El Salvador", "Equatorial Guinea", "Eritrea", "Estonia", "Ethiopia", "Falkland Islands (Malvinas)",
-        "Faroe Islands", "Fiji", "Finland", "France", "French Guiana", "French Polynesia",
-        "French Southern Territories", "Gabon", "Gambia", "Georgia", "Germany", "Ghana", "Gibraltar", "Greece", "Greenland", "Grenada", "Guadeloupe", "Guam", "Guatemala", "Guernsey", "Guinea",
-        "Guinea-Bissau", "Guyana", "Haiti", "Heard and McDonald Islands", "Holy See (Vatican City State)",
-        "Honduras", "Hong Kong", "Hungary", "Iceland", "India", "Indonesia", "Iran, Islamic Republic of", "Iraq",
-        "Ireland", "Isle of Man", "Israel", "Italy", "Jamaica", "Japan", "Jersey", "Jordan", "Kazakhstan", "Kenya",
-        "Kiribati", "Korea, Democratic People's Republic of", "Korea, Republic of", "Kuwait", "Kyrgyzstan",
-        "Lao People's Democratic Republic", "Latvia", "Lebanon", "Lesotho", "Liberia", "Libyan Arab Jamahiriya",
-        "Liechtenstein", "Lithuania", "Luxembourg", "Macao", "Macedonia, The Former Yugoslav Republic Of",
-        "Madagascar", "Malawi", "Malaysia", "Maldives", "Mali", "Malta", "Marshall Islands", "Martinique",
-        "Mauritania", "Mauritius", "Mayotte", "Mexico", "Micronesia, Federated States of", "Moldova, Republic of",
-        "Monaco", "Mongolia", "Montenegro", "Montserrat", "Morocco", "Mozambique", "Myanmar", "Namibia", "Nauru",
-        "Nepal", "Netherlands", "Netherlands Antilles", "New Caledonia", "New Zealand", "Nicaragua", "Niger",
-        "Nigeria", "Niue", "Norfolk Island", "Northern Mariana Islands", "Norway", "Oman", "Pakistan", "Palau",
-        "Palestinian Territory, Occupied", "Panama", "Papua New Guinea", "Paraguay", "Peru", "Philippines",
-        "Pitcairn", "Poland", "Portugal", "Puerto Rico", "Qatar", "Reunion", "Romania", "Russian Federation",
-        "Rwanda", "Saint Barthelemy", "Saint Helena", "Saint Kitts and Nevis", "Saint Lucia",
-        "Saint Pierre and Miquelon", "Saint Vincent and the Grenadines", "Samoa", "San Marino",
-        "Sao Tome and Principe", "Saudi Arabia", "Senegal", "Serbia", "Seychelles", "Sierra Leone", "Singapore",
-        "Slovakia", "Slovenia", "Solomon Islands", "Somalia", "South Africa",
-        "South Georgia and the South Sandwich Islands", "Spain", "Sri Lanka", "Sudan", "Suriname",
-        "Svalbard and Jan Mayen", "Swaziland", "Sweden", "Switzerland", "Syrian Arab Republic",
-        "Taiwan, Province of China", "Tajikistan", "Tanzania, United Republic of", "Thailand", "Timor-Leste",
-        "Togo", "Tokelau", "Tonga", "Trinidad and Tobago", "Tunisia", "Turkey", "Turkmenistan",
-        "Turks and Caicos Islands", "Tuvalu", "Uganda", "Ukraine", "United Arab Emirates", "United Kingdom",
-        "United States", "United States Minor Outlying Islands", "Uruguay", "Uzbekistan", "Vanuatu", "Venezuela",
-        "Viet Nam", "Virgin Islands, British", "Virgin Islands, U.S.", "Wallis and Futuna", "Western Sahara",
-        "Yemen", "Zambia", "Zimbabwe"] unless const_defined?("COUNTRIES")
-    end
-    
-    class InstanceTag
-      def to_country_select_tag(priority_countries, options, html_options)
-        html_options = html_options.stringify_keys
-        add_default_name_and_id(html_options)
-        value = value(object)
-        content_tag("select",
-          add_options(
-            country_options_for_select(value, priority_countries),
-            options, value
-          ), html_options
-        )
-      end
-    end
-    
-    class FormBuilder
-      def country_select(method, priority_countries = nil, options = {}, html_options = {})
-        @template.country_select(@object_name, method, priority_countries, options.merge(:object => @object), html_options)
-      end
-    end
-  end
-end

data/test/support/country_select/uninstall.rb

@@ -1 +0,0 @@
-# Uninstall hook code here