simple_form 1.4.1 → 1.4.2

data/.travis.yml

@@ -1,4 +1,4 @@
-script: "git submodule update --init && rake test"
+script: "git submodule update --init && bundle exec rake test"
 rvm:
   - 1.8.7
   - 1.9.2

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 1.4.2
+
+* enhancements
+  * Rails 3.1 support
+
 == 1.4.1
 
 * enhancements

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "rails", "~> 3.0.7"
+gemspec
 
 group :test do
   gem "mocha",      :require => false

data/Gemfile.lock

@@ -1,13 +1,17 @@
+PATH
+  remote: .
+  specs:
+    simple_form (1.4.1)
+      actionpack (~> 3.0)
+      activemodel (~> 3.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.7)
-      actionpack (= 3.0.7)
-      mail (~> 2.2.15)
-    actionpack (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
+    actionpack (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -15,68 +19,36 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
+    activemodel (3.0.9)
+      activesupport (= 3.0.9)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-    activesupport (3.0.7)
-    arel (2.0.9)
+    activesupport (3.0.9)
     builder (2.1.2)
     columnize (0.3.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     i18n (0.5.0)
     linecache (0.43)
-    mail (2.2.18)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
     mocha (0.9.10)
       rake
-    polyglot (0.3.1)
-    rack (1.2.2)
+    rack (1.2.3)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.7)
-      actionmailer (= 3.0.7)
-      actionpack (= 3.0.7)
-      activerecord (= 3.0.7)
-      activeresource (= 3.0.7)
-      activesupport (= 3.0.7)
-      bundler (~> 1.0)
-      railties (= 3.0.7)
-    railties (3.0.7)
-      actionpack (= 3.0.7)
-      activesupport (= 3.0.7)
-      rake (>= 0.8.7)
-      thor (~> 0.14.4)
     rake (0.8.7)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    thor (0.14.6)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.27)
+    tzinfo (0.3.28)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   mocha
-  rails (~> 3.0.7)
   ruby-debug
+  simple_form!

data/lib/simple_form/action_view_extensions/form_helper.rb

@@ -29,27 +29,31 @@ module SimpleForm
         result
       end
 
-      [:form_for, :fields_for].each do |helper|
-        class_eval <<-METHOD, __FILE__, __LINE__
-          def simple_#{helper}(record_or_name_or_array, *args, &block)
-            options = args.extract_options!
-            options[:builder] ||= SimpleForm::FormBuilder
-            css_class = case record_or_name_or_array
-              when String, Symbol then record_or_name_or_array.to_s
-              when Array then dom_class(record_or_name_or_array.last)
-              else dom_class(record_or_name_or_array)
-            end
-            options[:html] ||= {}
-            unless options[:html].key?(:novalidate)
-              options[:html][:novalidate] = !SimpleForm.browser_validations
-            end
-            options[:html][:class] = "\#{SimpleForm.form_class} \#{css_class} \#{options[:html][:class]}".strip
+      def simple_form_for(record, options={}, &block)
+        options[:builder] ||= SimpleForm::FormBuilder
+        css_class = case record
+                    when String, Symbol then record.to_s
+                    when Array then dom_class(record.last)
+                    else dom_class(record)
+                    end
+        options[:html] ||= {}
+        unless options[:html].key?(:novalidate)
+          options[:html][:novalidate] = !SimpleForm.browser_validations
+        end
+        options[:html][:class] = "#{SimpleForm.form_class} #{css_class} #{options[:html][:class]}".strip
 
-            with_custom_field_error_proc do
-              #{helper}(record_or_name_or_array, *(args << options), &block)
-            end
-          end
-        METHOD
+        with_custom_field_error_proc do
+          form_for(record, options, &block)
+        end
+      end
+
+      def simple_fields_for(record_name, record_object = nil, options = {}, &block)
+        options, record_object = record_object, nil if record_object.is_a?(Hash)
+        options[:builder] ||= SimpleForm::FormBuilder
+
+        with_custom_field_error_proc do
+          fields_for(record_name, record_object, options, &block)
+        end
       end
     end
   end

data/lib/simple_form/form_builder.rb

@@ -109,7 +109,7 @@ module SimpleForm
     #        name="user[name]" size="100" type="text" value="Carlos" />
     #
     def input_field(attribute_name, options={})
-      options[:input_html] = options.except(:as)
+      options[:input_html] = options.except(:as, :collection, :label_method, :value_method)
       options.merge!(:components => [:input], :wrapper => false)
       input(attribute_name, options)
     end

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "1.4.1".freeze
+  VERSION = "1.4.2".freeze
 end

data/simple_form.gemspec

@@ -19,4 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.rubyforge_project = "simple_form"
+
+  s.add_dependency('activemodel', '~> 3.0')
+  s.add_dependency('actionpack', '~> 3.0')
 end

data/test/form_builder_test.rb

@@ -434,6 +434,17 @@ class FormBuilderTest < ActionView::TestCase
     assert_no_select 'input.integer[as]'
   end
 
+  test 'builder collection input_field should generate input tag with a clean HTML' do
+    with_concat_form_for(@user) do |f|
+      f.input_field :status, :collection => ['Open', 'Closed'], :class => 'status', :label_method => :to_s, :value_method => :to_s
+    end
+
+    assert_no_select 'select.status[input_html]'
+    assert_no_select 'select.status[collection]'
+    assert_no_select 'select.status[label_method]'
+    assert_no_select 'select.status[value_method]'
+  end
+
   # WITHOUT OBJECT
   test 'builder should generate properly when object is not present' do
     with_form_for :project, :name

data/test/support/mock_controller.rb

@@ -12,4 +12,13 @@ class MockController
   def url_for(*args)
     "http://example.com"
   end
+
+  def url_helpers
+    self
+  end
+
+  def hash_for_user_path(*args); end
+  def hash_for_validating_user_path(*args); end
+  def hash_for_other_validating_user_path(*args); end
+  def hash_for_users_path(*args); end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_form
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 1
   - 4
-  - 1
-  version: 1.4.1
+  - 2
+  version: 1.4.2
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -16,9 +16,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-14 00:00:00 Z
-dependencies: []
-
+date: 2011-06-27 00:00:00 -03:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: activemodel
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: actionpack
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :runtime
+  version_requirements: *id002
 description: Forms made easy!
 email: contact@plataformatec.com.br
 executables: []
@@ -89,6 +119,7 @@ files:
 - test/support/mock_response.rb
 - test/support/models.rb
 - test/test_helper.rb
+has_rdoc: true
 homepage: http://github.com/plataformatec/simple_form
 licenses: []
 
@@ -118,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: simple_form
-rubygems_version: 1.8.5
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Forms made easy!