simple_form 1.2.1 → 1.2.2

data/lib/simple_form/action_view_extensions/builder.rb

@@ -96,25 +96,27 @@ module SimpleForm
         fields_for(*(args << options), &block)
       end
 
-      private
+    private
 
-        # Generate default options for collection helpers, such as :checked and
-        # :disabled.
-        def default_html_options_for_collection(item, value, options, html_options) #:nodoc:
-          returning(html_options.dup) do |default_html_options|
-            [:checked, :disabled].each do |option|
-              next unless options[option]
+      # 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 = html_options.dup
 
-              accept = if options[option].is_a?(Proc)
-                options[option].call(item)
-              else
-                Array(options[option]).include?(value)
-              end
+        [:checked, :disabled].each do |option|
+          next unless options[option]
 
-              default_html_options[option] = true if accept
-            end
+          accept = if options[option].is_a?(Proc)
+            options[option].call(item)
+          else
+            Array(options[option]).include?(value)
           end
+
+          html_options[option] = true if accept
         end
+
+        html_options
+      end
     end
   end
 end

data/lib/simple_form/form_builder.rb

@@ -147,7 +147,7 @@ module SimpleForm
         :conditions => @reflection.options[:conditions], :order => @reflection.options[:order]
       )
 
-      returning(input(attribute, options)) { @reflection = nil }
+      input(attribute, options).tap { @reflection = nil }
     end
 
     # Creates a button:

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "1.2.1".freeze
+  VERSION = "1.2.2".freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_form
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-24 00:00:00 +02:00
+date: 2010-07-27 00:00:00 +02:00
 default_executable: 
 dependencies: []