sitemap_generator 4.0.alpha → 4.0

data/spec/sitemap_generator/link_set_spec.rb

@@ -26,7 +26,7 @@ describe SitemapGenerator::LinkSet do
       :default_host  => nil,
       :include_index => false,
       :include_root  => true,
-      :create_index  => true
+      :create_index  => :auto
     }
 
     default_options.each do |option, value|
@@ -95,15 +95,15 @@ describe SitemapGenerator::LinkSet do
     it "should change when the sitemaps_path is changed" do
       ls.default_host = 'http://one.com'
       ls.sitemaps_path = 'sitemaps/'
-      ls.sitemap.location.url.should == 'http://one.com/sitemaps/sitemap1.xml.gz'
-      ls.sitemap_index.location.url.should == 'http://one.com/sitemaps/sitemap_index.xml.gz'
+      ls.sitemap.location.url.should == 'http://one.com/sitemaps/sitemap.xml.gz'
+      ls.sitemap_index.location.url.should == 'http://one.com/sitemaps/sitemap.xml.gz'
     end
   end
 
   describe "sitemap_index_url" do
     it "should return the url to the index file" do
       ls.default_host = default_host
-      ls.sitemap_index.location.url.should == "#{default_host}/sitemap_index.xml.gz"
+      ls.sitemap_index.location.url.should == "#{default_host}/sitemap.xml.gz"
       ls.sitemap_index_url.should == ls.sitemap_index.location.url
     end
   end
@@ -187,7 +187,7 @@ describe SitemapGenerator::LinkSet do
   end
 
   describe "when finalizing" do
-    let(:ls) { SitemapGenerator::LinkSet.new(:default_host => default_host, :verbose => true) }
+    let(:ls) { SitemapGenerator::LinkSet.new(:default_host => default_host, :verbose => true, :create_index => true) }
 
     it "should output summary lines" do
       ls.sitemap.expects(:summary)
@@ -230,7 +230,7 @@ describe SitemapGenerator::LinkSet do
     it "should not modify the index" do
       @ls.filename = :newname
       @ls.sitemap.location.filename.should =~ /newname/
-      @ls.sitemap_index.location.filename =~ /sitemap_index/
+      @ls.sitemap_index.location.filename =~ /sitemap/
     end
 
     it "should not modify the index" do
@@ -520,7 +520,7 @@ describe SitemapGenerator::LinkSet do
       ls.sitemaps_namer.should == namer
       ls.sitemap.location.namer.should == namer
       ls.sitemap.location.filename.should =~ /sitemap1_1/
-      ls.sitemap_index.location.filename.should =~ /sitemap1_index/
+      ls.sitemap_index.location.filename.should =~ /^sitemap1/
     end
 
     it "should support both sitemaps_namer and filename options no matter the order" do
@@ -530,7 +530,7 @@ describe SitemapGenerator::LinkSet do
       options[:filename] = "sitemap1"
       ls.create(options)
       ls.sitemap.location.filename.should =~ /sitemap1_1/
-      ls.sitemap_index.location.filename.should =~ /sitemap1_index/
+      ls.sitemap_index.location.filename.should =~ /^sitemap1/
     end
 
     it "should not modify the options hash" do
@@ -547,7 +547,7 @@ describe SitemapGenerator::LinkSet do
 
   describe "reset!" do
     it "should reset the sitemap namer" do
-      SitemapGenerator::Sitemap.sitemaps_namer.expects(:reset)
+      SitemapGenerator::Sitemap.namer.expects(:reset)
       SitemapGenerator::Sitemap.create(:default_host => 'http://cnn.com')
     end
 
@@ -556,6 +556,13 @@ describe SitemapGenerator::LinkSet do
       SitemapGenerator::Sitemap.create(:default_host => 'http://cnn.com')
       SitemapGenerator::Sitemap.instance_variable_set(:@added_default_links, false)
     end
+
+    it "should reset the deprecated sitemaps_namer, if set" do
+      ls.sitemaps_namer = stub(:reset => nil)
+      ls.sitemaps_namer.expects(:reset)
+      ls.send(:reset!)
+    end
+
   end
 
   describe "include_root?" do
@@ -720,6 +727,9 @@ describe SitemapGenerator::LinkSet do
   end
 
   describe "create_index" do
+    let(:location) { SitemapGenerator::SitemapLocation.new(:namer => SitemapGenerator::SitemapNamer.new(:sitemap), :public_path => 'tmp/', :sitemaps_path => 'test/', :host => 'http://example.com/') }
+    let(:sitemap)  { SitemapGenerator::Builder::SitemapFile.new(location) }
+
     describe "when false" do
       let(:ls)  { SitemapGenerator::LinkSet.new(:default_host => default_host, :create_index => false) }
 
@@ -762,19 +772,52 @@ describe SitemapGenerator::LinkSet do
         ls.send(:finalize_sitemap!)
       end
 
-      it "should not write the index when it has only one link" do
-        ls.sitemap_index.add '/test', :host => default_host
+      it "should write the index when a link is added manually" do
+        ls.sitemap_index.add '/test'
+        ls.sitemap_index.empty?.should be_false
+        ls.send(:finalize_sitemap_index!)
+        ls.sitemap_index.written?.should be_true
+      end
+
+      it "should not write the index when only one sitemap is added (considered internal usage)" do
+        ls.sitemap_index.add sitemap
         ls.sitemap_index.empty?.should be_false
         ls.send(:finalize_sitemap_index!)
         ls.sitemap_index.written?.should be_false
       end
 
+      it "should write the index when more than one sitemap is added (considered internal usage)" do
+        ls.sitemap_index.add sitemap
+        ls.sitemap_index.add sitemap.new
+        ls.send(:finalize_sitemap_index!)
+        ls.sitemap_index.written?.should be_true
+      end
+
       it "should write the index when it has more than one link" do
-        ls.sitemap_index.add '/test1', :host => default_host
-        ls.sitemap_index.add '/test2', :host => default_host
+        ls.sitemap_index.add '/test1'
+        ls.sitemap_index.add '/test2'
         ls.send(:finalize_sitemap_index!)
         ls.sitemap_index.written?.should be_true
       end
     end
   end
+      
+  describe "when sitemap empty" do
+    before :each do
+      ls.include_root = false
+    end
+    
+    it "should not be written" do
+      ls.sitemap.empty?.should be_true
+      ls.expects(:add_to_index).never
+      ls.send(:finalize_sitemap!)
+    end
+    
+    it "should be written" do
+      ls.sitemap.add '/test'
+      ls.sitemap.empty?.should be_false
+      ls.expects(:add_to_index).with(ls.sitemap)
+      ls.send(:finalize_sitemap!)
+    end
+  end
 end

data/spec/sitemap_generator/sitemap_generator_spec.rb

@@ -40,42 +40,77 @@ describe "SitemapGenerator" do
     end
   end
 
-  [:deprecated, :create].each do |extension|
-    describe "generate sitemap" do
-      before :all do
-        SitemapGenerator::Sitemap.reset!
-        clean_sitemap_files_from_rails_app
-        copy_sitemap_file_to_rails_app(extension)
-        with_max_links(10) { execute_sitemap_config }
-      end
+  describe "generate sitemap with deprecated config" do
+    before :all do
+      SitemapGenerator::Sitemap.reset!
+      clean_sitemap_files_from_rails_app
+      copy_sitemap_file_to_rails_app(:deprecated)
+      with_max_links(10) { execute_sitemap_config }
+    end
 
-      it "should create sitemaps" do
-        file_should_exist(rails_path('public/sitemap_index.xml.gz'))
-        file_should_exist(rails_path('public/sitemap1.xml.gz'))
-        file_should_exist(rails_path('public/sitemap2.xml.gz'))
-        file_should_not_exist(rails_path('public/sitemap3.xml.gz'))
-      end
+    it "should create sitemaps" do
+      file_should_exist(rails_path('public/sitemap_index.xml.gz'))
+      file_should_exist(rails_path('public/sitemap1.xml.gz'))
+      file_should_exist(rails_path('public/sitemap2.xml.gz'))
+      file_should_not_exist(rails_path('public/sitemap3.xml.gz'))
+    end
 
-      it "should have 13 links" do
-        SitemapGenerator::Sitemap.link_count.should == 13
-      end
+    it "should have 13 links" do
+      SitemapGenerator::Sitemap.link_count.should == 13
+    end
 
-      it "index XML should validate" do
-        gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap_index.xml.gz'), 'siteindex'
-      end
+    it "index XML should validate" do
+      gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap_index.xml.gz'), 'siteindex'
+    end
 
-      it "sitemap XML should validate" do
-        gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap1.xml.gz'), 'sitemap'
-        gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap2.xml.gz'), 'sitemap'
-      end
+    it "sitemap XML should validate" do
+      gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap1.xml.gz'), 'sitemap'
+      gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap2.xml.gz'), 'sitemap'
+    end
 
-      it "index XML should not have excess whitespace" do
-        gzipped_xml_file_should_have_minimal_whitespace rails_path('public/sitemap_index.xml.gz')
-      end
+    it "index XML should not have excess whitespace" do
+      gzipped_xml_file_should_have_minimal_whitespace rails_path('public/sitemap_index.xml.gz')
+    end
 
-      it "sitemap XML should not have excess whitespace" do
-        gzipped_xml_file_should_have_minimal_whitespace rails_path('public/sitemap1.xml.gz')
-      end
+    it "sitemap XML should not have excess whitespace" do
+      gzipped_xml_file_should_have_minimal_whitespace rails_path('public/sitemap1.xml.gz')
+    end
+  end
+
+  describe "generate sitemap with normal config" do
+    before :all do
+      SitemapGenerator::Sitemap.reset!
+      clean_sitemap_files_from_rails_app
+      copy_sitemap_file_to_rails_app(:create)
+      with_max_links(10) { execute_sitemap_config }
+    end
+
+    it "should create sitemaps" do
+      file_should_exist(rails_path('public/sitemap.xml.gz'))
+      file_should_exist(rails_path('public/sitemap1.xml.gz'))
+      file_should_exist(rails_path('public/sitemap2.xml.gz'))
+      file_should_not_exist(rails_path('public/sitemap3.xml.gz'))
+    end
+
+    it "should have 13 links" do
+      SitemapGenerator::Sitemap.link_count.should == 13
+    end
+
+    it "index XML should validate" do
+      gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap.xml.gz'), 'siteindex'
+    end
+
+    it "sitemap XML should validate" do
+      gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap1.xml.gz'), 'sitemap'
+      gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap2.xml.gz'), 'sitemap'
+    end
+
+    it "index XML should not have excess whitespace" do
+      gzipped_xml_file_should_have_minimal_whitespace rails_path('public/sitemap.xml.gz')
+    end
+
+    it "sitemap XML should not have excess whitespace" do
+      gzipped_xml_file_should_have_minimal_whitespace rails_path('public/sitemap1.xml.gz')
     end
   end
 
@@ -86,34 +121,35 @@ describe "SitemapGenerator" do
       copy_sitemap_file_to_rails_app(:groups)
       with_max_links(2) { execute_sitemap_config }
       @expected = %w[
-        public/en/xxx1.xml.gz
+        public/en/xxx.xml.gz
         public/fr/abc3.xml.gz
         public/fr/abc4.xml.gz
-        public/fr/new_sitemaps_index.xml.gz
+        public/fr/def.xml.gz
+        public/fr/new_sitemaps.xml.gz
         public/fr/new_sitemaps1.xml.gz
         public/fr/new_sitemaps2.xml.gz
         public/fr/new_sitemaps3.xml.gz
         public/fr/new_sitemaps4.xml.gz]
-      @sitemaps = (@expected - %w[public/fr/new_sitemaps_index.xml.gz])
+      @sitemaps = (@expected - %w[public/fr/new_sitemaps.xml.gz])
     end
 
     it "should create sitemaps" do
       @expected.each { |file| file_should_exist(rails_path(file)) }
       file_should_not_exist(rails_path('public/fr/new_sitemaps5.xml.gz'))
-      file_should_not_exist(rails_path('public/en/xxx2.xml.gz'))
+      file_should_not_exist(rails_path('public/en/xxx1.xml.gz'))
       file_should_not_exist(rails_path('public/fr/abc5.xml.gz'))
     end
 
-    it "should have 13 links" do
-      SitemapGenerator::Sitemap.link_count.should == 13
+    it "should have 16 links" do
+      SitemapGenerator::Sitemap.link_count.should == 16
     end
 
     it "index XML should validate" do
-      gzipped_xml_file_should_validate_against_schema rails_path('public/fr/new_sitemaps_index.xml.gz'), 'siteindex'
+      gzipped_xml_file_should_validate_against_schema rails_path('public/fr/new_sitemaps.xml.gz'), 'siteindex'
     end
 
     it "index XML should not have excess whitespace" do
-      gzipped_xml_file_should_have_minimal_whitespace rails_path('public/fr/new_sitemaps_index.xml.gz')
+      gzipped_xml_file_should_have_minimal_whitespace rails_path('public/fr/new_sitemaps.xml.gz')
     end
 
     it "sitemaps XML should validate" do
@@ -125,12 +161,119 @@ describe "SitemapGenerator" do
     end
   end
 
+  describe "should handle links added manually" do
+    before :each do
+      clean_sitemap_files_from_rails_app
+      ::SitemapGenerator::Sitemap.reset!
+      ::SitemapGenerator::Sitemap.default_host = "http://www.example.com"
+      ::SitemapGenerator::Sitemap.namer = ::SitemapGenerator::SimpleNamer.new(:sitemap, :start => 4)
+      ::SitemapGenerator::Sitemap.create do
+        3.times do |i|
+          add_to_index "sitemap#{i}.xml.gz"
+        end
+        add '/home'
+      end
+    end
+
+    it "should create the index and start the sitemap numbering from 4" do
+      file_should_exist(rails_path('public/sitemap.xml.gz'))
+      file_should_exist(rails_path('public/sitemap4.xml.gz'))
+      gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap.xml.gz'), 'siteindex'
+      gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap4.xml.gz'), 'sitemap'
+    end
+  end
+
+  describe "should handle links added manually" do
+    before :each do
+      clean_sitemap_files_from_rails_app
+      ::SitemapGenerator::Sitemap.reset!
+      ::SitemapGenerator::Sitemap.default_host = "http://www.example.com"
+      ::SitemapGenerator::Sitemap.include_root = false
+    end
+
+    it "should create the index" do
+      with_max_links(1) {
+        ::SitemapGenerator::Sitemap.create do
+          add_to_index "customsitemap.xml.gz"
+          add '/one'
+          add '/two'
+        end
+      }
+      file_should_exist(rails_path('public/sitemap.xml.gz'))
+      file_should_exist(rails_path('public/sitemap1.xml.gz'))
+      file_should_exist(rails_path('public/sitemap2.xml.gz'))
+      file_should_not_exist(rails_path('public/sitemap3.xml.gz'))
+      gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap.xml.gz'), 'siteindex'
+    end
+
+    it "should create the index" do
+      with_max_links(1) {
+        ::SitemapGenerator::Sitemap.create do
+          add '/one'
+          add_to_index "customsitemap.xml.gz"
+          add '/two'
+        end
+      }
+      file_should_exist(rails_path('public/sitemap.xml.gz'))
+      file_should_exist(rails_path('public/sitemap1.xml.gz'))
+      file_should_exist(rails_path('public/sitemap2.xml.gz'))
+      file_should_not_exist(rails_path('public/sitemap3.xml.gz'))
+      gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap.xml.gz'), 'siteindex'
+    end
+
+    it "should create an index when only manually added links" do
+      with_max_links(1) {
+        ::SitemapGenerator::Sitemap.create(:create_index => :auto) do
+          add_to_index "customsitemap1.xml.gz"
+        end
+      }
+      file_should_exist(rails_path('public/sitemap.xml.gz'))
+      file_should_not_exist(rails_path('public/sitemap1.xml.gz'))
+      gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap.xml.gz'), 'siteindex'
+    end
+
+    it "should create an index when only manually added links" do
+      with_max_links(1) {
+        ::SitemapGenerator::Sitemap.create(:create_index => :auto) do
+          add_to_index "customsitemap1.xml.gz"
+          add_to_index "customsitemap2.xml.gz"
+          add_to_index "customsitemap3.xml.gz"
+        end
+      }
+      file_should_exist(rails_path('public/sitemap.xml.gz'))
+      file_should_not_exist(rails_path('public/sitemap1.xml.gz'))
+      gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap.xml.gz'), 'siteindex'
+    end
+
+    it "should not create an index" do
+      # Create index is explicity turned off and no links added to sitemap,
+      # respect the setting and don't create the index.  There is no sitemap file either.
+      ::SitemapGenerator::Sitemap.create(:create_index => false) do
+        add_to_index "customsitemap1.xml.gz"
+        add_to_index "customsitemap2.xml.gz"
+        add_to_index "customsitemap3.xml.gz"
+      end
+      file_should_not_exist(rails_path('public/sitemap.xml.gz'))
+      file_should_not_exist(rails_path('public/sitemap1.xml.gz'))
+    end
+
+    it "should not create an index" do
+      ::SitemapGenerator::Sitemap.create(:create_index => false) do
+        add '/one'
+      end
+      file_should_exist(rails_path('public/sitemap.xml.gz')) # the sitemap, not an index
+      file_should_not_exist(rails_path('public/sitemap1.xml.gz'))
+      gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap.xml.gz'), 'sitemap'
+    end
+  end
+
   describe "sitemap path" do
     before :each do
       clean_sitemap_files_from_rails_app
       ::SitemapGenerator::Sitemap.reset!
       ::SitemapGenerator::Sitemap.default_host = 'http://test.local'
       ::SitemapGenerator::Sitemap.filename = 'sitemap'
+      ::SitemapGenerator::Sitemap.create_index = true
     end
 
     it "should allow changing of the filename" do
@@ -138,7 +281,7 @@ describe "SitemapGenerator" do
         add '/goerss', :geo => { :format => 'georss' }
         add '/kml', :geo => { :format => 'kml' }
       end
-      file_should_exist(rails_path('public/geo_sitemap_index.xml.gz'))
+      file_should_exist(rails_path('public/geo_sitemap.xml.gz'))
       file_should_exist(rails_path('public/geo_sitemap1.xml.gz'))
     end
 
@@ -152,7 +295,7 @@ describe "SitemapGenerator" do
         add '/another'
       end
 
-      file_should_exist(rails_path('public/sitemaps/sitemap_index.xml.gz'))
+      file_should_exist(rails_path('public/sitemaps/sitemap.xml.gz'))
       file_should_exist(rails_path('public/sitemaps/sitemap1.xml.gz'))
     end
 
@@ -167,7 +310,7 @@ describe "SitemapGenerator" do
         add '/yet-another'
       end
 
-      file_should_exist(rails_path('public/sitemaps/deep/directory/sitemap_index.xml.gz'))
+      file_should_exist(rails_path('public/sitemaps/deep/directory/sitemap.xml.gz'))
       file_should_exist(rails_path('public/sitemaps/deep/directory/sitemap1.xml.gz'))
     end
   end
@@ -203,7 +346,6 @@ describe "SitemapGenerator" do
   end
 
   describe "create_index" do
-
     before :each do
       clean_sitemap_files_from_rails_app
     end
@@ -211,87 +353,92 @@ describe "SitemapGenerator" do
     describe "when true" do
       let(:ls) { SitemapGenerator::LinkSet.new(:include_root => false, :default_host => 'http://example.com', :create_index => true) }
 
-      it "should always create index" do
-        ls.create { }
-        file_should_exist(rails_path('public/sitemap_index.xml.gz'))
-        file_should_exist(rails_path('public/sitemap1.xml.gz'))
-        file_should_not_exist(rails_path('public/sitemap2.xml.gz'))
-      end
-
       it "should always create index" do
         with_max_links(1) do
           ls.create { add('/one') }
         end
-        file_should_exist(rails_path('public/sitemap_index.xml.gz'))
+        file_should_exist(rails_path('public/sitemap.xml.gz'))
         file_should_exist(rails_path('public/sitemap1.xml.gz'))
         file_should_not_exist(rails_path('public/sitemap2.xml.gz'))
+        gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap.xml.gz'), 'siteindex'
+        gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap1.xml.gz'), 'sitemap'
       end
 
       it "should always create index" do
         with_max_links(1) do
           ls.create { add('/one'); add('/two') }
         end
-        file_should_exist(rails_path('public/sitemap_index.xml.gz'))
+        file_should_exist(rails_path('public/sitemap.xml.gz'))
         file_should_exist(rails_path('public/sitemap1.xml.gz'))
         file_should_exist(rails_path('public/sitemap2.xml.gz'))
+        gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap.xml.gz'), 'siteindex'
+        gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap1.xml.gz'), 'sitemap'
+        gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap2.xml.gz'), 'sitemap'
       end
     end
 
     describe "when false" do
       let(:ls) { SitemapGenerator::LinkSet.new(:include_root => false, :default_host => 'http://example.com', :create_index => false) }
 
-      it "should never create index" do
-        ls.create { }
-        file_should_not_exist(rails_path('public/sitemap_index.xml.gz'))
-        file_should_exist(rails_path('public/sitemap1.xml.gz'))
-        file_should_not_exist(rails_path('public/sitemap2.xml.gz'))
-      end
-
       it "should never create index" do
         with_max_links(1) do
           ls.create { add('/one') }
         end
-        file_should_not_exist(rails_path('public/sitemap_index.xml.gz'))
-        file_should_exist(rails_path('public/sitemap1.xml.gz'))
-        file_should_not_exist(rails_path('public/sitemap2.xml.gz'))
+        file_should_exist(rails_path('public/sitemap.xml.gz'))
+        file_should_not_exist(rails_path('public/sitemap1.xml.gz'))
+        gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap.xml.gz'), 'sitemap'
       end
 
       it "should never create index" do
         with_max_links(1) do
           ls.create { add('/one'); add('/two') }
         end
-        file_should_not_exist(rails_path('public/sitemap_index.xml.gz'))
+        file_should_exist(rails_path('public/sitemap.xml.gz'))
         file_should_exist(rails_path('public/sitemap1.xml.gz'))
-        file_should_exist(rails_path('public/sitemap2.xml.gz'))
+        file_should_not_exist(rails_path('public/sitemap2.xml.gz'))
+        gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap.xml.gz'), 'sitemap'
+        gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap1.xml.gz'), 'sitemap'
       end
     end
 
     describe "when :auto" do
       let(:ls) { SitemapGenerator::LinkSet.new(:include_root => false, :default_host => 'http://example.com', :create_index => :auto) }
 
-      it "should not create index if one sitemap file" do
-        ls.create { }
-        file_should_not_exist(rails_path('public/sitemap_index.xml.gz'))
-        file_should_exist(rails_path('public/sitemap1.xml.gz'))
-        file_should_not_exist(rails_path('public/sitemap2.xml.gz'))
-      end
-
-      it "should not create index if one sitemap file" do
+      it "should not create index if only one sitemap file" do
         with_max_links(1) do
           ls.create { add('/one') }
         end
-        file_should_not_exist(rails_path('public/sitemap_index.xml.gz'))
-        file_should_exist(rails_path('public/sitemap1.xml.gz'))
-        file_should_not_exist(rails_path('public/sitemap2.xml.gz'))
+        file_should_exist(rails_path('public/sitemap.xml.gz'))
+        file_should_not_exist(rails_path('public/sitemap1.xml.gz'))
+        gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap.xml.gz'), 'sitemap'
       end
 
       it "should create index if more than one sitemap file" do
         with_max_links(1) do
           ls.create { add('/one'); add('/two') }
         end
-        file_should_exist(rails_path('public/sitemap_index.xml.gz'))
+        file_should_exist(rails_path('public/sitemap.xml.gz'))
         file_should_exist(rails_path('public/sitemap1.xml.gz'))
         file_should_exist(rails_path('public/sitemap2.xml.gz'))
+        file_should_not_exist(rails_path('public/sitemap3.xml.gz'))
+        gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap.xml.gz'), 'siteindex'
+        gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap1.xml.gz'), 'sitemap'
+        gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap2.xml.gz'), 'sitemap'
+      end
+
+      it "should create index if more than one group" do
+        with_max_links(1) do
+          ls.create do
+            group(:filename => :group1) { add('/one') };
+            group(:filename => :group2) { add('/two') };
+          end
+        end
+        file_should_exist(rails_path('public/sitemap.xml.gz'))
+        file_should_exist(rails_path('public/group1.xml.gz'))
+        file_should_exist(rails_path('public/group2.xml.gz'))
+        gzipped_xml_file_should_validate_against_schema rails_path('public/sitemap.xml.gz'), 'siteindex'
+        gzipped_xml_file_should_validate_against_schema rails_path('public/group1.xml.gz'), 'sitemap'
+        gzipped_xml_file_should_validate_against_schema rails_path('public/group2.xml.gz'), 'sitemap'
       end
     end
   end