sitemap_generator 6.3.0 → 7.0.2

data/lib/sitemap_generator/utilities.rb

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
+
 module SitemapGenerator
   module Utilities
     extend self
 
     # Copy templates/sitemap.rb to config if not there yet.
-    def install_sitemap_rb(verbose=false)
+    def install_sitemap_rb(verbose = false)
       if File.exist?(SitemapGenerator.app.root + 'config/sitemap.rb')
-        puts "already exists: config/sitemap.rb, file not copied" if verbose
+        puts 'already exists: config/sitemap.rb, file not copied' if verbose
       else
         FileUtils.cp(
           SitemapGenerator.templates.template_path(:sitemap_sample),
           SitemapGenerator.app.root + 'config/sitemap.rb')
-        puts "created: config/sitemap.rb" if verbose
+        puts 'created: config/sitemap.rb' if verbose
       end
     end
 
@@ -31,7 +33,7 @@ module SitemapGenerator
     # strings for keys but assert symbols as keys, this will fail.
     def assert_valid_keys(hash, *valid_keys)
       unknown_keys = hash.keys - [valid_keys].flatten
-      raise(ArgumentError, "Unknown key(s): #{unknown_keys.join(", ")}") unless unknown_keys.empty?
+      raise(ArgumentError, "Unknown key(s): #{unknown_keys.join(', ')}") unless unknown_keys.empty?
     end
 
     # Return a new hash with all keys converted to symbols, as long as
@@ -69,7 +71,7 @@ module SitemapGenerator
     #   x.round(2) # => 1.34
     def round(float, precision = nil)
       if precision
-        magnitude = 10.0 ** precision
+        magnitude = 10.0**precision
         (float * magnitude).round / magnitude
       else
         float.round
@@ -98,7 +100,7 @@ module SitemapGenerator
     # Performs the opposite of <tt>merge</tt>, with the keys and values from the first hash taking precedence over the second.
     # Modifies the receiver in place.
     def reverse_merge!(hash, other_hash)
-      hash.merge!( other_hash ){|k,o,n| o }
+      hash.merge!(other_hash) { |k, o, n| o }
     end
 
     # An object is blank if it's false, empty, or a whitespace string.
@@ -111,7 +113,7 @@ module SitemapGenerator
     # ...to:
     #
     #   if !address.blank?
-    def blank?(object)
+    def blank?(object) # rubocop:disable Metrics/MethodLength
       case object
       when NilClass, FalseClass
         true
@@ -133,15 +135,16 @@ module SitemapGenerator
 
     # Sets $VERBOSE for the duration of the block and back to its original value afterwards.
     def with_warnings(flag)
-      old_verbose, $VERBOSE = $VERBOSE, flag
+      old_verbose, $VERBOSE = $VERBOSE, flag # rubocop:disable Style/ParallelAssignment
       yield
     ensure
       $VERBOSE = old_verbose
     end
 
     def titleize(string)
-      string.gsub!(/_/, ' ')
-      string.split(/(\W)/).map(&:capitalize).join
+      result = string.tr('_', ' ')
+      result.gsub!(/\b\w/) { |match| match.upcase }
+      result
     end
 
     def truthy?(value)
@@ -156,7 +159,7 @@ module SitemapGenerator
     # Returns a string.  Expects a string or Pathname object.
     def append_slash(path)
       strpath = path.to_s
-      if strpath[-1] != nil && strpath[-1].chr != '/'
+      if !strpath[-1].nil? && strpath[-1].chr != '/'
         strpath + '/'
       else
         strpath
@@ -177,5 +180,29 @@ module SitemapGenerator
     def bytesize(string)
       string.respond_to?(:bytesize) ? string.bytesize : string.length
     end
+
+    # Looks up an adapter from various sources:
+    # 1. symbol/string names are camelized and constantized
+    #   - :fog becomes SitemapGenerator::FogAdapter
+    #   - 'external/adapter_class' becomes External::AdapterClass
+    # 2. classes are instantiated
+    # 3. callables (procs, lambdas, #call) are "called"
+    # All steps recurse, so a proc could return a string that names a class that is instantiated.
+    #
+    # This method is used by the Rails railtie and as such,
+    # safely depends on ActiveSupport::Inflector.
+    def find_adapter(candidate)
+      if candidate.is_a?(Symbol) || candidate.is_a?(String)
+        candidate.to_s.camelize.then { |name|
+          "SitemapGenerator::#{name}Adapter".safe_constantize || name.safe_constantize
+        }.then { |c| find_adapter(c) }
+      elsif candidate.respond_to?(:new)
+        find_adapter candidate.new
+      elsif candidate.respond_to?(:call)
+        find_adapter candidate.call
+      else
+        candidate
+      end
+    end
   end
 end

data/lib/sitemap_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sitemap_generator/simple_namer'
 require 'sitemap_generator/builder'
 require 'sitemap_generator/link_set'
@@ -9,6 +11,7 @@ require 'sitemap_generator/sitemap_location'
 module SitemapGenerator
   autoload(:Interpreter,              'sitemap_generator/interpreter')
   autoload(:FileAdapter,              'sitemap_generator/adapters/file_adapter')
+  autoload(:ActiveStorageAdapter,     'sitemap_generator/adapters/active_storage_adapter') if defined?(::ActiveStorage)
   autoload(:S3Adapter,                'sitemap_generator/adapters/s3_adapter')
   autoload(:AwsSdkAdapter,            'sitemap_generator/adapters/aws_sdk_adapter')
   autoload(:WaveAdapter,              'sitemap_generator/adapters/wave_adapter')
@@ -22,7 +25,7 @@ module SitemapGenerator
   SitemapFinalizedError = Class.new(SitemapError)
 
   Utilities.with_warnings(nil) do
-    VERSION = File.read(File.dirname(__FILE__) + "/../VERSION").strip
+    VERSION = File.read(File.dirname(__FILE__) + '/../VERSION').strip
     MAX_SITEMAP_FILES    = 50_000        # max sitemap links per index file
     MAX_SITEMAP_LINKS    = 50_000        # max links per sitemap
     MAX_SITEMAP_IMAGES   = 1_000         # max images per url
@@ -37,18 +40,21 @@ module SitemapGenerator
     }
 
     # Lazy-initialize the LinkSet instance
-    Sitemap = (Class.new do
-      def method_missing(*args, &block)
-        (@link_set ||= reset!).send(*args, &block)
+    Sitemap = (Config = Class.new do
+      # Use a new LinkSet instance
+      def reset!
+        @link_set = LinkSet.new
       end
 
-      def respond_to?(name, include_private = false)
-        (@link_set ||= reset!).respond_to?(name, include_private)
+      private
+
+      def method_missing(name, *args, &block)
+        @link_set ||= reset!
+        @link_set.respond_to?(name, true) ? @link_set.__send__(name, *args, &block) : super
       end
 
-      # Use a new LinkSet instance
-      def reset!
-        @link_set = LinkSet.new
+      def respond_to_missing?(name, include_private = false)
+        (@link_set ||= reset!).respond_to?(name, include_private) || super
       end
     end).new
   end
@@ -62,13 +68,14 @@ module SitemapGenerator
   # Global default for the verbose setting.
   def self.verbose
     if @verbose.nil?
-      @verbose = if SitemapGenerator::Utilities.truthy?(ENV['VERBOSE'])
-        true
-      elsif SitemapGenerator::Utilities.falsy?(ENV['VERBOSE'])
-        false
-      else
-        nil
-      end
+      @verbose =
+        if SitemapGenerator::Utilities.truthy?(ENV['VERBOSE'])
+          true
+        elsif SitemapGenerator::Utilities.falsy?(ENV['VERBOSE'])
+          false
+        else
+          nil
+        end
     else
       @verbose
     end
@@ -79,7 +86,7 @@ module SitemapGenerator
     !!@yield_sitemap
   end
 
-  self.root      = File.expand_path(File.join(File.dirname(__FILE__), '../'))  # Root of the install dir, not the Rails app
+  self.root      = File.expand_path(File.join(File.dirname(__FILE__), '../')) # Root of the install dir, not the Rails app
   self.templates = SitemapGenerator::Templates.new(self.root)
   self.app       = SitemapGenerator::Application.new
 end

data/templates/sitemap.rb

@@ -1,5 +1,5 @@
 # Set the host name for URL creation
-SitemapGenerator::Sitemap.default_host = "http://www.example.com"
+SitemapGenerator::Sitemap.default_host = 'http://www.example.com'
 
 SitemapGenerator::Sitemap.create do
   # Put links creation logic here.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sitemap_generator
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 7.0.2
 platform: ruby
 authors:
 - Karl Varga
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-09 00:00:00.000000000 Z
+date: 2026-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -24,132 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-core
-  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: aws-sdk-s3
-  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: fog-aws
-  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: 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:
-    - - ">="
-      - !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: rake
-  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: rspec_junit_formatter
-  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: rspec
-  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: webmock
-  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'
 description: SitemapGenerator is a framework-agnostic XML Sitemap generator written
   in Ruby with automatic Rails integration.  It supports Video, News, Image, Mobile,
   PageMap and Alternate Links sitemap extensions and includes Rake tasks for managing
@@ -166,6 +40,7 @@ files:
 - lib/capistrano/sitemap_generator.rb
 - lib/capistrano/tasks/sitemap_generator.cap
 - lib/sitemap_generator.rb
+- lib/sitemap_generator/adapters/active_storage_adapter.rb
 - lib/sitemap_generator/adapters/aws_sdk_adapter.rb
 - lib/sitemap_generator/adapters/file_adapter.rb
 - lib/sitemap_generator/adapters/fog_adapter.rb
@@ -197,7 +72,8 @@ files:
 homepage: https://github.com/kjvarga/sitemap_generator
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -206,14 +82,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Easily generate XML Sitemaps