padrino-helpers 0.11.1 → 0.11.2

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

@@ -24,9 +24,9 @@ module Padrino
         end
 
         # f.label :username, :caption => "Nickname"
-        def label(field, options={})
+        def label(field, options={}, &block)
           options.reverse_merge!(:caption => "#{field_human_name(field)}: ")
-          @template.label_tag(field_id(field), options)
+          @template.label_tag(field_id(field), options, &block)
         end
 
         # f.hidden_field :session_id, :value => "45"
@@ -271,7 +271,7 @@ module Padrino
             else
               []
             end
-            variants.inject('') do |html, variant|
+            variants.inject(''.html_safe) do |html, variant|
               variant[2] = "#{field_id(field)}_#{variant[1]}"
               html << @template.label_tag("#{field_name(field)}[]", :for => variant[2], :caption => "#{yield(variant)} #{variant[0]}")
             end

data/lib/padrino-helpers/form_helpers.rb

@@ -248,7 +248,14 @@ module Padrino
       def error_message_on(object, field, options={})
         object = object.is_a?(Symbol) ? instance_variable_get("@#{object}") : object
         error  = object.errors[field] rescue nil
-        # Array(error).first is necessary because some ORMs give us an array others directly a value
+        error = if defined?(Ohm::Model) && object.is_a?(Ohm::Model)
+          I18n.t("ohm.errors.messages.#{error[0]}", :default => error[0].to_s)
+        else
+          # Array(error).first is necessary because some ORMs 
+          # give us an array others directly a value
+          Array(error)[0]
+        end
+
         if error = Array(error)[0]
           options.reverse_merge!(:tag => :span, :class => :error)
           tag   = options.delete(:tag)

data/lib/padrino-helpers/tag_helpers.rb

@@ -213,7 +213,7 @@ module Padrino
       #
       # @example
       #   tag :hr, :class => 'dotted'
-      #   # => <hr class="dotted">
+      #   # => <hr class="dotted" />
       #
       #   tag :input, :name => 'username', :type => :text
       #   # => <input name="username" type="text" />

data/test/helper.rb

@@ -27,6 +27,7 @@ class MiniTest::Spec
   # In this case, block is the html to evaluate
   def assert_has_tag(name, attributes = {}, &block)
     html = block && block.call
+    assert html.html_safe?, 'html_safe? failed'
     matcher = HaveSelector.new(name, attributes)
     raise "Please specify a block!" if html.blank?
     assert matcher.matches?(html), matcher.failure_message

data/test/test_form_builder.rb

@@ -256,6 +256,12 @@ describe "FormBuilder" do
       assert_has_tag('label', :class => 'large', :for => 'user_first_name', :content => "F. Name: ") { actual_html }
     end
 
+    should "set specific content inside the label if a block was provided" do
+      actual_html = standard_builder.label(:admin, :class => 'large') { input_tag :checkbox }
+      assert_has_tag('label', :class => 'large', :for => 'user_admin', :content => "Admin: ") { actual_html }
+      assert_has_tag('label input[type=checkbox]') { actual_html }
+    end
+
     should "display correct label in haml" do
       visit '/haml/form_for'
       assert_have_selector '#demo label', :content => "Login: ", :class => 'user-label'

data/test/test_form_helpers.rb

@@ -200,6 +200,12 @@ describe "FormHelpers" do
       assert_has_tag('label[for=username] span.required', :content => "*") { actual_html }
     end
 
+    should "display label tag in ruby with a block" do
+      actual_html = label_tag(:admin, :class => 'long-label') { input_tag :checkbox }
+      assert_has_tag(:label, :for => 'admin', :class => 'long-label', :content => "Admin") { actual_html }
+      assert_has_tag('label input[type=checkbox]') { actual_html }
+    end
+
     should "display label tag in erb for simple form" do
       visit '/erb/form_tag'
       assert_have_selector 'form.simple-form label', :count => 9
@@ -207,6 +213,7 @@ describe "FormHelpers" do
       assert_have_selector 'form.simple-form label', :content => "Password", :for => 'password'
       assert_have_selector 'form.simple-form label', :content => "Gender", :for => 'gender'
     end
+
     should "display label tag in erb for advanced form" do
       visit '/erb/form_tag'
       assert_have_selector 'form.advanced-form label', :count => 11

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-helpers
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-07 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -21,7 +21,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.2
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -174,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3249284005023139295
+      hash: -1875793301041170039
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: