padrino-helpers 0.12.0.rc3 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11dcd2a626d740ceec02caecc96a2ab739b8efbb
-  data.tar.gz: 28332dbf5e48bc2fd98c67be36eae6b0f855c4a3
+  metadata.gz: abf7a7c5e2a12e941b018c62e94e24b47f1b9bf6
+  data.tar.gz: c59d6ed08223958df60c85512571fa3b063e46af
 SHA512:
-  metadata.gz: 1943f4a6e59cccc9e4e342fe21a2bf56db13aa2d25b035c553604262c3b84163d31b19d8cbdee2b7757e00549f2a1e1132b0d3a15f203102c094a86e56fdab72
-  data.tar.gz: 735b182f9e9db1594d5c93980af0bb10821faab70debd70217fc5896967aae62634936ef8bff974485c527c875ca67ff8406e258bb58a0919515fdc672789b62
+  metadata.gz: b75a79d145a6a8027674b75713c11afa14fd727b02d6f60754bda869ded0c925f47c1f408158d4186f8ee70ee72826c829e92e4309708521b1fcba3f6d854e68
+  data.tar.gz: 3be7c0827d6f9750bf536b41abb358745c474cbd5429c54e7e11619c2973a3aecb8583793f7dbbed8c96f888e28a58a30b8ac7e721c72806c59bfa7ee60eb3f3

data/lib/padrino-helpers/form_builder/abstract_form_builder.rb

@@ -135,13 +135,23 @@ module Padrino
         # f.fields_for :addresses
         # f.fields_for :addresses, address
         # f.fields_for :addresses, @addresses
-        def fields_for(child_association, instance_or_collection=nil, &block)
+        # f.fields_for :addresses, address, index: i
+        def fields_for(child_association, instance_or_collection=nil, options={}, &block)
           default_collection = self.object.send(child_association)
+
           include_index = default_collection.respond_to?(:each)
+          custom_index = options.has_key?(:index)
+
           nested_options = { :parent => self, :association => child_association }
           nested_objects = instance_or_collection ? Array(instance_or_collection) : Array(default_collection)
           nested_objects.each_with_index.map do |child_instance, index|
-            nested_options[:index] = include_index ? index : nil
+            if custom_index
+              nested_options[:index] = options[:index]
+            elsif include_index
+              nested_options[:index] = index
+            else
+              nested_options[:index] = nil
+            end
             @template.fields_for(child_instance,  { :nested => nested_options }, &block)
           end.join("\n").html_safe
         end

data/lib/padrino-helpers/locale/lv.yml

@@ -15,7 +15,7 @@ lv:
       format:
         # Where is the currency sign? %u is the currency unit, %n the number (default: $5.00).
         format: "%u %n"
-        unit: "LVL"
+        unit: '€'
         # These three are to override number.format and are optional.
         separator: ","
         delimiter: "."

data/lib/padrino-helpers/tag_helpers.rb

@@ -129,7 +129,7 @@ module Padrino
         if content.respond_to?(:each) && !content.is_a?(String)
           content.each { |c| output.concat c; output.safe_concat NEWLINE }
         else
-          output.concat content
+          output.concat content.to_s
         end
         output.safe_concat "</#{name}>"
 

data/test/test_form_builder.rb

@@ -927,6 +927,23 @@ describe "FormBuilder" do
       assert_has_tag('input', :type => 'text', :id => 'user_addresses_attributes_1_businesses_attributes_0_name', :name => 'user[addresses_attributes][1][businesses_attributes][0][name]') { actual_html }
     end
 
+    should "display fields for nested forms with custom indices" do
+      actual_html = standard_builder.fields_for :addresses do |child_form|
+        html = ''.html_safe
+        child_form.object.businesses.each_with_index do |business, i|
+          html += child_form.fields_for(:businesses, business, :index => ('a'..'z').to_a[i]) do |second_child_form|
+            second_child_form.label(:name) +
+            second_child_form.text_field(:name) +
+            second_child_form.check_box('_destroy')
+          end
+        end
+        html
+      end
+
+      assert_has_tag('label', :for => 'user_addresses_attributes_1_businesses_attributes_a_name', :content => 'Name') { actual_html }
+      assert_has_tag('input', :type => 'text', :id => 'user_addresses_attributes_1_businesses_attributes_a_name', :name => 'user[addresses_attributes][1][businesses_attributes][a][name]') { actual_html }
+    end
+
     should "display nested children fields in erb" do
       visit '/erb/fields_for'
       # Telephone

data/test/test_form_helpers.rb

@@ -646,9 +646,9 @@ describe "FormHelpers" do
     should "take a range as a collection for options" do
       actual_html = select_tag(:favorite_color, :options => (1..3))
       assert_has_tag(:select) { actual_html }
-      assert_has_tag('select option', :value => '1') { actual_html }
-      assert_has_tag('select option', :value => '2') { actual_html }
-      assert_has_tag('select option', :value => '3') { actual_html }
+      assert_has_tag('select option', :content => '1', :value => '1') { actual_html }
+      assert_has_tag('select option', :content => '2', :value => '2') { actual_html }
+      assert_has_tag('select option', :content => '3', :value => '3') { actual_html }
     end
 
     should "include blank for grouped options" do

data/test/test_tag_helpers.rb

@@ -64,6 +64,11 @@ describe "TagHelpers" do
       assert_has_tag('p.large#star', :content => "<>") { actual_html }
     end
 
+    should "convert to a string if the content is not a string" do
+      actual_html = content_tag(:p, 97)
+      assert_has_tag('p', :content => "97") { actual_html }
+    end
+
     should "support tags with erb" do
       visit '/erb/content_tag'
       assert_have_selector :p, :content => "Test 1", :class => 'test', :id => 'test1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-helpers
 version: !ruby/object:Gem::Version
-  version: 0.12.0.rc3
+  version: 0.12.0
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0.rc3
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0.rc3
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -192,9 +192,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: 1.3.6
 requirements: []
 rubyforge_project: padrino-helpers
 rubygems_version: 2.0.6