middleman-sitemap 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1adc2a991abac1fef9c966deb289f3ebb33fddf5
-  data.tar.gz: a18eb3d7841acc6ed7d9c3efd259050d268d8d65
+  metadata.gz: 4f8f539efe5586eba219cffefa34d05936988698
+  data.tar.gz: 38c2ee30b0f4609f9c99c64e653e1760c70dd057
 SHA512:
-  metadata.gz: 5f5f18bb6b07b4c8cefdd626e951bcdc958a5ee8e42ec2774f05f86536f3f73eee4020f549a51c7846f0084e102059cb6de0f3f0fc013008d802e90012fd09e1
-  data.tar.gz: a8d6fa9008700e6779eca688c5db85f512a1d39cd06dcd42fcb0905685eac7a9c3ad998e93aeeb095a7cee19e640f02f2acba5f981f9996ab0770b5d01b6aa18
+  metadata.gz: 7423df9fc0816b610fd75046ed0eb0d2810d10e65a683f832b521ccba0e93190fdf0a3645afacee2a0464186fd6e030f725511ab2c25456d9324c2562f6db76d
+  data.tar.gz: 676b2db45e38175c1a048dc7034d8475c3cc3335d903b60d4ae2d2d5c427a56b7090da2fc281c0d60f43ae7b50dca5340c9f4cfab1eabfa6514cbadda817e404

data/features/multiple_sitemaps.feature

@@ -7,8 +7,27 @@ Feature: Multiple sitemaps for large sites
       | build/sitemap.xml |
 
   @slow
-  Scenario: Site should have multiple sitemaps
+  Scenario: Large site should have multiple sitemaps
     Given a successfully built app at "large-site-app"
     Then the following files should exist:
       | build/sitemap1.xml |
       | build/sitemap2.xml |
+
+  Scenario: Small site should have multiple sitemaps
+    Given a successfully built app at "gzip-app"
+    Then the following files should not exist:
+      | build/sitemap1.xml |
+      | build/sitemap2.xml |
+
+  @slow
+  Scenario: Site should have multiple sitemaps even when gzipped
+    Given a fixture app "large-site-app"
+    And a file named "config.rb" with:
+    """
+    activate :gzip
+    activate :sitemap
+    """
+    And a successfully built app at "large-site-app"
+    Then the following files should exist:
+      | build/sitemap1.xml |
+      | build/sitemap2.xml |

data/lib/middleman-sitemap.rb

@@ -1,101 +1,9 @@
 # Require core library
 require 'middleman-core'
 
-# Extension namespace
-class Sitemap < ::Middleman::Extension
-  option :gzip, true, 'Whether or not to GZIP the resulting file'
-  option :hostname, "http://www.example.com", "The hostname for your website"
-
-  def initialize(app, options_hash={}, &block)
-    # Call super to build options from the options_hash
-    super
-
-    # Require libraries only when activated
-    require 'erb'
-
-    # set up your extension
-    # puts options.my_option
-  end
-
-  def after_build(builder)
-    @builder = builder
-    pages = app.sitemap.resources.find_all{ |p| p.source_file.match(/\.html$/) }
-
-    if pages.count > 50000
-      sitemaps = build_multiple_sitemaps(pages)
-    else
-      sitemaps = [build_sitemap("sitemap.xml", pages)]
-    end
-
-    if options.gzip
-      sitemaps.each do |sitemap|
-        gzip_file(File.read(sitemap))
-        @builder.say_status :create, "#{sitemap}.gz"
-      end
-    end
-  end
-
-  def build_sitemap_index(sitemaps)
-    @hostname = options.hostname
-    @sitemaps = sitemaps
-    template = Tilt::ERBTemplate.new(File.expand_path(File.join("#{File.dirname(__FILE__)}", "../templates/sitemapindex.xml.erb")))
-    sitemap = template.render(self)
-
-    outfile = File.join(app.build_dir, "sitemap.xml")
-    File.open(outfile, 'w') {|f| f.write(sitemap) }
-
-    @builder.say_status :create, "build/sitemap.xml"
-
-    return "build/sitemap.xml"
-  end
-
-  def build_sitemap(name, pages)
-    @pages = pages
-    @hostname = options.hostname
-    template = Tilt::ERBTemplate.new(File.expand_path(File.join("#{File.dirname(__FILE__)}", "../templates/sitemap.xml.erb")))
-    sitemap = template.render(self)
-
-    outfile = File.join(app.build_dir, name)
-    File.open(outfile, 'w') {|f| f.write(sitemap) }
-
-    @builder.say_status :create, "build/#{name}"
-
-    return "build/#{name}"
-  end
-
-  def build_multiple_sitemaps(pages)
-    built_sitemaps = []
-    total_sitemaps = (pages.count / 50000.0).ceil
-    pages_per_sitemap = (50000.0 / total_sitemaps).ceil
-    built_sitemaps << build_sitemap_index(total_sitemaps)
-    1.upto(total_sitemaps) do |i|
-      sitemap_pages = pages[((i - 1) * pages_per_sitemap)...(i * pages_per_sitemap)]
-      built_sitemaps << build_sitemap("sitemap#{i}.xml", sitemap_pages)
-    end
-
-    return built_sitemaps
-  end
-
-  def gzip_file(sitemap)
-    require 'zlib'
-    File.open(File.join(@app.build_dir, "sitemap.xml.gz"), 'wb') do |f|
-      gz = Zlib::GzipWriter.new(f, Zlib::BEST_COMPRESSION)
-      gz.write sitemap
-      gz.close
-    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
+require 'middleman-sitemap/commands'
 
+::Middleman::Extensions.register(:sitemap) do
+  require 'middleman-sitemap/extension'
+  Sitemap
 end
-
-::Middleman::Extensions.register(:sitemap, Sitemap)

data/lib/middleman-sitemap/extension.rb

@@ -0,0 +1,100 @@
+# Extension namespace
+class Sitemap < ::Middleman::Extension
+  option :gzip, true, 'Whether or not to GZIP the resulting file'
+  option :hostname, "http://www.example.com", "The hostname for your website"
+
+  def initialize(app, options_hash={}, &block)
+    # Call super to build options from the options_hash
+    super
+
+    # Require libraries only when activated
+    require 'erb'
+
+    # set up your extension
+    # puts options.my_option
+  end
+
+  def after_build(builder)
+    @builder = builder
+    generate_sitemap
+  end
+
+  def generate_sitemap
+    pages = app.sitemap.resources.find_all{ |p| p.ext == ".html" }
+
+    if pages.count > 50000
+      sitemaps = build_multiple_sitemaps(pages)
+    else
+      sitemaps = [build_sitemap("sitemap.xml", pages)]
+    end
+
+    if options.gzip
+      sitemaps.each do |sitemap|
+        gzip_file(File.read(sitemap))
+        @builder.say_status :create, "#{sitemap}.gz" if @builder
+      end
+    end
+  end
+
+  def build_sitemap_index(sitemaps)
+    @hostname = options.hostname
+    @sitemaps = sitemaps
+    template = Tilt::ERBTemplate.new(File.expand_path(File.join("#{File.dirname(__FILE__)}", "../../templates/sitemapindex.xml.erb")))
+    sitemap = template.render(self)
+
+    outfile = File.join(app.build_dir, "sitemap.xml")
+    File.open(outfile, 'w') {|f| f.write(sitemap) }
+
+    @builder.say_status :create, "build/sitemap.xml"
+
+    return "build/sitemap.xml"
+  end
+
+  def build_sitemap(name, pages)
+    @pages = pages
+    @hostname = options.hostname
+    template = Tilt::ERBTemplate.new(File.expand_path(File.join("#{File.dirname(__FILE__)}", "../../templates/sitemap.xml.erb")))
+    sitemap = template.render(self)
+
+    outfile = File.join(app.build_dir, name)
+    File.open(outfile, 'w') {|f| f.write(sitemap) }
+
+    @builder.say_status :create, "build/#{name}"
+
+    return "build/#{name}"
+  end
+
+  def build_multiple_sitemaps(pages)
+    built_sitemaps = []
+    total_sitemaps = (pages.count / 50000.0).ceil
+    pages_per_sitemap = (50000.0 / total_sitemaps).ceil
+    built_sitemaps << build_sitemap_index(total_sitemaps)
+    1.upto(total_sitemaps) do |i|
+      sitemap_pages = pages[((i - 1) * pages_per_sitemap)...(i * pages_per_sitemap)]
+      built_sitemaps << build_sitemap("sitemap#{i}.xml", sitemap_pages)
+    end
+
+    return built_sitemaps
+  end
+
+  def gzip_file(sitemap)
+    require 'zlib'
+    File.open(File.join(@app.build_dir, "sitemap.xml.gz"), 'wb') do |f|
+      gz = Zlib::GzipWriter.new(f, Zlib::BEST_COMPRESSION)
+      gz.write sitemap
+      gz.close
+    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

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.5"
+  s.version     = "0.0.6"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Larry Staton Jr."]
   s.email       = ["larry@larrystaton.com"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-sitemap
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Larry Staton Jr.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-23 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -51053,6 +51053,7 @@ files:
 - fixtures/weird-urls-app/source/stylesheets/test.css
 - fixtures/weird-urls-app/source/this-&-that.html
 - lib/middleman-sitemap.rb
+- lib/middleman-sitemap/extension.rb
 - lib/middleman_extension.rb
 - middleman-sitemap.gemspec
 - templates/sitemap.xml.erb