sitemap_generator 6.2.0 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4649b091445a578b7e482dc4b73d76a78afdf97ad5af8694a8fb49972c157d7c
-  data.tar.gz: 9aab8c0be6dbb77dcfa9323a06b5621f0206bd75051edbb80de3cdfba9e7183c
+  metadata.gz: 6619733ac6e91a00c5a7b194f82f76b68de2c0521dda3c554d28c8315c0e7c29
+  data.tar.gz: 0d73d0acac5b95961d5799a766a5c6af6fac85173420807db5cbc9a630f1841d
 SHA512:
-  metadata.gz: 70f24b02d6d9a2e99a7eab5aa280040b69279254824f45b1375cdfc724a672818e6b65a5fa7fe49098f400752f3a64fd5e0ad527b4212d53651383d896c4c128
-  data.tar.gz: 9a45c8ab51121aa67dd2a8f5b9a72ec7610965e54d0f3c7dc173b7edef92bf6913c2247de2712adfb546babb679761cbf982809916beeeb4a1a3b0dd872bafa6
+  metadata.gz: 637cc70ee0036b4e9d228abe34abe4b220db7a6647c3e26b1b98e5df20e59d0e9c24f5f8596ef941afb5ea252081ce048cc74e95b7b52a69fc4c5e48774e3c22
+  data.tar.gz: 784183a6a1a1735078734f68aab8e62702b62e474c7602c9360bf2021aeff6492c03405b14a4800d42490bd0b2319c00814541252a3a8f6d4e70becfd87ee6d0

data/CHANGES.md

@@ -1,3 +1,7 @@
+### 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).

data/VERSION

@@ -1 +1 @@
-6.2.0
+6.2.1

data/lib/sitemap_generator/adapters/aws_sdk_adapter.rb

@@ -28,12 +28,13 @@ module SitemapGenerator
     def initialize(bucket, aws_access_key_id: nil, aws_secret_access_key: nil, aws_region: nil, aws_endpoint: nil, **options)
       @bucket = bucket
       @options = options
-      @options[:access_key_id] ||= aws_access_key_id
-      @options[:secret_access_key] ||= aws_secret_access_key
-      @options[:region] ||= aws_region
-      @options[:endpoint] ||= aws_endpoint
+      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)
@@ -47,6 +48,10 @@ module SitemapGenerator
 
     private
 
+    def set_option_unless_set(key, value)
+      @options[key] = value if @options[key].nil? && !value.nil?
+    end
+
     def s3_resource
       @s3_resource ||= Aws::S3::Resource.new(@options)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sitemap_generator
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.2.1
 platform: ruby
 authors:
 - Karl Varga
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-17 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder