Merge pull request #202 from keitaoouchi/fix/hreflang_element_to_opti…

…onal Change 'hreflang' to optional element
kjvarga · Jul 15, 2015 · 2fd6fd9 · 2fd6fd9
2 parents f8e79ed + 5d43d39
commit 2fd6fd9
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -1044,7 +1044,7 @@ end
 
 * `:alternate`/`:alternates` - Hash or array of hashes, respectively
     * `:href` - Required, string.
-    * `:lang`  - Required, string.
+    * `:lang`  - Optional, string.
     * `:nofollow` - Optional, boolean. Used to mark link as "nofollow".
     * `:media` - Optional, string.  Specify [media targets for responsive design pages][media].
 

diff --git a/lib/sitemap_generator/builder/sitemap_url.rb b/lib/sitemap_generator/builder/sitemap_url.rb
@@ -136,7 +136,8 @@ def to_xml(builder=nil)
 
           self[:alternates].each do |alternate|
             rel = alternate[:nofollow] ? 'alternate nofollow' : 'alternate'
-            attributes = { :rel => rel, :hreflang => alternate[:lang].to_s, :href => alternate[:href].to_s }
+            attributes = { :rel => rel, :href => alternate[:href].to_s }
+            attributes[:hreflang] = alternate[:lang].to_s if SitemapGenerator::Utilities.present?(alternate[:lang])
             attributes[:media] = alternate[:media].to_s if SitemapGenerator::Utilities.present?(alternate[:media])
             builder.xhtml :link, attributes
           end

diff --git a/spec/sitemap_generator/alternate_sitemap_spec.rb b/spec/sitemap_generator/alternate_sitemap_spec.rb
@@ -24,6 +24,27 @@
     alternate.attribute('media').should be_nil
   end
 
+  it "should not include hreflang element unless provided" do
+    xml_fragment = SitemapGenerator::Builder::SitemapUrl.new('link_with_alternates.html',
+                                                             :host => 'http://www.example.com',
+                                                             :alternates => [
+                                                                 {
+                                                                     :href => 'http://www.example.de/link_with_alternate.html'
+                                                                 }
+                                                             ]
+    ).to_xml
+
+    doc = Nokogiri::XML.parse("<root xmlns='http://www.sitemaps.org/schemas/sitemap/0.9' xmlns:xhtml='http://www.w3.org/1999/xhtml'>#{xml_fragment}</root>")
+    url = doc.css('url')
+    url.should_not be_nil
+    url.css('loc').text.should == 'http://www.example.com/link_with_alternates.html'
+
+    alternate = url.at_xpath('xhtml:link')
+    alternate.should_not be_nil
+    alternate.attribute('rel').value.should == 'alternate'
+    alternate.attribute('hreflang').should be_nil
+  end
+
   it "should add alternate links to sitemap" do
     xml_fragment = SitemapGenerator::Builder::SitemapUrl.new('link_with_alternates.html',
       :host => 'http://www.example.com',