sitemap_generator 4.0.alpha → 4.0

data/spec/sitemap_generator/sitemap_groups_spec.rb

@@ -10,48 +10,57 @@ def with_max_links(num)
 end
 
 describe "Sitemap Groups" do
+  let(:linkset) { ::SitemapGenerator::LinkSet.new(:default_host => 'http://test.com') }
+
   before :each do
-    @sm = ::SitemapGenerator::LinkSet.new(:default_host => 'http://test.com')
     FileUtils.rm_rf(SitemapGenerator.app.root + 'public/')
   end
 
   it "should not finalize the default sitemap if using groups" do
-    @sm.create do
+    linkset.create do
       group(:filename => :sitemap_en) do
         add '/en'
       end
     end
-
-    file_should_exist(SitemapGenerator.app.root + 'public/sitemap_index.xml.gz')
-    file_should_exist(SitemapGenerator.app.root + 'public/sitemap_en1.xml.gz')
+    file_should_exist(SitemapGenerator.app.root + 'public/sitemap.xml.gz')
+    file_should_exist(SitemapGenerator.app.root + 'public/sitemap_en.xml.gz')
     file_should_not_exist(SitemapGenerator.app.root + 'public/sitemap1.xml.gz')
   end
 
+  it "should not write out empty groups" do
+    linkset.create do
+      group(:filename => :sitemap_en) { }
+    end
+    file_should_not_exist(SitemapGenerator.app.root + 'public/sitemap_en.xml.gz')
+  end
+
   it "should add default links if no groups are created" do
-    @sm.create do
+    linkset.create do
     end
-    @sm.link_count.should == 1
-    file_should_exist(SitemapGenerator.app.root + 'public/sitemap_index.xml.gz')
-    file_should_exist(SitemapGenerator.app.root + 'public/sitemap1.xml.gz')
+    linkset.link_count.should == 1
+    file_should_exist(SitemapGenerator.app.root + 'public/sitemap.xml.gz')
+    file_should_not_exist(SitemapGenerator.app.root + 'public/sitemap1.xml.gz')
   end
 
   it "should add links to the default sitemap" do
-    @sm.create do
+    linkset.create do
       add '/before'
-      group(:filename => :sitemap_en) { }
+      group(:filename => :sitemap_en) do
+        add '/link'
+      end
       add '/after'
     end
-    @sm.link_count.should == 3
-    file_should_exist(SitemapGenerator.app.root + 'public/sitemap_index.xml.gz')
+    linkset.link_count.should == 4
+    file_should_exist(SitemapGenerator.app.root + 'public/sitemap.xml.gz')
     file_should_exist(SitemapGenerator.app.root + 'public/sitemap1.xml.gz')
-    file_should_exist(SitemapGenerator.app.root + 'public/sitemap_en1.xml.gz')
+    file_should_exist(SitemapGenerator.app.root + 'public/sitemap_en.xml.gz')
   end
 
   it "should rollover when sitemaps are full" do
     with_max_links(1) {
-      @sm.include_index = false
-      @sm.include_root = false
-      @sm.create do
+      linkset.include_index = false
+      linkset.include_root = false
+      linkset.create do
         add '/before'
         group(:filename => :sitemap_en, :sitemaps_path => 'en/') do
           add '/one'
@@ -60,18 +69,18 @@ describe "Sitemap Groups" do
         add '/after'
       end
     }
-    @sm.link_count.should == 4
-    file_should_exist(SitemapGenerator.app.root + 'public/sitemap_index.xml.gz')
+    linkset.link_count.should == 4
+    file_should_exist(SitemapGenerator.app.root + 'public/sitemap.xml.gz')
     file_should_exist(SitemapGenerator.app.root + 'public/sitemap1.xml.gz')
     file_should_exist(SitemapGenerator.app.root + 'public/sitemap2.xml.gz')
     file_should_not_exist(SitemapGenerator.app.root + 'public/sitemap3.xml.gz')
+    file_should_exist(SitemapGenerator.app.root + 'public/en/sitemap_en.xml.gz')
     file_should_exist(SitemapGenerator.app.root + 'public/en/sitemap_en1.xml.gz')
-    file_should_exist(SitemapGenerator.app.root + 'public/en/sitemap_en2.xml.gz')
-    file_should_not_exist(SitemapGenerator.app.root + 'public/en/sitemap_en3.xml.gz')
+    file_should_not_exist(SitemapGenerator.app.root + 'public/en/sitemap_en2.xml.gz')
   end
 
   it "should support multiple groups" do
-    @sm.create do
+    linkset.create do
       group(:filename => :sitemap_en, :sitemaps_path => 'en/') do
         add '/one'
       end
@@ -79,55 +88,57 @@ describe "Sitemap Groups" do
         add '/one'
       end
     end
-    @sm.link_count.should == 2
-    file_should_exist(SitemapGenerator.app.root + 'public/sitemap_index.xml.gz')
-    file_should_exist(SitemapGenerator.app.root + 'public/en/sitemap_en1.xml.gz')
-    file_should_exist(SitemapGenerator.app.root + 'public/fr/sitemap_fr1.xml.gz')
+    linkset.link_count.should == 2
+    file_should_exist(SitemapGenerator.app.root + 'public/sitemap.xml.gz')
+    file_should_exist(SitemapGenerator.app.root + 'public/en/sitemap_en.xml.gz')
+    file_should_exist(SitemapGenerator.app.root + 'public/fr/sitemap_fr.xml.gz')
   end
 
-  it "the sitemap shouldn't be finalized if the groups don't conflict" do
-    @sm.create do
+  it "the sitemap shouldn't be finalized until the end if the groups don't conflict" do
+    linkset.create do
       add 'one'
       group(:filename => :first) { add '/two' }
       add 'three'
       group(:filename => :second) { add '/four' }
       add 'five'
     end
-    @sm.link_count.should == 6
-    file_should_exist(SitemapGenerator.app.root + 'public/sitemap_index.xml.gz')
+    linkset.link_count.should == 6
+    file_should_exist(SitemapGenerator.app.root + 'public/sitemap.xml.gz')
     file_should_exist(SitemapGenerator.app.root + 'public/sitemap1.xml.gz')
-    file_should_exist(SitemapGenerator.app.root + 'public/first1.xml.gz')
-    file_should_exist(SitemapGenerator.app.root + 'public/second1.xml.gz')
+    file_should_exist(SitemapGenerator.app.root + 'public/first.xml.gz')
+    file_should_exist(SitemapGenerator.app.root + 'public/second.xml.gz')
+    gzipped_xml_file_should_validate_against_schema(SitemapGenerator.app.root + 'public/sitemap.xml.gz', 'siteindex')
+    gzipped_xml_file_should_validate_against_schema(SitemapGenerator.app.root + 'public/sitemap1.xml.gz', 'sitemap')
   end
 
   it "groups should share the sitemap if the sitemap location is unchanged" do
-    @sm.create do
+    linkset.create do
       add 'one'
       group(:default_host => 'http://newhost.com') { add '/two' }
       add 'three'
       group(:default_host => 'http://betterhost.com') { add '/four' }
       add 'five'
     end
-    @sm.link_count.should == 6
-    file_should_exist(SitemapGenerator.app.root + 'public/sitemap_index.xml.gz')
-    file_should_exist(SitemapGenerator.app.root + 'public/sitemap1.xml.gz')
-    file_should_not_exist(SitemapGenerator.app.root + 'public/sitemap2.xml.gz')
+    linkset.link_count.should == 6
+    file_should_exist(SitemapGenerator.app.root + 'public/sitemap.xml.gz')
+    file_should_not_exist(SitemapGenerator.app.root + 'public/sitemap1.xml.gz')
+    gzipped_xml_file_should_validate_against_schema(SitemapGenerator.app.root + 'public/sitemap.xml.gz', 'sitemap')
   end
 
   it "sitemaps should be finalized if virtual location settings are changed" do
-    @sm.create do
+    linkset.create do
       add 'one'
       group(:sitemaps_path => :en) { add '/two' }
       add 'three'
       group(:sitemaps_host => 'http://newhost.com') { add '/four' }
       add 'five'
     end
-    @sm.link_count.should == 6
-    file_should_exist(SitemapGenerator.app.root + 'public/sitemap_index.xml.gz')
+    linkset.link_count.should == 6
+    file_should_exist(SitemapGenerator.app.root + 'public/sitemap.xml.gz')
     file_should_exist(SitemapGenerator.app.root + 'public/sitemap1.xml.gz')
     file_should_exist(SitemapGenerator.app.root + 'public/sitemap2.xml.gz')
     file_should_exist(SitemapGenerator.app.root + 'public/sitemap3.xml.gz')
     file_should_not_exist(SitemapGenerator.app.root + 'public/sitemap4.xml.gz')
-    file_should_exist(SitemapGenerator.app.root + 'public/en/sitemap1.xml.gz')
+    file_should_exist(SitemapGenerator.app.root + 'public/en/sitemap.xml.gz')
   end
 end

data/spec/sitemap_generator/sitemap_location_spec.rb

@@ -1,72 +1,64 @@
 require 'spec_helper'
 
 describe SitemapGenerator::SitemapLocation do
-  before :all do
-    @default_host = 'http://example.com'
-  end
-
+  let(:default_host) { 'http://example.com' }
+  let(:location)     { SitemapGenerator::SitemapLocation.new }
+  
   it "public_path should default to the public directory in the application root" do
-    @l = SitemapGenerator::SitemapLocation.new
-    @l.public_path.should == SitemapGenerator.app.root + 'public/'
+    location.public_path.should == SitemapGenerator.app.root + 'public/'
   end
 
   it "should have a default namer" do
-    @l = SitemapGenerator::SitemapLocation.new
-    @l[:namer].should_not be_nil
-    @l[:filename].should be_nil
-    @l.filename.should == 'sitemap1.xml.gz'
+    location[:namer].should_not be_nil
+    location[:filename].should be_nil
+    location.filename.should == 'sitemap1.xml.gz'
   end
 
   it "should require a filename" do
-    @l = SitemapGenerator::SitemapLocation.new
-    @l[:filename] = nil
+    location[:filename] = nil
     lambda {
-      @l.filename.should be_nil
+      location.filename.should be_nil
     }.should raise_error
   end
 
   it "should require a namer" do
-    @l = SitemapGenerator::SitemapLocation.new
-    @l[:namer] = nil
+    location[:namer] = nil
     lambda {
-      @l.filename.should be_nil
+      location.filename.should be_nil
     }.should raise_error
   end
-  
+
   it "should require a host" do
-    @l = SitemapGenerator::SitemapLocation.new(:filename => nil, :namer => nil)
+    location = SitemapGenerator::SitemapLocation.new(:filename => nil, :namer => nil)
     lambda {
-      @l.host.should be_nil
+      location.host.should be_nil
     }.should raise_error
   end
 
   it "should accept a Namer option" do
     @namer = SitemapGenerator::SitemapNamer.new(:xxx)
-    @l = SitemapGenerator::SitemapLocation.new(:namer => @namer)
-    @l.filename.should == @namer.to_s
+    location = SitemapGenerator::SitemapLocation.new(:namer => @namer)
+    location.filename.should == @namer.to_s
   end
 
   it "should protect the filename from further changes in the Namer" do
     @namer = SitemapGenerator::SitemapNamer.new(:xxx)
-    @l = SitemapGenerator::SitemapLocation.new(:namer => @namer)
-    @l.filename.should == @namer.to_s
+    location = SitemapGenerator::SitemapLocation.new(:namer => @namer)
+    location.filename.should == @namer.to_s
     @namer.next
-    @l.filename.should == @namer.previous.to_s
+    location.filename.should == @namer.previous.to_s
   end
 
   it "should allow changing the namer" do
     @namer1 = SitemapGenerator::SitemapNamer.new(:xxx)
-    @l = SitemapGenerator::SitemapLocation.new(:namer => @namer1)
-    @l.filename.should == @namer1.to_s
+    location = SitemapGenerator::SitemapLocation.new(:namer => @namer1)
+    location.filename.should == @namer1.to_s
     @namer2 = SitemapGenerator::SitemapNamer.new(:yyy)
-    @l[:namer] = @namer2
-    @l.filename.should == @namer2.to_s
+    location[:namer] = @namer2
+    location.filename.should == @namer2.to_s
   end
 
   describe "testing options and #with" do
-    before :all do
-      @l = SitemapGenerator::SitemapLocation.new
-    end
 
     # Array of tuples with instance options and expected method return values
     tests = [
@@ -94,7 +86,7 @@ describe SitemapGenerator::SitemapLocation do
     tests.each do |opts, returns|
       returns.each do |method, value|
         it "#{method} should return #{value}" do
-          @l.with(opts).send(method).should == value
+          location.with(opts).send(method).should == value
         end
       end
     end
@@ -102,23 +94,33 @@ describe SitemapGenerator::SitemapLocation do
 
   describe "when duplicated" do
     it "should not inherit some objects" do
-      @l = SitemapGenerator::SitemapLocation.new(:filename => 'xxx', :host => @default_host, :public_path => 'public/')
-      @l.url.should == @default_host+'/xxx'
-      @l.public_path.to_s.should == 'public/'
-      dup = @l.dup
-      dup.url.should == @l.url
-      dup.url.should_not be(@l.url)
-      dup.public_path.to_s.should == @l.public_path.to_s
-      dup.public_path.should_not be(@l.public_path)
+      location = SitemapGenerator::SitemapLocation.new(:filename => 'xxx', :host => default_host, :public_path => 'public/')
+      location.url.should == default_host+'/xxx'
+      location.public_path.to_s.should == 'public/'
+      dup = location.dup
+      dup.url.should == location.url
+      dup.url.should_not be(location.url)
+      dup.public_path.to_s.should == location.public_path.to_s
+      dup.public_path.should_not be(location.public_path)
+    end
+  end
+
+  describe "filesize" do
+    it "should read the size of the file at path" do
+      location.expects(:path).returns('/somepath')
+      File.expects(:size?).with('/somepath')
+      location.filesize
     end
   end
 end
 
 describe SitemapGenerator::SitemapIndexLocation do
+  let(:location)     { SitemapGenerator::SitemapIndexLocation.new }
+
   it "should have a default namer" do
-    @l = SitemapGenerator::SitemapIndexLocation.new
-    @l[:namer].should_not be_nil
-    @l[:filename].should be_nil
-    @l.filename.should == 'sitemap_index.xml.gz'
+    location = SitemapGenerator::SitemapIndexLocation.new
+    location[:namer].should_not be_nil
+    location[:filename].should be_nil
+    location.filename.should == 'sitemap.xml.gz'
   end
 end

data/spec/sitemap_generator/sitemap_namer_spec.rb

@@ -66,6 +66,7 @@ describe SitemapGenerator::SitemapIndexNamer do
     namer.to_s.should == default
     namer.next.to_s.should == default
     namer.previous.to_s.should == default
+    SitemapGenerator::SitemapIndexNamer.new(:sitemap).to_s.should == 'sitemap.xml.gz'
   end
 end
 
@@ -148,5 +149,18 @@ describe SitemapGenerator::SimpleNamer do
       namer.to_s.should == "sitemap_index.xml.gz"
       namer.next.to_s.should == "sitemap1.xml.gz"
     end
+
+    it "as a symbol" do
+      namer = SitemapGenerator::SimpleNamer.new(:sitemap, :zero => :index)
+      namer.to_s.should == "sitemapindex.xml.gz"
+      namer.next.to_s.should == "sitemap1.xml.gz"
+    end
+
+    it "with a starting index" do
+      namer = SitemapGenerator::SimpleNamer.new(:sitemap, :zero => 'abc', :start => 10)
+      namer.to_s.should == "sitemapabc.xml.gz"
+      namer.next.to_s.should == "sitemap10.xml.gz"
+      namer.next.to_s.should == "sitemap11.xml.gz"
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+# require 'simplecov'
+# SimpleCov.start
+
 require "bundler/setup"
 Bundler.require
 require 'rspec/autorun'

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: sitemap_generator
 version: !ruby/object:Gem::Version
-  version: 4.0.alpha
-  prerelease: 4
+  version: '4.0'
+  prerelease: 
 platform: ruby
 authors:
 - Karl Varga
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000Z
+date: 2013-05-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70243003001900 !ruby/object:Gem::Requirement
+  requirement: &70315214520780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243003001900
+  version_requirements: *70315214520780
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70243003001480 !ruby/object:Gem::Requirement
+  requirement: &70315214520340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243003001480
+  version_requirements: *70315214520340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70243003001060 !ruby/object:Gem::Requirement
+  requirement: &70315214519920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243003001060
+  version_requirements: *70315214519920
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70243003000640 !ruby/object:Gem::Requirement
+  requirement: &70315214519500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70243003000640
+  version_requirements: *70315214519500
 description: SitemapGenerator is an XML Sitemap generator written in Ruby with automatic
   Rails integration.  It supports Video, News, Image and Geo sitemaps and includes
   Rake tasks for managing your sitemaps.
@@ -148,13 +148,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1078666966814794365
+      hash: -1068224574561597238
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -1068224574561597238
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10