sitemap_generator 5.0.4 → 5.0.5

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1f409e2e176959553327858497c6817be5f3ceaf
4
- data.tar.gz: f2d0c65be82f2c8c5a6dd9277903b74a2057a533
3
+ metadata.gz: 6445cea5741bfbdf3a4a22d3ea49b066283f8877
4
+ data.tar.gz: 4d7e44c720170f44a3b302d9215b0f39fea0e093
5
5
  SHA512:
6
- metadata.gz: 37b97c0e1b85707fdf4b663f5369017160543687d6d0800d96da7a3071ac749a743ebe58480ceb4f1fc5dfdbb8aa92473af43fc880e325a83a3d244df27fcc92
7
- data.tar.gz: b2b2899c879a19620c1f7a9bb19e33855234c7c6157e8d13bc3a9468a5b06a74b86d04e09c1a6eac0425d05bcefe918ece2dd7bab37163fd99989baf3103c674
6
+ metadata.gz: 5fb21aedf7c06c9b9d9229ab00f9104e7fc177c2d4ae359d193f1766c7cf09826bf39a4a2f0964a020224ffa38494fe6ceda72107da5f22f60db02deaa8acbc7
7
+ data.tar.gz: 6b858a5b19e875595e17774608bdd9cb73ffeeb5dd7a0c5fa76223a95ee39d3e4fd458b9ab4642cb104708fcab97af79718ebb9c6e2067b064b4d422fe0ae587
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: ./
3
3
  specs:
4
- sitemap_generator (5.0.4)
4
+ sitemap_generator (5.0.5)
5
5
  builder
6
6
 
7
7
  GEM
data/README.md CHANGED
@@ -117,6 +117,7 @@ That's it! Welcome to the future!
117
117
 
118
118
  ## Changelog
119
119
 
120
+ * 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)).
120
121
  * v5.0.4: Don't include the `media` attribute on alternate links unless it's given
121
122
  * v5.0.3: Add support for Video sitemaps options `:live` and ':requires_subscription'
122
123
  * 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
1119
1120
  [sitemaps_xml]:http://www.sitemaps.org/protocol.php#xmlTagDefinitions "XML Tag Definitions"
1120
1121
  [sitemap_generator_usage]:http://wiki.github.com/adamsalter/sitemap_generator/sitemapgenerator-usage "http://wiki.github.com/adamsalter/sitemap_generator/sitemapgenerator-usage"
1121
1122
  [sitemap_images]:http://www.google.com/support/webmasters/bin/answer.py?answer=178636
1122
- [sitemap_video]:http://www.google.com/support/webmasters/bin/topic.py?topic=10079
1123
- [sitemap_news]:http://www.google.com/support/webmasters/bin/topic.py?hl=en&topic=10078
1124
- [sitemap_geo]:http://www.google.com/support/webmasters/bin/topic.py?hl=en&topic=14688
1123
+ [sitemap_video]:https://support.google.com/webmasters/answer/80471?hl=en&ref_topic=4581190
1124
+ [sitemap_news]:https://support.google.com/news/publisher/topic/2527688?hl=en&ref_topic=4359874
1125
+ [sitemap_geo]:#
1125
1126
  [sitemap_mobile]:http://support.google.com/webmasters/bin/answer.py?hl=en&answer=34648
1126
1127
  [sitemap_pagemap]:https://developers.google.com/custom-search/docs/structured_data#addtositemap
1127
1128
  [sitemap_protocol]:http://sitemaps.org/protocol.php
data/VERSION CHANGED
@@ -1 +1 @@
1
- 5.0.4
1
+ 5.0.5
@@ -4,7 +4,7 @@ namespace :deploy do
4
4
  task :refresh do
5
5
  on roles :web do
6
6
  within release_path do
7
- with rails_env: fetch(:rails_env) do
7
+ with rails_env: (fetch(:rails_env) || fetch(:stage)) do
8
8
  execute :rake, "sitemap:refresh"
9
9
  end
10
10
  end
@@ -15,7 +15,7 @@ namespace :deploy do
15
15
  task :create do
16
16
  on roles :web do
17
17
  within release_path do
18
- with rails_env: fetch(:rails_env) do
18
+ with rails_env: (fetch(:rails_env) || fetch(:stage)) do
19
19
  execute :rake, "sitemap:create"
20
20
  end
21
21
  end
@@ -26,7 +26,7 @@ namespace :deploy do
26
26
  task :clean do
27
27
  on roles :web do
28
28
  within release_path do
29
- with rails_env: fetch(:rails_env) do
29
+ with rails_env: (fetch(:rails_env) || fetch(:stage)) do
30
30
  execute :rake, "sitemap:clean"
31
31
  end
32
32
  end
@@ -14,6 +14,7 @@ module SitemapGenerator
14
14
  @fog_directory = opts[:fog_directory] || ENV['FOG_DIRECTORY']
15
15
  @fog_region = opts[:fog_region] || ENV['FOG_REGION']
16
16
  @fog_path_style = opts[:fog_path_style] || ENV['FOG_PATH_STYLE']
17
+ @fog_storage_options = opts[:fog_storage_options] || {}
17
18
  end
18
19
 
19
20
  # Call with a SitemapLocation and string data
@@ -28,7 +29,7 @@ module SitemapGenerator
28
29
  credentials[:region] = @fog_region if @fog_region
29
30
  credentials[:path_style] = @fog_path_style if @fog_path_style
30
31
 
31
- storage = Fog::Storage.new(credentials)
32
+ storage = Fog::Storage.new(@fog_storage_options.merge(credentials))
32
33
  directory = storage.directories.new(:key => @fog_directory)
33
34
  directory.files.create(
34
35
  :key => location.path_in_public,
@@ -37,8 +37,8 @@ module SitemapGenerator
37
37
  path = sitemap.location.path_in_public
38
38
  end
39
39
 
40
- SitemapGenerator::Utilities.assert_valid_keys(options, :priority, :changefreq, :lastmod, :expires, :host, :images, :video, :geo, :news, :videos, :mobile, :alternate, :alternates, :pagemap, :data)
41
- SitemapGenerator::Utilities.reverse_merge!(options, :priority => 0.5, :changefreq => 'weekly', :lastmod => Time.now, :images => [], :news => {}, :videos => [], :mobile => false, :alternates => [], :data => false)
40
+ SitemapGenerator::Utilities.assert_valid_keys(options, :priority, :changefreq, :lastmod, :expires, :host, :images, :video, :geo, :news, :videos, :mobile, :alternate, :alternates, :pagemap)
41
+ SitemapGenerator::Utilities.reverse_merge!(options, :priority => 0.5, :changefreq => 'weekly', :lastmod => Time.now, :images => [], :news => {}, :videos => [], :mobile => false, :alternates => [])
42
42
  raise "Cannot generate a url without a host" unless SitemapGenerator::Utilities.present?(options[:host])
43
43
 
44
44
  if video = options.delete(:video)
@@ -63,8 +63,7 @@ module SitemapGenerator
63
63
  :geo => options[:geo],
64
64
  :mobile => options[:mobile],
65
65
  :alternates => options[:alternates],
66
- :pagemap => options[:pagemap],
67
- :data => options[:data]
66
+ :pagemap => options[:pagemap]
68
67
  )
69
68
  end
70
69
 
@@ -164,12 +163,6 @@ module SitemapGenerator
164
163
  end
165
164
  end
166
165
  end
167
-
168
- unless SitemapGenerator::Utilities.blank?(self[:data])
169
- builder.data {
170
- builder.display
171
- }
172
- end
173
166
  end
174
167
  builder << '' # Force to string
175
168
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sitemap_generator
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.0.4
4
+ version: 5.0.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Karl Varga
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-05-16 00:00:00.000000000 Z
11
+ date: 2014-07-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mocha
@@ -152,7 +152,8 @@ files:
152
152
  - spec/support/schemas/sitemap.xsd
153
153
  - spec/support/xml_macros.rb
154
154
  homepage: http://github.com/kjvarga/sitemap_generator
155
- licenses: []
155
+ licenses:
156
+ - MIT
156
157
  metadata: {}
157
158
  post_install_message: |
158
159
  NOTE: SitemapGenerator 4.x uses a new file naming scheme which is more standards-compliant.