sitemap_generator 1.3.5 → 1.3.6

data/Gemfile

@@ -0,0 +1,3 @@
+source 'http://rubygems.org'
+
+gem 'sitemap_generator', :path => 'lib/'

data/Gemfile.lock

@@ -0,0 +1,14 @@
+PATH
+  remote: .
+  specs:
+    sitemap_generator (1.3.5)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  sitemap_generator!

data/VERSION

@@ -1 +1 @@
-1.3.5
+1.3.6

data/lib/sitemap_generator/builder/sitemap_file.rb

@@ -15,6 +15,7 @@ module SitemapGenerator
     #
     class SitemapFile
       include ActionView::Helpers::NumberHelper
+      include ActionView::Helpers::TextHelper   # Rails 2.2.2 fails with missing 'pluralize' otherwise
       attr_accessor :sitemap_path, :public_path, :filesize, :link_count, :hostname
 
       # <tt>public_path</tt> full path of the directory to write sitemaps in.
@@ -150,4 +151,4 @@ module SitemapGenerator
       end
     end
   end
-end
+end

data/lib/sitemap_generator/utilities.rb

@@ -31,6 +31,8 @@ module SitemapGenerator
     # @return [Boolean]
     def self.rails3?
       Rails.version.to_f >= 3
+    rescue
+      false  # Rails.version defined in 2.1.0
     end
   end
 end

data/tasks/sitemap_generator_tasks.rake

@@ -1,8 +1,20 @@
+# Require sitemap_generator at runtime.  If we don't do this the ActionView helpers are included
+# before the Rails environment can be loaded by other Rake tasks, which causes problems
+# for those tasks when rendering using ActionView.
 namespace :sitemap do
-  # Require sitemap_generator at runtime.  If we don't do this the ActionView helpers are included
-  # before the Rails environment can be loaded by other Rake tasks, which causes problems 
-  # for those tasks when rendering using ActionView.
+  # Require sitemap_generator only.  When installed as a plugin, the require will fail, so in
+  # this case, we have to load the full environment first.
   task :require do
+    begin
+      require 'sitemap_generator'
+    rescue LoadError
+      Rake::Task['sitemap:require_environment'].invoke
+    end
+  end
+
+  # 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 => :environment do
     require 'sitemap_generator'
   end
 
@@ -24,9 +36,7 @@ namespace :sitemap do
   desc "Create Sitemap XML files (don't ping search engines)"
   task 'refresh:no_ping' => ['sitemap:create']
 
-  # Require sitemap_generator to handle the case that we are installed as a gem and are set to not
-  # automatically be required.  If the library has already been required, this is harmless.
-  task :create => [:environment, 'sitemap:require'] do
+  task :create => ['sitemap:require_environment'] do
     SitemapGenerator::Sitemap.verbose = verbose
     SitemapGenerator::Sitemap.create
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sitemap_generator
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 3
-  - 5
-  version: 1.3.5
+  - 6
+  version: 1.3.6
 platform: ruby
 authors: 
 - Karl Varga
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-07 00:00:00 -08:00
+date: 2010-12-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,6 +70,8 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.md
 - Rakefile