sitemap_generator 5.0.4 → 5.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f409e2e176959553327858497c6817be5f3ceaf
-  data.tar.gz: f2d0c65be82f2c8c5a6dd9277903b74a2057a533
+  metadata.gz: 6445cea5741bfbdf3a4a22d3ea49b066283f8877
+  data.tar.gz: 4d7e44c720170f44a3b302d9215b0f39fea0e093
 SHA512:
-  metadata.gz: 37b97c0e1b85707fdf4b663f5369017160543687d6d0800d96da7a3071ac749a743ebe58480ceb4f1fc5dfdbb8aa92473af43fc880e325a83a3d244df27fcc92
-  data.tar.gz: b2b2899c879a19620c1f7a9bb19e33855234c7c6157e8d13bc3a9468a5b06a74b86d04e09c1a6eac0425d05bcefe918ece2dd7bab37163fd99989baf3103c674
+  metadata.gz: 5fb21aedf7c06c9b9d9229ab00f9104e7fc177c2d4ae359d193f1766c7cf09826bf39a4a2f0964a020224ffa38494fe6ceda72107da5f22f60db02deaa8acbc7
+  data.tar.gz: 6b858a5b19e875595e17774608bdd9cb73ffeeb5dd7a0c5fa76223a95ee39d3e4fd458b9ab4642cb104708fcab97af79718ebb9c6e2067b064b4d422fe0ae587

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ./
   specs:
-    sitemap_generator (5.0.4)
+    sitemap_generator (5.0.5)
       builder
 
 GEM

data/README.md

@@ -117,6 +117,7 @@ That's it!  Welcome to the future!
 
 ## Changelog
 
+* v5.0.5: Use MIT licence.  Fix deploys with Capistrano 3 ([#163](https://github.com/kjvarga/sitemap_generator/issues/163)).  Allow any Fog storage options for S3 adapter ([#167](https://github.com/kjvarga/sitemap_generator/pull/167)).
 * v5.0.4: Don't include the `media` attribute on alternate links unless it's given
 * v5.0.3: Add support for Video sitemaps options `:live` and ':requires_subscription'
 * v5.0.2: Set maximum filesize to 10,000,000 bytes rather than 10,485,760 bytes.
@@ -1119,9 +1120,9 @@ Copyright (c) 2009 Karl Varga released under the MIT license
 [sitemaps_xml]:http://www.sitemaps.org/protocol.php#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]:http://www.google.com/support/webmasters/bin/topic.py?topic=10079
-[sitemap_news]:http://www.google.com/support/webmasters/bin/topic.py?hl=en&topic=10078
-[sitemap_geo]:http://www.google.com/support/webmasters/bin/topic.py?hl=en&topic=14688
+[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
+[sitemap_geo]:#
 [sitemap_mobile]:http://support.google.com/webmasters/bin/answer.py?hl=en&answer=34648
 [sitemap_pagemap]:https://developers.google.com/custom-search/docs/structured_data#addtositemap
 [sitemap_protocol]:http://sitemaps.org/protocol.php

data/VERSION

@@ -1 +1 @@
-5.0.4
+5.0.5

data/lib/capistrano/tasks/sitemap_generator.cap

@@ -4,7 +4,7 @@ namespace :deploy do
     task :refresh do
       on roles :web do
         within release_path do
-          with rails_env: fetch(:rails_env) do
+          with rails_env: (fetch(:rails_env) || fetch(:stage)) do
            execute :rake, "sitemap:refresh"
           end
         end
@@ -15,7 +15,7 @@ namespace :deploy do
     task :create do
       on roles :web do
         within release_path do
-          with rails_env: fetch(:rails_env) do
+          with rails_env: (fetch(:rails_env) || fetch(:stage)) do
            execute :rake, "sitemap:create"
           end
         end
@@ -26,7 +26,7 @@ namespace :deploy do
     task :clean do
       on roles :web do
         within release_path do
-          with rails_env: fetch(:rails_env) do
+          with rails_env: (fetch(:rails_env) || fetch(:stage)) do
            execute :rake, "sitemap:clean"
           end
         end

data/lib/sitemap_generator/adapters/s3_adapter.rb

@@ -14,6 +14,7 @@ module SitemapGenerator
       @fog_directory = opts[:fog_directory] || ENV['FOG_DIRECTORY']
       @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] || {}
     end
 
     # Call with a SitemapLocation and string data
@@ -28,7 +29,7 @@ module SitemapGenerator
       credentials[:region] = @fog_region if @fog_region
       credentials[:path_style] = @fog_path_style if @fog_path_style
 
-      storage   = Fog::Storage.new(credentials)
+      storage   = Fog::Storage.new(@fog_storage_options.merge(credentials))
       directory = storage.directories.new(:key => @fog_directory)
       directory.files.create(
         :key    => location.path_in_public,

data/lib/sitemap_generator/builder/sitemap_url.rb

@@ -37,8 +37,8 @@ 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, :data)
-        SitemapGenerator::Utilities.reverse_merge!(options, :priority => 0.5, :changefreq => 'weekly', :lastmod => Time.now, :images => [], :news => {}, :videos => [], :mobile => false, :alternates => [], :data => false)
+        SitemapGenerator::Utilities.assert_valid_keys(options, :priority, :changefreq, :lastmod, :expires, :host, :images, :video, :geo, :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)
@@ -63,8 +63,7 @@ module SitemapGenerator
           :geo        => options[:geo],
           :mobile     => options[:mobile],
           :alternates => options[:alternates],
-          :pagemap    => options[:pagemap],
-          :data       => options[:data]
+          :pagemap    => options[:pagemap]
         )
       end
 
@@ -164,12 +163,6 @@ module SitemapGenerator
               end
             end
           end
-
-          unless SitemapGenerator::Utilities.blank?(self[:data])
-            builder.data {
-              builder.display
-            }
-          end
         end
         builder << '' # Force to string
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sitemap_generator
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.0.5
 platform: ruby
 authors:
 - Karl Varga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
@@ -152,7 +152,8 @@ files:
 - spec/support/schemas/sitemap.xsd
 - spec/support/xml_macros.rb
 homepage: http://github.com/kjvarga/sitemap_generator
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: |
   NOTE: SitemapGenerator 4.x uses a new file naming scheme which is more standards-compliant.