sitemap_generator 5.2.0 → 5.3.0

data/VERSION

@@ -1 +1 @@
-5.2.0
+5.3.0

data/lib/capistrano/tasks/sitemap_generator.cap

@@ -1,34 +1,32 @@
-namespace :deploy do
-  namespace :sitemap do
-    desc 'Create sitemap and ping search engines'
-    task :refresh do
-      on roles :web do
-        within release_path do
-          with rails_env: (fetch(:rails_env) || fetch(:stage)) do
-           execute :rake, "sitemap:refresh"
-          end
+namespace :sitemap do
+  desc 'Create sitemap and ping search engines'
+  task :refresh do
+    on roles :web do
+      within release_path do
+        with rails_env: (fetch(:rails_env) || fetch(:stage)) do
+         execute :rake, "sitemap:refresh"
         end
       end
     end
+  end
 
-    desc 'Create sitemap without pinging search engines'
-    task :create do
-      on roles :web do
-        within release_path do
-          with rails_env: (fetch(:rails_env) || fetch(:stage)) do
-           execute :rake, "sitemap:create"
-          end
+  desc 'Create sitemap without pinging search engines'
+  task :create do
+    on roles :web do
+      within release_path do
+        with rails_env: (fetch(:rails_env) || fetch(:stage)) do
+         execute :rake, "sitemap:create"
         end
       end
     end
+  end
 
-    desc 'Clean up sitemaps in sitemap_generator path'
-    task :clean do
-      on roles :web do
-        within release_path do
-          with rails_env: (fetch(:rails_env) || fetch(:stage)) do
-           execute :rake, "sitemap:clean"
-          end
+  desc 'Clean up sitemaps in sitemap_generator path'
+  task :clean do
+    on roles :web do
+      within release_path do
+        with rails_env: (fetch(:rails_env) || fetch(:stage)) do
+         execute :rake, "sitemap:clean"
         end
       end
     end

data/lib/sitemap_generator.rb

@@ -1,4 +1,4 @@
-require 'sitemap_generator/sitemap_namer'
+require 'sitemap_generator/simple_namer'
 require 'sitemap_generator/builder'
 require 'sitemap_generator/link_set'
 require 'sitemap_generator/templates'
@@ -28,7 +28,6 @@ module SitemapGenerator
     MAX_SITEMAP_NEWS     = 1_000         # max news sitemap per index_file
     MAX_SITEMAP_FILESIZE = 10_000_000    # bytes
     SCHEMAS = {
-      'geo'     => 'http://www.google.com/geo/schemas/sitemap/1.0',
       'image'   => 'http://www.google.com/schemas/sitemap-image/1.1',
       'mobile'  => 'http://www.google.com/schemas/sitemap-mobile/1.0',
       'news'    => 'http://www.google.com/schemas/sitemap-news/0.9',

data/lib/sitemap_generator/adapters/s3_adapter.rb

@@ -1,3 +1,8 @@
+# Without this require, fog-core 1.2.0 raises
+# NameError: uninitialized constant Fog::ServicesMixin.
+# I don't know which versions this affects.
+require 'fog/core/services_mixin' rescue nil
+
 begin
   require 'fog/storage'
 rescue LoadError

data/lib/sitemap_generator/application.rb

@@ -3,7 +3,7 @@ require 'pathname'
 module SitemapGenerator
   class Application
     def rails?
-      defined?(Rails)
+      !!defined?(Rails::VERSION)
     end
 
     # Returns a boolean indicating whether this environment is Rails 3

data/lib/sitemap_generator/builder/sitemap_file.rb

@@ -18,7 +18,8 @@ module SitemapGenerator
       # === Options
       #
       # * <tt>location</tt> - a SitemapGenerator::SitemapLocation instance or a Hash of options
-      #   from which a SitemapLocation will be created for you.
+      #   from which a SitemapLocation will be created for you.  See `SitemapGenerator::SitemapLocation` for
+      #   the supported list of options.
       def initialize(opts={})
         @location = opts.is_a?(Hash) ? SitemapGenerator::SitemapLocation.new(opts) : opts
         @link_count = 0
@@ -33,7 +34,6 @@ module SitemapGenerator
               xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
               xmlns:image="#{SitemapGenerator::SCHEMAS['image']}"
               xmlns:video="#{SitemapGenerator::SCHEMAS['video']}"
-              xmlns:geo="#{SitemapGenerator::SCHEMAS['geo']}"
               xmlns:news="#{SitemapGenerator::SCHEMAS['news']}"
               xmlns:mobile="#{SitemapGenerator::SCHEMAS['mobile']}"
               xmlns:pagemap="#{SitemapGenerator::SCHEMAS['pagemap']}"
@@ -67,7 +67,7 @@ module SitemapGenerator
       # bytesize will be calculated for you.
       def file_can_fit?(bytes)
         bytes = bytes.is_a?(String) ? SitemapGenerator::Utilities.bytesize(bytes) : bytes
-        (@filesize + bytes) < SitemapGenerator::MAX_SITEMAP_FILESIZE && @link_count < SitemapGenerator::MAX_SITEMAP_LINKS && @news_count < SitemapGenerator::MAX_SITEMAP_NEWS
+        (@filesize + bytes) < SitemapGenerator::MAX_SITEMAP_FILESIZE && @link_count < max_sitemap_links && @news_count < SitemapGenerator::MAX_SITEMAP_NEWS
       end
 
       # Add a link to the sitemap file.
@@ -164,6 +164,10 @@ module SitemapGenerator
         location.delete(:filename) if location.namer
         self.class.new(location)
       end
+
+      def max_sitemap_links
+        @location[:max_sitemap_links] || SitemapGenerator::MAX_SITEMAP_LINKS
+      end
     end
   end
 end

data/lib/sitemap_generator/builder/sitemap_url.rb

@@ -25,7 +25,6 @@ module SitemapGenerator
       # * +lastmod+
       # * +images+
       # * +video+/+videos+
-      # * +geo+
       # * +news+
       # * +mobile+
       # * +alternate+/+alternates+
@@ -37,7 +36,7 @@ module SitemapGenerator
           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.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])
 
@@ -60,7 +59,6 @@ module SitemapGenerator
           :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]
@@ -142,13 +140,6 @@ module SitemapGenerator
             builder.xhtml :link, attributes
           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

data/lib/sitemap_generator/link_set.rb

@@ -8,7 +8,7 @@ module SitemapGenerator
     @@new_location_opts = [:filename, :sitemaps_path, :namer]
 
     attr_reader :default_host, :sitemaps_path, :filename, :create_index
-    attr_accessor :include_root, :include_index, :adapter, :yield_sitemap
+    attr_accessor :include_root, :include_index, :adapter, :yield_sitemap, :max_sitemap_links
     attr_writer :verbose
 
     # Create a new sitemap index and sitemap files.  Pass a block with calls to the following
@@ -112,7 +112,10 @@ module SitemapGenerator
     #   file in the group will not be compressed, the rest will).  So if you require different behaviour for your
     #   groups, pass in a `:compress` option e.g. <tt>group(:compress => false) { add('/link') }</tt>
     #
-    # KJV: When adding a new option be sure to include it in `options_for_group()` if
+    # * <tt>:max_sitemap_links</tt> - The maximum number of links to put in each sitemap.
+    #   Default is `SitemapGenerator::MAX_SITEMAPS_LINKS`, or 50,000.
+    #
+    # Note: When adding a new option be sure to include it in `options_for_group()` if
     # the option should be inherited by groups.
     def initialize(options={})
       options = SitemapGenerator::Utilities.reverse_merge(options,
@@ -124,7 +127,8 @@ module SitemapGenerator
           :bing           => "http://www.bing.com/ping?sitemap=%s"
         },
         :create_index => :auto,
-        :compress => true
+        :compress => true,
+        :max_sitemap_links => SitemapGenerator::MAX_SITEMAP_LINKS
       )
       options.each_pair { |k, v| instance_variable_set("@#{k}".to_sym, v) }
 
@@ -397,8 +401,9 @@ module SitemapGenerator
       )
       opts.delete(:public_path)
 
-      # Reverse merge the current settings
-      # KJV: This hash could be a problem because it needs to be maintained
+      # Reverse merge the current settings.
+      #
+      # This hash could be a problem because it needs to be maintained
       # when new options are added, but can easily be missed.  We really could
       # do with a separate SitemapOptions class.
       current_settings = [
@@ -411,11 +416,11 @@ module SitemapGenerator
         :default_host,
         :adapter,
         :create_index,
-        :compress
+        :compress,
+        :max_sitemap_links
       ].inject({}) do |hash, key|
-        if !(value = instance_variable_get(:"@#{key}")).nil?
-          hash[key] = value
-        end
+        value = instance_variable_get(:"@#{key}")
+        hash[key] = value unless value.nil?
         hash
       end
       SitemapGenerator::Utilities.reverse_merge!(opts, current_settings)
@@ -570,7 +575,8 @@ module SitemapGenerator
           :sitemaps_path => @sitemaps_path,
           :adapter => @adapter,
           :verbose => verbose,
-          :compress => @compress
+          :compress => @compress,
+          :max_sitemap_links => max_sitemap_links
         )
       end
 

data/lib/sitemap_generator/{sitemap_namer.rb → simple_namer.rb}

@@ -14,7 +14,7 @@ module SitemapGenerator
   #
   # Arguments:
   #   base - string or symbol that forms the base of the generated filename e.g.
-  #          if `:geo` files are generated like `geo.xml.gz`, `geo1.xml.gz`, `geo2.xml.gz` etc.
+  #          if `:geo`, files are generated like `geo.xml.gz`, `geo1.xml.gz`, `geo2.xml.gz` etc.
   #
   # Options:
   #   :extension - Default: '.xml.gz'. File extension to append.

data/lib/sitemap_generator/sitemap_location.rb

@@ -44,8 +44,20 @@ module SitemapGenerator
     # * <tt>compress</tt> - The LinkSet compress setting.  Default: +true+.  If `false` any `.gz` extension is
     #   stripped from the filename.  If `:all_but_first`, only the `.gz` extension of the first
     #   filename is stripped off.  If `true` the extensions are left unchanged.
+    # * <tt>max_sitemap_links</tt> - The maximum number of links to put in each sitemap.
     def initialize(opts={})
-      SitemapGenerator::Utilities.assert_valid_keys(opts, [:adapter, :public_path, :sitemaps_path, :host, :filename, :namer, :verbose, :create_index, :compress])
+      SitemapGenerator::Utilities.assert_valid_keys(opts, [
+        :adapter,
+        :public_path,
+        :sitemaps_path,
+        :host,
+        :filename,
+        :namer,
+        :verbose,
+        :create_index,
+        :compress,
+        :max_sitemap_links
+      ])
       opts[:adapter] ||= SitemapGenerator::FileAdapter.new
       opts[:public_path] ||= SitemapGenerator.app.root + 'public/'
       # This is a bit of a hack to make the SimpleNamer act like the old SitemapNamer.

data/lib/sitemap_generator/tasks.rb

@@ -11,7 +11,7 @@ namespace :sitemap do
     begin
       require 'sitemap_generator'
     rescue LoadError => e
-      if defined?(Rails)
+      if defined?(Rails::VERSION)
         Rake::Task['sitemap:require_environment'].invoke
       else
         raise e
@@ -22,7 +22,7 @@ namespace :sitemap do
   # Require sitemap_generator after loading the Rails environment.  We still need the require
   # in case we are installed as a gem and are setup to not automatically be required.
   task :require_environment do
-    if defined?(Rails)
+    if defined?(Rails::VERSION)
       Rake::Task['environment'].invoke
     end
     require 'sitemap_generator'

metadata

@@ -1,90 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: sitemap_generator
 version: !ruby/object:Gem::Version
-  version: !binary |-
-    NS4yLjA=
+  version: 5.3.0
 platform: ruby
 authors:
 - Karl Varga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-23 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: builder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC4xMC4w
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC4xMC4w
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.15.10
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.15.10
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: builder
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          My4w
-  type: :runtime
+        version: '2.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '12'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          My4w
+        version: '12'
 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.
+  in Ruby with automatic Rails integration.  It supports Video, News, Image, 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:
-- Gemfile
-- Gemfile.lock
+- CHANGES.md
 - MIT-LICENSE
 - README.md
-- Rakefile
 - VERSION
 - lib/capistrano/sitemap_generator.rb
 - lib/capistrano/tasks/sitemap_generator.cap
@@ -107,73 +128,20 @@ files:
 - lib/sitemap_generator/interpreter.rb
 - lib/sitemap_generator/link_set.rb
 - lib/sitemap_generator/railtie.rb
+- lib/sitemap_generator/simple_namer.rb
 - lib/sitemap_generator/sitemap_location.rb
-- lib/sitemap_generator/sitemap_namer.rb
 - lib/sitemap_generator/tasks.rb
 - lib/sitemap_generator/templates.rb
 - lib/sitemap_generator/utilities.rb
 - lib/tasks/sitemap_generator_tasks.rake
 - rails/install.rb
 - rails/uninstall.rb
-- spec/blueprint.rb
-- spec/files/sitemap.create.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
-- spec/sitemap_generator/builder/sitemap_index_file_spec.rb
-- spec/sitemap_generator/builder/sitemap_index_url_spec.rb
-- spec/sitemap_generator/builder/sitemap_url_spec.rb
-- spec/sitemap_generator/core_ext/bigdecimal_spec.rb
-- spec/sitemap_generator/core_ext/numeric_spec.rb
-- spec/sitemap_generator/file_adaptor_spec.rb
-- spec/sitemap_generator/geo_sitemap_spec.rb
-- spec/sitemap_generator/helpers/number_helper_spec.rb
-- spec/sitemap_generator/interpreter_spec.rb
-- spec/sitemap_generator/link_set_spec.rb
-- spec/sitemap_generator/mobile_sitemap_spec.rb
-- spec/sitemap_generator/news_sitemap_spec.rb
-- spec/sitemap_generator/pagemap_sitemap_spec.rb
-- spec/sitemap_generator/sitemap_generator_spec.rb
-- spec/sitemap_generator/sitemap_groups_spec.rb
-- spec/sitemap_generator/sitemap_location_spec.rb
-- spec/sitemap_generator/sitemap_namer_spec.rb
-- spec/sitemap_generator/templates_spec.rb
-- spec/sitemap_generator/utilities/existence_spec.rb
-- spec/sitemap_generator/utilities/hash_spec.rb
-- spec/sitemap_generator/utilities/rounding_spec.rb
-- spec/sitemap_generator/utilities_spec.rb
-- spec/sitemap_generator/video_sitemap_spec.rb
-- spec/spec_helper.rb
-- spec/support/file_macros.rb
-- spec/support/schemas/siteindex.xsd
-- spec/support/schemas/sitemap-geo.xsd
-- spec/support/schemas/sitemap-mobile.xsd
-- spec/support/schemas/sitemap-news.xsd
-- spec/support/schemas/sitemap-pagemap.xsd
-- spec/support/schemas/sitemap-video.xsd
-- spec/support/schemas/sitemap.xsd
-- spec/support/xml_macros.rb
 - templates/sitemap.rb
 homepage: http://github.com/kjvarga/sitemap_generator
 licenses:
 - MIT
 metadata: {}
-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.
-
-'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -189,48 +157,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Easily generate XML Sitemaps
-test_files:
-- spec/blueprint.rb
-- spec/files/sitemap.create.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
-- spec/sitemap_generator/builder/sitemap_index_file_spec.rb
-- spec/sitemap_generator/builder/sitemap_index_url_spec.rb
-- spec/sitemap_generator/builder/sitemap_url_spec.rb
-- spec/sitemap_generator/core_ext/bigdecimal_spec.rb
-- spec/sitemap_generator/core_ext/numeric_spec.rb
-- spec/sitemap_generator/file_adaptor_spec.rb
-- spec/sitemap_generator/geo_sitemap_spec.rb
-- spec/sitemap_generator/helpers/number_helper_spec.rb
-- spec/sitemap_generator/interpreter_spec.rb
-- spec/sitemap_generator/link_set_spec.rb
-- spec/sitemap_generator/mobile_sitemap_spec.rb
-- spec/sitemap_generator/news_sitemap_spec.rb
-- spec/sitemap_generator/pagemap_sitemap_spec.rb
-- spec/sitemap_generator/sitemap_generator_spec.rb
-- spec/sitemap_generator/sitemap_groups_spec.rb
-- spec/sitemap_generator/sitemap_location_spec.rb
-- spec/sitemap_generator/sitemap_namer_spec.rb
-- spec/sitemap_generator/templates_spec.rb
-- spec/sitemap_generator/utilities/existence_spec.rb
-- spec/sitemap_generator/utilities/hash_spec.rb
-- spec/sitemap_generator/utilities/rounding_spec.rb
-- spec/sitemap_generator/utilities_spec.rb
-- spec/sitemap_generator/video_sitemap_spec.rb
-- spec/spec_helper.rb
-- spec/support/file_macros.rb
-- spec/support/schemas/siteindex.xsd
-- spec/support/schemas/sitemap-geo.xsd
-- spec/support/schemas/sitemap-mobile.xsd
-- spec/support/schemas/sitemap-news.xsd
-- spec/support/schemas/sitemap-pagemap.xsd
-- spec/support/schemas/sitemap-video.xsd
-- spec/support/schemas/sitemap.xsd
-- spec/support/xml_macros.rb
+test_files: []