middleman-sitemap 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b98332b873efea3e949e8cd9c1813babdd432e1d
-  data.tar.gz: 4b28ccd1a50cb372a3de224f68caac7225cf72a2
+  metadata.gz: b6aec1a24ba9b08938486a49d644a42b2d72e4e4
+  data.tar.gz: ed96ebaa0ab1ef92c70ee3d0d347cd10d95b5c2d
 SHA512:
-  metadata.gz: c0a6a2456459cec088e1078aeb4cb5749ee758a7255a7d7ff983ea66115cd815197bc911b999de4438c2ad82e496343d74d9fc84e9bcec7354ac5ee56cf44ed1
-  data.tar.gz: f0d97be34463134e78ebfa67a344061da4b8dfd0ec0354914af73912ec2e92584b8394df06fa378d7df65ee03e334dc3af843042b73c684948242251c07ed63e
+  metadata.gz: 3059dfa28a7cf0e66c102f88cb2345f73e70621b877fb052509f6b2e717fd0047c50d5e5ae86e8832facb9c16ee1d078a7a9a02466d6d45a2e5f529d5e2678d0
+  data.tar.gz: e0d81cc050cfa275040b2096daa6a278ac3fa8939f7b7d307141449f3d870ddfed8cc164693b228ee6eb30970efdbb2ec88baa032e5dcd9263336e8fd2f430f7

data/features/encoding.feature

@@ -4,3 +4,8 @@ Feature: Encode HTML entities
     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"
+
+  Scenario: Subdirectories
+    Given a successfully built app at "subdirectories-app"
+    When I cd to "build"
+    Then the file "sitemap.xml" should contain "http://www.example.com/error-pages/404.html"

data/features/multiple_sitemaps.feature

@@ -13,7 +13,7 @@ Feature: Multiple sitemaps for large sites
       | build/sitemap1.xml |
       | build/sitemap2.xml |
 
-  @slow @announce
+  @slow
   Scenario: Sitemap index should have proper content
     Given a successfully built app at "large-site-app"
     When I cd to "build"
@@ -21,7 +21,7 @@ Feature: Multiple sitemaps for large sites
     And the file "sitemap.xml" should contain "http://www.example.com/sitemap1.xml.gz"
     And the file "sitemap.xml" should contain "http://www.example.com/sitemap2.xml.gz"
 
-  @slow @announce
+  @slow
   Scenario: Sitemap index should have proper URLs when GZIP is false
     Given a fixture app "large-site-app"
     And a file named "config.rb" with:
@@ -34,7 +34,7 @@ Feature: Multiple sitemaps for large sites
     And the file "sitemap.xml" should contain "http://www.example.com/sitemap1.xml"
     And the file "sitemap.xml" should contain "http://www.example.com/sitemap2.xml"
 
-  @slow @announce
+  @slow
   Scenario: Sitemaps should have proper content
     Given a successfully built app at "large-site-app"
     When I cd to "build"

data/fixtures/subdirectories-app/config.rb

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

data/fixtures/subdirectories-app/source/this-&-that.html

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

data/lib/middleman-sitemap/extension.rb

@@ -89,14 +89,9 @@ class Sitemap < ::Middleman::Extension
   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
+  def encode(path)
+    str = path.split("/").map { |f| app.escape_html(f) }.join("/")
+    return "#{str}.html"
   end
 
 end

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.10"
+  s.version     = "0.0.11"
   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><%= urlencode(@hostname + p.url).gsub(/\/$/,'') %></loc>
+    <loc><%= @hostname + encode(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.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Larry Staton Jr.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -51047,6 +51047,12 @@ files:
 - fixtures/large-site-app/source/page50999.html
 - fixtures/large-site-app/source/page51000.html
 - fixtures/large-site-app/source/stylesheets/test.css
+- fixtures/subdirectories-app/config.rb
+- fixtures/subdirectories-app/source/error-pages/404.html
+- fixtures/subdirectories-app/source/index.html
+- fixtures/subdirectories-app/source/javascripts/test.js
+- fixtures/subdirectories-app/source/stylesheets/test.css
+- fixtures/subdirectories-app/source/this-&-that.html
 - fixtures/weird-urls-app/config.rb
 - fixtures/weird-urls-app/source/index.html
 - fixtures/weird-urls-app/source/javascripts/test.js