sitemap_generator 0.2.5 → 0.2.6

data/README.md

@@ -1,9 +1,22 @@
 SitemapGenerator
 ================
 
-This plugin enables ['enterprise-class'][enterprise_class] Google Sitemaps to be easily generated for a Rails site as a rake task, using a simple 'Rails Routes'-like DSL.
+A Rails 3-compatible gem/plugin to generate ['enterprise-class'][enterprise_class] Sitemaps using a familiar Rails Routes-like DSL.  Sitemaps are readable by all search engines and adhere to the ['Sitemap protocol specification'][sitemap_protocol].  Automatically pings search engines to notify them of new sitemaps (including Google, Yahoo and Bing).  Provides rake tasks to easily manage your sitemaps.  Supports image sitemaps and handles millions of links.
 
-**Now supporting Rails 3 as of version 0.2.5!**
+Features
+-------
+
+- v0.2.6: **Support ['image sitemaps'][sitemap_images]**!
+- v0.2.5: **Support Rails 3**!
+
+- Adheres to the ['Sitemap protocol specification'][sitemap_protocol]
+- Handles millions of links
+- Automatic Gzip of Sitemap files
+- Automatic ping of search engines to notify them of new sitemaps: Google, Yahoo, Bing, Ask, SitemapWriter
+- Won't clobber your old sitemaps if the new one fails to generate
+- Set the priority of links, change frequency etc
+- You control which links are included
+- You set the host name, so it doesn't matter if your application is in a subdirectory
 
 Foreword
 -------
@@ -22,7 +35,7 @@ Installation
     <code>gem 'sitemap_generator'</code>
 
 2. `$ rake sitemap:install`
-    
+
 **Rails 2.x: As a gem**
 
 1. Add the gem as a dependency in your <tt>config/environment.rb</tt>
@@ -49,14 +62,19 @@ Installation
 
 Installation creates a <tt>config/sitemap.rb</tt> file which will contain your logic for generating the Sitemap files.  If you want to create this file manually run <code>rake sitemap:install</code>.
 
-You can run <code>rake sitemap:refresh</code> as needed to create Sitemap files. This will also ping all the ['major'][sitemap_engines] search engines.  If you want to disable all non-essential output run the rake task with <code>rake -s sitemap:refresh</code>.
+You can run <code>rake sitemap:refresh</code> as needed to create Sitemap files. This will also ping these ['major search engines'][sitemap_engines]: Google, Yahoo, Bing, Ask, SitemapWriter.  If you want to disable all non-essential output run the rake task with <code>rake -s sitemap:refresh</code>.
 
-Sitemaps with many urls (100,000+) take quite a long time to generate, so if you need to refresh your Sitemaps regularly you can set the rake task up as a cron job. Most cron agents will only send you an email if there is output from the cron task.
+To keep your Sitemaps up-to-date, setup a cron job.  Pass the <tt>-s</tt> option to the rake task to silence all but the most important output.  If you're using Whenever, then your schedule would look something like:
 
-Optionally, you can add the following to your <code>public/robots.txt</code> file, so that robots can find the sitemap file.
+    # config/schedule.rb
+    every 1.day, :at => '5:00 am' do
+      rake "-s sitemap:refresh"
+    end
+
+Optionally, you can add the following to your <code>public/robots.txt</code> file, so that robots can find the sitemap file:
 
     Sitemap: <hostname>/sitemap_index.xml.gz
-    
+
 The Sitemap URL in the robots file should be the complete URL to the Sitemap Index, such as <tt>http://www.example.org/sitemap_index.xml.gz</tt>
 
 
@@ -75,12 +93,12 @@ Example 'config/sitemap.rb'
       # Usage: sitemap.add path, options
       #        (default options are used if you don't specify them)
       #
-      # Defaults: :priority => 0.5, :changefreq => 'weekly', 
+      # Defaults: :priority => 0.5, :changefreq => 'weekly',
       #           :lastmod => Time.now, :host => default_host
 
-  
+
       # Examples:
-  
+
       # add '/articles'
       sitemap.add articles_path, :priority => 0.7, :changefreq => 'daily'
 
@@ -91,25 +109,30 @@ Example 'config/sitemap.rb'
 
       # add merchant path
       sitemap.add '/purchase', :priority => 0.7, :host => "https://www.example.com"
-  
+
+      # add all individual news with images
+      News.all.each do |n|
+        sitemap.add news_path(n), :lastmod => n.updated_at, :images=>n.images.collect{ |r| :loc=>r.image.url, :title=>r.image.name }
+      end
+
     end
 
     # Including Sitemaps from Rails Engines.
     #
-    # These Sitemaps should be almost identical to a regular Sitemap file except 
+    # These Sitemaps should be almost identical to a regular Sitemap file except
     # they needn't define their own SitemapGenerator::Sitemap.default_host since
     # they will undoubtedly share the host name of the application they belong to.
     #
     # As an example, say we have a Rails Engine in vendor/plugins/cadability_client
     # We can include its Sitemap here as follows:
-    # 
+    #
     file = File.join(Rails.root, 'vendor/plugins/cadability_client/config/sitemap.rb')
     eval(open(file).read, binding, file)
 
 Raison d'être
 -------
 
-Most of the Sitemap plugins out there seem to try to recreate the Sitemap links by iterating the Rails routes. In some cases this is possible, but for a great deal of cases it isn't. 
+Most of the Sitemap plugins out there seem to try to recreate the Sitemap links by iterating the Rails routes. In some cases this is possible, but for a great deal of cases it isn't.
 
 a) There are probably quite a few routes in your routes file that don't need inclusion in the Sitemap. (AJAX routes I'm looking at you.)
 
@@ -118,7 +141,7 @@ and
 b) How would you infer the correct series of links for the following route?
 
     map.zipcode 'location/:state/:city/:zipcode', :controller => 'zipcode', :action => 'index'
-    
+
 Don't tell me it's trivial, because it isn't. It just looks trivial.
 
 So my idea is to have another file similar to 'routes.rb' called 'sitemap.rb', where you can define what goes into the Sitemap.
@@ -133,22 +156,13 @@ Easy hey?
 
 Other Sitemap settings for the link, like `lastmod`, `priority`, `changefreq` and `host` are entered automatically, although you can override them if you need to.
 
-Other "difficult" Sitemap issues, solved by this plugin:
-
-- Support for more than 50,000 urls (using a Sitemap Index file)
-- Gzip of Sitemap files
-- Variable priority of links
-- Paging/sorting links (e.g. my_list?page=3)
-- SSL host links (e.g. https:)
-- Rails apps which are installed on a sub-path (e.g. example.com/blog_app/)
-
 Compatibility
 =======
 
 Tested and working on:
 
 - **Rails** 3.0.0, sitemap_generator version >= 0.2.5
-- **Rails** 1.x - 2.3.5 sitemap_generator version < 0.2.5
+- **Rails** 1.x - 2.3.5
 - **Ruby** 1.8.7, 1.9.1
 
 Notes
@@ -182,21 +196,26 @@ Known Bugs
 - There's no check on the size of a URL which [isn't supposed to exceed 2,048 bytes][sitemaps_xml].
 - Currently only supports one Sitemap Index file, which can contain 50,000 Sitemap files which can each contain 50,000 urls, so it _only_ supports up to 2,500,000,000 (2.5 billion) urls. I personally have no need of support for more urls, but plugin could be improved to support this.
 
-Wishlist
+Wishlist & Coming Soon
 ========
 
+- Support for generating sitemaps for sites with multiple domains.  Sitemaps are generated into subdirectories and we use a Rack middleware to rewrite requests for sitemaps to the correct subdirectory based on the request host.
+- I want to refactor the code because it has grown a lot.  Part of this refactoring will include implementing some more checks to make sure we adhere to standards as well as making sure that the sitemaps are being generated as efficiently as possible.
+
+I'd like to simplify adding links to a sitemap.  Right now it's all or nothing.  I'd like to break it up so you can add batches.
 - Auto coverage testing.  Generate a report of broken URLs by checking the status codes of each page in the sitemap.
 
 Thanks (in no particular order)
 ========
 
+- [Alexadre Bini](http://github.com/alexandrebini) for image sitemaps
 - [Dan Pickett](http://github.com/dpickett)
 - [Rob Biedenharn](http://github.com/rab)
 - [Richie Vos](http://github.com/jerryvos)
 - [Adrian Mugnolo](http://github.com/xymbol)
 
 
-Copyright (c) 2009 Adam @ [Codebright.net][cb], released under the MIT license
+Copyright (c) 2009 Karl Varga released under the MIT license
 
 [canonical_repo]:http://github.com/kjvarga/sitemap_generator
 [enterprise_class]:https://twitter.com/dhh/status/1631034662 "I use enterprise in the same sense the Phusion guys do - i.e. Enterprise Ruby. Please don't look down on my use of the word 'enterprise' to represent being a cut above. It doesn't mean you ever have to work for a company the size of IBM. Or constantly fight inertia, writing crappy software, adhering to change management practices and spending hours in meetings... Not that there's anything wrong with that - Wait, what?"
@@ -206,3 +225,5 @@ Copyright (c) 2009 Adam @ [Codebright.net][cb], released under the MIT license
 [sitemap_generator_usage]:http://wiki.github.com/adamsalter/sitemap_generator/sitemapgenerator-usage "http://wiki.github.com/adamsalter/sitemap_generator/sitemapgenerator-usage"
 [boost_juice]:http://www.boostjuice.com.au/ "Mmmm, sweet, sweet Boost Juice."
 [cb]:http://codebright.net "http://codebright.net"
+[sitemap_images]:http://www.google.com/support/webmasters/bin/answer.py?answer=178636
+[sitemap_protocol]:http://sitemaps.org/protocol.php

data/Rakefile

@@ -8,8 +8,8 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "sitemap_generator"
-    gem.summary = %Q{Easily generate enterprise class Sitemaps for your Rails site using a simple 'Rails Routes'-like DSL and a single Rake task}
-    gem.description = %Q{A Rails 3-compatible gem to easily generate enterprise class Sitemaps readable by all search engines.  Automatically ping search engines to notify them of new sitemaps, including Google, Yahoo and Bing. Provides rake tasks to easily manage your sitemaps.  Won't clobber your old sitemaps if the new one fails to generate. Setup a cron schedule and never worry about your sitemaps again.}
+    gem.summary = %Q{Easily generate enterprise class Sitemaps for your Rails site using a familiar Rails Routes-like DSL}
+    gem.description = %Q{A Rails 3-compatible gem/plugin to generate enterprise-class Sitemaps using a familiar Rails Routes-like DSL.  Sitemaps are readable by all search engines and adhere to the Sitemap protocol specification.  Automatically pings search engines to notify them of new sitemaps (including Google, Yahoo and Bing).  Provides rake tasks to easily manage your sitemaps.  Supports image sitemaps and handles millions of links.}
     gem.email = "kjvarga@gmail.com"
     gem.homepage = "http://github.com/kjvarga/sitemap_generator"
     gem.authors = ["Adam Salter", "Karl Varga"]
@@ -28,19 +28,19 @@ namespace :test do
   task :gem => ['test:prepare:gem', 'multi_spec']
   task :plugin => ['test:prepare:plugin', 'multi_spec']
   task :rails3 => ['test:prepare:rails3', 'multi_spec']
-  
+
   task :multi_spec do
     Rake::Task['spec'].invoke
     Rake::Task['spec'].reenable
   end
-  
+
   namespace :prepare do
     task :gem do
       ENV["SITEMAP_RAILS"] = 'gem'
       prepare_path(local_path('spec/mock_app_gem/vendor/gems/sitemap_generator-1.2.3'))
       rm_rf(local_path('spec/mock_app_gem/public/sitemap*'))
     end
-    
+
     task :plugin do
       ENV["SITEMAP_RAILS"] = 'plugin'
       prepare_path(local_path('spec/mock_app_plugin/vendor/plugins/sitemap_generator-1.2.3'))
@@ -51,11 +51,11 @@ namespace :test do
       ENV["SITEMAP_RAILS"] = 'rails3'
       rm_rf(local_path('spec/mock_rails3_gem/public/sitemap*'))
     end
-    
+
     def local_path(path)
       File.join(File.dirname(__FILE__), path)
     end
-    
+
     def prepare_path(path)
       rm_rf path
       mkdir_p path
@@ -64,8 +64,8 @@ namespace :test do
   end
 end
 
-desc "Run all tests both as a plugin and gem"
-task :test => ['test:plugin', 'test:gem']
+desc "Run tests as a gem install"
+task :test => ['test:gem']
 
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/sitemap_generator.rb

@@ -3,6 +3,9 @@ require 'sitemap_generator/link'
 require 'sitemap_generator/rails_helper'
 require 'sitemap_generator/helper'
 require 'sitemap_generator/link_set'
+require 'sitemap_generator/helper'
+require 'sitemap_generator/templates'
+require 'sitemap_generator/utilities'
 
 require 'sitemap_generator/railtie' if SitemapGenerator::RailsHelper.rails3?
 
@@ -10,17 +13,14 @@ module SitemapGenerator
   silence_warnings do
     VERSION = File.read(File.dirname(__FILE__) + "/../VERSION").strip
     MAX_ENTRIES = 50_000
+    MAX_IMAGES = 1_000
     Sitemap = LinkSet.new
   end
-  
+
   class << self
     attr_accessor :root, :templates
   end
 
   self.root = File.expand_path(File.join(File.dirname(__FILE__), '../'))
-  self.templates = {
-    :sitemap_index  => File.join(self.root, 'templates/sitemap_index.builder'),
-    :sitemap_xml    => File.join(self.root, 'templates/xml_sitemap.builder'),
-    :sitemap_sample => File.join(self.root, 'templates/sitemap.rb'),
-  }  
+  self.templates = SitemapGenerator::Templates.new(self.root)
 end

data/lib/sitemap_generator/link.rb

@@ -1,19 +1,31 @@
-
 module SitemapGenerator
   class Link
     class << self
       def generate(path, options = {})
-        options.assert_valid_keys(:priority, :changefreq, :lastmod, :host)
-        options.reverse_merge!(:priority => 0.5, :changefreq => 'weekly', :lastmod => Time.now, :host => Sitemap.default_host)
+        options.assert_valid_keys(:priority, :changefreq, :lastmod, :host, :images)
+        options.reverse_merge!(:priority => 0.5, :changefreq => 'weekly', :lastmod => Time.now, :host => Sitemap.default_host, :images => [])
         {
           :path => path,
           :priority => options[:priority],
           :changefreq => options[:changefreq],
           :lastmod => options[:lastmod],
           :host => options[:host],
-          :loc => URI.join(options[:host], path).to_s
+          :loc => URI.join(options[:host], path).to_s,
+          :images => prepare_images(options[:images], options[:host])
         }
       end
+
+      # Maximum 1000 images.  <tt>loc</tt> is required.
+      # ?? Does the image URL have to be on the same host?
+      def prepare_images(images, host)
+        images.delete_if { |key,value| key[:loc] == nil }
+        images.each do |r|
+          r.assert_valid_keys(:loc, :caption, :geo_location, :title, :license)
+          r[:loc] = URI.join(host, r[:loc]).to_s
+        end
+        images[0..(SitemapGenerator::MAX_IMAGES-1)]
+      end
     end
   end
 end
+

data/lib/sitemap_generator/link_set.rb

@@ -60,13 +60,19 @@ module SitemapGenerator
 
     # Write links to sitemap file.
     def write_sitemap(file = upcoming_file)
+      slice_index = 0
       buffer = ""
       xml = Builder::XmlMarkup.new(:target => buffer)
-      eval(File.read(SitemapGenerator.templates[:sitemap_xml]), binding)
+      eval(SitemapGenerator.templates.sitemap_xml, binding)
       filename = File.join(Rails.root, "public", file)
       write_file(filename, buffer)
       show_progress("Sitemap", filename, buffer) if verbose
-      links.clear
+      if slice_index==0
+        links.clear
+      else
+        links.slice! slice_index, links.size
+      end
+
       sitemaps.push filename
     end
 
@@ -74,7 +80,7 @@ module SitemapGenerator
     def write_index
       buffer = ""
       xml = Builder::XmlMarkup.new(:target => buffer)
-      eval(File.read(SitemapGenerator.templates[:sitemap_index]), binding)
+      eval(SitemapGenerator.templates.sitemap_index, binding)
       filename = File.join(Rails.root, "public", index_file)
       write_file(filename, buffer)
       show_progress("Sitemap Index", filename, buffer) if verbose
@@ -143,28 +149,6 @@ module SitemapGenerator
       puts "** #{title} too big! The uncompressed size exceeds 10Mb" if buffer.size > 10.megabytes
     end
 
-    # Copy templates/sitemap.rb to config if not there yet.
-    def install_sitemap_rb
-      if File.exist?(File.join(Rails.root, 'config/sitemap.rb'))
-        puts "already exists: config/sitemap.rb, file not copied"
-      else
-        FileUtils.cp(SitemapGenerator.templates[:sitemap_sample], File.join(Rails.root, 'config/sitemap.rb'))
-        puts "created: config/sitemap.rb"
-      end
-    end
-
-    # Remove config/sitemap.rb if exists.
-    def uninstall_sitemap_rb
-      if File.exist?(File.join(Rails.root, 'config/sitemap.rb'))
-        File.rm(File.join(Rails.root, 'config/sitemap.rb'))
-      end
-    end
-
-    # Clean sitemap files in output directory.
-    def clean_files
-      FileUtils.rm(Dir[File.join(Rails.root, 'public/sitemap*.xml.gz')])
-    end
-
     # Ping search engines passing sitemap location.
     def ping_search_engines
       super index_file

data/lib/sitemap_generator/mapper.rb

@@ -3,13 +3,14 @@ module SitemapGenerator
   # The object passed to the add_links block in config/sitemap.rb is a Generator instance.
   class Mapper
     attr_accessor :set
-    
+
     def initialize(set)
       @set = set
     end
-    
+
     def add(loc, options = {})
       set.add_link Link.generate(loc, options)
     end
   end
-end
+end
+

data/lib/sitemap_generator/templates.rb

@@ -0,0 +1,43 @@
+module SitemapGenerator
+  # Provide convenient access to template files.  E.g.
+  #
+  #   SitemapGenerator.templates.sitemap_index
+  #
+  # Lazy-load and cache for efficient access.
+  # Define an accessor method for each template file.
+  class Templates
+    FILES = {
+      :sitemap_index  =>  'sitemap_index.builder',
+      :sitemap_xml    =>  'xml_sitemap.builder',
+      :sitemap_sample =>  'sitemap.rb',
+    }
+
+    # Dynamically define accessors for each key defined in <tt>FILES</tt>
+    attr_accessor *FILES.keys
+    FILES.keys.each do |name|
+      eval <<-END
+        define_method(:#{name}) do
+          @#{name} ||= read_template(:#{name})
+        end
+      END
+    end
+
+    def initialize(root = SitemapGenerator.root)
+      @root = root
+    end
+
+    # Return the full path to a template.
+    #
+    # <tt>file</tt> template symbol e.g. <tt>:sitemap_index</tt>
+    def template_path(template)
+      File.join(@root, 'templates', self.class::FILES[template])
+    end
+
+    protected
+
+    # Read the template file and return its contents.
+    def read_template(template)
+      File.read(template_path(template))
+    end
+  end
+end

data/lib/sitemap_generator/utilities.rb

@@ -0,0 +1,29 @@
+module SitemapGenerator
+  module Utilities
+    extend self
+
+    # Copy templates/sitemap.rb to config if not there yet.
+    def install_sitemap_rb
+      if File.exist?(File.join(RAILS_ROOT, 'config/sitemap.rb'))
+        puts "already exists: config/sitemap.rb, file not copied"
+      else
+        FileUtils.cp(
+          SitemapGenerator.templates.template_path(:sitemap_sample),
+          File.join(RAILS_ROOT, 'config/sitemap.rb'))
+        puts "created: config/sitemap.rb"
+      end
+    end
+
+    # Remove config/sitemap.rb if exists.
+    def uninstall_sitemap_rb
+      if File.exist?(File.join(RAILS_ROOT, 'config/sitemap.rb'))
+        File.rm(File.join(RAILS_ROOT, 'config/sitemap.rb'))
+      end
+    end
+
+    # Clean sitemap files in output directory.
+    def clean_files
+      FileUtils.rm(Dir[File.join(RAILS_ROOT, 'public/sitemap*.xml.gz')])
+    end
+  end
+end

data/rails/install.rb

@@ -1,2 +1,2 @@
 # Install hook code here
-SitemapGenerator::Sitemap.install_sitemap_rb
+SitemapGenerator::Utilities.install_sitemap_rb

data/rails/uninstall.rb

@@ -1,2 +1,2 @@
 # Uninstall hook code here
-SitemapGenerator::Sitemap.uninstall_sitemap_rb
+SitemapGenerator::Utilities.uninstall_sitemap_rb

data/tasks/sitemap_generator_tasks.rake

@@ -1,15 +1,19 @@
 require 'zlib'
-require 'sitemap_generator'
+begin
+  require 'sitemap_generator'
+rescue LoadError, NameError
+  # Application should work without vlad
+end
 
 namespace :sitemap do
   desc "Install a default config/sitemap.rb file"
   task :install do
-    SitemapGenerator::Sitemap.install_sitemap_rb
+    SitemapGenerator::Utilities.install_sitemap_rb
   end
 
   desc "Delete all Sitemap files in public/ directory"
   task :clean do
-    SitemapGenerator::Sitemap.clean_files
+    SitemapGenerator::Utilities.clean_files
   end
 
   desc "Create Sitemap XML files in public/ directory (rake -s for no output)"
@@ -32,7 +36,8 @@ namespace :sitemap do
       SitemapGenerator::Sitemap.class_eval do
         include ActionController::UrlWriter
       end
-    end    
+    end
     SitemapGenerator::Sitemap.create_files
   end
 end
+

data/templates/sitemap.rb

@@ -10,12 +10,12 @@ SitemapGenerator::Sitemap.add_links do |sitemap|
   # Usage: sitemap.add path, options
   #        (default options are used if you don't specify)
   #
-  # Defaults: :priority => 0.5, :changefreq => 'weekly', 
+  # Defaults: :priority => 0.5, :changefreq => 'weekly',
   #           :lastmod => Time.now, :host => default_host
 
-  
+
   # Examples:
-  
+
   # add '/articles'
   sitemap.add articles_path, :priority => 0.7, :changefreq => 'daily'
 
@@ -26,17 +26,17 @@ SitemapGenerator::Sitemap.add_links do |sitemap|
 
   # add merchant path
   sitemap.add '/purchase', :priority => 0.7, :host => "https://www.example.com"
-  
+
 end
 
 # Including Sitemaps from Rails Engines.
 #
-# These Sitemaps should be almost identical to a regular Sitemap file except 
+# These Sitemaps should be almost identical to a regular Sitemap file except
 # they needn't define their own SitemapGenerator::Sitemap.default_host since
 # they will undoubtedly share the host name of the application they belong to.
 #
 # As an example, say we have a Rails Engine in vendor/plugins/cadability_client
 # We can include its Sitemap here as follows:
-# 
+#
 # file = File.join(Rails.root, 'vendor/plugins/cadability_client/config/sitemap.rb')
 # eval(open(file).read, binding, file)

data/templates/sitemap_index.builder

@@ -1,4 +1,4 @@
-
+# encoding: utf-8
 # <?xml version="1.0" encoding="UTF-8"?>
 # <sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 #    <sitemap>
@@ -19,4 +19,5 @@ xml.sitemapindex "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
       xml.lastmod w3c_date(File.mtime(file))
     end
   end
-end
+end
+

data/templates/xml_sitemap.builder

@@ -1,15 +1,38 @@
+# encoding: utf-8
 xml.instruct!
-xml.urlset "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance", 
-  "xsi:schemaLocation" => "http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd", 
+xml.urlset "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance",
+  "xsi:schemaLocation" => "http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd",
+  "xmlns:image" => "http://www.google.com/schemas/sitemap-image/1.1",
   "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
 
-  links.each do |link|
-    xml.url do
-      xml.loc        link[:loc]
-      xml.lastmod    w3c_date(link[:lastmod]) if link[:lastmod]
-      xml.changefreq link[:changefreq]        if link[:changefreq]
-      xml.priority   link[:priority]          if link[:priority]
-    end 
-  end
+    links.each_with_index do |link,index|
+      buffer_url = ""
+      url = Builder::XmlMarkup.new(:target=>buffer_url)
+      url.url do
+        url.loc        link[:loc]
+        url.lastmod    w3c_date(link[:lastmod])   if link[:lastmod]
+        url.changefreq link[:changefreq]          if link[:changefreq]
+        url.priority   link[:priority]            if link[:priority]
 
+        unless link[:images].blank?
+          link[:images].each do |image|
+            url.image:image do
+              url.image :loc, image[:loc]
+              url.image :caption, image[:caption]             if image[:caption]
+              url.image :geo_location, image[:geo_location]   if image[:geo_location]
+              url.image :title, image[:title]                 if image[:title]
+              url.image :license, image[:license]             if image[:license]
+            end
+          end
+        end
+      end
+
+      if (buffer+buffer_url).size < 10.megabytes
+        xml << buffer_url
+      else
+        slice_index = index
+        break
+      end
+    end
 end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Adam Salter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-19 00:00:00 -07:00
+date: 2010-05-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id001
-description: A Rails 3-compatible gem to easily generate enterprise class Sitemaps readable by all search engines.  Automatically ping search engines to notify them of new sitemaps, including Google, Yahoo and Bing. Provides rake tasks to easily manage your sitemaps.  Won't clobber your old sitemaps if the new one fails to generate. Setup a cron schedule and never worry about your sitemaps again.
+description: A Rails 3-compatible gem/plugin to generate enterprise-class Sitemaps using a familiar Rails Routes-like DSL.  Sitemaps are readable by all search engines and adhere to the Sitemap protocol specification.  Automatically pings search engines to notify them of new sitemaps (including Google, Yahoo and Bing).  Provides rake tasks to easily manage your sitemaps.  Supports image sitemaps and handles millions of links.
 email: kjvarga@gmail.com
 executables: []
 
@@ -51,6 +51,8 @@ files:
 - lib/sitemap_generator/rails_helper.rb
 - lib/sitemap_generator/railtie.rb
 - lib/sitemap_generator/tasks.rb
+- lib/sitemap_generator/templates.rb
+- lib/sitemap_generator/utilities.rb
 - rails/install.rb
 - rails/uninstall.rb
 - tasks/sitemap_generator_tasks.rake
@@ -86,6 +88,6 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Easily generate enterprise class Sitemaps for your Rails site using a simple 'Rails Routes'-like DSL and a single Rake task
+summary: Easily generate enterprise class Sitemaps for your Rails site using a familiar Rails Routes-like DSL
 test_files: []