sitemap_generator 2.1.3 → 2.1.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ./
   specs:
-    sitemap_generator (2.1.3)
+    sitemap_generator (2.1.4)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -26,6 +26,7 @@ Does your website use SitemapGenerator to generate Sitemaps?  Where would you be
 Changelog
 -------
 
+- v2.1.4: Allow special characters in URLs (don't use URI.join to construct URLs)
 - v2.1.3: Fix calling create with both `filename` and `sitemaps_namer` options
 - v2.1.2: Support multiple videos per url using the new `videos` option to `add()`.
 - v2.1.1: Support calling `create()` multiple times in a sitemap config.  Support host names with path segments so you can use a `default_host` like `'http://mysite.com/subdirectory/'`.  Turn off `include_index` when the `sitemaps_host` differs from `default_host`.  Add docs about how to upload to remote hosts.

data/VERSION

@@ -1 +1 @@
-2.1.3
+2.1.4

data/lib/sitemap_generator/builder/sitemap_url.rb

@@ -32,17 +32,21 @@ module SitemapGenerator
 
         SitemapGenerator::Utilities.assert_valid_keys(options, :priority, :changefreq, :lastmod, :host, :images, :video, :geo, :news, :videos)
         options.reverse_merge!(:priority => 0.5, :changefreq => 'weekly', :lastmod => Time.now, :images => [], :news => {}, :videos => [])
+        if options[:host].blank?
+          raise "Cannot generate a url without a host"
+        end
         if video = options.delete(:video)
           options[:videos] = video.is_a?(Array) ? options[:videos].concat(video) : options[:videos] << video
         end
-        raise "Cannot generate a url without a host" unless options[:host].present?
+
+        path = path.to_s.sub(/^\//, '')
+        loc  = path.empty? ? options[:host] : (options[:host].to_s.sub(/\/$/, '') + '/' + path)
         self.merge!(
-          :path       => path,
           :priority   => options[:priority],
           :changefreq => options[:changefreq],
           :lastmod    => options[:lastmod],
           :host       => options[:host],
-          :loc        => URI.join(options[:host], path.to_s.sub(/^\//, '')).to_s, # support host with subdirectory
+          :loc        => loc,
           :images     => prepare_images(options[:images], options[:host]),
           :news       => prepare_news(options[:news]),
           :videos     => options[:videos],

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sitemap_generator
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 2
   - 1
-  - 3
-  version: 2.1.3
+  - 4
+  version: 2.1.4
 platform: ruby
 authors: 
 - Karl Varga
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-23 00:00:00 -07:00
+date: 2011-10-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency