padrino-helpers 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -40,6 +40,14 @@ module Padrino
         link_to (caption || email), mail_href, html_options
       end
 
+      # Creates a meta element with the content and given options
+      # meta_tag "weblog,news", :name => "keywords"                         => <meta name="keywords" content="weblog,news">
+      # meta_tag "text/html; charset=UTF-8", :http-equiv => "Content-Type"  => <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+      def meta_tag(content, options={})
+        options.reverse_merge!("content" => content)
+        content_tag(:meta, '', options)
+      end
+
       # Creates an image element with given url and options
       # image_tag('icons/avatar.png')
       def image_tag(url, options={})

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

@@ -18,7 +18,7 @@ module Padrino
 
         # f.label :username, :caption => "Nickname"
         def label(field, options={})
-          options.reverse_merge!(:caption => field.to_s.titleize)
+          options.reverse_merge!(:caption => "#{field.to_s.titleize}: ")
           @template.label_tag(field_id(field), options)
         end
 

data/lib/padrino-helpers/form_helpers.rb

@@ -56,8 +56,8 @@ module Padrino
       # label_tag :username, :class => 'long-label'
       # label_tag :username, :class => 'long-label' do ... end
       def label_tag(name, options={}, &block)
-        options.reverse_merge!(:caption => name.to_s.titleize, :for => name)
-        caption_text = options.delete(:caption) + ": "
+        options.reverse_merge!(:caption => "#{name.to_s.titleize}: ", :for => name)
+        caption_text = options.delete(:caption)
         if block_given? # label with inner content
           label_content = caption_text + capture_html(&block)
           concat_content(content_tag(:label, label_content, options))
@@ -81,10 +81,10 @@ module Padrino
       end
 
       # Constructs a text area input from the given options
-      # text_area_tag :username, :class => 'long'
+      # text_area_tag :username, :class => 'long', :value => "Demo?"
       def text_area_tag(name, options={})
-        options.reverse_merge!(:name => name)
-        content_tag(:textarea, '', options)
+        options.reverse_merge!(:name => name, :value => '')
+        content_tag(:textarea, options.delete(:value), options)
       end
 
       # Constructs a password field input from the given options

data/padrino-helpers.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-helpers}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2009-12-21}
+  s.date = %q{2009-12-22}
   s.description = %q{Tag helpers, asset helpers, form helpers, form builders and many more helpers for padrino}
   s.email = %q{nesquena@gmail.com}
   s.extra_rdoc_files = [
@@ -49,6 +49,8 @@ Gem::Specification.new do |s|
      "test/fixtures/markup_app/views/link_to.haml",
      "test/fixtures/markup_app/views/mail_to.erb",
      "test/fixtures/markup_app/views/mail_to.haml",
+     "test/fixtures/markup_app/views/meta_tag.erb",
+     "test/fixtures/markup_app/views/meta_tag.haml",
      "test/fixtures/render_app/app.rb",
      "test/fixtures/render_app/views/erb/test.erb",
      "test/fixtures/render_app/views/haml/test.haml",

data/test/fixtures/markup_app/views/form_for.erb

@@ -2,7 +2,7 @@
   <%= f.error_messages(:header_message => "custom MarkupUser cannot be saved!") %>
   <%= f.hidden_field :session_id %>
   <p>
-    <%= f.label :username, :caption => "Login", :class => 'user-label' %>
+    <%= f.label :username, :caption => "Login: ", :class => 'user-label' %>
     <%= f.text_field :username, :class => 'user-text', :value => "John" %>
   </p>
   <p>
@@ -18,11 +18,11 @@
     <%= f.file_field :photo, :class => 'user-photo' %>
   </p>
   <p>
-    <%= f.label :about, :caption => "About Me" %>
+    <%= f.label :about, :caption => "About Me: " %>
     <%= f.text_area :about, :class => 'user-about'  %> 
   </p>
   <p>
-    <%= f.label :gender, :caption => "Your gender:" %>
+    <%= f.label :gender, :caption => "Your gender: " %>
     <%= f.radio_button :gender, :value => 'male' %>
     <%= f.radio_button :gender, :value => 'female' %>
   </p>
@@ -41,7 +41,7 @@
 <% form_for MarkupUser.new, '/another_demo', :id => 'demo2', :method => 'get' do |f| %>
   <%= f.error_messages :header_message => "custom MarkupUser cannot be saved!" %>
   <%= f.hidden_field :session_id %>
-  <%= f.text_field_block :username, { :class => 'input' }, { :caption => 'Nickname', :class => 'label' } %>
+  <%= f.text_field_block :username, { :class => 'input' }, { :caption => 'Nickname: ', :class => 'label' } %>
   <%= f.password_field_block :code, { :class => 'input' } %>
   <%= f.text_area_block :about, { :class => 'textarea' } %>
   <%= f.file_field_block :photo, { :class => 'upload' } %>

data/test/fixtures/markup_app/views/form_for.haml

@@ -2,7 +2,7 @@
   = f.error_messages(:header_message => "custom MarkupUser cannot be saved!")
   = f.hidden_field :session_id
   %p
-    = f.label :username, :caption => "Login", :class => 'user-label'
+    = f.label :username, :caption => "Login: ", :class => 'user-label'
     = f.text_field :username, :class => 'user-text', :value => "John"
   %p
     = f.label :email, :caption => "Email", :class => 'user-email'
@@ -14,10 +14,10 @@
     = f.label :photo
     = f.file_field :photo, :class => 'user-photo'
   %p
-    = f.label :about, :caption => "About Me"
+    = f.label :about, :caption => "About Me: "
     = f.text_area :about, :class => 'user-about'  
   %p
-    = f.label :gender, :caption => "Your gender"
+    = f.label :gender, :caption => "Your gender: "
     = f.radio_button :gender, :value => 'male'
     = f.radio_button :gender, :value => 'female'
   %p
@@ -34,7 +34,7 @@
 - form_for MarkupUser.new, '/another_demo', :id => 'demo2', :method => 'get' do |f|
   = f.error_messages :header_message => "custom MarkupUser cannot be saved!"
   = f.hidden_field :session_id
-  = f.text_field_block :username, { :class => 'input' }, { :caption => 'Nickname', :class => 'label' }
+  = f.text_field_block :username, { :class => 'input' }, { :caption => 'Nickname: ', :class => 'label' }
   = f.password_field_block :code, { :class => 'input' }
   = f.text_area_block :about, { :class => 'textarea' }
   = f.file_field_block :photo, { :class => 'upload' }

data/test/fixtures/markup_app/views/meta_tag.erb

@@ -0,0 +1,3 @@
+<%= meta_tag "weblog,news", :name => "keywords" %>
+
+<%= meta_tag "text/html; charset=UTF-8", :"http-equiv" => "Content-Type" %>

data/test/fixtures/markup_app/views/meta_tag.haml

@@ -0,0 +1,3 @@
+= meta_tag "weblog,news", :name => "keywords"
+
+= meta_tag "text/html; charset=UTF-8", :"http-equiv" => "Content-Type"

data/test/test_asset_tag_helpers.rb

@@ -82,6 +82,27 @@ class TestAssetTagHelpers < Test::Unit::TestCase
     end
   end
 
+  context 'for #meta_tag method' do
+    should "display meta tag with given content and name" do
+      actual_html = meta_tag("weblog,news", :name => "keywords")
+      assert_has_tag("meta", :name => "keywords", "content" => "weblog,news") { actual_html }
+    end
+    should "display meta tag with given content and http-equiv" do
+      actual_html = meta_tag("text/html; charset=UTF-8", :"http-equiv" => "Content-Type")
+      assert_has_tag("meta", :"http-equiv" => "Content-Type", "content" => "text/html; charset=UTF-8") { actual_html }
+    end
+    should "display meta tag element in haml" do
+      visit '/haml/meta_tag'
+      assert_have_selector 'meta', "content" => "weblog,news", :name => "keywords"
+      assert_have_selector 'meta', "content" => "text/html; charset=UTF-8", :"http-equiv" => "Content-Type"
+    end
+    should "display meta tag element in erb" do
+      visit '/erb/meta_tag'
+      assert_have_selector 'meta', "content" => "weblog,news", :name => "keywords"
+      assert_have_selector 'meta', "content" => "text/html; charset=UTF-8", :"http-equiv" => "Content-Type"
+    end
+  end
+
   context 'for #image_tag method' do
     should "display image tag absolute link with no options" do
       assert_has_tag('img', :src => "/absolute/pic.gif") { image_tag('/absolute/pic.gif') }

data/test/test_form_builder.rb

@@ -148,7 +148,7 @@ class TestFormBuilder < Test::Unit::TestCase
 
   context 'for #label method' do
     should "display correct label html" do
-      actual_html = standard_builder.label(:first_name, :class => 'large', :caption => "F. Name")
+      actual_html = standard_builder.label(:first_name, :class => 'large', :caption => "F. Name: ")
       assert_has_tag('label', :class => 'large', :for => 'user_first_name', :content => "F. Name: ") { actual_html }
     end
 
@@ -301,6 +301,11 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_has_tag('textarea.large', :id => 'user_about', :name => 'user[about]') { actual_html }
     end
 
+    should "display correct text_area html and content" do
+      actual_html = standard_builder.text_area(:about, :value => "Demo")
+      assert_has_tag('textarea', :id => 'user_about', :content => 'Demo') { actual_html }
+    end
+
     should "display correct text_area in haml" do
       visit '/haml/form_for'
       assert_have_selector '#demo textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'user-about'
@@ -454,7 +459,7 @@ class TestFormBuilder < Test::Unit::TestCase
   context 'for #text_field_block method' do
     should "display correct text field block html" do
       actual_html = standard_builder.text_field_block(:first_name, :class => 'large', :caption => "FName")
-      assert_has_tag('p label', :for => 'user_first_name', :content => "FName: ") { actual_html }
+      assert_has_tag('p label', :for => 'user_first_name', :content => "FName") { actual_html }
       assert_has_tag('p input.large[type=text]', :value => "Joe", :id => 'user_first_name', :name => 'user[first_name]') { actual_html }
     end
 
@@ -474,7 +479,7 @@ class TestFormBuilder < Test::Unit::TestCase
   context 'for #text_area_block method' do
     should "display correct text area block html" do
       actual_html = standard_builder.text_area_block(:about, :class => 'large', :caption => "About Me")
-      assert_has_tag('p label', :for => 'user_about', :content => "About Me: ") { actual_html }
+      assert_has_tag('p label', :for => 'user_about', :content => "About Me") { actual_html }
       assert_has_tag('p textarea', :id => 'user_about', :name => 'user[about]') { actual_html }
     end
 
@@ -493,7 +498,7 @@ class TestFormBuilder < Test::Unit::TestCase
 
   context 'for #password_field_block method' do
     should "display correct password field block html" do
-      actual_html = standard_builder.password_field_block(:keycode, :class => 'large', :caption => "Code")
+      actual_html = standard_builder.password_field_block(:keycode, :class => 'large', :caption => "Code: ")
       assert_has_tag('p label', :for => 'user_keycode', :content => "Code: ") { actual_html }
       assert_has_tag('p input.large[type=password]', :id => 'user_keycode', :name => 'user[keycode]') { actual_html }
     end
@@ -513,7 +518,7 @@ class TestFormBuilder < Test::Unit::TestCase
 
   context 'for #file_field_block method' do
     should "display correct file field block html" do
-      actual_html = standard_builder.file_field_block(:photo, :class => 'large', :caption => "Photo")
+      actual_html = standard_builder.file_field_block(:photo, :class => 'large', :caption => "Photo: ")
       assert_has_tag('p label', :for => 'user_photo', :content => "Photo: ") { actual_html }
       assert_has_tag('p input.large[type=file]', :id => 'user_photo', :name => 'user[photo]') { actual_html }
     end
@@ -533,8 +538,8 @@ class TestFormBuilder < Test::Unit::TestCase
 
   context 'for #check_box_block method' do
     should "display correct check box block html" do
-      actual_html = standard_builder.check_box_block(:remember_me, :class => 'large', :caption => "Remember session")
-      assert_has_tag('p label', :for => 'user_remember_me', :content => "Remember session: ") { actual_html }
+      actual_html = standard_builder.check_box_block(:remember_me, :class => 'large', :caption => "Remember session?")
+      assert_has_tag('p label', :for => 'user_remember_me', :content => "Remember session?") { actual_html }
       assert_has_tag('p input.large[type=checkbox]', :id => 'user_remember_me', :name => 'user[remember_me]') { actual_html }
     end
 
@@ -554,7 +559,7 @@ class TestFormBuilder < Test::Unit::TestCase
   context 'for #select_block method' do
     should "display correct select_block block html" do
       actual_html = standard_builder.select_block(:country, :options => ['USA', 'Canada'], :class => 'large', :caption => "Your country")
-      assert_has_tag('p label', :for => 'user_country', :content => "Your country: ") { actual_html }
+      assert_has_tag('p label', :for => 'user_country', :content => "Your country") { actual_html }
       assert_has_tag('p select', :id => 'user_country', :name => 'user[country]') { actual_html }
       assert_has_tag('p select option', :content => 'USA')   { actual_html }
       assert_has_tag('p select option', :content => 'Canada') { actual_html }

data/test/test_form_helpers.rb

@@ -108,7 +108,7 @@ class TestFormHelpers < Test::Unit::TestCase
   context 'for #label_tag method' do
     should "display label tag in ruby" do
       actual_html = label_tag(:username, :class => 'long-label', :caption => "Nickname")
-      assert_has_tag(:label, :for => 'username', :class => 'long-label', :content => "Nickname: ") { actual_html }
+      assert_has_tag(:label, :for => 'username', :class => 'long-label', :content => "Nickname") { actual_html }
     end
 
     should "display label tag in erb for simple form" do
@@ -190,6 +190,11 @@ class TestFormHelpers < Test::Unit::TestCase
       assert_has_tag(:textarea, :class => "long", :name => 'about') { actual_html }
     end
 
+    should "display text area in ruby with specified content" do
+      actual_html = text_area_tag(:about, :value => "a test")
+      assert_has_tag(:textarea, :content => "a test", :name => 'about') { actual_html }
+    end
+
     should "display text area in erb" do
       visit '/erb/form_tag'
       assert_have_selector 'form.advanced-form textarea', :count => 1, :name => 'about', :class => 'large'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-helpers
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-21 00:00:00 -08:00
+date: 2009-12-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -127,6 +127,8 @@ files:
 - test/fixtures/markup_app/views/link_to.haml
 - test/fixtures/markup_app/views/mail_to.erb
 - test/fixtures/markup_app/views/mail_to.haml
+- test/fixtures/markup_app/views/meta_tag.erb
+- test/fixtures/markup_app/views/meta_tag.haml
 - test/fixtures/render_app/app.rb
 - test/fixtures/render_app/views/erb/test.erb
 - test/fixtures/render_app/views/haml/test.haml