@@ -28,7 +28,7 @@ All fields are optional but the name, you are required to provide at least one o ===Contact -* +tel+ - Provide the phone number +* +tel+ - Provide a hash with the phone types and numbers * +url+ - Add a link to a site in the name * +email+ - Add a link to a mailto: address @@ -55,7 +55,21 @@ The output is: <a href="http:blog.shadowmaru.org" class="fn n url"> <span class="given-name">Ricardo</span> <span class="family-name">Yasuda</span> </a> - <div class="adr"> + <span class="adr"> <span class="country-name">Brazil</span> - </div> - </span> \ No newline at end of file + </span> + </span> + +An example with telephone numbers: + + <%= hcard(:fn => "John Doe", :tel => { "fax" => "544-5544", "home" => "555-5555" }) %> + +The output is: + + <span class="vcard"> + <span class="fn n">John Doe</span> + <span class="tel"> + <span class="tel-label-fax type">Fax: </span><span class="value">544-5544</span> + <span class="tel-label-home type">Home: </span><span class="value">555-5555</span> + </span> + </span> README.rdoc @@ -21,18 +21,19 @@ module MicroformatsHelper # * +additional+ - Additional Name: goes between given and family names # * +prefix+ - Honorific Prefix: for titles like Dr. or Sir # * +suffix+ - Honorific Suffix: for titles like M.D. or Jr + # * +org+ - Organization name # # ===Address # # * +street+ - Street Address # * +locality+ - The city or similar # * +region+ - The state, county or similar - # * +postal-code+ - ZIP number + # * +postal_code+ - ZIP number # * +country+ - The country # # ===Contact # - # * +tel+ - Provide the phone number + # * +tel+ - Provide a hash with the phone types and numbers # * +url+ - Add a link to a site in the name # * +email+ - Add a link to a mailto: address def hcard(values) @@ -107,7 +108,11 @@ module MicroformatsHelper end if tel = values[:tel] - span_tel = "\nTel: " + content_tag("div", tel, :class => "tel") + "\n" + tel_values = "" + tel.each do |k,v| + tel_values += content_tag("span", "#{k.capitalize}: ", :class => "tel-label-#{k} type") + content_tag("span", v, :class => "value") + end + span_tel = "\n" + content_tag("span", tel_values, :class => "tel") + "\n" else span_tel = "" end lib/microformats_helper.rb @@ -45,7 +45,7 @@ class MicroformatsHelperTest < Test::Unit::TestCase def test_hcard_address output = hcard(:fn => "John Doe", :street => "123 Fictional Lane", :locality => "Neverland", :region => "Imagination") - assert_equal "<span class=\"vcard\">\n<span class=\"fn n\">John Doe</span>\n\n<div class=\"adr\"><span class=\"street-address\">123 Fictional Lane</span> <span class=\"locality\">Neverland</span> - <span class=\"region\">Imagination</span></div>\n</span>", output + assert_equal "<span class=\"vcard\">\n<span class=\"fn n\">John Doe</span>\n\n<span class=\"adr\"><span class=\"street-address\">123 Fictional Lane</span> <span class=\"locality\">Neverland</span> - <span class=\"region\">Imagination</span></span>\n</span>", output end def test_hcard_email @@ -54,7 +54,7 @@ class MicroformatsHelperTest < Test::Unit::TestCase end def test_hcard_tel - output = hcard(:fn => "John Doe", :tel => "555-5555") - assert_equal "<span class=\"vcard\">\n<span class=\"fn n\">John Doe</span>\n\nTel: <div class=\"tel\">555-5555</div>\n</span>", output + output = hcard(:fn => "John Doe", :tel => { "fax" => "544-5544", "home" => "555-5555" }) + assert_equal "<span class=\"vcard\">\n<span class=\"fn n\">John Doe</span>\n\n<span class=\"tel\"><span class=\"tel-label-fax type\">Fax: </span><span class=\"value\">544-5544</span><span class=\"tel-label-home type\">Home: </span><span class=\"value\">555-5555</span></span>\n</span>", output end end \ No newline at end of file test/microformats_helper_test.rb 24a1e44bf6b60826b256dd3f7af402a762dcf547 Ricardo Shiota Yasuda shadow11@gmail.com http://github.com/shadow11/microformats_helper/commit/e1c7f4224f50006132d4262e5d349c1eae9b6af8 e1c7f4224f50006132d4262e5d349c1eae9b6af8 2009-09-04T09:53:31-07:00 2009-09-04T09:53:31-07:00 Support for multiple phone numbers 14df86186b4bc13eb220a834c8669e227415ece9 Ricardo Shiota Yasuda shadow11@gmail.com