xml-sitemap 1.3.1 → 1.3.2

data/.travis.yml

@@ -1,5 +1,4 @@
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0

data/README.md

@@ -38,7 +38,7 @@ map = XmlSitemap::Map.new('domain.com') do |m|
   # You can drop leading slash, it will be automatically added
   m.add 'page2'
 
-  # Set the page priority (default is 0.5)
+  # Set the page priority
   m.add 'page3', :priority => 0.2
 
   # Specify last modification date and update frequiency
@@ -73,7 +73,7 @@ map = XmlSitemap.map('foobar.com')
   
 By default XmlSitemap creates a map with link to homepage of your domain. 
 
-Homepage priority is `1.0`. Default page priority is set to `0.5`
+Homepage priority is `1.0`.
 
 List of available update periods:
 

data/lib/xml-sitemap/index.rb

@@ -21,7 +21,7 @@ module XmlSitemap
     # map - XmlSitemap::Map instance
     #
     def add(map)
-      raise ArgumentError, 'XmlSitemap::Map object requred!' unless map.kind_of?(XmlSitemap::Map)
+      raise ArgumentError, 'XmlSitemap::Map object required!' unless map.kind_of?(XmlSitemap::Map)
       raise ArgumentError, 'Map is empty!' if map.empty?
       
       @maps << {

data/lib/xml-sitemap/item.rb

@@ -5,13 +5,16 @@ module XmlSitemap
     # ISO8601 regex from here: http://www.pelagodesign.com/blog/2009/05/20/iso-8601-date-validation-that-doesnt-suck/
     ISO8601_REGEX = /^([\+-]?\d{4}(?!\d{2}\b))((-?)((0[1-9]|1[0-2])(\3([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6])))([T\s]((([01]\d|2[0-3])((:?)[0-5]\d)?|24\:?00)([\.,]\d+(?!:))?)?(\17[0-5]\d([\.,]\d+)?)?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?)?$/
 
-    attr_reader :target, :updated, :priority, :changefreq, :validate_time, :image_location, :image_caption, :image_geolocation, :image_title, :image_license
-
+    attr_reader :target, :updated, :priority, :changefreq, :validate_time, :image_location, :image_caption, :image_geolocation, :image_title, :image_license,
+                :video_thumbnail_location, :video_title, :video_description, :video_content_location, :video_player_location,
+                :video_duration, :video_expiration_date, :video_rating, :video_view_count, :video_publication_date, :video_family_friendly, :video_category,
+                :video_restriction, :video_gallery_location, :video_price, :video_requires_subscription, :video_uploader, :video_platform, :video_live
+                
     def initialize(target, opts={})
       @target            = target.to_s.strip
       @updated           = opts[:updated]  || Time.now
-      @priority          = opts[:priority] || DEFAULT_PRIORITY
-      @changefreq        = opts[:period]   || :weekly
+      @priority          = opts[:priority]
+      @changefreq        = opts[:period]
       @validate_time     = (opts[:validate_time] != false)
 
       # Refer to http://support.google.com/webmasters/bin/answer.py?hl=en&answer=178636 for requirement to support images in sitemap
@@ -21,6 +24,35 @@ module XmlSitemap
       @image_title       = opts[:image_title]
       @image_license     = opts[:image_license]
 
+      # Refer to http://support.google.com/webmasters/bin/answer.py?hl=en&answer=80472&topic=10079&ctx=topic#2 for requirement to support videos in sitemap
+      @video_thumbnail_location     = opts[:video_thumbnail_location]
+      @video_title                  = opts[:video_title]
+      @video_description            = opts[:video_description]
+      @video_content_location       = opts[:video_content_location]
+      @video_player_location        = opts[:video_player_location]
+      @video_duration               = opts[:video_duration]
+      @video_expiration_date        = opts[:video_expiration_date]
+      @video_rating                 = opts[:video_rating]
+      @video_view_count             = opts[:video_view_count]
+      @video_publication_date       = opts[:video_publication_date]
+      @video_family_friendly        = opts[:video_family_friendly]
+      # tag
+      @video_category               = opts[:video_category]
+      @video_restriction            = opts[:video_restriction]
+      @video_gallery_location       = opts[:video_gallery_location]
+      @video_price                  = opts[:video_price]
+      @video_requires_subscription  = opts[:video_requires_subscription]
+      @video_uploader               = opts[:video_uploader]
+      @video_platform               = opts[:video_platform]
+      @video_live                   = opts[:video_live]
+
+      if @changefreq
+        @changefreq = @changefreq.to_sym
+        unless XmlSitemap::PERIODS.include?(@changefreq)
+          raise ArgumentError, "Invalid :period value '#{@changefreq}'"
+        end
+      end
+
       unless @updated.kind_of?(Time) || @updated.kind_of?(Date) || @updated.kind_of?(String)
         raise ArgumentError, "Time, Date, or ISO8601 String required for :updated!"
       end
@@ -29,15 +61,36 @@ module XmlSitemap
         raise ArgumentError, "String provided to :updated did not match ISO8601 standard!"
       end
 
-      @changefreq = @changefreq.to_sym
-      unless XmlSitemap::PERIODS.include?(@changefreq)
-        raise ArgumentError, "Invalid :period value '#{@changefreq}'"
+      @updated = @updated.to_time if @updated.kind_of?(Date)
+
+      ##############################################################################################
+      ##############################################################################################
+
+      unless @video_expiration_date.kind_of?(Time) || @video_expiration_date.kind_of?(Date) || @video_expiration_date.kind_of?(String)
+        raise ArgumentError, "Time, Date, or ISO8601 String required for :video_expiration_date!" unless @video_expiration_date.nil?
       end
 
-      @updated = @updated.to_time if @updated.kind_of?(Date)
+      if @validate_time && @video_expiration_date.kind_of?(String) && !(@video_expiration_date =~ ISO8601_REGEX)
+        raise ArgumentError, "String provided to :video_expiration_date did not match ISO8601 standard!"
+      end
+
+      @video_expiration_date = @video_expiration_date.to_time if @video_expiration_date.kind_of?(Date)
+
+      ##############################################################################################
+      ##############################################################################################
+
+      unless @video_publication_date.kind_of?(Time) || @video_publication_date.kind_of?(Date) || @video_publication_date.kind_of?(String)
+        raise ArgumentError, "Time, Date, or ISO8601 String required for :video_publication_date!" unless @video_publication_date.nil?
+      end
+
+      if @validate_time && @video_publication_date.kind_of?(String) && !(@video_publication_date =~ ISO8601_REGEX)
+        raise ArgumentError, "String provided to :video_publication_date did not match ISO8601 standard!"
+      end
+
+      @video_publication_date = @video_publication_date.to_time if @video_publication_date.kind_of?(Date)
     end
 
-    # Returns the timestamp value for rendere
+    # Returns the timestamp value of lastmod for renderer
     #
     def lastmod_value
       if @updated.kind_of?(Time)
@@ -46,5 +99,25 @@ module XmlSitemap
         @updated.to_s
       end
     end
+
+    # Returns the timestamp value of video:expiration_date for renderer
+    #
+    def video_expiration_date_value
+      if @video_expiration_date.kind_of?(Time)
+        @video_expiration_date.utc.iso8601
+      else
+        @video_expiration_date.to_s
+      end
+    end
+
+    # Returns the timestamp value of video:publication_date for renderer
+    #
+    def video_publication_date_value
+      if @video_publication_date.kind_of?(Time)
+        @video_publication_date.utc.iso8601
+      else
+        @video_publication_date.to_s
+      end
+    end
   end
-end
+end

data/lib/xml-sitemap/map.rb

@@ -1,13 +1,13 @@
-module XmlSitemap  
+module XmlSitemap
   class Map
     include XmlSitemap::RenderEngine
-    
+
     attr_reader   :domain, :items
     attr_reader   :buffer
     attr_reader   :created_at
     attr_reader   :root
     attr_reader   :group
-    
+
     # Initializa a new Map instance
     #
     # domain - Primary domain for the map (required)
@@ -23,70 +23,70 @@ module XmlSitemap
     def initialize(domain, opts={})
       @domain     = domain.to_s.strip
       raise ArgumentError, 'Domain required!' if @domain.empty?
-      
+
       @created_at = opts[:time]   || Time.now.utc
       @secure     = opts[:secure] || false
       @home       = opts.key?(:home) ? opts[:home] : true
       @root       = opts.key?(:root) ? opts[:root] : true
       @group      = opts[:group] || "sitemap"
       @items      = []
-      
+
       self.add('/', :priority => 1.0) if @home === true
-      
+
       yield self if block_given?
     end
-    
+
     # Adds a new item to the map
     #
     # target - Path or url
     # opts   - Item options
     #
     # opts[:updated]       - Lastmod property of the item
-    # opts[:period]        - Update frequency. (default - :weekly)
-    # opts[:priority]      - Item priority. (default: 0.5)
+    # opts[:period]        - Update frequency.
+    # opts[:priority]      - Item priority.
     # opts[:validate_time] - Skip time validation if want to insert raw strings.
-    # 
+    #
     def add(target, opts={})
       raise RuntimeError, 'Only up to 50k records allowed!' if @items.size > 50000
       raise ArgumentError, 'Target required!' if target.nil?
       raise ArgumentError, 'Target is empty!' if target.to_s.strip.empty?
-      
+
       url = process_target(target)
-      
+
       if url.length > 2048
         raise ArgumentError, "Target can't be longer than 2,048 characters!"
       end
-      
+
       opts[:updated] = @created_at unless opts.key?(:updated)
       item = XmlSitemap::Item.new(url, opts)
       @items << item
       item
     end
-    
+
     # Get map items count
     #
     def size
       @items.size
     end
-    
+
     # Returns true if sitemap does not have any items
     #
     def empty?
       @items.empty?
     end
-    
+
     # Generate full url for path
     #
     def url(path='')
       "#{@secure ? 'https' : 'http'}://#{@domain}#{path}"
     end
-    
+
     # Get full url for index
     #
     def index_url(offset, secure)
       "#{secure ? 'https' : 'http'}://#{@domain}/#{@group}-#{offset}.xml"
     end
-    
+
     # Render XML
     #
     # method - Pick a render engine (:builder, :nokogiri, :string).
@@ -102,7 +102,7 @@ module XmlSitemap
           render_string
       end
     end
-    
+
     # Render XML sitemap into the file
     #
     # path    - Output filename
@@ -114,15 +114,15 @@ module XmlSitemap
     def render_to(path, options={})
       overwrite = options[:overwrite] == true || true
       compress  = options[:gzip]      == true || false
-      
+
       path = File.expand_path(path)
       path << ".gz" unless path =~ /\.gz\z/i if compress
-      
+
       if File.exists?(path) && !overwrite
         raise RuntimeError, "File already exists and not overwritable!"
       end
-      
-      File.open(path, 'w') do |f|
+
+      File.open(path, 'wb') do |f|
         unless compress
           f.write(self.render)
         else
@@ -132,9 +132,9 @@ module XmlSitemap
         end
       end
     end
-    
+
     protected
-  
+
     # Process target path or url
     #
     def process_target(str)

data/lib/xml-sitemap/options.rb

@@ -14,6 +14,7 @@ module XmlSitemap
     '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:image'        => "http://www.google.com/schemas/sitemap-image/1.1",
+    'xmlns:video'        => "http://www.google.com/schemas/sitemap-video/1.1",
     'xmlns'              => "http://www.sitemaps.org/schemas/sitemap/0.9"
   }.freeze
 

data/lib/xml-sitemap/render_engine.rb

@@ -15,19 +15,45 @@ module XmlSitemap
             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
+                  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
-              u.priority   item.priority.to_s
+              u.changefreq item.changefreq.to_s if item.changefreq
+              u.priority   item.priority.to_s if item.priority
             end
           end
         }
@@ -46,19 +72,45 @@ module XmlSitemap
           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")           { |b| b.text! item.image_location }
-                a.tag!("image:caption")       { |b| b.text! item.image_caption }        if item.image_caption
-                a.tag!("image:title")         { |b| b.text! item.image_title }          if item.image_title
-                a.tag!("image:license")       { |b| b.text! item.image_license }        if item.image_license
-                a.tag!("image:geo_location")  { |b| b.text! item.image_geolocation }    if item.image_geolocation
+                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
-            u.priority   item.priority.to_s
+            u.changefreq item.changefreq.to_s if item.changefreq
+            u.priority   item.priority.to_s if item.priority
           end
         end
       }.to_s
@@ -80,7 +132,7 @@ module XmlSitemap
         item_string  = "  <url>\n"
         item_string << "    <loc>#{CGI::escapeHTML(item.target)}</loc>\n"
 
-        # Format and image tag specifications found in http://support.google.com/webmasters/bin/answer.py?hl=en&answer=178636
+        # 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"
@@ -91,9 +143,34 @@ module XmlSitemap
           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"
-        item_string << "    <priority>#{item.priority}</priority>\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
@@ -101,7 +178,7 @@ module XmlSitemap
 
       result << item_results.join("")
       result << "</urlset>\n"
-      
+
       result
     end
   end

data/lib/xml-sitemap/version.rb

@@ -1,6 +1,6 @@
 module XmlSitemap
   unless defined?(::XmlSitemap::VERSION)
-    VERSION = '1.3.1'
+    VERSION = '1.3.2'
   end
 
   def self.version

data/spec/fixtures/encoded_image_map.xml

@@ -3,7 +3,6 @@
   <url>
     <loc>http://foobar.com/</loc>
     <lastmod>2011-06-01T00:00:01Z</lastmod>
-    <changefreq>weekly</changefreq>
     <priority>1.0</priority>
   </url>
   <url>
@@ -12,8 +11,6 @@
       <image:loc>http://foobar.com/foo.gif</image:loc>
     </image:image>
     <lastmod>2011-06-01T00:00:01Z</lastmod>
-    <changefreq>weekly</changefreq>
-    <priority>0.5</priority>
   </url>
   <url>
     <loc>http://foobar.com/path?a=b&amp;c=d&amp;e=image support string</loc>
@@ -22,8 +19,6 @@
       <image:title>Image Title</image:title>
     </image:image>
     <lastmod>2011-06-01T00:00:01Z</lastmod>
-    <changefreq>weekly</changefreq>
-    <priority>0.5</priority>
   </url>
   <url>
     <loc>http://foobar.com/path?a=b&amp;c=d&amp;e=image support string</loc>
@@ -32,8 +27,6 @@
       <image:caption>Image Caption</image:caption>
     </image:image>
     <lastmod>2011-06-01T00:00:01Z</lastmod>
-    <changefreq>weekly</changefreq>
-    <priority>0.5</priority>
   </url>
   <url>
     <loc>http://foobar.com/path?a=b&amp;c=d&amp;e=image support string</loc>
@@ -42,8 +35,6 @@
       <image:license>Image License</image:license>
     </image:image>
     <lastmod>2011-06-01T00:00:01Z</lastmod>
-    <changefreq>weekly</changefreq>
-    <priority>0.5</priority>
   </url>
   <url>
     <loc>http://foobar.com/path?a=b&amp;c=d&amp;e=image support string</loc>
@@ -52,8 +43,6 @@
       <image:geo_location>Image GeoLocation</image:geo_location>
     </image:image>
     <lastmod>2011-06-01T00:00:01Z</lastmod>
-    <changefreq>weekly</changefreq>
-    <priority>0.5</priority>
   </url>
   <url>
     <loc>http://foobar.com/path?a=b&amp;c=d&amp;e=image support string</loc>
@@ -65,7 +54,5 @@
       <image:geo_location>Image GeoLocation</image:geo_location>
     </image:image>
     <lastmod>2011-06-01T00:00:01Z</lastmod>
-    <changefreq>weekly</changefreq>
-    <priority>0.5</priority>
   </url>
 </urlset>

data/spec/fixtures/encoded_map.xml

@@ -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

@@ -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/saved_map.xml

@@ -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

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

data/spec/index_spec.rb

@@ -11,7 +11,7 @@ describe XmlSitemap::Index do
 
     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 requred!'
+      expect { index.add(nil) }.to raise_error ArgumentError, 'XmlSitemap::Map object required!'
     end
 
     it 'should raise error if passing an empty sitemap' do

data/spec/map_spec.rb

@@ -100,24 +100,56 @@ describe XmlSitemap::Map do
   describe '#render' do
 
     before do
-      opts1 = { :image_location => "http://foobar.com/foo.gif"}
-      opts2 = { :image_location => "http://foobar.com/foo.gif", :image_title => "Image Title"}
-      opts3 = { :image_location => "http://foobar.com/foo.gif", :image_caption => "Image Caption"}
-      opts4 = { :image_location => "http://foobar.com/foo.gif", :image_license => "Image License"}
-      opts5 = { :image_location => "http://foobar.com/foo.gif", :image_geolocation => "Image GeoLocation"}
+      opts1 = { :image_location => "http://foobar.com/foo.gif" }
+      opts2 = { :image_location => "http://foobar.com/foo.gif", :image_title => "Image Title" }
+      opts3 = { :image_location => "http://foobar.com/foo.gif", :image_caption => "Image Caption" }
+      opts4 = { :image_location => "http://foobar.com/foo.gif", :image_license => "Image License" }
+      opts5 = { :image_location => "http://foobar.com/foo.gif", :image_geolocation => "Image GeoLocation" }
       opts6 = { :image_location => "http://foobar.com/foo.gif",
                 :image_title    => "Image Title",
                 :image_caption  => "Image Caption",
                 :image_license  => "Image License",
-                :image_geolocation => "Image GeoLocation"}
-
-      @map = XmlSitemap::Map.new('foobar.com', :time => base_time)
-      @map.add('/path?a=b&c=d&e=image support string', opts1)
-      @map.add('/path?a=b&c=d&e=image support string', opts2)
-      @map.add('/path?a=b&c=d&e=image support string', opts3)
-      @map.add('/path?a=b&c=d&e=image support string', opts4)
-      @map.add('/path?a=b&c=d&e=image support string', opts5)
-      @map.add('/path?a=b&c=d&e=image support string', opts6)
+                :image_geolocation => "Image GeoLocation" }
+      opts7 = { :video_thumbnail_location => "http://foobar.com/foo.jpg",
+                :video_title => "Video Title",
+                :video_description => "Video Description",
+                :video_content_location => "http://foobar.com/foo.mp4" }
+      opts8 = { :video_thumbnail_location => "http://foobar.com/foo.jpg",
+                :video_title => "Video Title",
+                :video_description => "Video Description",
+                :video_player_location => "http://foobar.com/foo.swf" }
+      opts9 = { :video_thumbnail_location => "http://foobar.com/foo.jpg",
+                :video_title => "Video Title",
+                :video_description => "Video Description",
+                :video_content_location => "http://foobar.com/foo.mp4",
+                :video_player_location => "http://foobar.com/foo.swf",
+                :video_duration => 180,
+                :video_expiration_date => Time.gm(2012, 6, 1, 0, 0, 1),
+                :video_rating => 3.5,
+                :video_view_count => 2500,
+                :video_publication_date => base_time,
+                :video_family_friendly => "no",
+                :video_category => "Video Category",
+                :video_restriction => "IT",
+                :video_gallery_location => "http://foobar.com/foo.mpu",
+                :video_price => 20,
+                :video_requires_subscription => "no",
+                :video_uploader => "Video Uploader",
+                :video_platform => "web",
+                :video_live => "no" }
+
+      @image_map = XmlSitemap::Map.new('foobar.com', :time => base_time)
+      @image_map.add('/path?a=b&c=d&e=image support string', opts1)
+      @image_map.add('/path?a=b&c=d&e=image support string', opts2)
+      @image_map.add('/path?a=b&c=d&e=image support string', opts3)
+      @image_map.add('/path?a=b&c=d&e=image support string', opts4)
+      @image_map.add('/path?a=b&c=d&e=image support string', opts5)
+      @image_map.add('/path?a=b&c=d&e=image support string', opts6)
+
+      @video_map = XmlSitemap::Map.new('foobar.com', :time => base_time)
+      @video_map.add('/path?a=b&c=d&e=video', opts7)
+      @video_map.add('/path?a=b&c=d&e=video', opts8)
+      @video_map.add('/path?a=b&c=d&e=video', opts9)
     end
 
     it 'should have properly encoded entities' do
@@ -134,6 +166,16 @@ describe XmlSitemap::Map do
         # ignore ordering of urlset attributes by dropping first two lines
         s.split("\n")[2..-1].join("\n").should == fixture('encoded_map.xml').split("\n")[2..-1].join("\n")
       end
+
+      it 'should have properly encoded entities with image support' do
+        s = @image_map.render(:builder)
+        s.split("\n")[2..-1].join("\n").should == fixture('encoded_image_map.xml').split("\n")[2..-1].join("\n")
+      end
+
+      it 'should have properly encoded entities with video support' do
+        s = @video_map.render(:builder)
+        s.split("\n")[2..-1].join("\n").should == fixture('encoded_video_map.xml').split("\n")[2..-1].join("\n")
+      end
     end
 
     context 'with nokogiri engine' do
@@ -146,9 +188,14 @@ describe XmlSitemap::Map do
       end
 
       it 'should have properly encoded entities with image support' do
-        s = @map.render(:nokogiri)
+        s = @image_map.render(:nokogiri)
         s.split("\n")[2..-1].join("\n").should == fixture('encoded_image_map.xml').split("\n")[2..-1].join("\n")
       end
+
+      it 'should have properly encoded entities with video support' do
+        s = @video_map.render(:nokogiri)
+        s.split("\n")[2..-1].join("\n").should == fixture('encoded_video_map.xml').split("\n")[2..-1].join("\n")
+      end
     end
 
     context 'with string engine' do
@@ -161,9 +208,14 @@ describe XmlSitemap::Map do
       end
 
       it 'should have properly encoded entities with image support' do
-        s = @map.render(:string)
+        s = @image_map.render(:string)
         s.split("\n")[2..-1].join("\n").should == fixture('encoded_image_map.xml').split("\n")[2..-1].join("\n")
       end
+
+      it 'should have properly encoded entities with video support' do
+        s = @video_map.render(:string)
+        s.split("\n")[2..-1].join("\n").should == fixture('encoded_video_map.xml').split("\n")[2..-1].join("\n")
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xml-sitemap
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -115,6 +115,7 @@ files:
 - spec/fixtures/empty_index.xml
 - spec/fixtures/encoded_image_map.xml
 - spec/fixtures/encoded_map.xml
+- spec/fixtures/encoded_video_map.xml
 - spec/fixtures/group_index.xml
 - spec/fixtures/sample_index.xml
 - spec/fixtures/sample_index_secure.xml
@@ -146,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Simple XML sitemap generator for Ruby/Rails applications.
@@ -154,6 +155,7 @@ test_files:
 - spec/fixtures/empty_index.xml
 - spec/fixtures/encoded_image_map.xml
 - spec/fixtures/encoded_map.xml
+- spec/fixtures/encoded_video_map.xml
 - spec/fixtures/group_index.xml
 - spec/fixtures/sample_index.xml
 - spec/fixtures/sample_index_secure.xml
@@ -164,4 +166,3 @@ test_files:
 - spec/map_spec.rb
 - spec/spec_helper.rb
 - spec/xmlsitemap_spec.rb
-has_rdoc: