sitemap_generator 4.1.1 → 4.2.0

data/Gemfile

@@ -5,7 +5,7 @@ gem 'sitemap_generator', :path => './'
 
 group :development, :test do
   gem 'mocha'
-  gem 'nokogiri'
+  gem 'nokogiri', '=1.5.10' # last release to support Ruby 1.8.7
   gem 'rake'
   gem 'rspec'
   #gem 'ruby-debug19', :require => 'ruby-debug'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ./
   specs:
-    sitemap_generator (4.1.1)
+    sitemap_generator (4.2)
       builder
 
 GEM
@@ -12,7 +12,7 @@ GEM
     metaclass (0.0.1)
     mocha (0.10.0)
       metaclass (~> 0.0.1)
-    nokogiri (1.5.0)
+    nokogiri (1.5.10)
     rake (10.0.4)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
@@ -29,7 +29,7 @@ PLATFORMS
 DEPENDENCIES
   builder
   mocha
-  nokogiri
+  nokogiri (= 1.5.10)
   rake
   rspec
   sitemap_generator!

data/README.md

@@ -105,6 +105,7 @@ That's it!  Welcome to the future!
 
 ## Changelog
 
+* v4.2: Update Google ping URL.  Quote the ping URL in the output.  Support Video `video:price` element ([#117][https://github.com/kjvarga/sitemap_generator/issues/117]).  Support symbols as well as strings for most arguments to `add()` ([#113][https://github.com/kjvarga/sitemap_generator/issues/113]).  Ensure that `public_path` and `sitemaps_path` end with a slash (`/`) ([#113][https://github.com/kjvarga/sitemap_generator/issues/118]).
 * v4.1.1: Support setting the S3 region.  Fixed bug where incorrect URL was being used in the ping to search engines - only affected sites with a single sitemap file and no index file.  Output the URL being pinged in the verbose output.  Test in Rails 4.
 * v4.1.0: [PageMap sitemap][using_pagemaps] support.  Tested with Rails 4 pre-release.
 * v4.0.1: Add a post install message regarding the naming convention change.
@@ -912,6 +913,10 @@ end
     * `:gallery_title` - Title attribute of the gallery location element
     * `:uploader`
     * `:uploader_info` - Info attribute of uploader element
+    * `:price` - Only one price supported at this time
+        * `:price_currency` - Required.  In [ISO_4217][iso_4217] format.
+        * `:price_type` - Optional. `rent` or `own`
+        * `:price_resolution` - Optional. `HD` or `SD`
 
 ### Geo Sitemaps
 
@@ -1078,3 +1083,4 @@ Copyright (c) 2009 Karl Varga released under the MIT license
 [ehoch]:https://github.com/ehoch
 [alternate_links]:http://support.google.com/webmasters/bin/answer.py?hl=en&answer=2620865
 [using_pagemaps]:https://developers.google.com/custom-search/docs/structured_data#pagemaps
+[iso_4217]:http://en.wikipedia.org/wiki/ISO_4217

data/VERSION

@@ -1 +1 @@
-4.1.1
+4.2.0

data/lib/sitemap_generator.rb

@@ -26,7 +26,15 @@ module SitemapGenerator
     MAX_SITEMAP_IMAGES   = 1_000         # max images per url
     MAX_SITEMAP_NEWS     = 1_000         # max news sitemap per index_file
     MAX_SITEMAP_FILESIZE = SitemapGenerator::Numeric.new(10).megabytes  # bytes
-
+    SCHEMAS = {
+      'geo'     => 'http://www.google.com/geo/schemas/sitemap/1.0',
+      'image'   => 'http://www.google.com/schemas/sitemap-image/1.1',
+      'mobile'  => 'http://www.google.com/schemas/sitemap-mobile/1.0',
+      'news'    => 'http://www.google.com/schemas/sitemap-news/0.9',
+      'pagemap' => 'http://www.google.com/schemas/sitemap-pagemap/1.0',
+      'video'   => 'http://www.google.com/schemas/sitemap-video/1.1'
+    }
+    
     # Lazy-initialize the LinkSet instance
     Sitemap = (Class.new do
       def method_missing(*args, &block)

data/lib/sitemap_generator/builder/sitemap_file.rb

@@ -28,15 +28,15 @@ module SitemapGenerator
           <?xml version="1.0" encoding="UTF-8"?>
             <urlset
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xmlns:image="http://www.google.com/schemas/sitemap-image/1.1"
               xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9
                 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"
               xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
-              xmlns:video="http://www.google.com/schemas/sitemap-video/1.1"
-              xmlns:geo="http://www.google.com/geo/schemas/sitemap/1.0"
-              xmlns:news="http://www.google.com/schemas/sitemap-news/0.9"
-              xmlns:mobile="http://www.google.com/schemas/sitemap-mobile/1.0"
-              xmlns:pagemap="http://www.google.com/schemas/sitemap-pagemap/1.0"
+              xmlns:image="#{SitemapGenerator::SCHEMAS['image']}"              
+              xmlns:video="#{SitemapGenerator::SCHEMAS['video']}"
+              xmlns:geo="#{SitemapGenerator::SCHEMAS['geo']}"
+              xmlns:news="#{SitemapGenerator::SCHEMAS['news']}"
+              xmlns:mobile="#{SitemapGenerator::SCHEMAS['mobile']}"
+              xmlns:pagemap="#{SitemapGenerator::SCHEMAS['pagemap']}"
               xmlns:xhtml="http://www.w3.org/1999/xhtml"
             >
         HTML

data/lib/sitemap_generator/builder/sitemap_url.rb

@@ -72,72 +72,73 @@ module SitemapGenerator
         builder.url do
           builder.loc        self[:loc]
           builder.lastmod    w3c_date(self[:lastmod])      if self[:lastmod]
-          builder.changefreq self[:changefreq]             if self[:changefreq]
+          builder.changefreq self[:changefreq].to_s        if self[:changefreq]
           builder.priority   format_float(self[:priority]) if self[:priority]
 
           unless SitemapGenerator::Utilities.blank?(self[:news])
             news_data = self[:news]
             builder.news:news do
               builder.news:publication do
-                builder.news :name, news_data[:publication_name] if news_data[:publication_name]
-                builder.news :language, news_data[:publication_language] if news_data[:publication_language]
+                builder.news :name, news_data[:publication_name].to_s if news_data[:publication_name]
+                builder.news :language, news_data[:publication_language].to_s if news_data[:publication_language]
               end
 
-              builder.news :access, news_data[:access] if news_data[:access]
-              builder.news :genres, news_data[:genres] if news_data[:genres]
+              builder.news :access, news_data[:access].to_s if news_data[:access]
+              builder.news :genres, news_data[:genres].to_s if news_data[:genres]
               builder.news :publication_date, w3c_date(news_data[:publication_date]) if news_data[:publication_date]
-              builder.news :title, news_data[:title] if news_data[:title]
-              builder.news :keywords, news_data[:keywords] if news_data[:keywords]
-              builder.news :stock_tickers, news_data[:stock_tickers] if news_data[:stock_tickers]
+              builder.news :title, news_data[:title].to_s if news_data[:title]
+              builder.news :keywords, news_data[:keywords].to_s if news_data[:keywords]
+              builder.news :stock_tickers, news_data[:stock_tickers].to_s if news_data[:stock_tickers]
             end
           end
 
           self[:images].each do |image|
             builder.image:image do
               builder.image :loc, image[:loc]
-              builder.image :caption, image[:caption]             if image[:caption]
-              builder.image :geo_location, image[:geo_location]   if image[:geo_location]
-              builder.image :title, image[:title]                 if image[:title]
-              builder.image :license, image[:license]             if image[:license]
+              builder.image :caption, image[:caption].to_s             if image[:caption]
+              builder.image :geo_location, image[:geo_location].to_s   if image[:geo_location]
+              builder.image :title, image[:title].to_s                 if image[:title]
+              builder.image :license, image[:license].to_s             if image[:license]
             end
           end
 
           self[:videos].each do |video|
             builder.video :video do
-              builder.video :thumbnail_loc, video[:thumbnail_loc]
-              builder.video :title, video[:title]
-              builder.video :description, video[:description]
-              builder.video :content_loc, video[:content_loc]           if video[:content_loc]
+              builder.video :thumbnail_loc, video[:thumbnail_loc].to_s
+              builder.video :title, video[:title].to_s
+              builder.video :description, video[:description].to_s
+              builder.video :content_loc, video[:content_loc].to_s           if video[:content_loc]
               if video[:player_loc]
                 loc_attributes = { :allow_embed => yes_or_no_with_default(video[:allow_embed], true) }
-                loc_attributes[:autoplay] = video[:autoplay] if SitemapGenerator::Utilities.present?(video[:autoplay])
-                builder.video :player_loc, video[:player_loc], loc_attributes
+                loc_attributes[:autoplay] = video[:autoplay].to_s if SitemapGenerator::Utilities.present?(video[:autoplay])
+                builder.video :player_loc, video[:player_loc].to_s, loc_attributes
               end
-              builder.video :duration, video[:duration]                 if video[:duration]
+              builder.video :duration, video[:duration].to_s                 if video[:duration]
               builder.video :expiration_date,  w3c_date(video[:expiration_date])  if video[:expiration_date]
               builder.video :rating, format_float(video[:rating])       if video[:rating]
-              builder.video :view_count, video[:view_count]             if video[:view_count]
+              builder.video :view_count, video[:view_count].to_s             if video[:view_count]
               builder.video :publication_date, w3c_date(video[:publication_date]) if video[:publication_date]
-              video[:tags].each {|tag| builder.video :tag, tag }        if video[:tags]
-              builder.video :tag, video[:tag]                           if video[:tag]
-              builder.video :category, video[:category]                 if video[:category]
+              video[:tags].each {|tag| builder.video :tag, tag.to_s }        if video[:tags]
+              builder.video :tag, video[:tag].to_s                           if video[:tag]
+              builder.video :category, video[:category].to_s                 if video[:category]
               builder.video :family_friendly,  yes_or_no_with_default(video[:family_friendly], true) if video.has_key?(:family_friendly)
-              builder.video :gallery_loc, video[:gallery_loc], :title => video[:gallery_title] if video[:gallery_loc]
+              builder.video :gallery_loc, video[:gallery_loc].to_s, :title => video[:gallery_title].to_s if video[:gallery_loc]
+              builder.video :price, video[:price].to_s, prepare_video_price_attribs(video) if SitemapGenerator::Utilities.present?(video[:price])
               if video[:uploader]
-                builder.video :uploader, video[:uploader], video[:uploader_info] ? { :info => video[:uploader_info] } : {}
+                builder.video :uploader, video[:uploader].to_s, video[:uploader_info] ? { :info => video[:uploader_info].to_s } : {}
               end
             end
           end
 
           self[:alternates].each do |alternate|
             rel = alternate[:nofollow] ? 'alternate nofollow' : 'alternate'
-            builder.xhtml :link, :rel => rel, :hreflang => alternate[:lang], :href => alternate[:href]
+            builder.xhtml :link, :rel => rel, :hreflang => alternate[:lang].to_s, :href => alternate[:href].to_s
           end
 
           unless SitemapGenerator::Utilities.blank?(self[:geo])
             geo = self[:geo]
             builder.geo :geo do
-              builder.geo :format, geo[:format] if geo[:format]
+              builder.geo :format, geo[:format].to_s if geo[:format]
             end
           end
 
@@ -148,9 +149,9 @@ module SitemapGenerator
           unless SitemapGenerator::Utilities.blank?(self[:pagemap])
             builder.pagemap :PageMap do
               SitemapGenerator::Utilities.as_array(self[:pagemap][:dataobjects]).each do |dataobject|
-                builder.pagemap :DataObject, :type => dataobject[:type], :id => dataobject[:id] do
+                builder.pagemap :DataObject, :type => dataobject[:type].to_s, :id => dataobject[:id].to_s do
                   SitemapGenerator::Utilities.as_array(dataobject[:attributes]).each do |attribute|
-                    builder.pagemap :Attribute, attribute[:value], :name => attribute[:name]
+                    builder.pagemap :Attribute, attribute[:value].to_s, :name => attribute[:name].to_s
                   end
                 end
               end
@@ -166,6 +167,14 @@ module SitemapGenerator
 
       protected
 
+      def prepare_video_price_attribs(video)
+        attribs = {}
+        attribs[:currency] = video[:price_currency].to_s # required
+        attribs[:type] = video[:price_type] if SitemapGenerator::Utilities.present?(video[:price_type])
+        attribs[:resolution] = video[:price_resolution] if SitemapGenerator::Utilities.present?(video[:price_resolution])
+        attribs
+      end
+      
       def prepare_news(news)
         SitemapGenerator::Utilities.assert_valid_keys(news, :publication_name, :publication_language, :publication_date, :genres, :access, :title, :keywords, :stock_tickers) unless news.empty?
         news

data/lib/sitemap_generator/link_set.rb

@@ -34,7 +34,7 @@ module SitemapGenerator
       set_options(opts)
       if verbose
         start_time = Time.now
-        puts "In #{sitemap_index.location.public_path}"
+        puts "In '#{sitemap_index.location.public_path}':"
       end
       interpreter.eval(:yield_sitemap => yield_sitemap?, &block)
       finalize!
@@ -123,7 +123,7 @@ module SitemapGenerator
         :include_index => false,
         :filename => :sitemap,
         :search_engines => {
-          :google         => "http://www.google.com/webmasters/sitemaps/ping?sitemap=%s",
+          :google         => "http://www.google.com/webmasters/tools/ping?sitemap=%s",
           :bing           => "http://www.bing.com/webmaster/ping.aspx?siteMap=%s",
           :sitemap_writer => "http://www.sitemapwriter.com/notify.php?crawler=all&url=%s"
         },
@@ -285,7 +285,7 @@ module SitemapGenerator
       index_url = CGI.escape(unescaped_url)
 
       output("\n")
-      output("Pinging with URL #{unescaped_url}:")
+      output("Pinging with URL '#{unescaped_url}':")
       search_engines.merge(engines).each do |engine, link|
         link = link % index_url
         name = Utilities.titleize(engine.to_s)
@@ -506,8 +506,10 @@ module SitemapGenerator
       #
       # Set to nil to use the current directory.
       def public_path=(value)
-        @public_path = Pathname.new(value.to_s)
-        @public_path = SitemapGenerator.app.root + @public_path if @public_path.relative?
+        @public_path = Pathname.new(SitemapGenerator::Utilities.append_slash(value))
+        if @public_path.relative?
+          @public_path = SitemapGenerator.app.root + @public_path 
+        end
         update_location_info(:public_path, @public_path)
         @public_path
       end

data/lib/sitemap_generator/sitemap_location.rb

@@ -10,7 +10,7 @@ module SitemapGenerator
 
     [:public_path, :sitemaps_path].each do |method|
       define_method(method) do
-        Pathname.new(self[method].nil? ? '' : self[method].to_s)
+        Pathname.new(SitemapGenerator::Utilities.append_slash(self[method]))
       end
     end
 

data/lib/sitemap_generator/utilities.rb

@@ -151,5 +151,16 @@ module SitemapGenerator
     def falsy?(value)
       ['0', 0, 'f', 'false', false].include?(value)
     end
+    
+    # Append a slash to `path` if it does not already end in a slash.
+    # Returns a string.  Expects a string or Pathname object.
+    def append_slash(path)
+      strpath = path.to_s
+      if strpath[-1] != nil && strpath[-1].chr != '/'
+        strpath + '/'
+      else
+        strpath 
+      end
+    end
   end
 end

data/spec/sitemap_generator/geo_sitemap_spec.rb

@@ -14,7 +14,7 @@ describe "SitemapGenerator" do
     ).to_xml
 
     # Check that the options were parsed correctly
-    doc = Nokogiri::XML.parse("<root xmlns:geo='http://www.google.com/geo/schemas/sitemap/1.0'>#{geo_xml_fragment}</root>")
+    doc = Nokogiri::XML.parse("<root xmlns:geo='#{SitemapGenerator::SCHEMAS['geo']}'>#{geo_xml_fragment}</root>")
     url = doc.at_xpath("//url")
     url.should_not be_nil
     url.at_xpath("loc").text.should == loc
@@ -25,6 +25,6 @@ describe "SitemapGenerator" do
 
     # Google's documentation and published schema don't match some valid elements may
     # not validate.
-    xml_fragment_should_validate_against_schema(geo, 'http://www.google.com/geo/schemas/sitemap/1.0', 'sitemap-geo')
+    xml_fragment_should_validate_against_schema(geo, 'sitemap-geo', 'xmlns:geo' => SitemapGenerator::SCHEMAS['geo'])
   end
 end

data/spec/sitemap_generator/link_set_spec.rb

@@ -72,15 +72,26 @@ describe SitemapGenerator::LinkSet do
 
   describe "sitemaps public_path" do
     it "should default to public/" do
-      ls.public_path.should ==  SitemapGenerator.app.root + 'public/'
-      ls.sitemap.location.public_path.should == ls.public_path
-      ls.sitemap_index.location.public_path.should == ls.public_path
+      path = SitemapGenerator.app.root + 'public/'
+      ls.public_path.should == path
+      ls.sitemap.location.public_path.should == path
+      ls.sitemap_index.location.public_path.should == path
     end
 
     it "should change when the public_path is changed" do
+      path = SitemapGenerator.app.root + 'tmp/'
+      ls.public_path = 'tmp/'
+      ls.public_path.should == path
+      ls.sitemap.location.public_path.should == path
+      ls.sitemap_index.location.public_path.should == path
+    end
+    
+    it "should append a slash to the path" do
+      path = SitemapGenerator.app.root + 'tmp/'
       ls.public_path = 'tmp'
-      ls.sitemap.location.public_path.should == ls.public_path
-      ls.sitemap_index.location.public_path.should == ls.public_path
+      ls.public_path.should == path
+      ls.sitemap.location.public_path.should == path
+      ls.sitemap_index.location.public_path.should == path
     end
   end
 
@@ -98,6 +109,13 @@ describe SitemapGenerator::LinkSet do
       ls.sitemap.location.url.should == 'http://one.com/sitemaps/sitemap.xml.gz'
       ls.sitemap_index.location.url.should == 'http://one.com/sitemaps/sitemap.xml.gz'
     end
+    
+    it "should append a slash to the path" do
+      ls.default_host = 'http://one.com'
+      ls.sitemaps_path = 'sitemaps'
+      ls.sitemap.location.url.should == 'http://one.com/sitemaps/sitemap.xml.gz'
+      ls.sitemap_index.location.url.should == 'http://one.com/sitemaps/sitemap.xml.gz'
+    end
   end
 
   describe "sitemap_index_url" do
@@ -317,7 +335,7 @@ describe SitemapGenerator::LinkSet do
         path = 'new/path'
         group = ls.group(:sitemaps_path => path)
         group.sitemaps_path.should == path
-        group.sitemap.location.sitemaps_path.to_s.should == path
+        group.sitemap.location.sitemaps_path.to_s.should == 'new/path/'
       end
     end
 
@@ -489,7 +507,7 @@ describe SitemapGenerator::LinkSet do
       path = 'new/path'
       ls.create(:sitemaps_path => path)
       ls.sitemaps_path.should == path
-      ls.sitemap.location.sitemaps_path.to_s.should == path
+      ls.sitemap.location.sitemaps_path.to_s.should == 'new/path/'
     end
 
     it "should set the default_host" do

data/spec/sitemap_generator/mobile_sitemap_spec.rb

@@ -12,7 +12,7 @@ describe "SitemapGenerator" do
     ).to_xml
 
     # Check that the options were parsed correctly
-    doc = Nokogiri::XML.parse("<root xmlns:mobile='http://www.google.com/schemas/sitemap-mobile/1.0'>#{mobile_xml_fragment}</root>")
+    doc = Nokogiri::XML.parse("<root xmlns:mobile='#{SitemapGenerator::SCHEMAS['mobile']}'>#{mobile_xml_fragment}</root>")
     url = doc.at_xpath("//url")
     url.should_not be_nil
     url.at_xpath("loc").text.should == loc
@@ -22,6 +22,6 @@ describe "SitemapGenerator" do
 
     # Google's documentation and published schema don't match some valid elements may
     # not validate.
-    xml_fragment_should_validate_against_schema(mobile, 'http://www.google.com/schemas/sitemap-mobile/1.0', 'sitemap-mobile')
+    xml_fragment_should_validate_against_schema(mobile, 'sitemap-mobile', 'xmlns:mobile' => SitemapGenerator::SCHEMAS['mobile'])
   end
 end

data/spec/sitemap_generator/news_sitemap_spec.rb

@@ -20,7 +20,7 @@ describe "SitemapGenerator" do
       }
     }).to_xml
 
-    doc = Nokogiri::XML.parse("<root xmlns:news='http://www.google.com/schemas/sitemap-news/0.9'>#{news_xml_fragment}</root>")
+    doc = Nokogiri::XML.parse("<root xmlns:news='#{SitemapGenerator::SCHEMAS['news']}'>#{news_xml_fragment}</root>")
 
     url = doc.at_xpath("//url")
     loc = url.at_xpath("loc")
@@ -37,6 +37,6 @@ describe "SitemapGenerator" do
     news.at_xpath("//news:name").text.should == "Example"
     news.at_xpath("//news:language").text.should == "en"
 
-    xml_fragment_should_validate_against_schema(news, 'http://www.google.com/schemas/sitemap-news/0.9', 'sitemap-news')
+    xml_fragment_should_validate_against_schema(news, 'sitemap-news', 'xmlns:news' => SitemapGenerator::SCHEMAS['news'])
   end
 end

data/spec/sitemap_generator/pagemap_sitemap_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
 
 describe "SitemapGenerator" do
-
+  let(:schema) { SitemapGenerator::SCHEMAS['pagemap'] }
+  
   it "should add the pagemap sitemap element" do
     pagemap_xml_fragment = SitemapGenerator::Builder::SitemapUrl.new('my_page.html', {
       :host => 'http://www.example.com',
@@ -9,42 +10,48 @@ describe "SitemapGenerator" do
       :pagemap => {
         :dataobjects => [
           {
-            type: 'document',
-            id: 'hibachi',
-            attributes: [
-              {name: 'name', value: 'Dragon'},
-              {name: 'review', value: 3.5},
+            :type => 'document',
+            :id => 'hibachi',
+            :attributes => [
+              {:name => 'name', :value => 'Dragon'},
+              {:name => 'review', :value => 3.5},
             ]
           },
           {
-            type: 'stats',
-            attributes: [
-              {name: 'installs', value: 2000},
-              {name: 'comments', value: 200},
+            :type => 'stats',
+            :attributes => [
+              {:name => 'installs', :value => 2000},
+              {:name => 'comments', :value => 200},
             ]
           }
         ]
       }
     }).to_xml
 
+    # Nokogiri is a fickle beast.  We have to add the namespace and define
+    # the prefix in order for XPath queries to work.  And then we have to
+    # reingest because otherwise Nokogiri doesn't use it.
     doc = Nokogiri::XML.parse(pagemap_xml_fragment)
-
+    doc.root.add_namespace_definition('pagemap', schema)
+    doc = Nokogiri::XML.parse(doc.to_xml)
+    
     url = doc.at_xpath("//url")
     loc = url.at_xpath("loc")
     loc.text.should == 'http://www.example.com/my_page.html'
-
-    pagemap = doc.at_xpath("//PageMap")
-    pagemap.children.count.should == 2
-    pagemap.at_xpath('//DataObject').attributes['type'].value.should == 'document'
-    pagemap.at_xpath('//DataObject').attributes['id'].value.should == 'hibachi'
-    pagemap.at_xpath('//DataObject').children.count.should == 2
-    first_attribute = pagemap.at_xpath('//DataObject').children.first
-    second_attribute = pagemap.at_xpath('//DataObject').children.last
+    
+    pagemap =  doc.at_xpath('//pagemap:PageMap', 'pagemap' => schema)
+    pagemap.element_children.count.should == 2
+    dataobject = pagemap.at_xpath('//pagemap:DataObject')
+    dataobject.attributes['type'].value.should == 'document'
+    dataobject.attributes['id'].value.should == 'hibachi'
+    dataobject.element_children.count.should == 2
+    first_attribute = dataobject.element_children.first
+    second_attribute = dataobject.element_children.last
     first_attribute.text.should == 'Dragon'
     first_attribute.attributes['name'].value.should == 'name'
     second_attribute.text.should == '3.5'
     second_attribute.attributes['name'].value.should == 'review'
 
-    xml_fragment_should_validate_against_schema(pagemap, 'http://www.google.com/schemas/sitemap-pagemap/1.0', 'sitemap-pagemap')
+    xml_fragment_should_validate_against_schema(pagemap, 'sitemap-pagemap', 'xmlns:pagemap' => schema)
   end
 end

data/spec/sitemap_generator/sitemap_location_spec.rb

@@ -112,6 +112,37 @@ describe SitemapGenerator::SitemapLocation do
       location.filesize
     end
   end
+  
+  describe "public_path" do
+    it "should append a trailing slash" do
+      location = SitemapGenerator::SitemapLocation.new(:public_path => 'public/google')
+      location.public_path.to_s.should == 'public/google/'
+      location[:public_path] = 'new/path'
+      location.public_path.to_s.should == 'new/path/'
+      location[:public_path] = 'already/slashed/'
+      location.public_path.to_s.should == 'already/slashed/'
+    end
+  end
+  
+  describe "sitemaps_path" do
+    it "should append a trailing slash" do
+      location = SitemapGenerator::SitemapLocation.new(:sitemaps_path => 'public/google')
+      location.sitemaps_path.to_s.should == 'public/google/'
+      location[:sitemaps_path] = 'new/path'
+      location.sitemaps_path.to_s.should == 'new/path/'
+      location[:sitemaps_path] = 'already/slashed/'
+      location.sitemaps_path.to_s.should == 'already/slashed/'
+    end
+  end
+  
+  describe "url" do
+    it "should handle paths not ending in slash" do
+      location = SitemapGenerator::SitemapLocation.new(
+          :public_path => 'public/google', :filename => 'xxx', 
+          :host => default_host, :sitemaps_path => 'sub/dir')
+      location.url.should == default_host + '/sub/dir/xxx'
+    end
+  end
 end
 
 describe SitemapGenerator::SitemapIndexLocation do

data/spec/sitemap_generator/utilities_spec.rb

@@ -66,4 +66,14 @@ describe SitemapGenerator::Utilities do
       SitemapGenerator::Utilities.as_array({}).should == [{}]
     end
   end
+  
+  describe "append_slash" do
+    SitemapGenerator::Utilities.append_slash('').should == ''
+    SitemapGenerator::Utilities.append_slash(nil).should == ''
+    SitemapGenerator::Utilities.append_slash(Pathname.new('')).should == ''
+    SitemapGenerator::Utilities.append_slash('tmp').should == 'tmp/'
+    SitemapGenerator::Utilities.append_slash(Pathname.new('tmp')).should == 'tmp/'
+    SitemapGenerator::Utilities.append_slash('tmp/').should == 'tmp/'
+    SitemapGenerator::Utilities.append_slash(Pathname.new('tmp/')).should == 'tmp/'
+  end
 end

data/spec/sitemap_generator/video_sitemap_spec.rb

@@ -28,7 +28,11 @@ describe "SitemapGenerator" do
       :family_friendly => true,
       :view_count => 123,
       :duration => 456,
-      :rating => 0.499999999
+      :rating => 0.499999999,
+      :price => 123.45,
+      :price_currency => 'CAD',
+      :price_resolution => 'HD',
+      :price_type => 'rent'
     }
   end
 
@@ -42,7 +46,7 @@ describe "SitemapGenerator" do
 
   # Return a Nokogiri document from the XML.  The root of the document is the <URL> element.
   def video_doc(xml)
-    Nokogiri::XML.parse("<root xmlns:video='http://www.google.com/schemas/sitemap-video/1.1'>#{xml}</root>")
+    Nokogiri::XML.parse("<root xmlns:video='#{SitemapGenerator::SCHEMAS['video']}'>#{xml}</root>")
   end
 
   # Validate the contents of the video element
@@ -65,7 +69,11 @@ describe "SitemapGenerator" do
     video_doc.at_xpath("video:player_loc").attribute('autoplay').text.should    == video_options[:autoplay]
     video_doc.at_xpath("video:uploader").text.should      == video_options[:uploader]
     video_doc.at_xpath("video:uploader").attribute("info").text.should == video_options[:uploader_info]
-    xml_fragment_should_validate_against_schema(video_doc, 'http://www.google.com/schemas/sitemap-video/1.1', 'sitemap-video')
+    video_doc.at_xpath("video:price").text.should == video_options[:price].to_s
+    video_doc.at_xpath("video:price").attribute("resolution").text.should == video_options[:price_resolution].to_s
+    video_doc.at_xpath("video:price").attribute("type").text.should == video_options[:price_type].to_s
+    video_doc.at_xpath("video:price").attribute("currency").text.should == video_options[:price_currency].to_s
+    xml_fragment_should_validate_against_schema(video_doc, 'sitemap-video', 'xmlns:video' => SitemapGenerator::SCHEMAS['video'])
   end
 
   it "should add a valid video sitemap element" do

data/spec/support/schemas/sitemap-video.xsd

@@ -50,9 +50,19 @@
   </xsd:restriction>
 </xsd:simpleType>
 
-<xsd:simpleType name="tNonNegativeDecimal">
-  <xsd:restriction base="xsd:decimal">
-    <xsd:minInclusive value="0"/>
+<xsd:simpleType name="tPlatformList">
+  <xsd:annotation>
+    <xsd:documentation>
+      Space-separated platform names.
+
+      Platform names:
+      web - desktop and laptop browsers.
+      mobile - mobile devices such as phones and tablets.
+      tv - tv platforms such as GoogleTV.
+    </xsd:documentation>
+  </xsd:annotation>
+  <xsd:restriction base="xsd:string">
+    <xsd:pattern value="((web|mobile|tv)( (web|mobile|tv))*)?"/>
   </xsd:restriction>
 </xsd:simpleType>
 
@@ -63,11 +73,12 @@
         <xsd:annotation>
           <xsd:documentation>
             A URL pointing to the URL for the video thumbnail image file. We can
-            accept most image sizes/types but recommend your thumbs are at least
-            120x90 pixels in .jpg, .png, or. gif formats.
+            accept most image sizes/types but recommend your thumbnails are at
+            least 120x90 pixels in .jpg, .png, or. gif formats.
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
+
       <xsd:element name="title">
         <xsd:annotation>
           <xsd:documentation>
@@ -80,6 +91,7 @@
           </xsd:restriction>
         </xsd:simpleType>
       </xsd:element>
+
       <xsd:element name="description">
         <xsd:annotation>
           <xsd:documentation>
@@ -92,6 +104,7 @@
           </xsd:restriction>
         </xsd:simpleType>
       </xsd:element>
+
       <xsd:element name="content_loc" minOccurs="0" type="xsd:anyURI">
         <xsd:annotation>
           <xsd:documentation>
@@ -107,6 +120,7 @@
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
+
       <xsd:element name="player_loc" minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>
@@ -148,6 +162,7 @@
           </xsd:simpleContent>
         </xsd:complexType>
       </xsd:element>
+
       <xsd:element name="duration" minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>
@@ -160,6 +175,7 @@
           </xsd:restriction>
         </xsd:simpleType>
       </xsd:element>
+
       <xsd:element name="expiration_date" minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>
@@ -181,6 +197,7 @@
           </xsd:union>
         </xsd:simpleType>
       </xsd:element>
+
       <xsd:element name="rating" minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>
@@ -194,6 +211,7 @@
           </xsd:restriction>
         </xsd:simpleType>
       </xsd:element>
+
       <xsd:element name="content_segment_loc"
           minOccurs="0"
           maxOccurs="unbounded">
@@ -231,6 +249,7 @@
           </xsd:simpleContent>
         </xsd:complexType>
       </xsd:element>
+
       <xsd:element name="view_count"
           minOccurs="0"
           type="xsd:nonNegativeInteger">
@@ -240,6 +259,7 @@
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
+
       <xsd:element name="publication_date" minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>
@@ -260,6 +280,7 @@
           </xsd:union>
         </xsd:simpleType>
       </xsd:element>
+
       <xsd:element name="tag" type="xsd:string" minOccurs="0" maxOccurs="32">
         <xsd:annotation>
           <xsd:documentation>
@@ -273,10 +294,11 @@
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
+
       <xsd:element name="category" minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>
-            The video's category. For example, cooking. In general, categories
+            The video's category - for example, cooking. In general, categories
             are broad groupings of content by subject. For example, a site about
             cooking could have categories for Broiling, Baking, and Grilling.
           </xsd:documentation>
@@ -287,6 +309,7 @@
           </xsd:restriction>
         </xsd:simpleType>
       </xsd:element>
+
       <xsd:element name="family_friendly" minOccurs="0" type="tYesNo">
         <xsd:annotation>
           <xsd:documentation>
@@ -295,6 +318,7 @@
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
+
       <xsd:element name="restriction" minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>
@@ -324,6 +348,7 @@
           </xsd:simpleContent>
         </xsd:complexType>
       </xsd:element>
+
       <xsd:element name="gallery_loc" minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>
@@ -345,21 +370,27 @@
           </xsd:simpleContent>
         </xsd:complexType>
       </xsd:element>
+
       <xsd:element name="price" minOccurs="0" maxOccurs="unbounded">
         <xsd:annotation>
           <xsd:documentation>
             The price to download or view the video. More than one
             &lt;video:price&gt; element can be listed (for example, in order to
-            specify various currencies).
+            specify various currencies). The price value must either be a
+            non-negative decimal or be empty. If a price value is specified, the
+            currency attribute is required. If no price value is specified, the
+            type attribute must be valid and present. The resolution attribute
+            is optional.
           </xsd:documentation>
         </xsd:annotation>
         <xsd:complexType>
           <xsd:simpleContent>
-            <xsd:extension base="tNonNegativeDecimal">
-              <xsd:attribute name="currency" use="required">
+            <xsd:extension base="xsd:string">
+              <xsd:attribute name="currency">
                 <xsd:annotation>
                   <xsd:documentation>
-                    The currency in ISO 4217 format.
+                    The currency in ISO 4217 format. This attribute is required
+                    if a value is given for price.
                   </xsd:documentation>
                 </xsd:annotation>
                 <xsd:simpleType>
@@ -368,10 +399,42 @@
                   </xsd:restriction>
                 </xsd:simpleType>
               </xsd:attribute>
+              <xsd:attribute name="type">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    The type (purchase or rent) of price. This value is required
+                    if there is no value given for price.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:simpleType>
+                  <xsd:restriction base="xsd:string">
+                    <xsd:enumeration value="purchase"/>
+                    <xsd:enumeration value="PURCHASE"/>
+                    <xsd:enumeration value="rent"/>
+                    <xsd:enumeration value="RENT"/>
+                  </xsd:restriction>
+                </xsd:simpleType>
+              </xsd:attribute>
+              <xsd:attribute name="resolution">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    The resolution of the video at this price (SD or HD).
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:simpleType>
+                  <xsd:restriction base="xsd:string">
+                    <xsd:enumeration value="sd"/>
+                    <xsd:enumeration value="SD"/>
+                    <xsd:enumeration value="hd"/>
+                    <xsd:enumeration value="HD"/>
+                  </xsd:restriction>
+                </xsd:simpleType>
+              </xsd:attribute>
             </xsd:extension>
           </xsd:simpleContent>
         </xsd:complexType>
       </xsd:element>
+
       <xsd:element name="requires_subscription" minOccurs="0" type="tYesNo">
         <xsd:annotation>
           <xsd:documentation>
@@ -380,6 +443,7 @@
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
+
       <xsd:element name="uploader" minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>
@@ -402,8 +466,178 @@
           </xsd:simpleContent>
         </xsd:complexType>
       </xsd:element>
+
+      <xsd:element name="tvshow" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>
+            Encloses all information about a single TV video.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="show_title" type="xsd:string">
+              <xsd:annotation>
+                <xsd:documentation>
+                  The title of the TV show. This should be the same for all
+                  episodes from the same series.
+                </xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="video_type">
+              <xsd:annotation>
+                <xsd:documentation>
+                  Describes the relationship of the video to the specified
+                  TV show/episode.
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:simpleType>
+                <xsd:restriction base="xsd:string">
+                  <!-- Complete episode -->
+                  <xsd:enumeration value="full"/>
+                  <!-- Episode promo -->
+                  <xsd:enumeration value="preview"/>
+                  <!-- Episode clip -->
+                  <xsd:enumeration value="clip"/>
+                  <!-- Interview -->
+                  <xsd:enumeration value="interview"/>
+                  <!-- News related to the content -->
+                  <xsd:enumeration value="news"/>
+                  <!-- If none of the above options accurately describe
+                       the relationship -->
+                  <xsd:enumeration value="other"/>
+                </xsd:restriction>
+              </xsd:simpleType>
+            </xsd:element>
+            <xsd:element name="episode_title" type="xsd:string" minOccurs="0">
+              <xsd:annotation>
+                <xsd:documentation>
+                  The title of the episode—for example, "Flesh and Bone" is the
+                  title of the Season 1, Episode 8 episode of Battlestar
+                  Galactica. This tag is not necessary if the video is not
+                  related to a specific episode (for example, if it's a trailer
+                  for an entire series or season).
+                </xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="season_number" minOccurs="0">
+              <xsd:annotation>
+                <xsd:documentation>
+                  Only for shows with a per-season schedule.
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:simpleType>
+                <xsd:restriction base="xsd:integer">
+                  <xsd:minInclusive value="1"/>
+                </xsd:restriction>
+              </xsd:simpleType>
+            </xsd:element>
+            <xsd:element name="episode_number" minOccurs="0">
+              <xsd:annotation>
+                <xsd:documentation>
+                  The episode number in number format. For TV shoes with a
+                  per-season schedule, the first episode of each series should
+                  be numbered 1.
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:simpleType>
+                <xsd:restriction base="xsd:integer">
+                  <xsd:minInclusive value="1"/>
+                </xsd:restriction>
+              </xsd:simpleType>
+            </xsd:element>
+            <xsd:element name="premier_date" minOccurs="0">
+              <xsd:annotation>
+                <xsd:documentation>
+                  The date the content of the video was first broadcast, in
+                  W3C format (for example, 2010-11-05.)
+                </xsd:documentation>
+              </xsd:annotation>
+              <xsd:simpleType>
+                <xsd:union>
+                  <xsd:simpleType>
+                    <xsd:restriction base="xsd:date"/>
+                  </xsd:simpleType>
+                  <xsd:simpleType>
+                    <xsd:restriction base="xsd:dateTime"/>
+                  </xsd:simpleType>
+                </xsd:union>
+              </xsd:simpleType>
+            </xsd:element>
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element name="platform" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>
+            A list of platforms where the video may or may not be played.
+            If there is no &lt;video:platform&gt; tag, it is assumed that
+            the video can be played on all platforms.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="tPlatformList">
+              <xsd:attribute name="relationship" use="required">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    Attribute "relationship" specifies whether the video is
+                    restricted or permitted for the specified platforms.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:simpleType>
+                  <xsd:restriction base="xsd:string">
+                    <xsd:enumeration value="allow"/>
+                    <xsd:enumeration value="deny"/>
+                  </xsd:restriction>
+                </xsd:simpleType>
+              </xsd:attribute>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element name="live" minOccurs="0" type="tYesNo">
+        <xsd:annotation>
+          <xsd:documentation>
+            Whether the video is a live internet broadcast.
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="id" minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>
+            An unambiguous identifier for the video within a given
+            identification context.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+              <xsd:attribute name="type" use="required">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    The identification context.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:simpleType>
+                  <xsd:restriction base="xsd:string">
+                    <xsd:enumeration value="tms:series"/>
+                    <xsd:enumeration value="tms:program"/>
+                    <xsd:enumeration value="rovi:series"/>
+                    <xsd:enumeration value="rovi:program"/>
+                    <xsd:enumeration value="freebase"/>
+                    <xsd:enumeration value="url"/>
+                  </xsd:restriction>
+                </xsd:simpleType>
+              </xsd:attribute>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
     </xsd:sequence>
   </xsd:complexType>
 </xsd:element>
 
-</xsd:schema>
+</xsd:schema>

data/spec/support/xml_macros.rb

@@ -8,6 +8,10 @@ module XmlMacros
     end
   end
 
+  # Validate XML against a local schema file.
+  #
+  # `schema_name` gives the name of the schema file to validate against.  The schema
+  # file is looked for in `spec/support/schemas/<schema_name>.xsd`.
   def xml_data_should_validate_against_schema(xml, schema_name)
     xml = xml.is_a?(String) ? xml : xml.to_s
     doc = Nokogiri::XML(xml)
@@ -26,15 +30,23 @@ module XmlMacros
   #
   #    Element 'video': No matching global declaration available for the validation root.
   #
-  # <tt>xmlns</tt> the XML namespace of the root element.
-  # <tt>xml_fragment</tt> XML string
+  # <tt>xml</tt> The XML fragment
+  # <tt>schema_name</tt> the name of the schema file to validate against.  The schema
+  # file is looked for in `spec/support/schemas/<schema_name>.xsd`.
+  # <tt>xmlns</tt> A hash with only one key which gives the XML namespace and associated
+  # URI.  Sometimes one needs to specify a prefix to the namespace, in which case this would
+  # look like: 'xmlns:video' => 'http://www.google.com/schemas/sitemap-video/1.1'
   #
   # Example:
-  #   xml_fragment_should_validate('<video/>', { 'video' => 'http://www.google.com/schemas/sitemap-video/1.1' })
-  def xml_fragment_should_validate_against_schema(xml, xmlns, schema_name)
+  #   xml_fragment_should_validate_against_schema('<video/>', 'sitemap-video', 'xmlns:video' => 'http://www.google.com/schemas/sitemap-video/1.1')
+  #   
+  #   This validates the given XML using the spec/support/schemas/sitemap-video.xsd`
+  #   schema.  The XML namespace `xmlns:video='http://www.google.com/schemas/sitemap-video/1.1'` is automatically
+  #   added to the root element for you.
+  def xml_fragment_should_validate_against_schema(xml, schema_name, xmlns={})
     xml = xml.is_a?(String) ? xml : xml.to_s
     doc = Nokogiri::XML(xml)
-    doc.root['xmlns'] = xmlns
+    doc.root.send(:[]=, *xmlns.first)
     xml_data_should_validate_against_schema(doc, schema_name)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sitemap_generator
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-13 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
@@ -183,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -880166997178231543
+      hash: 629438297049129393
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -880166997178231543
+      hash: 629438297049129393
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25