middleman-sitemap 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ab52e406cb849678df451ea164e0e0342831ba7
-  data.tar.gz: 49b19c5c83c1683efde279766cbce91a4af1b6d9
+  metadata.gz: 1adc2a991abac1fef9c966deb289f3ebb33fddf5
+  data.tar.gz: a18eb3d7841acc6ed7d9c3efd259050d268d8d65
 SHA512:
-  metadata.gz: 99e85bc60ace7ab5593744e7e7ff446816e6e608944ac7a1e44ea30cfaa1720bf9b4403a9e51ede3762dfc4675870f02a2b95fd82719503e67eba5ec6b95d6da
-  data.tar.gz: dce8d39a3df91276e5c05d786d7bf2ba6ffa843c1c93497fe5447453ac69eaac2e2ed8a9283b0fa3016a51de202aa6fc8a8e46d9fb195c570fc5cc51041d0086
+  metadata.gz: 5f5f18bb6b07b4c8cefdd626e951bcdc958a5ee8e42ec2774f05f86536f3f73eee4020f549a51c7846f0084e102059cb6de0f3f0fc013008d802e90012fd09e1
+  data.tar.gz: a8d6fa9008700e6779eca688c5db85f512a1d39cd06dcd42fcb0905685eac7a9c3ad998e93aeeb095a7cee19e640f02f2acba5f981f9996ab0770b5d01b6aa18

data/features/encoding.feature

@@ -0,0 +1,6 @@
+Feature: Encode HTML entities
+
+  Scenario: URLs in loc entities are HTML encoded
+    Given a successfully built app at "weird-urls-app"
+    When I cd to "build"
+    Then the file "sitemap.xml" should contain "http://www.example.com/this-&-that"

data/fixtures/weird-urls-app/config.rb

@@ -0,0 +1 @@
+activate :sitemap

data/fixtures/weird-urls-app/source/this-&-that.html

@@ -0,0 +1,5 @@
+---
+priority: 0.8
+changefreq: monthly
+---
+this & that

data/lib/middleman-sitemap.rb

@@ -85,6 +85,17 @@ class Sitemap < ::Middleman::Extension
     end
   end
 
+  # Returns a URL with proper HTML entities
+  def urlencode(url)
+    purl = URI.parse(url)
+    path_match = purl.path.match(/\/([^.]+)/)
+    if path_match
+      escaped_path = app.escape_html(path_match[1])
+      purl.path = "/#{escaped_path}.html"
+    end
+    return purl.to_s
+  end
+
 end
 
 ::Middleman::Extensions.register(:sitemap, Sitemap)

data/middleman-sitemap.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "middleman-sitemap"
-  s.version     = "0.0.4"
+  s.version     = "0.0.5"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Larry Staton Jr."]
   s.email       = ["larry@larrystaton.com"]

data/templates/sitemap.xml.erb

@@ -2,7 +2,7 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 <% @pages.each do |p| %>
   <url>
-    <loc><%= @hostname %><%= p.url.gsub(/\/$/, '') %></loc>
+    <loc><%= urlencode(@hostname + p.url).gsub(/\/$/,'') %></loc>
     <lastmod><%= Date.today.to_time.iso8601 %></lastmod>
     <changefreq><%= p.data.changefreq || 'weekly' %></changefreq>
     <priority><%= p.data.priority || '0.5' %></priority>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-sitemap
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Larry Staton Jr.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -37,6 +37,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- features/encoding.feature
 - features/gzip.feature
 - features/multiple_sitemaps.feature
 - features/support/env.rb
@@ -51046,6 +51047,11 @@ files:
 - fixtures/large-site-app/source/page50999.html
 - fixtures/large-site-app/source/page51000.html
 - fixtures/large-site-app/source/stylesheets/test.css
+- fixtures/weird-urls-app/config.rb
+- fixtures/weird-urls-app/source/index.html
+- fixtures/weird-urls-app/source/javascripts/test.js
+- fixtures/weird-urls-app/source/stylesheets/test.css
+- fixtures/weird-urls-app/source/this-&-that.html
 - lib/middleman-sitemap.rb
 - lib/middleman_extension.rb
 - middleman-sitemap.gemspec
@@ -51075,6 +51081,7 @@ signing_key:
 specification_version: 4
 summary: Builds a sitemap.xml for your site
 test_files:
+- features/encoding.feature
 - features/gzip.feature
 - features/multiple_sitemaps.feature
 - features/support/env.rb