sitemap_generator 6.2.1 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6619733ac6e91a00c5a7b194f82f76b68de2c0521dda3c554d28c8315c0e7c29
-  data.tar.gz: 0d73d0acac5b95961d5799a766a5c6af6fac85173420807db5cbc9a630f1841d
+  metadata.gz: b26cd553fe4ecc452da26ac6aff3262238f065dc12d9f328959eb3c1edc79f6e
+  data.tar.gz: 877828e867880ed215df8b3e1f6acb130e4e8c5856a349e61e6af17a5c641ac9
 SHA512:
-  metadata.gz: 637cc70ee0036b4e9d228abe34abe4b220db7a6647c3e26b1b98e5df20e59d0e9c24f5f8596ef941afb5ea252081ce048cc74e95b7b52a69fc4c5e48774e3c22
-  data.tar.gz: 784183a6a1a1735078734f68aab8e62702b62e474c7602c9360bf2021aeff6492c03405b14a4800d42490bd0b2319c00814541252a3a8f6d4e70becfd87ee6d0
+  metadata.gz: d957d69f7a4c2fe8e98cecb84045d58fe59f9f8143764c88695a7561a63d54e9d515c80bdc2b2cf496b1704ffb2ca4610b54f5889cb246e2ed45aac88029abdd
+  data.tar.gz: 884fc7be3809f6670cce09afdddfa64cdf6b4c5b25cdc7ad5c7c3b784d08f83bbc96bdb671a1b52de7f0f59fac8618f1bc83122c01664ee574a52c4edd791699

data/CHANGES.md

@@ -1,3 +1,26 @@
+### 7.0.1
+
+* **Breaking:** Default search engines list is empty. `rake sitemap:refresh` and `ping_search_engines` perform no HTTP pings unless you configure engine URLs on `search_engines` or pass them into `ping_search_engines` (Google’s ping endpoint is deprecated upstream). [#444](https://github.com/kjvarga/sitemap_generator/pull/444)
+* **Breaking:** `LinkSet#create` runs `finalize!` only when a block is given. Calling `create` without a block requires `finalize!` when you are done adding links (supported workflow for programmatic builds). [#463](https://github.com/kjvarga/sitemap_generator/pull/463)
+* **Breaking:** Drop Ruby 2.5, Rails 5.2 [#438](https://github.com/kjvarga/sitemap_generator/pull/438)
+* Migrate continuous integration from CircleCI to GitHub Actions with expanded Ruby × Rails CI matrix.
+* Support AWS temporary credentials (`aws_session_token` / `AWS_SESSION_TOKEN`) for S3 uploads in AWS Lambda [#415](https://github.com/kjvarga/sitemap_generator/pull/415)
+* Add `frozen_string_literal: true` magic comments [#430](https://github.com/kjvarga/sitemap_generator/pull/430)
+* Add support for Rails 8.0 [#441](https://github.com/kjvarga/sitemap_generator/pull/441)
+* Fix uninitialized constant ActiveSupport::LoggerThreadSafeLevel::Logger [#449](https://github.com/kjvarga/sitemap_generator/pull/449)
+* Add support for Ruby 3.4 [#451](https://github.com/kjvarga/sitemap_generator/pull/451)
+* Add support for Rails 8.1 [#461](https://github.com/kjvarga/sitemap_generator/pull/461)
+* Replace CGI-based escaping with `URI.encode_www_form_component` for ping URLs; remove reliance on `cgi` (Ruby 4 compatibility) [#465](https://github.com/kjvarga/sitemap_generator/pull/465)
+* Add support for Ruby 4.0 [#466](https://github.com/kjvarga/sitemap_generator/pull/466)
+* Add ActiveStorage adapter (`ActiveStorage::Blob`) [#467](https://github.com/kjvarga/sitemap_generator/pull/467)
+
+### 6.3.0
+
+* Remove Bing's deprecated sitemap submission [#400](https://github.com/kjvarga/sitemap_generator/pull/400).
+* `SitemapGenerator::AwsSdkAdapter`: Support configuring ACL and caching on the uploaded files [#409](https://github.com/kjvarga/sitemap_generator/pull/409).
+* `SitemapGenerator::GoogleStorageAdapter`: Support configuring ACL on the uploaded files [#410](https://github.com/kjvarga/sitemap_generator/pull/410).
+* Fix CircleCI specs for Ruby 3 [#407](https://github.com/kjvarga/sitemap_generator/pull/407).
+
 ### 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).

data/README.md

@@ -1,6 +1,6 @@
 # SitemapGenerator
 
-[![CircleCI](https://circleci.com/gh/kjvarga/sitemap_generator/tree/master.svg?style=shield)](https://circleci.com/gh/kjvarga/sitemap_generator/tree/master)
+[![CI](https://github.com/kjvarga/sitemap_generator/actions/workflows/ci.yml/badge.svg)](https://github.com/kjvarga/sitemap_generator/actions/workflows/ci.yml)
 
 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.
 
@@ -11,14 +11,15 @@ Sitemaps adhere to the [Sitemap 0.9 protocol][sitemap_protocol] specification.
 * Framework agnostic
 * Supports [News sitemaps][sitemap_news], [Video sitemaps][sitemap_video], [Image sitemaps][sitemap_images], [Mobile sitemaps][sitemap_mobile], [PageMap sitemaps][sitemap_pagemap] and [Alternate Links][alternate_links]
 * Supports read-only filesystems like Heroku via uploading to a remote host like Amazon S3
-* Compatible with all versions of Rails and Ruby
 * Adheres to the [Sitemap 0.9 protocol][sitemap_protocol]
 * Handles millions of links
 * Customizable sitemap compression
-* Notifies search engines (Google, Bing) of new sitemaps
+* Optional HTTP notification of search engines when `search_engines` is configured
 * 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
+* Compatible with Ruby from version 2.6 to version 4.0
+* Compatible with Rails from version 6.0 to version 8.1
 
 ### Show Me
 
@@ -41,7 +42,6 @@ SitemapGenerator::Sitemap.create do
   add '/home', :changefreq => 'daily', :priority => 0.9
   add '/contact_us', :changefreq => 'weekly'
 end
-SitemapGenerator::Sitemap.ping_search_engines # Not needed if you use the rake tasks
 ```
 
 Run it:
@@ -56,9 +56,6 @@ Output:
 In /Users/karl/projects/sitemap_generator-test/public/
 + sitemap.xml.gz                                           3 links /  364 Bytes
 Sitemap stats: 3 links / 1 sitemaps / 0m00s
-
-Successful ping of Google
-Successful ping of Bing
 ```
 
 ## Contents
@@ -67,7 +64,6 @@ Successful ping of Bing
   - [Features](#features)
     - [Show Me](#show-me)
   - [Contents](#contents)
-  - [Contribute](#contribute)
   - [Foreword](#foreword)
   - [Installation](#installation)
     - [Ruby](#ruby)
@@ -79,11 +75,12 @@ Successful ping of Bing
     - [Crontab](#crontab)
     - [Robots.txt](#robotstxt)
     - [Ruby Modules](#ruby-modules)
-    - [Deployments & Capistrano](#deployments--capistrano)
+    - [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::ActiveStorageAdapter`](#sitemapgeneratoractivestorageadapter)
         - [`SitemapGenerator::FogAdapter`](#sitemapgeneratorfogadapter)
         - [`SitemapGenerator::S3Adapter`](#sitemapgenerators3adapter)
         - [`SitemapGenerator::AwsSdkAdapter`](#sitemapgeneratorawssdkadapter)
@@ -97,6 +94,7 @@ Successful ping of Bing
     - [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)
+    - [Using `create` without a block](#using-create-without-a-block)
     - [Speeding Things Up](#speeding-things-up)
   - [Customizing your Sitemaps](#customizing-your-sitemaps)
     - [Sitemap Options](#sitemap-options)
@@ -126,13 +124,6 @@ Successful ping of Bing
   - [Compatibility](#compatibility)
   - [Licence](#licence)
 
-## Contribute
-
-Does your website use SitemapGenerator to generate Sitemaps?  Where would you be without Sitemaps?  Probably still knocking rocks together.  Consider donating to the project to keep it up-to-date and open source.
-
-<a href='http://www.pledgie.com/campaigns/15267'><img alt='Click here to lend your support to: SitemapGenerator and make a donation at www.pledgie.com !' src='http://pledgie.com/campaigns/15267.png?skin_name=chrome' border='0' /></a>
-
-
 ## Foreword
 
 Adam Salter first created SitemapGenerator while we were working together in Sydney, Australia.  Unfortunately, he passed away in 2009.  Since then I have taken over development of SitemapGenerator.
@@ -160,7 +151,7 @@ The Rake tasks expect your sitemap to be at `config/sitemap.rb` but if you need
 
 ### Rails
 
-SitemapGenerator works with all versions of Rails and has been tested in Rails 2, 3 and 4.
+SitemapGenerator targets Rails 6.0 through 8.1 (see [Compatibility](#compatibility)).
 
 Add the gem to your `Gemfile`:
 
@@ -205,10 +196,10 @@ SitemapGenerator.verbose = false
 
 ### Pinging Search Engines
 
-Using `rake sitemap:refresh` will notify Google and Bing to let them know that a new sitemap
+Using `rake sitemap:refresh` will notify configured search engines to let them know that a new sitemap
 is available.  To generate new sitemaps without notifying search engines, use `rake sitemap:refresh:no_ping`.
 
-If you want to customize the hash of search engines you can access it at:
+By default no search engines are configured. If you want to customize the hash of search engines you can access it at:
 
 ```ruby
 SitemapGenerator::Sitemap.search_engines
@@ -225,7 +216,7 @@ directly in the call, as in the following example:
 SitemapGenerator::Sitemap.ping_search_engines(newengine: 'http://newengine.com/ping?url=%s')
 ```
 
-The key gives the name of the search engine, as a string or symbol, and the value is the full URL to ping, with a string interpolation that will be replaced by the CGI escaped sitemap index URL.  If you have any literal percent characters in your URL you need to escape them with `%%`.
+The key gives the name of the search engine, as a string or symbol, and the value is the full URL to ping, with a string interpolation that will be replaced by the URL-encoded (percent-encoded) sitemap index URL.  If you have any literal percent characters in your URL you need to escape them with `%%`.
 
 If you are calling `SitemapGenerator::Sitemap.ping_search_engines` from outside of your sitemap config file, then you will need to set `SitemapGenerator::Sitemap.default_host` and any other options that you set in your sitemap config which affect the location of the sitemap index file.  For example:
 
@@ -343,6 +334,10 @@ directory.
 
   Standard adapter, writes out to a file.
 
+##### `SitemapGenerator::ActiveStorageAdapter`
+
+  Uses `ActiveStorage::Blob` to store the sitemap.
+
 ##### `SitemapGenerator::FogAdapter`
 
   Uses `Fog::Storage` to upload to any service supported by Fog.
@@ -365,6 +360,7 @@ directory.
   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
+* `aws_session_token` [String] Session token for temporary credentials (optional)
 * `fog_provider` [String]
 * `fog_directory` [String]
 * `fog_region` [String]
@@ -373,7 +369,7 @@ directory.
 * `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`.
+name but capitalized, e.g. `AWS_SESSION_TOKEN`, `FOG_PATH_STYLE`.
 
 ##### `SitemapGenerator::AwsSdkAdapter`
 
@@ -387,18 +383,19 @@ name but capitalized, e.g. `FOG_PATH_STYLE`.
 
   ```ruby
   SitemapGenerator::Sitemap.adapter = SitemapGenerator::AwsSdkAdapter.new('s3_bucket',
-    access_key_id: 'AKIAI3SW5CRAZBL4WSTA',
-    secret_access_key: 'asdfadsfdsafsadf',
+    acl: 'public-read', # Optional. This is the default.
+    cache_control: 'private, max-age=0, no-cache', # Optional. This is the default.
+    access_key_id: 'YOUR_AWS_ACCESS_KEY_ID',
+    secret_access_key: 'YOUR_AWS_SECRET_ACCESS_KEY',
+    session_token: 'YOUR_AWS_SESSION_TOKEN', # Optional; use with temporary credentials.
     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.
+  Where the first argument is the S3 bucket name, and the rest are keyword argument options.  Options `:acl` and `:cache_control` configure access and caching of the uploaded files; `session_token` supports STS-style credentials (or set `AWS_SESSION_TOKEN` and rely on SDK defaults). All other keyword options 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.
+  See [the `SitemapGenerator::AwsSdkAdapter` docs](https://github.com/kjvarga/sitemap_generator/blob/master/lib/sitemap_generator/adapters/aws_sdk_adapter.rb), and [https://docs.aws.amazon.com/sdk-for-ruby/v2/api/Aws/S3/Client.html#initialize-instance_method](https://docs.aws.amazon.com/sdk-for-ruby/v2/api/Aws/S3/Client.html#initialize-instance_method) for the full list of supported options.
 
 ##### `SitemapGenerator::WaveAdapter`
 
@@ -420,9 +417,10 @@ name but capitalized, e.g. `FOG_PATH_STYLE`.
 
   ```ruby
   SitemapGenerator::Sitemap.adapter = SitemapGenerator::GoogleStorageAdapter.new(
+    acl: 'public', # Optional.  This is the default value.
+    bucket: 'name_of_bucket'
     credentials: 'path/to/keyfile.json',
     project_id: 'google_account_project_id',
-    bucket: 'name_of_bucket'
   )
   ```
   Also, inline with Google Authentication options, it can also pick credentials from environment variables. All [supported environment variables][google_cloud_storage_authentication] can be used, for example: `GOOGLE_CLOUD_PROJECT` and `GOOGLE_CLOUD_CREDENTIALS`.  An example of using this adapter with the environment variables is:
@@ -433,7 +431,7 @@ name but capitalized, e.g. `FOG_PATH_STYLE`.
   )
   ```
 
-  All options other than the `:bucket` option are passed to the `Google::Cloud::Storage.new` initializer giving you maximum configurability.  See the [Google Cloud Storage initializer][google_cloud_storage_initializer] for supported options.
+  All options other than the `:bucket` and `:acl` options are passed to the `Google::Cloud::Storage.new` initializer giving you maximum configurability.  See the [Google Cloud Storage initializer][google_cloud_storage_initializer] for supported options.
 
 #### An Example of Using an Adapter
 
@@ -536,7 +534,6 @@ SitemapGenerator::Sitemap.create do
 end
 ```
 
-
 To generate each one specify the configuration file to run by passing the `CONFIG_FILE` option to `rake sitemap:refresh`, e.g.:
 
 ```
@@ -780,11 +777,21 @@ In /Users/karl/projects/sitemap_generator-test/public/
 Sitemap stats: 3 links / 4 sitemaps / 0m00s
 ```
 
+### Using `create` without a block
+
+You can call `create` without a block, add links (and use `group` as needed), then call `finalize!` on the returned link set when finished.
+
+```ruby
+sitemap = SitemapGenerator::Sitemap.create(default_host: 'http://www.example.com')
+sitemap.add('/home')
+# ... add more links or use groups, then:
+sitemap.finalize!
+```
+
 ### Speeding Things Up
 
 For large ActiveRecord collections with thousands of records it is advisable to iterate through them in batches to avoid loading all records into memory at once.  For this reason in the example above we use `Content.find_each` which is a batched iterator available since Rails 2.3.2, rather than `Content.all`.
 
-
 ## Customizing your Sitemaps
 
 SitemapGenerator supports a number of options which allow you to control every aspect of your sitemap generation.  How they are named, where they are stored, the contents of the links and the location that the sitemaps will be hosted from can all be set.
@@ -1167,16 +1174,15 @@ end
 
 ## Compatibility
 
-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.
+Ruby 2.6 through 4.0 and Rails 6.0 through 8.1 are supported.
+Ruby 2.5 and Rails 5.2 were dropped in v7.0.0.
+Ruby 1.9.3 support was dropped in v6.0.0.
 
 ## Licence
 
-Released under the MIT License.  See the (MIT-LICENSE)[MIT-LICENSE] file.
-
-MIT. See the LICENSE.md file.
+Released under the MIT license which is included in the [MIT-LICENSE](./MIT-LICENSE) file.
 
-Copyright (c) Karl Varga released under the MIT license
+Copyright (c) Karl Varga
 
 [canonical_repo]:http://github.com/kjvarga/sitemap_generator
 [sitemap_images]:http://www.google.com/support/webmasters/bin/answer.py?answer=178636

data/VERSION

@@ -1 +1 @@
-6.2.1
+7.0.1

data/lib/sitemap_generator/adapters/active_storage_adapter.rb

@@ -0,0 +1,26 @@
+module SitemapGenerator
+  # Class for uploading sitemaps to ActiveStorage.
+  class ActiveStorageAdapter
+    attr_reader :key, :filename
+
+    def initialize key: :sitemap, filename: 'sitemap.xml.gz'
+      @key, @filename = key, filename
+    end
+
+    def write(location, raw_data)
+      SitemapGenerator::FileAdapter.new.write(location, raw_data)
+
+      ActiveStorage::Blob.transaction do
+        ActiveStorage::Blob.where(key: key).destroy_all
+
+        ActiveStorage::Blob.create_and_upload!(
+          key: key,
+          io: open(location.path, 'rb'),
+          filename: filename,
+          content_type: 'application/gzip',
+          identify: false
+        )
+      end
+    end
+  end
+end

data/lib/sitemap_generator/adapters/aws_sdk_adapter.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 if !defined?(Aws::S3::Resource) or !defined?(Aws::Credentials)
-  raise LoadError, "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
 
@@ -18,32 +20,36 @@ module SitemapGenerator
     # 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 :access_key_id instead** :aws_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
+    #   :acl [String] The ACL to apply to the uploaded files.  Defaults to 'public-read'.
+    #   :cache_control [String] The cache control headder to apply to the uploaded files.  Defaults to 'private, max-age=0, no-cache'.
     #
     #   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)
+    def initialize(bucket, aws_access_key_id: nil, aws_secret_access_key: nil, aws_session_token: nil, aws_region: nil, aws_endpoint: nil, acl: 'public-read', cache_control: 'private, max-age=0, no-cache', **options)
       @bucket = bucket
+      @acl = acl
+      @cache_control = cache_control
       @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(:session_token, aws_session_token)
       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)
       s3_object = s3_resource.bucket(@bucket).object(location.path_in_public)
-      s3_object.upload_file(location.path,
-        acl: 'public-read',
-        cache_control: 'private, max-age=0, no-cache',
+      s3_object.upload_file(location.path, {
+        acl: @acl,
+        cache_control: @cache_control,
         content_type: location[:compress] ? 'application/x-gzip' : 'application/xml'
-      )
+      }.compact)
     end
 
     private

data/lib/sitemap_generator/adapters/file_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SitemapGenerator
   # Class for writing out data to a file.
   class FileAdapter

data/lib/sitemap_generator/adapters/fog_adapter.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 if !defined?(Fog::Storage)
-  raise LoadError, "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
 
@@ -21,11 +23,11 @@ module SitemapGenerator
       SitemapGenerator::FileAdapter.new.write(location, raw_data)
 
       storage   = Fog::Storage.new(@fog_credentials)
-      directory = storage.directories.new(:key => @fog_directory)
+      directory = storage.directories.new(key: @fog_directory)
       directory.files.create(
-        :key    => location.path_in_public,
-        :body   => File.open(location.path),
-        :public => true
+        key: location.path_in_public,
+        body: File.open(location.path),
+        public: true
       )
     end
   end

data/lib/sitemap_generator/adapters/google_storage_adapter.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 if !defined?(Google::Cloud::Storage)
-  raise LoadError, "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
 
@@ -10,8 +12,9 @@ module SitemapGenerator
     #
     # @param [Hash] opts Google::Cloud::Storage configuration options.
     # @option :bucket [String] Required. Name of Google Storage Bucket where the file is to be uploaded.
+    # @option :acl [String] Optional. Access control which is applied to the uploaded file(s).  Default value is 'public'.
     #
-    # All options other than the `:bucket` option are passed to the `Google::Cloud::Storage.new`
+    # All options other than the `:bucket` and `:acl` options are passed to the `Google::Cloud::Storage.new`
     # initializer.  See https://googleapis.dev/ruby/google-cloud-storage/latest/file.AUTHENTICATION.html
     # for all the supported environment variables and https://github.com/googleapis/google-cloud-ruby/blob/master/google-cloud-storage/lib/google/cloud/storage.rb
     # for supported options.
@@ -22,6 +25,7 @@ module SitemapGenerator
     def initialize(opts = {})
       opts = opts.clone
       @bucket = opts.delete(:bucket)
+      @acl = opts.has_key?(:acl) ? opts.delete(:acl) : 'public'
       @storage_options = opts
     end
 
@@ -31,7 +35,7 @@ module SitemapGenerator
 
       storage = Google::Cloud::Storage.new(**@storage_options)
       bucket = storage.bucket(@bucket)
-      bucket.create_file(location.path, location.path_in_public, acl: 'public')
+      bucket.create_file(location.path, location.path_in_public, acl: @acl)
     end
   end
 end

data/lib/sitemap_generator/adapters/s3_adapter.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 if !defined?(Fog::Storage)
-  raise LoadError, "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
 
@@ -23,6 +25,7 @@ module SitemapGenerator
     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']
+      @aws_session_token = opts[:aws_session_token] || ENV['AWS_SESSION_TOKEN']
       @fog_provider = opts[:fog_provider] || ENV['FOG_PROVIDER']
       @fog_directory = opts[:fog_directory] || ENV['FOG_DIRECTORY']
       @fog_region = opts[:fog_region] || ENV['FOG_REGION']
@@ -36,11 +39,12 @@ module SitemapGenerator
     def write(location, raw_data)
       SitemapGenerator::FileAdapter.new.write(location, raw_data)
 
-      credentials = { :provider => @fog_provider }
+      credentials = { provider: @fog_provider }
 
       if @aws_access_key_id && @aws_secret_access_key
         credentials[:aws_access_key_id] = @aws_access_key_id
         credentials[:aws_secret_access_key] = @aws_secret_access_key
+        credentials[:aws_session_token] = @aws_session_token if @aws_session_token
       else
         credentials[:use_iam_profile] = true
       end
@@ -49,11 +53,11 @@ module SitemapGenerator
       credentials[:path_style] = @fog_path_style if @fog_path_style
 
       storage   = Fog::Storage.new(@fog_storage_options.merge(credentials))
-      directory = storage.directories.new(:key => @fog_directory)
+      directory = storage.directories.new(key: @fog_directory)
       directory.files.create(
-        :key    => location.path_in_public,
-        :body   => File.open(location.path),
-        :public => @fog_public
+        key: location.path_in_public,
+        body: File.open(location.path),
+        public: @fog_public
       )
     end
   end

data/lib/sitemap_generator/adapters/wave_adapter.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 if !defined?(::CarrierWave::Uploader::Base)
-  raise LoadError, "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/application.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 
 module SitemapGenerator
@@ -29,6 +31,7 @@ module SitemapGenerator
     def rails_root
       return ::Rails.root.to_s if defined?(::Rails.root) && ::Rails.root
       return RAILS_ROOT.to_s if defined?(RAILS_ROOT)
+
       nil
     end
 
@@ -40,6 +43,7 @@ module SitemapGenerator
     def rails_env
       return ::Rails.env.to_s if defined?(::Rails.env)
       return RAILS_ENV.to_s if defined?(RAILS_ENV)
+
       nil
     end
   end

data/lib/sitemap_generator/builder/sitemap_file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'zlib'
 require 'fileutils'
 require 'sitemap_generator/helpers/number_helper'
@@ -20,12 +22,12 @@ module SitemapGenerator
       # * <tt>location</tt> - a SitemapGenerator::SitemapLocation instance or a Hash of options
       #   from which a SitemapLocation will be created for you.  See `SitemapGenerator::SitemapLocation` for
       #   the supported list of options.
-      def initialize(opts={})
+      def initialize(opts = {})
         @location = opts.is_a?(Hash) ? SitemapGenerator::SitemapLocation.new(opts) : opts
         @link_count = 0
         @news_count = 0
-        @xml_content = '' # XML urlset content
-        @xml_wrapper_start = <<-HTML
+        @xml_content = +'' # XML urlset content
+        @xml_wrapper_start = +<<-HTML
           <?xml version="1.0" encoding="UTF-8"?>
             <urlset
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -41,7 +43,7 @@ module SitemapGenerator
             >
         HTML
         @xml_wrapper_start.gsub!(/\s+/, ' ').gsub!(/ *> */, '>').strip!
-        @xml_wrapper_end   = %q[</urlset>]
+        @xml_wrapper_end = '</urlset>'
         @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
@@ -89,15 +91,16 @@ module SitemapGenerator
       #
       # The link added to the sitemap will use the host from its location object
       # if no host has been specified.
-      def add(link, options={})
+      def add(link, options = {})
         raise SitemapGenerator::SitemapFinalizedError if finalized?
 
-        sitemap_url = if link.is_a?(SitemapUrl)
-          link
-        else
-          options[:host] ||= @location.host
-          SitemapUrl.new(link, options)
-        end
+        sitemap_url =
+          if link.is_a?(SitemapUrl)
+            link
+          else
+            options[:host] ||= @location.host
+            SitemapUrl.new(link, options)
+          end
 
         xml = sitemap_url.to_xml
         raise SitemapGenerator::SitemapFullError if !file_can_fit?(xml)
@@ -118,6 +121,7 @@ module SitemapGenerator
       # has already been finalized.
       def finalize!
         raise SitemapGenerator::SitemapFinalizedError if finalized?
+
         @frozen = true
       end
 
@@ -133,7 +137,8 @@ module SitemapGenerator
       # A SitemapGenerator::SitemapError exception is raised if the file has
       # already been written.
       def write
-        raise SitemapGenerator::SitemapError.new("Sitemap already written!") if written?
+        raise SitemapGenerator::SitemapError.new('Sitemap already written!') if written?
+
         finalize! unless finalized?
         reserve_name
         @location.write(@xml_wrapper_start + @xml_content + @xml_wrapper_end, link_count)