simple_form 1.0.3 → 1.0.4

data/README.rdoc

@@ -238,7 +238,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_box :options, [[true, 'Yes'] ,[false, 'No']], :first, :last
+    f.collection_check_boxes :options, [[true, 'Yes'] ,[false, 'No']], :first, :last
   end
 
   <input name="user[options][]" type="hidden" value="" />

data/lib/simple_form/action_view_extensions/builder.rb

@@ -36,8 +36,8 @@ module SimpleForm
 
           default_html_options = default_html_options_for_collection(item, value, options, html_options)
 
-          radio = radio_button(attribute, value, default_html_options)
-          result << label("#{attribute}_#{value}", radio << text.to_s, :class => "collection_radio")
+          result << radio_button(attribute, value, default_html_options) <<
+                    label("#{attribute}_#{value}", text, :class => "collection_radio")
         end
       end
 
@@ -48,15 +48,15 @@ module SimpleForm
       # == Examples
       #
       #   form_for @user do |f|
-      #     f.collection_check_box :options, [[true, 'Yes'] ,[false, 'No']], :first, :last
+      #     f.collection_check_boxes :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_box" for="user_options_true">Yes</label>
+      #   <label class="collection_check_boxes" 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_box" for="user_options_false">No</label>
+      #   <label class="collection_check_boxes" for="user_options_false">No</label>
       #
       # == Options
       #
@@ -76,8 +76,8 @@ module SimpleForm
           default_html_options = default_html_options_for_collection(item, value, options, html_options)
           default_html_options[:multiple] = true
 
-          check_box = check_box(attribute, default_html_options, value, '')
-          result << label("#{attribute}_#{value}", check_box << text.to_s, :class => "collection_check_boxes")
+          result << check_box(attribute, default_html_options, value, '') <<
+                    label("#{attribute}_#{value}", text, :class => "collection_check_boxes")
         end
       end
 
@@ -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:
-          returning(html_options.dup) do |default_html_options|
+          html_options.dup.tap do |default_html_options|
             [:checked, :disabled].each do |option|
               next unless options[option]
 

data/lib/simple_form/components/labels.rb

@@ -28,8 +28,7 @@ module SimpleForm
       end
 
       def label_text
-        result = SimpleForm.label_text.call(raw_label_text, required_label_text)
-        result.respond_to?(:html_safe) ? result.html_safe : result
+        html_safe(SimpleForm.label_text.call(raw_label_text, required_label_text))
       end
 
       def label_target
@@ -66,4 +65,4 @@ module SimpleForm
       end
     end
   end
-end
+end

data/lib/simple_form/form_builder.rb

@@ -172,7 +172,7 @@ module SimpleForm
         klass.all(finders)
       end
 
-      returning(input(attribute, options)) { @reflection = nil }
+      input(attribute, options).tap { @reflection = nil }
     end
 
     # Creates a button:

data/lib/simple_form/inputs/base.rb

@@ -39,7 +39,8 @@ module SimpleForm
           send(component)
         end
         content.compact!
-        wrap(content.join.html_safe).html_safe
+        content = html_safe(content.join)
+        html_safe(wrap(content))
       end
 
     protected
@@ -64,6 +65,17 @@ 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:
       #

data/lib/simple_form/locale/en.yml

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

data/lib/simple_form/version.rb

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

data/test/form_builder_test.rb

@@ -366,7 +366,7 @@ class FormBuilderTest < ActionView::TestCase
 
   test 'builder should create object buttons with localized labels' do
     store_translations(:en, :simple_form => { :buttons => {
-        :create => "Criar {{model}}", :update => "Atualizar {{model}}" }}) do
+        :create => "Criar %{model}", :update => "Atualizar %{model}" }}) do
       with_button_for @user, :submit
       assert_select 'form input[type=submit][value=Atualizar User]'
 
@@ -377,7 +377,7 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder should create non object buttons with localized labels' do
-    store_translations(:en, :simple_form => { :buttons => { :submit => "Enviar {{model}}" }}) 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

data/test/test_helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'test/unit'
+require 'mocha'
 
 require 'action_controller'
 require 'action_view/test_case'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_form
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-31 00:00:00 +02:00
+date: 2010-10-08 00:00:00 -03:00
 default_executable: 
 dependencies: []