sitemap_generator 4.2.0 → 4.3.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ./
   specs:
-    sitemap_generator (4.2)
+    sitemap_generator (4.3.0)
       builder
 
 GEM

data/README.md

@@ -13,7 +13,7 @@ Sitemaps adhere to the [Sitemap 0.9 protocol][sitemap_protocol] specification.
 * Adheres to the [Sitemap 0.9 protocol][sitemap_protocol]
 * Handles millions of links
 * Automatically compresses your sitemaps
-* Notifies search engines (Google, Bing, SitemapWriter) of new sitemaps
+* Notifies search engines (Google, Bing) of new sitemaps
 * Ensures your old sitemaps stay in place if the new sitemap fails to generate
 * Gives you complete control over your sitemap contents and naming scheme
 * Intelligent sitemap indexing
@@ -57,7 +57,6 @@ Sitemap stats: 3 links / 1 sitemaps / 0m00s
 
 Successful ping of Google
 Successful ping of Bing
-Successful ping of Sitemap Writer
 ```
 
 
@@ -105,7 +104,8 @@ That's it!  Welcome to the future!
 
 ## Changelog
 
-* v4.2: Update Google ping URL.  Quote the ping URL in the output.  Support Video `video:price` element ([#117][https://github.com/kjvarga/sitemap_generator/issues/117]).  Support symbols as well as strings for most arguments to `add()` ([#113][https://github.com/kjvarga/sitemap_generator/issues/113]).  Ensure that `public_path` and `sitemaps_path` end with a slash (`/`) ([#113][https://github.com/kjvarga/sitemap_generator/issues/118]).
+* v4.3.0: Support `media` attibute on alternate links ([#125](https://github.com/kjvarga/sitemap_generator/issues/125)).  Changed `SitemapGenerator::S3Adapter` to write files in a single operation, avoiding potential permissions errors when listing a directory prior to writing ([#130](https://github.com/kjvarga/sitemap_generator/issues/130)).  Remove Sitemap Writer from ping task ([#129](https://github.com/kjvarga/sitemap_generator/issues/129)).  Support `url:expires` element ([#126](https://github.com/kjvarga/sitemap_generator/issues/126)).
+* v4.2.0: Update Google ping URL.  Quote the ping URL in the output.  Support Video `video:price` element ([#117](https://github.com/kjvarga/sitemap_generator/issues/117)).  Support symbols as well as strings for most arguments to `add()` ([#113](https://github.com/kjvarga/sitemap_generator/issues/113)).  Ensure that `public_path` and `sitemaps_path` end with a slash (`/`) ([#113](https://github.com/kjvarga/sitemap_generator/issues/118)).
 * v4.1.1: Support setting the S3 region.  Fixed bug where incorrect URL was being used in the ping to search engines - only affected sites with a single sitemap file and no index file.  Output the URL being pinged in the verbose output.  Test in Rails 4.
 * v4.1.0: [PageMap sitemap][using_pagemaps] support.  Tested with Rails 4 pre-release.
 * v4.0.1: Add a post install message regarding the naming convention change.
@@ -219,7 +219,7 @@ SitemapGenerator.verbose = false
 
 ### Pinging Search Engines
 
-Using `rake sitemap:refresh` will notify major search engines to let them know that a new sitemap is available (Google, Bing, SitemapWriter).  To generate new sitemaps without notifying search engines (for example when running in a local environment) use `rake sitemap:refresh:no_ping`.
+Using `rake sitemap:refresh` will notify major search engines to let them know that a new sitemap is available (Google, Bing).  To generate new sitemaps without notifying search engines (for example when running in a local environment) use `rake sitemap:refresh:no_ping`.
 
 If you want to customize the hash of search engines you can access it at:
 
@@ -272,6 +272,14 @@ You should add the URL of the sitemap index file to `public/robots.txt` to help
 Sitemap: http://www.example.com/sitemap.xml.gz
 ```
 
+### Ruby Modules
+
+If you need to include a module (e.g. a rails helper) you can add the following line:
+
+```ruby
+SitemapGenerator::Interpreter.send :include, RoutingHelper
+```
+
 ## Deployments & Capistrano
 
 To ensure that your application's sitemaps are available after a deployment you can do one of the following:
@@ -302,6 +310,7 @@ To ensure that your application's sitemaps are available after a deployment you
     end
     ```
 
+
 ### Sitemaps with no Index File
 
 The sitemap index file is created for you on-demand, meaning that if you have a large site with more than one sitemap file, you will have a sitemap index file to reference those sitemap files.  If however you have a small site with only one sitemap file, you don't require an index and so no index will be created.  In both cases the index and sitemap file's name, respectively, is `sitemap.xml.gz`.

data/VERSION

@@ -1 +1 @@
-4.2.0
+4.3.0

data/lib/sitemap_generator/adapters/s3_adapter.rb

@@ -1,4 +1,8 @@
-require 'fog'
+begin
+  require 'fog'
+rescue LoadError
+  raise LoadError.new("Missing required 'fog'.  Please 'gem install fog' and require it in your application.")
+end
 
 module SitemapGenerator
   class S3Adapter
@@ -15,7 +19,7 @@ module SitemapGenerator
     def write(location, raw_data)
       SitemapGenerator::FileAdapter.new.write(location, raw_data)
 
-      credentials = { 
+      credentials = {
         :aws_access_key_id     => @aws_access_key_id,
         :aws_secret_access_key => @aws_secret_access_key,
         :provider              => @fog_provider,
@@ -23,7 +27,7 @@ module SitemapGenerator
       credentials[:region] = @fog_region if @fog_region
 
       storage   = Fog::Storage.new(credentials)
-      directory = storage.directories.get(@fog_directory)
+      directory = storage.directories.new(:key => @fog_directory)
       directory.files.create(
         :key    => location.path_in_public,
         :body   => File.open(location.path),

data/lib/sitemap_generator/adapters/wave_adapter.rb

@@ -1,4 +1,8 @@
-require 'carrierwave'
+begin
+  require 'carrierwave'
+rescue LoadError
+  raise LoadError.new("Missing required 'carrierwave'.  Please 'gem install carrierwave' and require it in your application.")
+end
 
 module SitemapGenerator
   class WaveAdapter < ::CarrierWave::Uploader::Base

data/lib/sitemap_generator/builder/sitemap_url.rb

@@ -37,7 +37,7 @@ module SitemapGenerator
           path = sitemap.location.path_in_public
         end
 
-        SitemapGenerator::Utilities.assert_valid_keys(options, :priority, :changefreq, :lastmod, :host, :images, :video, :geo, :news, :videos, :mobile, :alternate, :alternates, :pagemap)
+        SitemapGenerator::Utilities.assert_valid_keys(options, :priority, :changefreq, :lastmod, :expires, :host, :images, :video, :geo, :news, :videos, :mobile, :alternate, :alternates, :pagemap)
         SitemapGenerator::Utilities.reverse_merge!(options, :priority => 0.5, :changefreq => 'weekly', :lastmod => Time.now, :images => [], :news => {}, :videos => [], :mobile => false, :alternates => [])
         raise "Cannot generate a url without a host" unless SitemapGenerator::Utilities.present?(options[:host])
 
@@ -54,6 +54,7 @@ module SitemapGenerator
           :priority   => options[:priority],
           :changefreq => options[:changefreq],
           :lastmod    => options[:lastmod],
+          :expires    => options[:expires],
           :host       => options[:host],
           :loc        => loc,
           :images     => prepare_images(options[:images], options[:host]),
@@ -72,6 +73,7 @@ module SitemapGenerator
         builder.url do
           builder.loc        self[:loc]
           builder.lastmod    w3c_date(self[:lastmod])      if self[:lastmod]
+          builder.expires    w3c_date(self[:expires])      if self[:expires]
           builder.changefreq self[:changefreq].to_s        if self[:changefreq]
           builder.priority   format_float(self[:priority]) if self[:priority]
 
@@ -132,7 +134,7 @@ module SitemapGenerator
 
           self[:alternates].each do |alternate|
             rel = alternate[:nofollow] ? 'alternate nofollow' : 'alternate'
-            builder.xhtml :link, :rel => rel, :hreflang => alternate[:lang].to_s, :href => alternate[:href].to_s
+            builder.xhtml :link, :rel => rel, :hreflang => alternate[:lang].to_s, :href => alternate[:href].to_s, :media => alternate[:media].to_s
           end
 
           unless SitemapGenerator::Utilities.blank?(self[:geo])
@@ -174,7 +176,7 @@ module SitemapGenerator
         attribs[:resolution] = video[:price_resolution] if SitemapGenerator::Utilities.present?(video[:price_resolution])
         attribs
       end
-      
+
       def prepare_news(news)
         SitemapGenerator::Utilities.assert_valid_keys(news, :publication_name, :publication_language, :publication_date, :genres, :access, :title, :keywords, :stock_tickers) unless news.empty?
         news

data/lib/sitemap_generator/builder/sitemap_url.rb.orig

@@ -0,0 +1,248 @@
+require 'builder'
+require 'uri'
+require 'time'
+require 'date'
+
+module SitemapGenerator
+  module Builder
+    # A Hash-like class for holding information about a sitemap URL and
+    # generating an XML <url> element suitable for sitemaps.
+    class SitemapUrl < Hash
+
+      # Return a new instance with options configured on it.
+      #
+      # == Arguments
+      # * sitemap - a Sitemap instance, or
+      # * path, options - a path string and options hash
+      #
+      # == Options
+      # Requires a host to be set.  If passing a sitemap, the sitemap must have a +default_host+
+      # configured.  If calling with a path and options, you must include the <tt>:host</tt> option.
+      #
+      # * +host+
+      # * +priority+
+      # * +changefreq+
+      # * +lastmod+
+      # * +images+
+      # * +video+/+videos+
+      # * +geo+
+      # * +news+
+      # * +mobile+
+      # * +alternate+/+alternates+
+      # * +pagemap+
+      def initialize(path, options={})
+        options = options.dup
+        if sitemap = path.is_a?(SitemapGenerator::Builder::SitemapFile) && path
+          SitemapGenerator::Utilities.reverse_merge!(options, :host => sitemap.location.host, :lastmod => sitemap.lastmod)
+          path = sitemap.location.path_in_public
+        end
+
+        SitemapGenerator::Utilities.assert_valid_keys(options, :priority, :changefreq, :lastmod, :expires, :host, :images, :video, :geo, :news, :videos, :mobile, :alternate, :alternates, :pagemap)
+        SitemapGenerator::Utilities.reverse_merge!(options, :priority => 0.5, :changefreq => 'weekly', :lastmod => Time.now, :images => [], :news => {}, :videos => [], :mobile => false, :alternates => [])
+        raise "Cannot generate a url without a host" unless SitemapGenerator::Utilities.present?(options[:host])
+
+        if video = options.delete(:video)
+          options[:videos] = video.is_a?(Array) ? options[:videos].concat(video) : options[:videos] << video
+        end
+        if alternate = options.delete(:alternate)
+          options[:alternates] = alternate.is_a?(Array) ? options[:alternates].concat(alternate) : options[:alternates] << alternate
+        end
+
+        path = path.to_s.sub(/^\//, '')
+        loc  = path.empty? ? options[:host] : (options[:host].to_s.sub(/\/$/, '') + '/' + path)
+        self.merge!(
+          :priority   => options[:priority],
+          :changefreq => options[:changefreq],
+          :lastmod    => options[:lastmod],
+          :expires    => options[:expires],
+          :host       => options[:host],
+          :loc        => loc,
+          :images     => prepare_images(options[:images], options[:host]),
+          :news       => prepare_news(options[:news]),
+          :videos     => options[:videos],
+          :geo        => options[:geo],
+          :mobile     => options[:mobile],
+          :alternates => options[:alternates],
+          :pagemap    => options[:pagemap]
+        )
+      end
+
+      # Return the URL as XML
+      def to_xml(builder=nil)
+        builder = ::Builder::XmlMarkup.new if builder.nil?
+        builder.url do
+          builder.loc        self[:loc]
+          builder.lastmod    w3c_date(self[:lastmod])      if self[:lastmod]
+          builder.expires    w3c_date(self[:expires])      if self[:expires]
+          builder.changefreq self[:changefreq].to_s        if self[:changefreq]
+          builder.priority   format_float(self[:priority]) if self[:priority]
+          
+          unless SitemapGenerator::Utilities.blank?(self[:news])
+            news_data = self[:news]
+            builder.news:news do
+              builder.news:publication do
+                builder.news :name, news_data[:publication_name].to_s if news_data[:publication_name]
+                builder.news :language, news_data[:publication_language].to_s if news_data[:publication_language]
+              end
+
+              builder.news :access, news_data[:access].to_s if news_data[:access]
+              builder.news :genres, news_data[:genres].to_s if news_data[:genres]
+              builder.news :publication_date, w3c_date(news_data[:publication_date]) if news_data[:publication_date]
+              builder.news :title, news_data[:title].to_s if news_data[:title]
+              builder.news :keywords, news_data[:keywords].to_s if news_data[:keywords]
+              builder.news :stock_tickers, news_data[:stock_tickers].to_s if news_data[:stock_tickers]
+            end
+          end
+
+          self[:images].each do |image|
+            builder.image:image do
+              builder.image :loc, image[:loc]
+              builder.image :caption, image[:caption].to_s             if image[:caption]
+              builder.image :geo_location, image[:geo_location].to_s   if image[:geo_location]
+              builder.image :title, image[:title].to_s                 if image[:title]
+              builder.image :license, image[:license].to_s             if image[:license]
+            end
+          end
+
+          self[:videos].each do |video|
+            builder.video :video do
+              builder.video :thumbnail_loc, video[:thumbnail_loc].to_s
+              builder.video :title, video[:title].to_s
+              builder.video :description, video[:description].to_s
+              builder.video :content_loc, video[:content_loc].to_s           if video[:content_loc]
+              if video[:player_loc]
+                loc_attributes = { :allow_embed => yes_or_no_with_default(video[:allow_embed], true) }
+                loc_attributes[:autoplay] = video[:autoplay].to_s if SitemapGenerator::Utilities.present?(video[:autoplay])
+                builder.video :player_loc, video[:player_loc].to_s, loc_attributes
+              end
+              builder.video :duration, video[:duration].to_s                 if video[:duration]
+              builder.video :expiration_date,  w3c_date(video[:expiration_date])  if video[:expiration_date]
+              builder.video :rating, format_float(video[:rating])       if video[:rating]
+              builder.video :view_count, video[:view_count].to_s             if video[:view_count]
+              builder.video :publication_date, w3c_date(video[:publication_date]) if video[:publication_date]
+              video[:tags].each {|tag| builder.video :tag, tag.to_s }        if video[:tags]
+              builder.video :tag, video[:tag].to_s                           if video[:tag]
+              builder.video :category, video[:category].to_s                 if video[:category]
+              builder.video :family_friendly,  yes_or_no_with_default(video[:family_friendly], true) if video.has_key?(:family_friendly)
+              builder.video :gallery_loc, video[:gallery_loc].to_s, :title => video[:gallery_title].to_s if video[:gallery_loc]
+              builder.video :price, video[:price].to_s, prepare_video_price_attribs(video) if SitemapGenerator::Utilities.present?(video[:price])
+              if video[:uploader]
+                builder.video :uploader, video[:uploader].to_s, video[:uploader_info] ? { :info => video[:uploader_info].to_s } : {}
+              end
+            end
+          end
+
+          self[:alternates].each do |alternate|
+            rel = alternate[:nofollow] ? 'alternate nofollow' : 'alternate'
+<<<<<<< HEAD
+            builder.xhtml :link, :rel => rel, :hreflang => alternate[:lang].to_s, :href => alternate[:href].to_s
+=======
+            builder.xhtml :link, :rel => rel, :hreflang => alternate[:lang], :href => alternate[:href], :media => alternate[:media]
+>>>>>>> ddeebe0aa558b4ecc08c7e8d5324842205d20b79
+          end
+
+          unless SitemapGenerator::Utilities.blank?(self[:geo])
+            geo = self[:geo]
+            builder.geo :geo do
+              builder.geo :format, geo[:format].to_s if geo[:format]
+            end
+          end
+
+          unless SitemapGenerator::Utilities.blank?(self[:mobile])
+            builder.mobile :mobile
+          end
+
+          unless SitemapGenerator::Utilities.blank?(self[:pagemap])
+            builder.pagemap :PageMap do
+              SitemapGenerator::Utilities.as_array(self[:pagemap][:dataobjects]).each do |dataobject|
+                builder.pagemap :DataObject, :type => dataobject[:type].to_s, :id => dataobject[:id].to_s do
+                  SitemapGenerator::Utilities.as_array(dataobject[:attributes]).each do |attribute|
+                    builder.pagemap :Attribute, attribute[:value].to_s, :name => attribute[:name].to_s
+                  end
+                end
+              end
+            end
+          end
+        end
+        builder << '' # Force to string
+      end
+
+      def news?
+        SitemapGenerator::Utilities.present?(self[:news])
+      end
+
+      protected
+
+      def prepare_video_price_attribs(video)
+        attribs = {}
+        attribs[:currency] = video[:price_currency].to_s # required
+        attribs[:type] = video[:price_type] if SitemapGenerator::Utilities.present?(video[:price_type])
+        attribs[:resolution] = video[:price_resolution] if SitemapGenerator::Utilities.present?(video[:price_resolution])
+        attribs
+      end
+
+      def prepare_news(news)
+        SitemapGenerator::Utilities.assert_valid_keys(news, :publication_name, :publication_language, :publication_date, :genres, :access, :title, :keywords, :stock_tickers) unless news.empty?
+        news
+      end
+
+      # Return an Array of image option Hashes suitable to be parsed by SitemapGenerator::Builder::SitemapFile
+      def prepare_images(images, host)
+        images.delete_if { |key,value| key[:loc] == nil }
+        images.each do |r|
+          SitemapGenerator::Utilities.assert_valid_keys(r, :loc, :caption, :geo_location, :title, :license)
+          r[:loc] = URI.join(host, r[:loc]).to_s
+        end
+        images[0..(SitemapGenerator::MAX_SITEMAP_IMAGES-1)]
+      end
+
+      def w3c_date(date)
+        if date.is_a?(String)
+          date
+        elsif date.respond_to?(:iso8601)
+          date.iso8601.sub(/Z$/i, '+00:00')
+        elsif date.is_a?(Date) && !date.is_a?(DateTime)
+          date.strftime("%Y-%m-%d")
+        else
+          zulutime = if date.is_a?(DateTime)
+            date.new_offset(0)
+          elsif date.respond_to?(:utc)
+            date.utc
+          else
+            nil
+          end
+
+          if zulutime
+            zulutime.strftime("%Y-%m-%dT%H:%M:%S+00:00")
+          else
+            zone = date.strftime('%z').insert(-3, ':')
+            date.strftime("%Y-%m-%dT%H:%M:%S") + zone
+          end
+        end
+      end
+
+      # Accept a string or boolean and return 'yes' or 'no'.  If a string, the
+      # value must be 'yes' or 'no'.  Pass the default value as a boolean using `default`.
+      def yes_or_no(value)
+        if value.is_a?(String)
+          raise ArgumentError.new("Unrecognized value for yes/no field: #{value.inspect}") unless value =~ /^(yes|no)$/i
+          value.downcase
+        else
+          value ? 'yes' : 'no'
+        end
+      end
+
+      # If the value is nil, return `default` converted to either 'yes' or 'no'.
+      # If the value is set, return its value converted to 'yes' or 'no'.
+      def yes_or_no_with_default(value, default)
+        yes_or_no(value.nil? ? default : value)
+      end
+
+      # Format a float to to one decimal precision.
+      # TODO: Use rounding with precision once merged with framework_agnostic.
+      def format_float(value)
+        value.is_a?(String) ? value : ('%0.1f' % value)
+      end
+    end
+  end
+end

data/lib/sitemap_generator/link_set.rb

@@ -124,8 +124,7 @@ module SitemapGenerator
         :filename => :sitemap,
         :search_engines => {
           :google         => "http://www.google.com/webmasters/tools/ping?sitemap=%s",
-          :bing           => "http://www.bing.com/webmaster/ping.aspx?siteMap=%s",
-          :sitemap_writer => "http://www.sitemapwriter.com/notify.php?crawler=all&url=%s"
+          :bing           => "http://www.bing.com/webmaster/ping.aspx?siteMap=%s"
         },
         :create_index => :auto
       )

data/spec/sitemap_generator/adapters/s3_adapter_spec.rb

@@ -0,0 +1,23 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+# Don't run this test as part of the unit testing suite as we don't want
+# Fog to be a dependency of SitemapGenerator core.  This is an integration
+# test.  Unfortunately it doesn't really test much, so its usefullness is
+# questionable.
+describe 'SitemapGenerator::S3Adapter', :integration => true do
+
+  let(:location) { SitemapGenerator::SitemapLocation.new(:namer => SitemapGenerator::SitemapNamer.new(:sitemap), :public_path => 'tmp/', :sitemaps_path => 'test/', :host => 'http://example.com/') }
+  let(:directory) { stub(:files => stub(:create)) }
+  let(:directories) { stub(:directories => stub(:new => directory)) }
+
+  before do
+    SitemapGenerator::S3Adapter # eager load
+    Fog::Storage.stubs(:new => directories)
+  end
+
+  it 'should create the file in S3 with a single operation' do
+    subject.write(location, 'payload')
+  end
+end

data/spec/sitemap_generator/alternate_sitemap_spec.rb

@@ -8,7 +8,8 @@ describe "SitemapGenerator" do
       :alternates => [
         {
           :lang => 'de',
-          :href => 'http://www.example.de/link_with_alternate.html'
+          :href => 'http://www.example.de/link_with_alternate.html',
+          :media => 'only screen and (max-width: 640px)'
         }
       ]
     ).to_xml
@@ -23,6 +24,7 @@ describe "SitemapGenerator" do
     alternate.attribute('rel').value.should == 'alternate'
     alternate.attribute('hreflang').value.should == 'de'
     alternate.attribute('href').value.should == 'http://www.example.de/link_with_alternate.html'
+    alternate.attribute('media').value.should == 'only screen and (max-width: 640px)'
   end
 
   it "should add alternate links to sitemap with rel nofollow" do
@@ -32,7 +34,8 @@ describe "SitemapGenerator" do
         {
           :lang => 'de',
           :href => 'http://www.example.de/link_with_alternate.html',
-          :nofollow => true
+          :nofollow => true,
+          :media => 'only screen and (max-width: 640px)'
         }
       ]
     ).to_xml
@@ -47,6 +50,7 @@ describe "SitemapGenerator" do
     alternate.attribute('rel').value.should == 'alternate nofollow'
     alternate.attribute('hreflang').value.should == 'de'
     alternate.attribute('href').value.should == 'http://www.example.de/link_with_alternate.html'
+    alternate.attribute('media').value.should == 'only screen and (max-width: 640px)'
   end
 
 end

data/spec/sitemap_generator/builder/sitemap_url_spec.rb

@@ -164,4 +164,19 @@ describe SitemapGenerator::Builder::SitemapUrl do
       url.send(:format_float, 3.444444).should == '3.4'
     end
   end
+
+  describe "expires" do
+    let(:url)  { SitemapGenerator::Builder::SitemapUrl.new('/path', :host => 'http://example.com', :expires => time) }
+    let(:time) { Time.at(0).utc }
+
+    it "should include the option" do
+      url[:expires].should == time
+    end
+
+    it "should format it and include it in the XML" do
+      xml = url.to_xml
+      doc = Nokogiri::XML("<root xmlns='http://www.sitemaps.org/schemas/sitemap/0.9' xmlns:xhtml='http://www.w3.org/1999/xhtml'>#{xml}</root>")
+      doc.css('url expires').text.should == url.send(:w3c_date, time)
+    end
+  end
 end

data/spec/sitemap_generator/link_set_spec.rb

@@ -85,7 +85,7 @@ describe SitemapGenerator::LinkSet do
       ls.sitemap.location.public_path.should == path
       ls.sitemap_index.location.public_path.should == path
     end
-    
+
     it "should append a slash to the path" do
       path = SitemapGenerator.app.root + 'tmp/'
       ls.public_path = 'tmp'
@@ -109,7 +109,7 @@ describe SitemapGenerator::LinkSet do
       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
-    
+
     it "should append a slash to the path" do
       ls.default_host = 'http://one.com'
       ls.sitemaps_path = 'sitemaps'
@@ -129,12 +129,12 @@ describe SitemapGenerator::LinkSet do
   describe "search_engines" do
     it "should have search engines by default" do
       ls.search_engines.should be_a(Hash)
-      ls.search_engines.size.should == 3
+      ls.search_engines.size.should == 2
     end
 
     it "should support being modified" do
       ls.search_engines[:newengine] = 'abc'
-      ls.search_engines.size.should == 4
+      ls.search_engines.size.should == 3
     end
 
     it "should support being set to nil" do

data/spec/spec_helper.rb

@@ -20,4 +20,5 @@ RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
+  config.filter_run_excluding :integration => true
 end

metadata

@@ -1,89 +1,83 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: sitemap_generator
-version: !ruby/object:Gem::Version
-  version: 4.2.0
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 4
+  - 3
+  - 0
+  version: 4.3.0
 platform: ruby
-authors:
+authors: 
 - Karl Varga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-11-14 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: builder
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: SitemapGenerator is a framework-agnostic XML Sitemap generator written
-  in Ruby with automatic Rails integration.  It supports Video, News, Image, Geo,
-  Mobile, PageMap and Alternate Links sitemap extensions and includes Rake tasks for
-  managing your sitemaps, as well as many other great features.
+  version_requirements: *id004
+description: SitemapGenerator is a framework-agnostic XML Sitemap generator written in Ruby with automatic Rails integration.  It supports Video, News, Image, Geo, Mobile, PageMap and Alternate Links sitemap extensions and includes Rake tasks for managing your sitemaps, as well as many other great features.
 email: kjvarga@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -99,6 +93,7 @@ files:
 - lib/sitemap_generator/builder/sitemap_index_file.rb
 - lib/sitemap_generator/builder/sitemap_index_url.rb
 - lib/sitemap_generator/builder/sitemap_url.rb
+- lib/sitemap_generator/builder/sitemap_url.rb.orig
 - lib/sitemap_generator/builder.rb
 - lib/sitemap_generator/core_ext/big_decimal.rb
 - lib/sitemap_generator/core_ext/numeric.rb
@@ -121,6 +116,7 @@ files:
 - 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
 - spec/sitemap_generator/application_spec.rb
 - spec/sitemap_generator/builder/sitemap_file_spec.rb
@@ -156,54 +152,54 @@ files:
 - spec/support/schemas/sitemap-video.xsd
 - spec/support/schemas/sitemap.xsd
 - spec/support/xml_macros.rb
+has_rdoc: true
 homepage: http://github.com/kjvarga/sitemap_generator
 licenses: []
-post_install_message: ! 'NOTE: SitemapGenerator 4.x uses a new file naming scheme
-  which is more standards-compliant.
-
-  If you''re upgrading from 3.x, please see the release note in the README:
-
 
+post_install_message: |
+  NOTE: SitemapGenerator 4.x uses a new file naming scheme which is more standards-compliant.
+  If you're upgrading from 3.x, please see the release note in the README:
+  
   https://github.com/kjvarga/sitemap_generator#important-changes-in-version-4
-
-
+  
   The simple answer is that your index file is now called sitemap.xml.gz
-
   and not sitemap_index.xml.gz, but please take a look and see what else has changed.
 
-'
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: -1330086136380345562
+      segments: 
       - 0
-      hash: 629438297049129393
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: -1330086136380345562
+      segments: 
       - 0
-      hash: 629438297049129393
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.3.7.1
 signing_key: 
 specification_version: 3
 summary: Easily generate XML Sitemaps
-test_files:
+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
 - spec/sitemap_generator/application_spec.rb
 - spec/sitemap_generator/builder/sitemap_file_spec.rb