sitemap_generator 6.1.2 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07d190381c5aae66acc3b6eaa43d61444f3280e1ff76fd0dadf49d6c730d9b7a
-  data.tar.gz: dc61f7ff02926247d30ead18d71b16068e14a01ed36bb0694f0615febef6000a
+  metadata.gz: 6619733ac6e91a00c5a7b194f82f76b68de2c0521dda3c554d28c8315c0e7c29
+  data.tar.gz: 0d73d0acac5b95961d5799a766a5c6af6fac85173420807db5cbc9a630f1841d
 SHA512:
-  metadata.gz: ee8f86311c174e2b9b01514d48325f6d824bcabfaf8e5a711ff7e83442bc9f5adf4bbbe1ddc990d292c8ffc73138e7244b840a38aaeccef6f26bb55adee8cae6
-  data.tar.gz: 1049e27acaa1dafee38153d4faa1b51de61e67162a792a525269090e51f85e1c5c919c9755cc301543e6cd97dd8f18f5d914685cc7e3a23c49a494d3abdb21d9
+  metadata.gz: 637cc70ee0036b4e9d228abe34abe4b220db7a6647c3e26b1b98e5df20e59d0e9c24f5f8596ef941afb5ea252081ce048cc74e95b7b52a69fc4c5e48774e3c22
+  data.tar.gz: 784183a6a1a1735078734f68aab8e62702b62e474c7602c9360bf2021aeff6492c03405b14a4800d42490bd0b2319c00814541252a3a8f6d4e70becfd87ee6d0

data/CHANGES.md

@@ -1,3 +1,16 @@
+### 6.2.1
+
+* Bugfix: Improve handling of deprecated options in `AwsSdkAdapter`.  Fixes bug where `:region` was being set to `nil`. [#390](https://github.com/kjvarga/sitemap_generator/pull/390).
+
+### 6.2.0
+
+* Raise `LoadError` when an adapter's dependency is missing to better support Sorbet [#387](https://github.com/kjvarga/sitemap_generator/pull/387).
+* Update the Bing notification URL [#386](https://github.com/kjvarga/sitemap_generator/pull/386).
+* Setup integration testing against a matrix of Ruby and Rails versions; test against Ruby 3.1 and Rails 7.
+* Change default `changefreq` of the root URL from `always` to `weekly` [#376](https://github.com/kjvarga/sitemap_generator/pull/376).
+* `SitemapGenerator::GoogleStorageAdapter`: Support ruby 3 kwarg changes [#375](https://github.com/kjvarga/sitemap_generator/pull/375).
+* `SitemapGenerator::S3Adapter`: Allow Fog `public` option to be Configurable [#359](https://github.com/kjvarga/sitemap_generator/pull/359).
+
 ### 6.1.2
 
 * Resolve NoMethodError using URI#open for Ruby less than 2.5.0 [#353](https://github.com/kjvarga/sitemap_generator/pull/353)

data/README.md

@@ -1,5 +1,7 @@
 # SitemapGenerator
 
+[![CircleCI](https://circleci.com/gh/kjvarga/sitemap_generator/tree/master.svg?style=shield)](https://circleci.com/gh/kjvarga/sitemap_generator/tree/master)
+
 SitemapGenerator is the easiest way to generate Sitemaps in Ruby.  Rails integration provides access to the Rails route helpers within your sitemap config file and automatically makes the rake tasks available to you.  Or if you prefer to use another framework, you can!  You can use the rake tasks provided or run your sitemap configs as plain ruby scripts.
 
 Sitemaps adhere to the [Sitemap 0.9 protocol][sitemap_protocol] specification.
@@ -61,66 +63,68 @@ Successful ping of Bing
 
 ## Contents
 
-* [Features](#features)
-  + [Show Me](#show-me)
-* [Contents](#contents)
-* [Contribute](#contribute)
-* [Foreword](#foreword)
-* [Installation](#installation)
-  + [Ruby](#ruby)
-  + [Rails](#rails)
-* [Getting Started](#getting-started)
-  + [Preventing Output](#preventing-output)
-  + [Rake Tasks](#rake-tasks)
-  + [Pinging Search Engines](#pinging-search-engines)
-  + [Crontab](#crontab)
-  + [Robots.txt](#robotstxt)
-  + [Ruby Modules](#ruby-modules)
-  + [Deployments & Capistrano](#deployments--capistrano)
-  + [Sitemaps with no Index File](#sitemaps-with-no-index-file)
-  + [Upload Sitemaps to a Remote Host using Adapters](#upload-sitemaps-to-a-remote-host-using-adapters)
-    - [Supported Adapters](#supported-adapters)
-      * [`SitemapGenerator::FileAdapter`](#sitemapgeneratorfileadapter)
-      * [`SitemapGenerator::FogAdapter`](#sitemapgeneratorfogadapter)
-      * [`SitemapGenerator::S3Adapter`](#sitemapgenerators3adapter)
-      * [`SitemapGenerator::AwsSdkAdapter`](#sitemapgeneratorawssdkadapter)
-      * [`SitemapGenerator::WaveAdapter`](#sitemapgeneratorwaveadapter)
-      * [`SitemapGenerator::GoogleStorageAdapter`](#sitemapgeneratorgooglestorageadapter)
-    - [An Example of Using an Adapter](#an-example-of-using-an-adapter)
-  + [Generating Multiple Sitemaps](#generating-multiple-sitemaps)
-* [Sitemap Configuration](#sitemap-configuration)
-  + [A Simple Example](#a-simple-example)
-  + [Adding Links](#adding-links)
-  + [Supported Options to `add`](#supported-options-to-add)
-  + [Adding Links to the Sitemap Index](#adding-links-to-the-sitemap-index)
-  + [Accessing the LinkSet instance](#accessing-the-linkset-instance)
-  + [Speeding Things Up](#speeding-things-up)
-* [Customizing your Sitemaps](#customizing-your-sitemaps)
-  + [Sitemap Options](#sitemap-options)
-* [Sitemap Groups](#sitemap-groups)
-  + [A Groups Example](#a-groups-example)
-  + [Using `group` without a block](#using-group-without-a-block)
-* [Sitemap Extensions](#sitemap-extensions)
-  + [News Sitemaps](#news-sitemaps)
-    - [Example](#example)
-    - [Supported options](#supported-options)
-  + [Image Sitemaps](#image-sitemaps)
-    - [Example](#example-1)
-    - [Supported options](#supported-options-1)
-  + [Video Sitemaps](#video-sitemaps)
-    - [Example](#example-2)
-    - [Supported options](#supported-options-2)
-  + [PageMap Sitemaps](#pagemap-sitemaps)
-    - [Supported options](#supported-options-3)
-    - [Example:](#example)
-  + [Alternate Links](#alternate-links)
-    - [Example](#example-3)
-    - [Supported options](#supported-options-4)
-  + [Mobile Sitemaps](#-mobile-sitemaps)
-    - [Example](#example-4)
-    - [Supported options](#supported-options-5)
-* [Compatibility](#compatibility)
-* [Licence](#licence)
+- [SitemapGenerator](#sitemapgenerator)
+  - [Features](#features)
+    - [Show Me](#show-me)
+  - [Contents](#contents)
+  - [Contribute](#contribute)
+  - [Foreword](#foreword)
+  - [Installation](#installation)
+    - [Ruby](#ruby)
+    - [Rails](#rails)
+  - [Getting Started](#getting-started)
+    - [Preventing Output](#preventing-output)
+    - [Rake Tasks](#rake-tasks)
+    - [Pinging Search Engines](#pinging-search-engines)
+    - [Crontab](#crontab)
+    - [Robots.txt](#robotstxt)
+    - [Ruby Modules](#ruby-modules)
+    - [Deployments & Capistrano](#deployments--capistrano)
+    - [Sitemaps with no Index File](#sitemaps-with-no-index-file)
+    - [Upload Sitemaps to a Remote Host using Adapters](#upload-sitemaps-to-a-remote-host-using-adapters)
+      - [Supported Adapters](#supported-adapters)
+        - [`SitemapGenerator::FileAdapter`](#sitemapgeneratorfileadapter)
+        - [`SitemapGenerator::FogAdapter`](#sitemapgeneratorfogadapter)
+        - [`SitemapGenerator::S3Adapter`](#sitemapgenerators3adapter)
+        - [`SitemapGenerator::AwsSdkAdapter`](#sitemapgeneratorawssdkadapter)
+        - [`SitemapGenerator::WaveAdapter`](#sitemapgeneratorwaveadapter)
+        - [`SitemapGenerator::GoogleStorageAdapter`](#sitemapgeneratorgooglestorageadapter)
+      - [An Example of Using an Adapter](#an-example-of-using-an-adapter)
+    - [Generating Multiple Sitemaps](#generating-multiple-sitemaps)
+  - [Sitemap Configuration](#sitemap-configuration)
+    - [A Simple Example](#a-simple-example)
+    - [Adding Links](#adding-links)
+    - [Supported Options to `add`](#supported-options-to-add)
+    - [Adding Links to the Sitemap Index](#adding-links-to-the-sitemap-index)
+    - [Accessing the LinkSet instance](#accessing-the-linkset-instance)
+    - [Speeding Things Up](#speeding-things-up)
+  - [Customizing your Sitemaps](#customizing-your-sitemaps)
+    - [Sitemap Options](#sitemap-options)
+  - [Sitemap Groups](#sitemap-groups)
+    - [A Groups Example](#a-groups-example)
+    - [Using `group` without a block](#using-group-without-a-block)
+  - [Sitemap Extensions](#sitemap-extensions)
+    - [News Sitemaps](#news-sitemaps)
+      - [Example](#example)
+      - [Supported options](#supported-options)
+    - [Image Sitemaps](#image-sitemaps)
+      - [Example](#example-1)
+      - [Supported options](#supported-options-1)
+    - [Video Sitemaps](#video-sitemaps)
+      - [Example](#example-2)
+      - [Supported options](#supported-options-2)
+    - [PageMap Sitemaps](#pagemap-sitemaps)
+      - [Supported options](#supported-options-3)
+      - [Example:](#example-3)
+    - [Alternate Links](#alternate-links)
+      - [Example](#example-4)
+      - [Supported options](#supported-options-4)
+      - [Alternates Example](#alternates-example)
+    - [Mobile Sitemaps](#mobile-sitemaps)
+      - [Example](#example-5)
+      - [Supported options](#supported-options-5)
+  - [Compatibility](#compatibility)
+  - [Licence](#licence)
 
 ## Contribute
 
@@ -352,28 +356,29 @@ directory.
 
   You must `require 'fog-aws'` in your sitemap config before using this adapter.
 
-##### `SitemapGenerator::AwsSdkAdapter`
-
-  Uses `Aws::S3::Resource` to upload to Amazon S3 storage.  Includes automatic detection of your AWS
-  credentials using `Aws::Credentials`.
-
-  You must `require 'aws-sdk-s3'` in your sitemap config before using this adapter,
-  or `require` another library that defines `Aws::S3::Resource` and `Aws::Credentials`.
-
   An example of using this adapter in your sitemap configuration:
 
   ```ruby
-  SitemapGenerator::Sitemap.adapter = SitemapGenerator::AwsSdkAdapter.new('s3_bucket',
-    aws_access_key_id: 'AKIAI3SW5CRAZBL4WSTA',
-    aws_secret_access_key: 'asdfadsfdsafsadf',
-    aws_region: 'us-east-1'
-  )
+  SitemapGenerator::Sitemap.adapter = SitemapGenerator::S3Adapter.new(options)
   ```
 
-##### `SitemapGenerator::AwsSdkAdapter (DigitalOcean Spaces)`
+  Where `options` is a Hash with any of the following keys:
+* `aws_access_key_id` [String] Your AWS access key id
+* `aws_secret_access_key` [String] Your AWS secret access key
+* `fog_provider` [String]
+* `fog_directory` [String]
+* `fog_region` [String]
+* `fog_path_style` [String]
+* `fog_storage_options` [Hash] Other options to pass to `Fog::Storage`
+* `fog_public` [Boolean] Whether the file is publicly accessible
+
+Alternatively you can use an environment variable to configure each option (except `fog_storage_options`).  The environment variables have the same
+name but capitalized, e.g. `FOG_PATH_STYLE`.
+
+##### `SitemapGenerator::AwsSdkAdapter`
 
   Uses `Aws::S3::Resource` to upload to Amazon S3 storage.  Includes automatic detection of your AWS
-  credentials using `Aws::Credentials`.
+  credentials and region.
 
   You must `require 'aws-sdk-s3'` in your sitemap config before using this adapter,
   or `require` another library that defines `Aws::S3::Resource` and `Aws::Credentials`.
@@ -382,13 +387,19 @@ directory.
 
   ```ruby
   SitemapGenerator::Sitemap.adapter = SitemapGenerator::AwsSdkAdapter.new('s3_bucket',
-    aws_access_key_id: 'AKIAI3SW5CRAZBL4WSTA',
-    aws_secret_access_key: 'asdfadsfdsafsadf',
-    aws_region: 'sfo2',
-    aws_endpoint: 'https://sfo2.digitaloceanspaces.com'
+    access_key_id: 'AKIAI3SW5CRAZBL4WSTA',
+    secret_access_key: 'asdfadsfdsafsadf',
+    region: 'us-east-1',
+    endpoint: 'https://sfo2.digitaloceanspaces.com'
   )
   ```
 
+  Where the first argument is the S3 bucket name, and the rest are keyword argument options which
+  are passed directly to the AWS client.
+
+  See https://docs.aws.amazon.com/sdk-for-ruby/v2/api/Aws/S3/Client.html#initialize-instance_method
+  for a full list of supported options.
+
 ##### `SitemapGenerator::WaveAdapter`
 
   Uses `CarrierWave::Uploader::Base` to upload to any service supported by CarrierWave, for example,
@@ -460,8 +471,7 @@ directory.
     Note that SitemapGenerator will automatically turn off `include_index` in this case because
     the `sitemaps_host` does not match the `default_host`.  The link to the sitemap index file
     that would otherwise be included would point to a different host than the rest of the links
-    in the sitemap, something that the sitemap rules forbid.  (Since version 3.2 this is no
-    longer an issue because [`include_index` is off by default][include_index_change].)
+    in the sitemap, something that the sitemap rules forbid.
 
 4. Verify to Google that you own the S3 url
 
@@ -571,7 +581,7 @@ In /Users/karl/projects/sitemap_generator-test/public/
 Sitemap stats: 2 links / 1 sitemaps / 0m00s
 ```
 
-Weird!  The sitemap has two links, even though we only added one!  This is because SitemapGenerator adds the root URL `/` for you by default.  (Note that prior to version 3.2 the  URL of the sitemap index file was also added to the sitemap by default but [this behaviour has been changed][include_index_change] because of Google complaining about nested indexing.  This also doesn't make sense anymore because indexes are not always needed.)  You can change the default behaviour by setting the `include_root` or `include_index` option.
+Weird!  The sitemap has two links, even though we only added one!  This is because SitemapGenerator adds the root URL `/` for you by default.  You can change the default behaviour by setting the `include_root` or `include_index` option.
 
 Now let's take a look at the file that was created.  After uncompressing and XML-tidying the contents we have:
 
@@ -584,7 +594,7 @@ Now let's take a look at the file that was created.  After uncompressing and XML
   <url>
     <loc>http://www.example.com/</loc>
     <lastmod>2011-05-21T00:03:38+00:00</lastmod>
-    <changefreq>always</changefreq>
+    <changefreq>weekly</changefreq>
     <priority>1.0</priority>
   </url>
   <url>
@@ -1116,7 +1126,27 @@ end
     * `:nofollow` - Optional, boolean. Used to mark link as "nofollow".
     * `:media` - Optional, string.  Specify [media targets for responsive design pages][media].
 
-### <a name="internal_mobile"></a> Mobile Sitemaps
+#### Alternates Example
+
+```ruby
+SitemapGenerator::Sitemap.default_host = "http://www.example.com"
+SitemapGenerator::Sitemap.create do
+ add('/index.html', :alternates => [
+        {
+            :href => 'http://www.example.de/index.html',
+            :lang => 'de',
+            :nofollow => true
+        },
+        {
+            :href => 'http://www.example.es/index.html',
+            :lang => 'es',
+            :nofollow => true
+        }
+    ])
+end
+```
+
+### Mobile Sitemaps
 
 Mobile sitemaps include a specific `<mobile:mobile/>` tag.
 
@@ -1137,8 +1167,8 @@ end
 
 ## Compatibility
 
-Compatible with all versions of Rails and Ruby.
-Ruby 1.9.3 support was dropped in Version 6.0.0 of this gem.
+Compatible with all versions of Rails and Ruby.  Tested up to Ruby 3.1 and Rails 7.0.
+Ruby 1.9.3 support was dropped in Version 6.0.0.
 
 ## Licence
 
@@ -1149,10 +1179,6 @@ MIT. See the LICENSE.md file.
 Copyright (c) Karl Varga released under the MIT license
 
 [canonical_repo]:http://github.com/kjvarga/sitemap_generator
-[enterprise_class]:https://twitter.com/dhh/status/1631034662 "I use enterprise in the same sense the Phusion guys do - i.e. Enterprise Ruby. Please don't look down on my use of the word 'enterprise' to represent being a cut above. It doesn't mean you ever have to work for a company the size of IBM. Or constantly fight inertia, writing crappy software, adhering to change management practices and spending hours in meetings... Not that there's anything wrong with that - Wait, what?"
-[sitemaps_org]:http://www.sitemaps.org/protocol.html "http://www.sitemaps.org/protocol.html"
-[sitemaps_xml]:http://www.sitemaps.org/protocol.html#xmlTagDefinitions "XML Tag Definitions"
-[sitemap_generator_usage]:http://wiki.github.com/adamsalter/sitemap_generator/sitemapgenerator-usage "http://wiki.github.com/adamsalter/sitemap_generator/sitemapgenerator-usage"
 [sitemap_images]:http://www.google.com/support/webmasters/bin/answer.py?answer=178636
 [sitemap_video]:https://support.google.com/webmasters/answer/80471?hl=en&ref_topic=4581190
 [sitemap_news]:https://support.google.com/news/publisher/topic/2527688?hl=en&ref_topic=4359874
@@ -1163,8 +1189,6 @@ Copyright (c) Karl Varga released under the MIT license
 [image_tags]:http://www.google.com/support/webmasters/bin/answer.py?hl=en&answer=178636
 [news_tags]:http://www.google.com/support/news_pub/bin/answer.py?answer=74288
 [remote_hosts]:https://github.com/kjvarga/sitemap_generator/wiki/Generate-Sitemaps-on-read-only-filesystems-like-Heroku
-[include_index_change]:https://github.com/kjvarga/sitemap_generator/issues/70
-[ehoch]:https://github.com/ehoch
 [alternate_links]:http://support.google.com/webmasters/bin/answer.py?hl=en&answer=2620865
 [using_pagemaps]:https://developers.google.com/custom-search/docs/structured_data#pagemaps
 [iso_4217]:http://en.wikipedia.org/wiki/ISO_4217

data/VERSION

@@ -1 +1 @@
-6.1.2
+6.2.1

data/lib/sitemap_generator/adapters/aws_sdk_adapter.rb

@@ -1,5 +1,5 @@
 if !defined?(Aws::S3::Resource) or !defined?(Aws::Credentials)
-  raise "Error: `Aws::S3::Resource` and/or `Aws::Credentials` are not defined.\n\n"\
+  raise LoadError, "Error: `Aws::S3::Resource` and/or `Aws::Credentials` are not defined.\n\n"\
         "Please `require 'aws-sdk'` - or another library that defines these classes."
 end
 
@@ -8,25 +8,33 @@ module SitemapGenerator
   class AwsSdkAdapter
     # Specify your AWS bucket name, credentials, and/or region.  By default
     # the AWS SDK will auto-detect your credentials and region, but you can use
-    # the following options to configure - or override - them manually:
-    #
-    # Options:
-    #   :aws_access_key_id [String] Your AWS access key id
-    #   :aws_secret_access_key [String] Your AWS secret access key
-    #   :aws_region [String] Your AWS region
+    # the options to configure them manually.
     #
     # Requires Aws::S3::Resource and Aws::Credentials to be defined.
     #
-    # @param [String] bucket Name of the S3 bucket
-    # @param [Hash] options AWS credential overrides, see above
-    def initialize(bucket, options = {})
+    # @param bucket [String] Name of the S3 bucket
+    # @param options [Hash] Options passed directly to AWS to control the Resource created.  See Options below.
+    #
+    # Options:
+    #   **Deprecated, use :endpoint instead** :aws_endpoint [String] The object storage endpoint,
+    #                                                                if not AWS, e.g. 'https://sfo2.digitaloceanspaces.com'
+    #   **Deprecated, use :access_key_id instead** :access_key_id [String] Your AWS access key id
+    #   **Deprecated, use :secret_access_key instead** :aws_secret_access_key [String] Your AWS secret access key
+    #   **Deprecated, use :region instead** :aws_region [String] Your AWS region
+    #
+    #   All other options you provide are passed directly to the AWS client.
+    #   See https://docs.aws.amazon.com/sdk-for-ruby/v2/api/Aws/S3/Client.html#initialize-instance_method
+    #   for a full list of supported options.
+    def initialize(bucket, aws_access_key_id: nil, aws_secret_access_key: nil, aws_region: nil, aws_endpoint: nil, **options)
       @bucket = bucket
-      @aws_access_key_id = options[:aws_access_key_id]
-      @aws_secret_access_key = options[:aws_secret_access_key]
-      @aws_region = options[:aws_region]
-      @aws_endpoint = options[:aws_endpoint]
+      @options = options
+      set_option_unless_set(:access_key_id, aws_access_key_id)
+      set_option_unless_set(:secret_access_key, aws_secret_access_key)
+      set_option_unless_set(:region, aws_region)
+      set_option_unless_set(:endpoint, aws_endpoint)
     end
 
+
     # Call with a SitemapLocation and string data
     def write(location, raw_data)
       SitemapGenerator::FileAdapter.new.write(location, raw_data)
@@ -40,21 +48,12 @@ module SitemapGenerator
 
     private
 
-    def s3_resource
-      @s3_resource ||= Aws::S3::Resource.new(s3_resource_options)
+    def set_option_unless_set(key, value)
+      @options[key] = value if @options[key].nil? && !value.nil?
     end
 
-    def s3_resource_options
-      options = {}
-      options[:region] = @aws_region if !@aws_region.nil?
-      options[:endpoint] = @aws_endpoint if !@aws_endpoint.nil?
-      if !@aws_access_key_id.nil? && !@aws_secret_access_key.nil?
-        options[:credentials] = Aws::Credentials.new(
-          @aws_access_key_id,
-          @aws_secret_access_key
-        )
-      end
-      options
+    def s3_resource
+      @s3_resource ||= Aws::S3::Resource.new(@options)
     end
   end
 end

data/lib/sitemap_generator/adapters/fog_adapter.rb

@@ -1,5 +1,5 @@
 if !defined?(Fog::Storage)
-  raise "Error: `Fog::Storage` is not defined.\n\n"\
+  raise LoadError, "Error: `Fog::Storage` is not defined.\n\n"\
         "Please `require 'fog'` - or another library that defines this class."
 end
 

data/lib/sitemap_generator/adapters/google_storage_adapter.rb

@@ -1,5 +1,5 @@
 if !defined?(Google::Cloud::Storage)
-  raise "Error: `Google::Cloud::Storage` is not defined.\n\n"\
+  raise LoadError, "Error: `Google::Cloud::Storage` is not defined.\n\n"\
         "Please `require 'google/cloud/storage'` - or another library that defines this class."
 end
 
@@ -29,7 +29,7 @@ module SitemapGenerator
     def write(location, raw_data)
       SitemapGenerator::FileAdapter.new.write(location, raw_data)
 
-      storage = Google::Cloud::Storage.new(@storage_options)
+      storage = Google::Cloud::Storage.new(**@storage_options)
       bucket = storage.bucket(@bucket)
       bucket.create_file(location.path, location.path_in_public, acl: 'public')
     end

data/lib/sitemap_generator/adapters/s3_adapter.rb

@@ -1,5 +1,5 @@
 if !defined?(Fog::Storage)
-  raise "Error: `Fog::Storage` is not defined.\n\n"\
+  raise LoadError, "Error: `Fog::Storage` is not defined.\n\n"\
         "Please `require 'fog-aws'` - or another library that defines this class."
 end
 
@@ -16,6 +16,10 @@ module SitemapGenerator
     # @option :fog_region [String]
     # @option :fog_path_style [String]
     # @option :fog_storage_options [Hash] Other options to pass to `Fog::Storage`
+    # @option :fog_public [Boolean] Whether the file is publicly accessible
+    #
+    # Alternatively you can use an environment variable to configure each option (except `fog_storage_options`).
+    # The environment variables have the same name but capitalized, e.g. `FOG_PATH_STYLE`.
     def initialize(opts = {})
       @aws_access_key_id = opts[:aws_access_key_id] || ENV['AWS_ACCESS_KEY_ID']
       @aws_secret_access_key = opts[:aws_secret_access_key] || ENV['AWS_SECRET_ACCESS_KEY']
@@ -24,6 +28,8 @@ module SitemapGenerator
       @fog_region = opts[:fog_region] || ENV['FOG_REGION']
       @fog_path_style = opts[:fog_path_style] || ENV['FOG_PATH_STYLE']
       @fog_storage_options = opts[:fog_storage_options] || {}
+      fog_public = opts[:fog_public].nil? ? ENV['FOG_PUBLIC'] : opts[:fog_public]
+      @fog_public = SitemapGenerator::Utilities.falsy?(fog_public) ? false : true
     end
 
     # Call with a SitemapLocation and string data
@@ -47,7 +53,7 @@ module SitemapGenerator
       directory.files.create(
         :key    => location.path_in_public,
         :body   => File.open(location.path),
-        :public => true
+        :public => @fog_public
       )
     end
   end

data/lib/sitemap_generator/adapters/wave_adapter.rb

@@ -1,5 +1,5 @@
 if !defined?(::CarrierWave::Uploader::Base)
-  raise "Error: `CarrierWave::Uploader::Base` is not defined.\n\n"\
+  raise LoadError, "Error: `CarrierWave::Uploader::Base` is not defined.\n\n"\
         "Please `require 'carrierwave'` - or another library that defines this class."
 end
 

data/lib/sitemap_generator/builder/sitemap_index_url.rb

@@ -6,7 +6,7 @@ module SitemapGenerator
 
       def initialize(path, options={})
         if index = path.is_a?(SitemapGenerator::Builder::SitemapIndexFile) && path
-          options = SitemapGenerator::Utilities.reverse_merge(options, :host => index.location.host, :lastmod => Time.now, :changefreq => 'always', :priority => 1.0)
+          options = SitemapGenerator::Utilities.reverse_merge(options, :host => index.location.host, :lastmod => Time.now, :priority => 1.0)
           path = index.location.path_in_public
           super(path, options)
         else
@@ -25,4 +25,4 @@ module SitemapGenerator
       end
     end
   end
-end
+end

data/lib/sitemap_generator/builder/sitemap_url.rb

@@ -32,12 +32,29 @@ module SitemapGenerator
       def initialize(path, options={})
         options = SitemapGenerator::Utilities.symbolize_keys(options)
         if sitemap = path.is_a?(SitemapGenerator::Builder::SitemapFile) && path
-          SitemapGenerator::Utilities.reverse_merge!(options, :host => sitemap.location.host, :lastmod => sitemap.lastmod)
+          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, :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 => [])
+        SitemapGenerator::Utilities.assert_valid_keys(
+          options,
+          :priority, :changefreq, :lastmod, :expires, :host, :images, :video, :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)

data/lib/sitemap_generator/link_set.rb

@@ -126,7 +126,7 @@ module SitemapGenerator
         :filename => :sitemap,
         :search_engines => {
           :google         => "http://www.google.com/webmasters/tools/ping?sitemap=%s",
-          :bing           => "http://www.bing.com/ping?sitemap=%s"
+          :bing           => "http://www.bing.com/webmaster/ping.aspx?sitemap=%s"
         },
         :create_index => :auto,
         :compress => true,
@@ -438,7 +438,7 @@ module SitemapGenerator
     # in an instance variable.
     def add_default_links
       @added_default_links = true
-      link_options = { :lastmod => Time.now, :changefreq => 'always', :priority => 1.0 }
+      link_options = { :lastmod => Time.now, :priority => 1.0 }
       if include_root?
         add('/', link_options)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sitemap_generator
 version: !ruby/object:Gem::Version
-  version: 6.1.2
+  version: 6.2.1
 platform: ruby
 authors:
 - Karl Varga
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-03 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: fog-aws
+  name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: google-cloud-storage
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-core
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-s3
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: google-cloud-storage
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -180,11 +194,11 @@ files:
 - rails/install.rb
 - rails/uninstall.rb
 - templates/sitemap.rb
-homepage: http://github.com/kjvarga/sitemap_generator
+homepage: https://github.com/kjvarga/sitemap_generator
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -199,8 +213,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Easily generate XML Sitemaps
 test_files: []