sitemap_generator 4.3.1 → 5.0.0.beta

data/spec/sitemap_generator/sitemap_location_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe SitemapGenerator::SitemapLocation do
   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
     location.public_path.should == SitemapGenerator.app.root + 'public/'
   end
@@ -36,13 +36,13 @@ describe SitemapGenerator::SitemapLocation do
   end
 
   it "should accept a Namer option" do
-    @namer = SitemapGenerator::SitemapNamer.new(:xxx)
+    @namer = SitemapGenerator::SimpleNamer.new(:xxx)
     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)
+    @namer = SitemapGenerator::SimpleNamer.new(:xxx)
     location = SitemapGenerator::SitemapLocation.new(:namer => @namer)
     location.filename.should == @namer.to_s
     @namer.next
@@ -50,10 +50,10 @@ describe SitemapGenerator::SitemapLocation do
   end
 
   it "should allow changing the namer" do
-    @namer1 = SitemapGenerator::SitemapNamer.new(:xxx)
+    @namer1 = SitemapGenerator::SimpleNamer.new(:xxx)
     location = SitemapGenerator::SitemapLocation.new(:namer => @namer1)
     location.filename.should == @namer1.to_s
-    @namer2 = SitemapGenerator::SitemapNamer.new(:yyy)
+    @namer2 = SitemapGenerator::SimpleNamer.new(:yyy)
     location[:namer] = @namer2
     location.filename.should == @namer2.to_s
   end
@@ -65,22 +65,22 @@ describe SitemapGenerator::SitemapLocation do
       [{
         :sitemaps_path => nil,
         :public_path => '/public',
-        :filename => 'sitemap1.xml.gz',
+        :filename => 'sitemap.xml.gz',
         :host => 'http://test.com' },
-      { :url => 'http://test.com/sitemap1.xml.gz',
+      { :url => 'http://test.com/sitemap.xml.gz',
         :directory => '/public',
-        :path => '/public/sitemap1.xml.gz',
-        :path_in_public => 'sitemap1.xml.gz'
+        :path => '/public/sitemap.xml.gz',
+        :path_in_public => 'sitemap.xml.gz'
       }],
       [{
         :sitemaps_path => 'sitemaps/en/',
         :public_path => '/public/system/',
-        :filename => 'sitemap1.xml.gz',
+        :filename => 'sitemap.xml.gz',
         :host => 'http://test.com/plus/extra/' },
-      { :url => 'http://test.com/plus/extra/sitemaps/en/sitemap1.xml.gz',
+      { :url => 'http://test.com/plus/extra/sitemaps/en/sitemap.xml.gz',
         :directory => '/public/system/sitemaps/en',
-        :path => '/public/system/sitemaps/en/sitemap1.xml.gz',
-        :path_in_public => 'sitemaps/en/sitemap1.xml.gz'
+        :path => '/public/system/sitemaps/en/sitemap.xml.gz',
+        :path_in_public => 'sitemaps/en/sitemap.xml.gz'
       }]
     ]
     tests.each do |opts, returns|
@@ -112,7 +112,7 @@ describe SitemapGenerator::SitemapLocation do
       location.filesize
     end
   end
-  
+
   describe "public_path" do
     it "should append a trailing slash" do
       location = SitemapGenerator::SitemapLocation.new(:public_path => 'public/google')
@@ -123,7 +123,7 @@ describe SitemapGenerator::SitemapLocation do
       location.public_path.to_s.should == 'already/slashed/'
     end
   end
-  
+
   describe "sitemaps_path" do
     it "should append a trailing slash" do
       location = SitemapGenerator::SitemapLocation.new(:sitemaps_path => 'public/google')
@@ -134,15 +134,57 @@ describe SitemapGenerator::SitemapLocation do
       location.sitemaps_path.to_s.should == 'already/slashed/'
     end
   end
-  
+
   describe "url" do
     it "should handle paths not ending in slash" do
       location = SitemapGenerator::SitemapLocation.new(
-          :public_path => 'public/google', :filename => 'xxx', 
+          :public_path => 'public/google', :filename => 'xxx',
           :host => default_host, :sitemaps_path => 'sub/dir')
       location.url.should == default_host + '/sub/dir/xxx'
     end
   end
+
+  describe "write" do
+    it "should output summary line when verbose" do
+      location = SitemapGenerator::SitemapLocation.new(:public_path => 'public/', :verbose => true)
+      location.adapter.stubs(:write)
+      location.expects(:summary)
+      location.write('data')
+    end
+
+    it "should not output summary line when not verbose" do
+      location = SitemapGenerator::SitemapLocation.new(:public_path => 'public/', :verbose => false)
+      location.adapter.stubs(:write)
+      location.expects(:summary).never
+      location.write('data')
+    end
+  end
+
+  describe "filename" do
+    it "should strip gz extension if not compressing" do
+      location = SitemapGenerator::SitemapLocation.new(:namer => SitemapGenerator::SimpleNamer.new(:sitemap), :compress => false)
+      location.filename.should == 'sitemap.xml'
+    end
+
+    it "should not strip gz extension if compressing" do
+      location = SitemapGenerator::SitemapLocation.new(:namer => SitemapGenerator::SimpleNamer.new(:sitemap), :compress => true)
+      location.filename.should == 'sitemap.xml.gz'
+    end
+
+    it "should strip gz extension if :all_but_first and first file" do
+      namer = SitemapGenerator::SimpleNamer.new(:sitemap)
+      namer.stubs(:start?).returns(true)
+      location = SitemapGenerator::SitemapLocation.new(:namer => namer, :compress => :all_but_first)
+      location.filename.should == 'sitemap.xml'
+    end
+
+    it "should strip gz extension if :all_but_first and first file" do
+      namer = SitemapGenerator::SimpleNamer.new(:sitemap)
+      namer.stubs(:start?).returns(false)
+      location = SitemapGenerator::SitemapLocation.new(:namer => namer, :compress => :all_but_first)
+      location.filename.should == 'sitemap.xml.gz'
+    end
+  end
 end
 
 describe SitemapGenerator::SitemapIndexLocation do

data/spec/sitemap_generator/sitemap_namer_spec.rb

@@ -1,75 +1,5 @@
 require 'spec_helper'
 
-describe 'SitemapGenerator::SitemapNamer' do
-
-  it "should generate file names" do
-    namer = SitemapGenerator::SitemapNamer.new(:sitemap)
-    namer.to_s.should == "sitemap1.xml.gz"
-    namer.next.to_s.should == "sitemap2.xml.gz"
-    namer.next.to_s.should == "sitemap3.xml.gz"
-  end
-
-  it "should set the file extension" do
-    namer = SitemapGenerator::SitemapNamer.new(:sitemap, :extension => '.xyz')
-    namer.to_s.should == "sitemap1.xyz"
-    namer.next.to_s.should == "sitemap2.xyz"
-    namer.next.to_s.should == "sitemap3.xyz"
-  end
-
-  it "should set the starting index" do
-    namer = SitemapGenerator::SitemapNamer.new(:sitemap, :start => 10)
-    namer.to_s.should == "sitemap10.xml.gz"
-    namer.next.to_s.should == "sitemap11.xml.gz"
-    namer.next.to_s.should == "sitemap12.xml.gz"
-  end
-
-  it "should accept a string name" do
-    namer = SitemapGenerator::SitemapNamer.new('abc-def')
-    namer.to_s.should == "abc-def1.xml.gz"
-    namer.next.to_s.should == "abc-def2.xml.gz"
-    namer.next.to_s.should == "abc-def3.xml.gz"
-  end
-
-  it "should return previous name" do
-    namer = SitemapGenerator::SitemapNamer.new(:sitemap)
-    namer.to_s.should == "sitemap1.xml.gz"
-    namer.next.to_s.should == "sitemap2.xml.gz"
-    namer.previous.to_s.should == "sitemap1.xml.gz"
-    namer.next.to_s.should == "sitemap2.xml.gz"
-  end
-
-  it "should raise if already at the start" do
-    namer = SitemapGenerator::SitemapNamer.new(:sitemap)
-    namer.to_s.should == "sitemap1.xml.gz"
-    lambda { namer.previous }.should raise_error
-  end
-
-  it "should handle names with underscores" do
-    namer = SitemapGenerator::SitemapNamer.new("sitemap1_")
-    namer.to_s.should == "sitemap1_1.xml.gz"
-  end
-
-  it "should reset the namer" do
-    namer = SitemapGenerator::SitemapNamer.new(:sitemap)
-    namer.to_s.should == "sitemap1.xml.gz"
-    namer.next.to_s.should == "sitemap2.xml.gz"
-    namer.reset
-    namer.to_s.should == "sitemap1.xml.gz"
-    namer.next.to_s.should == "sitemap2.xml.gz"
-  end
-end
-
-describe SitemapGenerator::SitemapIndexNamer do
-  it "should always return the same name" do
-    default = "sitemap_index.xml.gz"
-    namer = SitemapGenerator::SitemapIndexNamer.new(:sitemap_index)
-    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
-
 describe SitemapGenerator::SimpleNamer do
   it "should generate file names" do
     namer = SitemapGenerator::SimpleNamer.new(:sitemap)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sitemap_generator
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
-  - 4
-  - 3
-  - 1
-  version: 4.3.1
+  - 5
+  - 0
+  - 0
+  - beta
+  version: 5.0.0.beta
 platform: ruby
 authors: 
 - Karl Varga
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-12-10 00:00:00 -08:00
+date: 2014-01-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,7 +115,6 @@ files:
 - templates/sitemap.rb
 - spec/blueprint.rb
 - spec/files/sitemap.create.rb
-- spec/files/sitemap.deprecated.rb
 - spec/files/sitemap.groups.rb
 - spec/sitemap_generator/adapters/s3_adapter_spec.rb
 - spec/sitemap_generator/alternate_sitemap_spec.rb
@@ -125,6 +125,7 @@ files:
 - spec/sitemap_generator/builder/sitemap_url_spec.rb
 - spec/sitemap_generator/core_ext/bigdecimal_spec.rb
 - spec/sitemap_generator/core_ext/numeric_spec.rb
+- spec/sitemap_generator/file_adaptor_spec.rb
 - spec/sitemap_generator/geo_sitemap_spec.rb
 - spec/sitemap_generator/helpers/number_helper_spec.rb
 - spec/sitemap_generator/interpreter_spec.rb
@@ -174,19 +175,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 556482523995297639
+      hash: -334787337373282166
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 556482523995297639
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -197,7 +199,6 @@ summary: Easily generate XML Sitemaps
 test_files: 
 - spec/blueprint.rb
 - spec/files/sitemap.create.rb
-- spec/files/sitemap.deprecated.rb
 - spec/files/sitemap.groups.rb
 - spec/sitemap_generator/adapters/s3_adapter_spec.rb
 - spec/sitemap_generator/alternate_sitemap_spec.rb
@@ -208,6 +209,7 @@ test_files:
 - spec/sitemap_generator/builder/sitemap_url_spec.rb
 - spec/sitemap_generator/core_ext/bigdecimal_spec.rb
 - spec/sitemap_generator/core_ext/numeric_spec.rb
+- spec/sitemap_generator/file_adaptor_spec.rb
 - spec/sitemap_generator/geo_sitemap_spec.rb
 - spec/sitemap_generator/helpers/number_helper_spec.rb
 - spec/sitemap_generator/interpreter_spec.rb

data/spec/files/sitemap.deprecated.rb

@@ -1,15 +0,0 @@
-SitemapGenerator::Sitemap.default_host = "http://www.example.com"
-SitemapGenerator::Sitemap.yahoo_app_id = false
-SitemapGenerator::Sitemap.create_index = true
-SitemapGenerator::Sitemap.namer = SitemapGenerator::SimpleNamer.new(:sitemap, :zero => '_index')
-
-SitemapGenerator::Sitemap.add_links do |sitemap|
-  sitemap.add '/contents', :priority => 0.7, :changefreq => 'daily'
-
-  # add all individual articles
-  (1..10).each do |i|
-    sitemap.add "/content/#{i}"
-  end
-
-  sitemap.add "/merchant_path", :host => "https://www.example.com"
-end