padrino-helpers 0.10.6.c → 0.10.6.d

data/lib/padrino-helpers/format_helpers.rb

@@ -81,11 +81,11 @@ module Padrino
       # @api public
       def simple_format(text, options={})
         t = options.delete(:tag) || :p
-        start_tag = tag(t, options)
+        start_tag = tag(t, options, true)
         text = text.to_s.dup
         text.gsub!(/\r\n?/, "\n")                    # \r\n and \r -> \n
         text.gsub!(/\n\n+/, "</#{t}>\n\n#{start_tag}")  # 2+ newline  -> paragraph
-        text.gsub!(/([^\n]\n)(?=[^\n])/, '\1<br>') # 1 newline   -> br
+        text.gsub!(/([^\n]\n)(?=[^\n])/, '\1<br />') # 1 newline   -> br
         text.insert 0, start_tag
         text << "</#{t}>"
       end

data/lib/padrino-helpers/tag_helpers.rb

@@ -138,16 +138,16 @@ module Padrino
       #
       # @example
       #   input_tag :text, :name => 'handle'
-      #   # => <input type="test" name="handle">
+      #   # => <input type="test" name="handle" />
       #
       #   input_tag :password, :name => 'password', :size => 20
-      #   # => <input type="password" name="password" size="20">
+      #   # => <input type="password" name="password" size="20" />
       #
       #   input_tag :text, :name => 'username', :required => true, :autofocus => true
-      #   # => <input type="text" name="username" required autofocus>
+      #   # => <input type="text" name="username" required autofocus />
       #
       #   input_tag :number, :name => 'credit_card', :autocomplete => :off
-      #   # => <input type="number" autocomplete="off">
+      #   # => <input type="number" autocomplete="off" />
       #
       # @api semipublic
       def input_tag(type, options = {})
@@ -172,17 +172,17 @@ module Padrino
       #   # => <hr class="dotted">
       #
       #   tag :input, :name => 'username', :type => :text
-      #   # => <input name="username" type="text">
+      #   # => <input name="username" type="text" />
       #
       #   tag :img, :src => 'images/pony.jpg', :alt => 'My Little Pony'
-      #   # => <img src="images/pony.jpg" alt="My Little Pony">
+      #   # => <img src="images/pony.jpg" alt="My Little Pony" />
       #
       #   tag :img, :src => 'sinatra.jpg, :data => { :nsfw => false, :geo => [34.087, -118.407] }
-      #   # => <img src="sinatra.jpg" data-nsfw="false" data-geo="34.087 -118.407">
+      #   # => <img src="sinatra.jpg" data-nsfw="false" data-geo="34.087 -118.407" />
       #
       # @api public
-      def tag(name, options = nil)
-        "<#{name}#{tag_options(options) if options}>"
+      def tag(name, options = nil, open = false)
+        "<#{name}#{tag_options(options) if options}#{open ? '>' : ' />'}"
       end
 
       private

data/test/test_asset_tag_helpers.rb

@@ -176,6 +176,11 @@ describe "AssetTagHelpers" do
       self.class.expects(:asset_stamp).returns(false)
       assert_has_tag('img', :src => "/absolute/pic.gif") { image_tag('/absolute/pic.gif') }
     end
+
+    should "have xhtml convention tag" do
+      self.class.expects(:asset_stamp).returns(false)
+      assert_equal image_tag('/absolute/pic.gif'), '<img src="/absolute/pic.gif" />'
+    end
   end
 
   context 'for #stylesheet_link_tag method' do

data/test/test_format_helpers.rb

@@ -15,7 +15,7 @@ describe "FormatHelpers" do
   context 'for #simple_format method' do
     should "format simple text into html format" do
       actual_text = simple_format("Here is some basic text...\n...with a line break.")
-      assert_equal "<p>Here is some basic text...\n<br>...with a line break.</p>", actual_text
+      assert_equal "<p>Here is some basic text...\n<br />...with a line break.</p>", actual_text
     end
 
     should "format more text into html format" do
@@ -31,7 +31,7 @@ describe "FormatHelpers" do
     context 'wrapped in a custom tag' do
       should "format simple text into html format" do
         actual_text = simple_format("Here is some basic text...\n...with a line break.", :tag => :div)
-        assert_equal "<div>Here is some basic text...\n<br>...with a line break.</div>", actual_text
+        assert_equal "<div>Here is some basic text...\n<br />...with a line break.</div>", actual_text
       end
 
       should "format more text into html format" do

data/test/test_tag_helpers.rb

@@ -7,6 +7,15 @@ describe "TagHelpers" do
   end
 
   context 'for #tag method' do
+    should("support tags with no content no attributes") do
+      assert_has_tag(:br) { tag(:br) }
+    end
+
+    should("support tags with no content with attributes") do
+      actual_html = tag(:br, :style => 'clear:both', :class => 'yellow')
+      assert_has_tag(:br, :class => 'yellow', :style=>'clear:both') { actual_html }
+    end
+
     should "support selected attribute by using 'selected' if true" do
       actual_html = tag(:option, :selected => true)
       assert_has_tag('option', :selected => 'selected') { actual_html }
@@ -17,9 +26,14 @@ describe "TagHelpers" do
       assert_has_tag(:a, 'data-remote' => 'true', 'data-method' => 'post') { actual_html }
     end
 
+    should "support open tags" do
+      actual_html = tag(:p, { :class => 'demo' }, true)
+      assert_equal "<p class=\"demo\">", actual_html
+    end
+
     should "escape html" do
       actual_html = tag(:br, :class => 'Example "bar"')
-      assert_equal "<br class=\"Example &quot;bar&quot;\">", actual_html
+      assert_equal "<br class=\"Example &quot;bar&quot;\" />", actual_html
     end
   end
 

metadata

@@ -1,16 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: padrino-helpers
-version: !ruby/object:Gem::Version 
-  hash: 96
+version: !ruby/object:Gem::Version
+  version: 0.10.6.d
   prerelease: 7
-  segments: 
-  - 0
-  - 10
-  - 6
-  - c
-  version: 0.10.6.c
 platform: ruby
-authors: 
+authors:
 - Padrino Team
 - Nathan Esquenazi
 - Davide D'Agostino
@@ -18,51 +12,38 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-25 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: padrino-core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70111273349200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 96
-        segments: 
-        - 0
-        - 10
-        - 6
-        - c
-        version: 0.10.6.c
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.10.6.d
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70111273349200
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &70111273347840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        version: "0.6"
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :runtime
-  version_requirements: *id002
-description: Tag helpers, asset helpers, form helpers, form builders and many more helpers for padrino
+  prerelease: false
+  version_requirements: *70111273347840
+description: Tag helpers, asset helpers, form helpers, form builders and many more
+  helpers for padrino
 email: padrinorb@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .document
 - .gitignore
 - .yardopts
@@ -162,43 +143,32 @@ files:
 - test/test_output_helpers.rb
 - test/test_render_helpers.rb
 - test/test_tag_helpers.rb
-has_rdoc: true
 homepage: http://www.padrinorb.com
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: padrino-helpers
-rubygems_version: 1.6.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Helpers for padrino
-test_files: 
+test_files:
 - test/fixtures/markup_app/app.rb
 - test/fixtures/markup_app/views/capture_concat.erb
 - test/fixtures/markup_app/views/capture_concat.haml
@@ -257,3 +227,4 @@ test_files:
 - test/test_output_helpers.rb
 - test/test_render_helpers.rb
 - test/test_tag_helpers.rb
+has_rdoc: