dynamic_sitemaps 2.0.0.beta2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f029dbe8d23b37ba620af6793be4d12f10fd009c
-  data.tar.gz: 98818a397372a0e01313d75d9b1985d8865deca5
+  metadata.gz: 918400614ebe09f1635dfed4f30d9d80459b084e
+  data.tar.gz: 1f0f3df4fddd3d6d6de765bd33da680f5c012af5
 SHA512:
-  metadata.gz: 509e7d231f8465dfbf7a13917535c0acd36d32436c81db94988feae183abf5eb3c5c650fa3cef837909745ec3014e51d76a747df5152e83b30e1c71f66e0002c
-  data.tar.gz: cc1836f900c00716056143b9b93a115eec34f876f10ecf5167c9f5239639fdc1f7c697eb30cac940c54f515eb777849f47dfeb9e1d448383c18039789961b7d3
+  metadata.gz: e47989bdc4540a62cb5cb3816880ea9603e5aa78a2a2553e84a68a917a62f77be3e936152c6bbd87986d753a9c5323eed132e10183e2119a6081e0ab54849757
+  data.tar.gz: 75dd53c52cc9d49fcd117f63039f99b613f94b613976bc103f38f85b8179f66147bb7cddb8a95395585d514fd70d3c9fbb8e7aefe639cc86a6b0c0e7d01b9ba3

data/lib/dynamic_sitemaps/generator.rb

@@ -31,10 +31,12 @@ module DynamicSitemaps
 
     def move_to_destination
       sitemaps.map(&:folder).uniq.each do |folder|
-        destination = "#{DynamicSitemaps.path}/#{folder}"
+        destination = File.join(DynamicSitemaps.path, folder)
         FileUtils.mkdir_p destination
-        FileUtils.rm_rf Dir.glob("#{destination}/*")
-        FileUtils.mv Dir["#{DynamicSitemaps.temp_path}/#{folder}/*"], destination
+        FileUtils.rm_rf Dir.glob(File.join(destination, "*"))
+
+        temp_files = File.join(DynamicSitemaps.temp_path, folder, "*.xml")
+        FileUtils.mv Dir.glob(temp_files), destination
       end
       remove_temp_dir
     end
@@ -58,7 +60,7 @@ module DynamicSitemaps
     def sitemap_for(collection, options = {}, &block)
       raise ArgumentError, "The collection given to `sitemap_for` must respond to #find_each. This is for performance. Use `Model.scoped` to get an ActiveRecord relation that responds to #find_each." unless collection.respond_to?(:find_each)
 
-      name = options.delete(:name) || collection.model_name.underscore.pluralize.to_sym
+      name = options.delete(:name) || collection.model_name.to_s.underscore.pluralize.to_sym
       options[:collection] = collection
 
       sitemap(name, options, &block)

data/lib/dynamic_sitemaps/version.rb

@@ -1,3 +1,3 @@
 module DynamicSitemaps
-  VERSION = "2.0.0.beta2"
+  VERSION = "2.0.0"
 end

data/lib/generators/dynamic_sitemaps/templates/config.rb

@@ -1,10 +1,40 @@
+# Change this to your host. See the readme at https://github.com/lassebunk/dynamic_sitemaps
+# for examples of multiple hosts and folders.
 host "www.example.com"
 
 sitemap :site do
   url root_url, last_mod: Time.now, change_freq: "daily", priority: 1.0
+end
 
-  # Ping search engines after sitemap generation
-  # ping_with "http://#{host}/sitemap.xml"
-  
-  # TODO: Add examples
-end
+# You can have multiple sitemaps like the above – just make sure their names are different.
+
+# Automatically link to all pages using the routes specified
+# using "resources :pages" in config/routes.rb. This will also
+# automatically set <lastmod> to the date and time in page.updated_at:
+#
+#   sitemap_for Page.scoped
+
+# For products with special sitemap name and priority, and link to comments:
+#
+#   sitemap_for Product.published, name: :published_products do |product|
+#     url product, last_mod: product.updated_at, priority: (product.featured? ? 1.0 : 0.7)
+#     url product_comments_url(product)
+#   end
+
+# If you want to generate multiple sitemaps in different folders (for example if you have
+# more than one domain, you can specify a folder before the sitemap definitions:
+# 
+#   Site.all.each do |site|
+#     folder "sitemaps/#{site.domain}"
+#     host site.domain
+#     
+#     sitemap :site do
+#       url root_url
+#     end
+# 
+#     sitemap_for site.products.scoped
+#   end
+
+# Ping search engines after sitemap generation:
+#
+#   ping_with "http://#{host}/sitemap.xml"

data/test/generator_test.rb

@@ -341,6 +341,30 @@ class GeneratorTest < ActiveSupport::TestCase
     assert !Dir.exists?(DynamicSitemaps.temp_path)
   end
 
+  test "subfolders" do
+    DynamicSitemaps.per_page = 5
+    DynamicSitemaps.generate_sitemap do
+      host "www.example.com"
+       
+      sitemap :site do
+        url root_url, :last_mod => Time.now, change_freq: "weekly", priority: 1.0
+      end
+      
+      folder "sitemaps/subfolder"
+      sitemap :articles do
+        14.times do |i|
+          url "http://#{host}/articles/#{i}"
+        end
+      end
+    end
+    assert_equal ["sitemaps/sitemap.xml",
+                  "sitemaps/subfolder/articles.xml",
+                  "sitemaps/subfolder/articles2.xml",
+                  "sitemaps/subfolder/articles3.xml",
+                  "sitemaps/subfolder/sitemap.xml"],
+                  Dir[Rails.root.join("public/sitemaps/**/*.xml")].map { |p| Pathname.new(p).relative_path_from(Pathname.new(DynamicSitemaps.path)).to_s }.sort
+  end
+
   test "large sitemap" do
     DynamicSitemaps.generate_sitemap do
       host "www.mydomain.com"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_sitemaps
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0
 platform: ruby
 authors:
 - Lasse Bunk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-14 00:00:00.000000000 Z
+date: 2013-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -166,9 +166,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3