RubyGems - xml-sitemap - Versions diffs - 1.1.3 → 1.3.3 - Mend

xml-sitemap 1.1.3 → 1.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (30) hide show

checksums.yaml +7 -0
data/.travis.yml +2 -2
data/Gemfile +1 -2
data/LICENSE +18 -0
data/README.md +80 -25
data/Rakefile +1 -0
data/lib/xml-sitemap/index.rb +23 -6
data/lib/xml-sitemap/item.rb +123 -0
data/lib/xml-sitemap/map.rb +76 -65
data/lib/xml-sitemap/options.rb +7 -3
data/lib/xml-sitemap/render_engine.rb +185 -0
data/lib/xml-sitemap/version.rb +7 -1
data/lib/xml-sitemap.rb +8 -0
data/spec/fixtures/empty_index.xml +2 -2
data/spec/fixtures/encoded_image_map.xml +58 -0
data/spec/fixtures/encoded_map.xml +0 -3
data/spec/fixtures/encoded_video_map.xml +53 -0
data/spec/fixtures/group_index.xml +2 -2
data/spec/fixtures/sample_index.xml +2 -2
data/spec/fixtures/sample_index_secure.xml +11 -0
data/spec/fixtures/sample_many_subdomains_index.xml +11 -0
data/spec/fixtures/saved_map.xml +0 -7
data/spec/fixtures/simple_map.xml +1 -1
data/spec/index_spec.rb +85 -60
data/spec/item_spec.rb +10 -0
data/spec/map_spec.rb +277 -115
data/spec/spec_helper.rb +10 -0
data/spec/xmlsitemap_spec.rb +21 -6
data/xml-sitemap.gemspec +6 -5
metadata +62 -25

data/lib/xml-sitemap/render_engine.rb ADDED Viewed

@@ -0,0 +1,185 @@
+module XmlSitemap
+  module RenderEngine
+    private
+    # Render with Nokogiri gem
+    #
+    def render_nokogiri
+      unless defined? Nokogiri
+        raise ArgumentError, "Nokogiri not found!"
+      end
+      builder = Nokogiri::XML::Builder.new(:encoding => "UTF-8") do |xml|
+        xml.urlset(XmlSitemap::MAP_SCHEMA_OPTIONS) { |s|
+          @items.each do |item|
+            s.url do |u|
+              u.loc        item.target
+              # Format and image tag specifications found at http://support.google.com/webmasters/bin/answer.py?hl=en&answer=178636
+              if item.image_location
+                u["image"].image do |a|
+                  a["image"].loc                item.image_location
+                  a["image"].caption            item.image_caption     if item.image_caption
+                  a["image"].title              item.image_title       if item.image_title
+                  a["image"].license            item.image_license     if item.image_license
+                  a["image"].geo_location       item.image_geolocation if item.image_geolocation
+                end
+              end
+              # Format and video tag specifications found at http://support.google.com/webmasters/bin/answer.py?hl=en&answer=80472&topic=10079&ctx=topic#2
+              if item.video_thumbnail_location && item.video_title && item.video_description && (item.video_content_location || item.video_player_location)
+                u["video"].video do |a|
+                  a["video"].thumbnail_loc            item.video_thumbnail_location
+                  a["video"].title                    item.video_title
+                  a["video"].description              item.video_description
+                  a["video"].content_loc              item.video_content_location                       if item.video_content_location
+                  a["video"].player_loc               item.video_player_location                        if item.video_player_location
+                  a["video"].duration                 item.video_duration.to_s                          if item.video_duration
+                  a["video"].expiration_date          item.video_expiration_date_value                  if item.video_expiration_date
+                  a["video"].rating                   item.video_rating.to_s                            if item.video_rating
+                  a["video"].view_count               item.video_view_count.to_s                        if item.video_view_count
+                  a["video"].publication_date         item.video_publication_date_value                 if item.video_publication_date
+                  a["video"].family_friendly          item.video_family_friendly                        if item.video_family_friendly
+                  a["video"].category                 item.video_category                               if item.video_category
+                  a["video"].restriction              item.video_restriction, :relationship => "allow"  if item.video_restriction
+                  a["video"].gallery_loc              item.video_gallery_location                       if item.video_gallery_location
+                  a["video"].price                    item.video_price.to_s, :currency => "USD"         if item.video_price
+                  a["video"].requires_subscription    item.video_requires_subscription                  if item.video_requires_subscription
+                  a["video"].uploader                 item.video_uploader                               if item.video_uploader
+                  a["video"].platform                 item.video_platform, :relationship => "allow"     if item.video_platform
+                  a["video"].live                     item.video_live                                   if item.video_live
+                end
+              end
+              u.lastmod    item.lastmod_value
+              u.changefreq item.changefreq.to_s if item.changefreq
+              u.priority   item.priority.to_s if item.priority
+            end
+          end
+        }
+      end
+      builder.to_xml
+    end
+    # Render with Builder gem
+    #
+    def render_builder
+      xml = Builder::XmlMarkup.new(:indent => 2)
+      xml.instruct!(:xml, :version => '1.0', :encoding => 'UTF-8')
+      xml.urlset(XmlSitemap::MAP_SCHEMA_OPTIONS) { |s|
+        @items.each do |item|
+          s.url do |u|
+            u.loc        item.target
+            # Format and image tag specifications found at http://support.google.com/webmasters/bin/answer.py?hl=en&answer=178636
+            if item.image_location
+              u.image :image do |a|
+                a.tag! "image:loc",           CGI::escapeHTML(item.image_location)
+                a.tag! "image:caption",       CGI::escapeHTML(item.image_caption)     if item.image_caption
+                a.tag! "image:title",         CGI::escapeHTML(item.image_title)       if item.image_title
+                a.tag! "image:license",       CGI::escapeHTML(item.image_license)     if item.image_license
+                a.tag! "image:geo_location",  CGI::escapeHTML(item.image_geolocation) if item.image_geolocation
+              end
+            end
+            # Format and video tag specifications found at http://support.google.com/webmasters/bin/answer.py?hl=en&answer=80472&topic=10079&ctx=topic#2
+            if item.video_thumbnail_location && item.video_title && item.video_description && (item.video_content_location || item.video_player_location)
+              u.video :video do |a|
+                a.tag! "video:thumbnail_loc",         CGI::escapeHTML(item.video_thumbnail_location)
+                a.tag! "video:title",                 CGI::escapeHTML(item.video_title)
+                a.tag! "video:description",           CGI::escapeHTML(item.video_description)
+                a.tag! "video:content_loc",           CGI::escapeHTML(item.video_content_location)                      if item.video_content_location
+                a.tag! "video:player_loc",            CGI::escapeHTML(item.video_player_location)                       if item.video_player_location
+                a.tag! "video:duration",              CGI::escapeHTML(item.video_duration.to_s)                         if item.video_duration
+                a.tag! "video:expiration_date",       CGI::escapeHTML(item.video_expiration_date_value)                 if item.video_expiration_date
+                a.tag! "video:rating",                CGI::escapeHTML(item.video_rating.to_s)                           if item.video_rating
+                a.tag! "video:view_count",            CGI::escapeHTML(item.video_view_count.to_s)                       if item.video_view_count
+                a.tag! "video:publication_date",      CGI::escapeHTML(item.video_publication_date_value)                if item.video_publication_date
+                a.tag! "video:family_friendly",       CGI::escapeHTML(item.video_family_friendly)                       if item.video_family_friendly
+                a.tag! "video:category",              CGI::escapeHTML(item.video_category)                              if item.video_category
+                a.tag! "video:restriction",           CGI::escapeHTML(item.video_restriction), :relationship => "allow" if item.video_restriction
+                a.tag! "video:gallery_loc",           CGI::escapeHTML(item.video_gallery_location)                      if item.video_gallery_location
+                a.tag! "video:price",                 CGI::escapeHTML(item.video_price.to_s), :currency => "USD"        if item.video_price
+                a.tag! "video:requires_subscription", CGI::escapeHTML(item.video_requires_subscription)                 if item.video_requires_subscription
+                a.tag! "video:uploader",              CGI::escapeHTML(item.video_uploader)                              if item.video_uploader
+                a.tag! "video:platform",              CGI::escapeHTML(item.video_platform), :relationship => "allow"    if item.video_platform
+                a.tag! "video:live",                  CGI::escapeHTML(item.video_live)                                  if item.video_live
+              end
+            end
+            u.lastmod    item.lastmod_value
+            u.changefreq item.changefreq.to_s if item.changefreq
+            u.priority   item.priority.to_s if item.priority
+          end
+        end
+      }.to_s
+    end
+    # Render with plain strings
+    #
+    def render_string
+      result = '<?xml version="1.0" encoding="UTF-8"?>' + "\n<urlset"
+      XmlSitemap::MAP_SCHEMA_OPTIONS.each do |key, val|
+        result << ' ' + key + '="' + val + '"'
+      end
+      result << ">\n"
+      item_results = []
+      @items.each do |item|
+        item_string  = "  <url>\n"
+        item_string << "    <loc>#{CGI::escapeHTML(item.target)}</loc>\n"
+        # Format and image tag specifications found at http://support.google.com/webmasters/bin/answer.py?hl=en&answer=178636
+        if item.image_location
+          item_string << "    <image:image>\n"
+          item_string << "      <image:loc>#{CGI::escapeHTML(item.image_location)}</image:loc>\n"
+          item_string << "      <image:caption>#{CGI::escapeHTML(item.image_caption)}</image:caption>\n"               if item.image_caption
+          item_string << "      <image:title>#{CGI::escapeHTML(item.image_title)}</image:title>\n"                     if item.image_title
+          item_string << "      <image:license>#{CGI::escapeHTML(item.image_license)}</image:license>\n"               if item.image_license
+          item_string << "      <image:geo_location>#{CGI::escapeHTML(item.image_geolocation)}</image:geo_location>\n" if item.image_geolocation
+          item_string << "    </image:image>\n"
+        end
+        # Format and video tag specifications found at http://support.google.com/webmasters/bin/answer.py?hl=en&answer=80472&topic=10079&ctx=topic#2
+        if item.video_thumbnail_location && item.video_title && item.video_description && (item.video_content_location || item.video_player_location)
+          item_string << "    <video:video>\n"
+          item_string << "      <video:thumbnail_loc>#{CGI::escapeHTML(item.video_thumbnail_location)}</video:thumbnail_loc>\n"
+          item_string << "      <video:title>#{CGI::escapeHTML(item.video_title)}</video:title>\n"
+          item_string << "      <video:description>#{CGI::escapeHTML(item.video_description)}</video:description>\n"
+          item_string << "      <video:content_loc>#{CGI::escapeHTML(item.video_content_location)}</video:content_loc>\n"                           if item.video_content_location
+          item_string << "      <video:player_loc>#{CGI::escapeHTML(item.video_player_location)}</video:player_loc>\n"                              if item.video_player_location
+          item_string << "      <video:duration>#{CGI::escapeHTML(item.video_duration.to_s)}</video:duration>\n"                                    if item.video_duration
+          item_string << "      <video:expiration_date>#{item.video_expiration_date_value}</video:expiration_date>\n"                               if item.video_expiration_date
+          item_string << "      <video:rating>#{CGI::escapeHTML(item.video_rating.to_s)}</video:rating>\n"                                          if item.video_rating
+          item_string << "      <video:view_count>#{CGI::escapeHTML(item.video_view_count.to_s)}</video:view_count>\n"                              if item.video_view_count
+          item_string << "      <video:publication_date>#{item.video_publication_date_value}</video:publication_date>\n"                            if item.video_publication_date
+          item_string << "      <video:family_friendly>#{CGI::escapeHTML(item.video_family_friendly)}</video:family_friendly>\n"                    if item.video_family_friendly
+          item_string << "      <video:category>#{CGI::escapeHTML(item.video_category)}</video:category>\n"                                         if item.video_category
+          item_string << "      <video:restriction relationship=\"allow\">#{CGI::escapeHTML(item.video_restriction)}</video:restriction>\n"         if item.video_restriction
+          item_string << "      <video:gallery_loc>#{CGI::escapeHTML(item.video_gallery_location)}</video:gallery_loc>\n"                           if item.video_gallery_location
+          item_string << "      <video:price currency=\"USD\">#{CGI::escapeHTML(item.video_price.to_s)}</video:price>\n"                            if item.video_price
+          item_string << "      <video:requires_subscription>#{CGI::escapeHTML(item.video_requires_subscription)}</video:requires_subscription>\n"  if item.video_requires_subscription
+          item_string << "      <video:uploader>#{CGI::escapeHTML(item.video_uploader)}</video:uploader>\n"                                         if item.video_uploader
+          item_string << "      <video:platform relationship=\"allow\">#{CGI::escapeHTML(item.video_platform)}</video:platform>\n"                  if item.video_platform
+          item_string << "      <video:live>#{CGI::escapeHTML(item.video_live)}</video:live>\n"                                                     if item.video_live
+          item_string << "    </video:video>\n"
+        end
+        item_string << "    <lastmod>#{item.lastmod_value}</lastmod>\n"
+        item_string << "    <changefreq>#{item.changefreq}</changefreq>\n" if item.changefreq
+        item_string << "    <priority>#{item.priority}</priority>\n" if item.priority
+        item_string << "  </url>\n"
+        item_results << item_string
+      end
+      result << item_results.join("")
+      result << "</urlset>\n"
+      result
+    end
+  end
+end

data/lib/xml-sitemap/version.rb CHANGED Viewed

@@ -1,3 +1,9 @@
 module XmlSitemap
-  VERSION = '1.1.3'
+  unless defined?(::XmlSitemap::VERSION)
+    VERSION = "1.3.3"
+  end
+  def self.version
+    XmlSitemap::VERSION
+  end
 end

data/lib/xml-sitemap.rb CHANGED Viewed

@@ -2,8 +2,16 @@ require 'time'
 require 'date'
 require 'zlib'
 require 'builder'
+require 'cgi'
+begin
+  require 'nokogiri'
+rescue LoadError
+end
+require 'xml-sitemap/version'
 require 'xml-sitemap/options'
+require 'xml-sitemap/render_engine'
+require 'xml-sitemap/item'
 require 'xml-sitemap/map'
 require 'xml-sitemap/index'

data/spec/fixtures/empty_index.xml CHANGED Viewed

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-</urlset>
+<sitemapindex xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+</sitemapindex>

data/spec/fixtures/encoded_image_map.xml ADDED Viewed

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  <url>
+    <loc>http://foobar.com/</loc>
+    <lastmod>2011-06-01T00:00:01Z</lastmod>
+    <priority>1.0</priority>
+  </url>
+  <url>
+    <loc>http://foobar.com/path?a=b&amp;c=d&amp;e=image support string</loc>
+    <image:image>
+      <image:loc>http://foobar.com/foo.gif</image:loc>
+    </image:image>
+    <lastmod>2011-06-01T00:00:01Z</lastmod>
+  </url>
+  <url>
+    <loc>http://foobar.com/path?a=b&amp;c=d&amp;e=image support string</loc>
+    <image:image>
+      <image:loc>http://foobar.com/foo.gif</image:loc>
+      <image:title>Image Title</image:title>
+    </image:image>
+    <lastmod>2011-06-01T00:00:01Z</lastmod>
+  </url>
+  <url>
+    <loc>http://foobar.com/path?a=b&amp;c=d&amp;e=image support string</loc>
+    <image:image>
+      <image:loc>http://foobar.com/foo.gif</image:loc>
+      <image:caption>Image Caption</image:caption>
+    </image:image>
+    <lastmod>2011-06-01T00:00:01Z</lastmod>
+  </url>
+  <url>
+    <loc>http://foobar.com/path?a=b&amp;c=d&amp;e=image support string</loc>
+    <image:image>
+      <image:loc>http://foobar.com/foo.gif</image:loc>
+      <image:license>Image License</image:license>
+    </image:image>
+    <lastmod>2011-06-01T00:00:01Z</lastmod>
+  </url>
+  <url>
+    <loc>http://foobar.com/path?a=b&amp;c=d&amp;e=image support string</loc>
+    <image:image>
+      <image:loc>http://foobar.com/foo.gif</image:loc>
+      <image:geo_location>Image GeoLocation</image:geo_location>
+    </image:image>
+    <lastmod>2011-06-01T00:00:01Z</lastmod>
+  </url>
+  <url>
+    <loc>http://foobar.com/path?a=b&amp;c=d&amp;e=image support string</loc>
+    <image:image>
+      <image:loc>http://foobar.com/foo.gif</image:loc>
+      <image:caption>Image Caption</image:caption>
+      <image:title>Image Title</image:title>
+      <image:license>Image License</image:license>
+      <image:geo_location>Image GeoLocation</image:geo_location>
+    </image:image>
+    <lastmod>2011-06-01T00:00:01Z</lastmod>
+  </url>
+</urlset>

data/spec/fixtures/encoded_map.xml CHANGED Viewed

@@ -3,13 +3,10 @@
   <url>
     <loc>http://foobar.com/</loc>
     <lastmod>2011-06-01T00:00:01Z</lastmod>
-    <changefreq>weekly</changefreq>
     <priority>1.0</priority>
   </url>
   <url>
     <loc>http://foobar.com/path?a=b&amp;c=d&amp;e=sample string</loc>
     <lastmod>2011-06-01T00:00:01Z</lastmod>
-    <changefreq>weekly</changefreq>
-    <priority>0.5</priority>
   </url>
 </urlset>

data/spec/fixtures/encoded_video_map.xml ADDED Viewed

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  <url>
+    <loc>http://foobar.com/</loc>
+    <lastmod>2011-06-01T00:00:01Z</lastmod>
+    <priority>1.0</priority>
+  </url>
+  <url>
+    <loc>http://foobar.com/path?a=b&amp;c=d&amp;e=video</loc>
+    <video:video>
+      <video:thumbnail_loc>http://foobar.com/foo.jpg</video:thumbnail_loc>
+      <video:title>Video Title</video:title>
+      <video:description>Video Description</video:description>
+      <video:content_loc>http://foobar.com/foo.mp4</video:content_loc>
+    </video:video>
+    <lastmod>2011-06-01T00:00:01Z</lastmod>
+  </url>
+  <url>
+    <loc>http://foobar.com/path?a=b&amp;c=d&amp;e=video</loc>
+    <video:video>
+      <video:thumbnail_loc>http://foobar.com/foo.jpg</video:thumbnail_loc>
+      <video:title>Video Title</video:title>
+      <video:description>Video Description</video:description>
+      <video:player_loc>http://foobar.com/foo.swf</video:player_loc>
+    </video:video>
+    <lastmod>2011-06-01T00:00:01Z</lastmod>
+  </url>
+  <url>
+    <loc>http://foobar.com/path?a=b&amp;c=d&amp;e=video</loc>
+    <video:video>
+      <video:thumbnail_loc>http://foobar.com/foo.jpg</video:thumbnail_loc>
+      <video:title>Video Title</video:title>
+      <video:description>Video Description</video:description>
+      <video:content_loc>http://foobar.com/foo.mp4</video:content_loc>
+      <video:player_loc>http://foobar.com/foo.swf</video:player_loc>
+      <video:duration>180</video:duration>
+      <video:expiration_date>2012-06-01T00:00:01Z</video:expiration_date>
+      <video:rating>3.5</video:rating>
+      <video:view_count>2500</video:view_count>
+      <video:publication_date>2011-06-01T00:00:01Z</video:publication_date>
+      <video:family_friendly>no</video:family_friendly>
+      <video:category>Video Category</video:category>
+      <video:restriction relationship="allow">IT</video:restriction>
+      <video:gallery_loc>http://foobar.com/foo.mpu</video:gallery_loc>
+      <video:price currency="USD">20</video:price>
+      <video:requires_subscription>no</video:requires_subscription>
+      <video:uploader>Video Uploader</video:uploader>
+      <video:platform relationship="allow">web</video:platform>
+      <video:live>no</video:live>
+    </video:video>
+    <lastmod>2011-06-01T00:00:01Z</lastmod>
+  </url>
+</urlset>

data/spec/fixtures/group_index.xml CHANGED Viewed

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+<sitemapindex xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
   <sitemap>
     <loc>http://foobar.com/first-0.xml</loc>
     <lastmod>2011-06-01T00:00:01Z</lastmod>
@@ -16,4 +16,4 @@
     <loc>http://foobar.com/third-0.xml</loc>
     <lastmod>2011-06-01T00:00:01Z</lastmod>
   </sitemap>
-</urlset>
+</sitemapindex>

data/spec/fixtures/sample_index.xml CHANGED Viewed

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+<sitemapindex xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
   <sitemap>
     <loc>http://foobar.com/sitemap-0.xml</loc>
     <lastmod>2011-06-01T00:00:01Z</lastmod>
@@ -8,4 +8,4 @@
     <loc>http://foobar.com/sitemap-1.xml</loc>
     <lastmod>2011-06-01T00:00:01Z</lastmod>
   </sitemap>
-</urlset>
+</sitemapindex>

data/spec/fixtures/sample_index_secure.xml ADDED Viewed

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sitemapindex xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  <sitemap>
+    <loc>https://foobar.com/sitemap-0.xml</loc>
+    <lastmod>2011-06-01T00:00:01Z</lastmod>
+  </sitemap>
+  <sitemap>
+    <loc>https://foobar.com/sitemap-1.xml</loc>
+    <lastmod>2011-06-01T00:00:01Z</lastmod>
+  </sitemap>
+</sitemapindex>

data/spec/fixtures/sample_many_subdomains_index.xml ADDED Viewed

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sitemapindex xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  <sitemap>
+    <loc>http://one.foobar.com/sitemap.xml</loc>
+    <lastmod>2011-06-01T00:00:01Z</lastmod>
+  </sitemap>
+  <sitemap>
+    <loc>http://two.foobar.com/sitemap.xml</loc>
+    <lastmod>2011-06-01T00:00:01Z</lastmod>
+  </sitemap>
+</sitemapindex>

data/spec/fixtures/saved_map.xml CHANGED Viewed

@@ -3,25 +3,18 @@
   <url>
     <loc>http://foobar.com/</loc>
     <lastmod>2011-06-01T00:00:01Z</lastmod>
-    <changefreq>weekly</changefreq>
     <priority>1.0</priority>
   </url>
   <url>
     <loc>http://foobar.com/about</loc>
     <lastmod>2011-06-01T00:00:01Z</lastmod>
-    <changefreq>weekly</changefreq>
-    <priority>0.5</priority>
   </url>
   <url>
     <loc>http://foobar.com/terms</loc>
     <lastmod>2011-06-01T00:00:01Z</lastmod>
-    <changefreq>weekly</changefreq>
-    <priority>0.5</priority>
   </url>
   <url>
     <loc>http://foobar.com/privacy</loc>
     <lastmod>2011-06-01T00:00:01Z</lastmod>
-    <changefreq>weekly</changefreq>
-    <priority>0.5</priority>
   </url>
 </urlset>

data/spec/fixtures/simple_map.xml CHANGED Viewed

@@ -6,4 +6,4 @@
     <changefreq>monthly</changefreq>
     <priority>0.8</priority>
   </url>
-</urlset>
+</urlset>

data/spec/index_spec.rb CHANGED Viewed

@@ -1,70 +1,95 @@
 require 'spec_helper'
 describe XmlSitemap::Index do
-  before :all do
-    @base_time = Time.gm(2011, 6, 1, 0, 0, 1)
-  end
-  it 'should be valid if no sitemaps were supplied' do
-    index = XmlSitemap::Index.new
-    index.render.should == fixture('empty_index.xml')
-  end
-  it 'should raise error if passing a wrong object' do
-    index = XmlSitemap::Index.new
-    proc { index.add(nil) }.should raise_error ArgumentError, 'XmlSitemap::Map object requred!'
-  end
-  it 'should raise error if passing an empty sitemap' do
-    map = XmlSitemap::Map.new('foobar.com', :home => false)
-    index = XmlSitemap::Index.new
-    proc { index.add(map) }.should raise_error ArgumentError, 'Map is empty!'
-  end
-  it 'should render a proper index' do
-    m1 = XmlSitemap::Map.new('foobar.com', :time => @base_time) { |m| m.add('about') }
-    m2 = XmlSitemap::Map.new('foobar.com', :time => @base_time) { |m| m.add('about') }
-    index = XmlSitemap::Index.new do |i|
-      i.add(m1)
-      i.add(m2)
+  let(:base_time) { Time.gm(2011, 6, 1, 0, 0, 1) }
+  describe '#new' do
+    it 'should be valid if no sitemaps were supplied' do
+      index = XmlSitemap::Index.new
+      index.render.split("\n")[2..-1].join("\n").should == fixture('empty_index.xml').split("\n")[2..-1].join("\n")
+    end
+    it 'should raise error if passing a wrong object' do
+      index = XmlSitemap::Index.new
+      expect { index.add(nil) }.to raise_error ArgumentError, 'XmlSitemap::Map object required!'
+    end
+    it 'should raise error if passing an empty sitemap' do
+      map = XmlSitemap::Map.new('foobar.com', :home => false)
+      index = XmlSitemap::Index.new
+      expect { index.add(map) }.to raise_error ArgumentError, 'Map is empty!'
     end
-    index.render.should == fixture('sample_index.xml')
   end
-  it 'should save index contents to the filesystem' do
-    m1 = XmlSitemap::Map.new('foobar.com', :time => @base_time) { |m| m.add('about') }
-    m2 = XmlSitemap::Map.new('foobar.com', :time => @base_time) { |m| m.add('about') }
-    index = XmlSitemap::Index.new do |i|
-      i.add(m1)
-      i.add(m2)
+  describe '#render' do
+    it 'renders a proper index' do
+      m1 = XmlSitemap::Map.new('foobar.com', :time => base_time) { |m| m.add('about') }
+      m2 = XmlSitemap::Map.new('foobar.com', :time => base_time) { |m| m.add('about') }
+      index = XmlSitemap::Index.new do |i|
+        i.add(m1)
+        i.add(m2)
+      end
+      index.render.split("\n")[2..-1].join("\n").should == fixture('sample_index.xml').split("\n")[2..-1].join("\n")
+    end
+    it 'renders a proper index with the secure option' do
+      m1 = XmlSitemap::Map.new('foobar.com', :time => base_time) { |m| m.add('about') }
+      m2 = XmlSitemap::Map.new('foobar.com', :time => base_time) { |m| m.add('about') }
+      index = XmlSitemap::Index.new(:secure => true) do |i|
+        i.add(m1)
+        i.add(m2)
+      end
+      index.render.split("\n")[2..-1].join("\n").should == fixture('sample_index_secure.xml').split("\n")[2..-1].join("\n")
+    end
+    it 'renders a proper index for multiple subdomains' do
+      m1 = XmlSitemap::Map.new('one.foobar.com', :time => base_time) { |m| m.add('about') }
+      m2 = XmlSitemap::Map.new('two.foobar.com', :time => base_time) { |m| m.add('about') }
+      index = XmlSitemap::Index.new do |i|
+        i.add(m1, false)
+        i.add(m2, false)
+      end
+      index.render.split("\n")[2..-1].join("\n").should == fixture('sample_many_subdomains_index.xml').split("\n")[2..-1].join("\n")
     end
-    path = "/tmp/index_#{Time.now.to_i}.xml"
-    index.render_to(path)
-    File.read(path).should == fixture('sample_index.xml')
-    File.delete(path) if File.exists?(path)
   end
-  it 'should have separate running offsets for different map groups' do
-    m1 = XmlSitemap::Map.new('foobar.com', :time => @base_time, :group => "first")  { |m| m.add('about') }
-    m2 = XmlSitemap::Map.new('foobar.com', :time => @base_time, :group => "second") { |m| m.add('about') }
-    m3 = XmlSitemap::Map.new('foobar.com', :time => @base_time, :group => "second") { |m| m.add('about') }
-    m4 = XmlSitemap::Map.new('foobar.com', :time => @base_time, :group => "third")  { |m| m.add('about') }
-    index = XmlSitemap::Index.new do |i|
-      i.add(m1)
-      i.add(m2)
-      i.add(m3)
-      i.add(m4)
+  describe '#render_to' do
+    let(:index_path) { "/tmp/xml_index.xml" }
+    after :all do
+      File.delete_if_exists(index_path)
+    end
+    it 'saves index contents to the filesystem' do
+      m1 = XmlSitemap::Map.new('foobar.com', :time => base_time) { |m| m.add('about') }
+      m2 = XmlSitemap::Map.new('foobar.com', :time => base_time) { |m| m.add('about') }
+      index = XmlSitemap::Index.new do |i|
+        i.add(m1)
+        i.add(m2)
+      end
+      index.render_to(index_path)
+      File.read(index_path).split("\n")[2..-1].join("\n").should eq(fixture('sample_index.xml').split("\n")[2..-1].join("\n"))
+    end
+    it 'should have separate running offsets for different map groups' do
+      maps = %w(first second second third).map do |name|
+        XmlSitemap::Map.new('foobar.com', :time => base_time, :group => name)  { |m| m.add('about') }
+      end
+      index = XmlSitemap::Index.new do |i|
+        maps.each { |m| i.add(m) }
+      end
+      index.render_to(index_path)
+      File.read(index_path).split("\n")[2..-1].join("\n").should eq(fixture('group_index.xml').split("\n")[2..-1].join("\n"))
     end
-    path = "/tmp/index_#{Time.now.to_i}.xml"
-    index.render_to(path)
-    File.read(path).should == fixture('group_index.xml')
-    File.delete(path) if File.exists?(path)
   end
 end

data/spec/item_spec.rb ADDED Viewed

@@ -0,0 +1,10 @@
+require 'spec_helper'
+describe 'XmlSitemap::Item' do
+  describe '#new' do
+    it 'raises ArgumentError if invalid :period value was passed' do
+      proc { XmlSitemap::Item.new('hello', :period => :foobar) }.
+        should raise_error ArgumentError, "Invalid :period value 'foobar'"
+    end
+  end
+end