sitemap_generator 5.0.0.beta → 5.0.0.beta1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ./
   specs:
-    sitemap_generator (5.0.0.beta)
+    sitemap_generator (5.0.0.beta1)
       builder
 
 GEM

data/VERSION

@@ -1 +1 @@
-5.0.0.beta
+5.0.0.beta1

data/lib/sitemap_generator/builder/sitemap_file.rb

@@ -42,7 +42,7 @@ module SitemapGenerator
         HTML
         @xml_wrapper_start.gsub!(/\s+/, ' ').gsub!(/ *> */, '>').strip!
         @xml_wrapper_end   = %q[</urlset>]
-        @filesize = bytesize(@xml_wrapper_start) + bytesize(@xml_wrapper_end)
+        @filesize = SitemapGenerator::Utilities.bytesize(@xml_wrapper_start) + SitemapGenerator::Utilities.bytesize(@xml_wrapper_end)
         @written = false
         @reserved_name = nil # holds the name reserved from the namer
         @frozen = false      # rather than actually freeze, use this boolean
@@ -66,7 +66,7 @@ module SitemapGenerator
       # of <tt>bytes</tt> bytes in size.  You can also pass a string and the
       # bytesize will be calculated for you.
       def file_can_fit?(bytes)
-        bytes = bytes.is_a?(String) ? bytesize(bytes) : bytes
+        bytes = bytes.is_a?(String) ? SitemapGenerator::Utilities.bytesize(bytes) : bytes
         (@filesize + bytes) < SitemapGenerator::MAX_SITEMAP_FILESIZE && @link_count < SitemapGenerator::MAX_SITEMAP_LINKS && @news_count < SitemapGenerator::MAX_SITEMAP_NEWS
       end
 
@@ -108,7 +108,7 @@ module SitemapGenerator
 
         # Add the XML to the sitemap
         @xml_content << xml
-        @filesize += bytesize(xml)
+        @filesize += SitemapGenerator::Utilities.bytesize(xml)
         @link_count += 1
       end
 
@@ -136,7 +136,7 @@ module SitemapGenerator
         raise SitemapGenerator::SitemapError.new("Sitemap already written!") if written?
         finalize! unless finalized?
         reserve_name
-        @location.write(@xml_wrapper_start + @xml_content + @xml_wrapper_end)
+        @location.write(@xml_wrapper_start + @xml_content + @xml_wrapper_end, link_count)
         @xml_content = @xml_wrapper_start = @xml_wrapper_end = ''
         @written = true
       end
@@ -164,23 +164,6 @@ module SitemapGenerator
         location.delete(:filename) if location.namer
         self.class.new(location)
       end
-
-      protected
-
-      # Replace the last 3 characters of string with ... if the string is as big
-      # or bigger than max.
-      def ellipsis(string, max)
-        if string.size > max
-          (string[0, max - 3] || '') + '...'
-        else
-          string
-        end
-      end
-
-      # Return the bytesize length of the string.  Ruby 1.8.6 compatible.
-      def bytesize(string)
-        string.respond_to?(:bytesize) ? string.bytesize : string.length
-      end
     end
   end
 end

data/lib/sitemap_generator/builder/sitemap_index_file.rb

@@ -22,7 +22,7 @@ module SitemapGenerator
         HTML
         @xml_wrapper_start.gsub!(/\s+/, ' ').gsub!(/ *> */, '>').strip!
         @xml_wrapper_end   = %q[</sitemapindex>]
-        @filesize = bytesize(@xml_wrapper_start) + bytesize(@xml_wrapper_end)
+        @filesize = SitemapGenerator::Utilities.bytesize(@xml_wrapper_start) + SitemapGenerator::Utilities.bytesize(@xml_wrapper_end)
         @written = false
         @reserved_name = nil # holds the name reserved from the namer
         @frozen = false      # rather than actually freeze, use this boolean
@@ -84,7 +84,7 @@ module SitemapGenerator
       # of <tt>bytes</tt> bytes in size.  You can also pass a string and the
       # bytesize will be calculated for you.
       def file_can_fit?(bytes)
-        bytes = bytes.is_a?(String) ? bytesize(bytes) : bytes
+        bytes = bytes.is_a?(String) ? SitemapGenerator::Utilities.bytesize(bytes) : bytes
         (@filesize + bytes) < SitemapGenerator::MAX_SITEMAP_FILESIZE && @link_count < SitemapGenerator::MAX_SITEMAP_FILES
       end
 

data/lib/sitemap_generator/sitemap_location.rb

@@ -150,16 +150,17 @@ module SitemapGenerator
 
     # Write `data` out to a file.
     # Output a summary line if verbose is true.
-    def write(data)
+    def write(data, link_count)
       adapter.write(self, data)
-      puts summary if verbose?
+      puts summary(link_count) if verbose?
     end
 
     # Return a summary string
-    def summary
+    def summary(link_count)
       filesize = number_to_human_size(self.filesize)
-      path = ellipsis(self.path_in_public, self::PATH_OUTPUT_WIDTH)
-      "+ #{'%-'+self::PATH_OUTPUT_WIDTH+'s' % path} #{'%10s' % @link_count} links / #{'%10s' % filesize}"
+      width = self.class::PATH_OUTPUT_WIDTH
+      path = SitemapGenerator::Utilities.ellipsis(self.path_in_public, width)
+      "+ #{('%-'+width.to_s+'s') % path} #{'%10s' % link_count} links / #{'%10s' % filesize}"
     end
   end
 
@@ -181,10 +182,11 @@ module SitemapGenerator
     end
 
     # Return a summary string
-    def summary
+    def summary(link_count)
       filesize = number_to_human_size(self.filesize)
-      path = ellipsis(self.path_in_public, self::PATH_OUTPUT_WIDTH - 3)
-      "+ #{'%-'+self::PATH_OUTPUT_WIDTH+'s' % path} #{'%10s' % @link_count} sitemaps / #{'%10s' % filesize}"
+      width = self.class::PATH_OUTPUT_WIDTH - 3
+      path = SitemapGenerator::Utilities.ellipsis(self.path_in_public, width)
+      "+ #{('%-'+width.to_s+'s') % path} #{'%10s' % link_count} sitemaps / #{'%10s' % filesize}"
     end
   end
 end

data/lib/sitemap_generator/utilities.rb

@@ -60,7 +60,7 @@ module SitemapGenerator
         [value]
       end
     end
-    
+
     # Rounds the float with the specified precision.
     #
     #   x = 1.337
@@ -151,7 +151,7 @@ module SitemapGenerator
     def falsy?(value)
       ['0', 0, 'f', 'false', false].include?(value)
     end
-    
+
     # Append a slash to `path` if it does not already end in a slash.
     # Returns a string.  Expects a string or Pathname object.
     def append_slash(path)
@@ -159,8 +159,23 @@ module SitemapGenerator
       if strpath[-1] != nil && strpath[-1].chr != '/'
         strpath + '/'
       else
-        strpath 
+        strpath
+      end
+    end
+
+    # Replace the last 3 characters of string with ... if the string is as big
+    # or bigger than max.
+    def ellipsis(string, max)
+      if string.size > max
+        (string[0, max - 3] || '') + '...'
+      else
+        string
       end
     end
+
+    # Return the bytesize length of the string.  Ruby 1.8.6 compatible.
+    def bytesize(string)
+      string.respond_to?(:bytesize) ? string.bytesize : string.length
+    end
   end
 end

data/spec/sitemap_generator/builder/sitemap_file_spec.rb

@@ -107,26 +107,4 @@ describe 'SitemapGenerator::Builder::SitemapFile' do
       sitemap.add '/one'
     end
   end
-
-  describe "ellipsis" do
-    it "should not modify when less than or equal to max" do
-      (1..10).each do |i|
-        string = 'a'*i
-        sitemap.send(:ellipsis, string, 10).should == string
-      end
-    end
-
-    it "should replace last 3 characters with ellipsis when greater than max" do
-      (1..5).each do |i|
-        string = 'aaaaa' + 'a'*i
-        sitemap.send(:ellipsis, string, 5).should == 'aa...'
-      end
-    end
-
-    it "should not freak out when string too small" do
-      sitemap.send(:ellipsis, 'a', 1).should == 'a'
-      sitemap.send(:ellipsis, 'aa', 1).should == '...'
-      sitemap.send(:ellipsis, 'aaa', 1).should == '...'
-    end
-  end
 end

data/spec/sitemap_generator/sitemap_location_spec.rb

@@ -149,14 +149,14 @@ describe SitemapGenerator::SitemapLocation do
       location = SitemapGenerator::SitemapLocation.new(:public_path => 'public/', :verbose => true)
       location.adapter.stubs(:write)
       location.expects(:summary)
-      location.write('data')
+      location.write('data', 1)
     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')
+      location.write('data', 1)
     end
   end
 
@@ -185,6 +185,17 @@ describe SitemapGenerator::SitemapLocation do
       location.filename.should == 'sitemap.xml.gz'
     end
   end
+
+  describe "when not compressing" do
+    it "the URL should point to the uncompressed file" do
+      location = SitemapGenerator::SitemapLocation.new(
+        :namer => SitemapGenerator::SimpleNamer.new(:sitemap),
+        :host => 'http://example.com',
+        :compress => false
+      )
+      location.url.should == 'http://example.com/sitemap.xml'
+    end
+  end
 end
 
 describe SitemapGenerator::SitemapIndexLocation do

data/spec/sitemap_generator/utilities_spec.rb

@@ -66,7 +66,7 @@ describe SitemapGenerator::Utilities do
       SitemapGenerator::Utilities.as_array({}).should == [{}]
     end
   end
-  
+
   describe "append_slash" do
     SitemapGenerator::Utilities.append_slash('').should == ''
     SitemapGenerator::Utilities.append_slash(nil).should == ''
@@ -76,4 +76,26 @@ describe SitemapGenerator::Utilities do
     SitemapGenerator::Utilities.append_slash('tmp/').should == 'tmp/'
     SitemapGenerator::Utilities.append_slash(Pathname.new('tmp/')).should == 'tmp/'
   end
+
+  describe "ellipsis" do
+    it "should not modify when less than or equal to max" do
+      (1..10).each do |i|
+        string = 'a'*i
+        SitemapGenerator::Utilities.ellipsis(string, 10).should == string
+      end
+    end
+
+    it "should replace last 3 characters with ellipsis when greater than max" do
+      (1..5).each do |i|
+        string = 'aaaaa' + 'a'*i
+        SitemapGenerator::Utilities.ellipsis(string, 5).should == 'aa...'
+      end
+    end
+
+    it "should not freak out when string too small" do
+      SitemapGenerator::Utilities.ellipsis('a', 1).should == 'a'
+      SitemapGenerator::Utilities.ellipsis('aa', 1).should == '...'
+      SitemapGenerator::Utilities.ellipsis('aaa', 1).should == '...'
+    end
+  end
 end

metadata

@@ -7,7 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  version: 5.0.0.beta
+  - 1
+  version: 5.0.0.beta1
 platform: ruby
 authors: 
 - Karl Varga
@@ -175,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -334787337373282166
+      hash: -4596845010722426093
       segments: 
       - 0
       version: "0"