alexrabarts-big_sitemap 0.2.0 → 0.2.1

data/History.txt

@@ -0,0 +1,17 @@
+=== 0.2.1 / 2009-03-12
+
+* Normalize path arguments so it no longer matters whether a leading slash is used or not
+
+=== 0.2.0 / 2009-03-11
+
+* Methods are now chainable
+
+=== 0.1.4 / 2009-03-11
+
+* Add clean method to clear out Sitemaps directory
+* Make methods chainable
+
+=== 0.1.3 / 2009-03-10
+
+* Initial release
+

data/{README.markdown → README.rdoc}

@@ -1,82 +1,77 @@
-# BigSitemap
+= BigSitemap
 
-## DESCRIPTION
+== DESCRIPTION
 
-BigSitemap is a Sitemap generator specifically designed for large sites (although it works equally well with small sites).  It splits large Sitemaps into multiple files, gzips the files to minimize bandwidth usage, batches database queries so it doesn't take your site down, can be set up with just a few lines of code and is compatible with just about any framework.
+BigSitemap is a Sitemap (http://sitemaps.org) generator specifically designed for large sites (although it works equally well with small sites).  It splits large Sitemaps into multiple files, gzips the files to minimize bandwidth usage, batches database queries so it doesn't take your site down, can be set up with just a few lines of code and is compatible with just about any framework.
 
-## INSTALL
+== INSTALL
 
-* Via git: git clone git://github.com/alexrabarts/big_sitemap.git
-* Via gem: gem install alexrabarts-big_sitemap -s http://gems.github.com
+Via git:
 
-## SYNOPSIS
+  git clone git://github.com/alexrabarts/big_sitemap.git
+
+Via gem:
+
+  gem install alexrabarts-big_sitemap -s http://gems.github.com
+
+== SYNOPSIS
 
 The minimum required to generate a sitemap is:
 
-<pre>
   BigSitemap.new(:base_url => 'http://example.com').add(:model => MyModel, :path => 'my_controller').generate
-</pre>
 
-You can put this in a rake/thor task and create a cron job to run it periodically.  It should be enough for most Rails/Merb applications.  Note that the methods are chainable, although you can call them on an instance variable if you prefer:
+You can put this in a rake/thor task and create a cron job to run it periodically.  It should be enough for most Rails/Merb applications.  You can add more models by further calls to the <code>add</code> method.  Note that the methods are chainable, although you can call them on an instance variable if you prefer:
 
-<pre>
   sitemap = BigSitemap.new(:base_url => 'http://example.com')
-  sitemap.add(:model => MyModel, :path => 'my_controller')
+  sitemap.add(:model => Posts,    :path => 'articles')
+  sitemap.add(:model => Comments, :path => 'comments')
   sitemap.generate
-</pre>
 
-### Find Methods
+=== Find Methods
 
-Your models must provide either a <code>find_for_sitemap</code> or <code>all</code> class method that returns the instances that are to be included in the sitemap.  Additionally, you models must provide a <code>count_for_sitemap</code> or <code>count</code> class method that returns a count of the instances to be included.  If you're using ActiveRecord (Rails) or DataMapper then <code>all</code> and <code>count</code> are already provided and you don't need to do anything unless you want to include a subset of records.  If you provide your own <code>find_for_sitemap</code> or <code>all</code> method then it should be able to handle the <code>:offset</code> and <code>:limit</code> options, in the same way that ActiveRecord and DataMapper handle them.  This is especially important if you have more than 50,000 URLs.
+Your models must provide either a <code>find_for_sitemap</code> or <code>all</code> class method that returns the instances that are to be included in the sitemap.
 
-### URL Format
+Additionally, you models must provide a <code>count_for_sitemap</code> or <code>count</code> class method that returns a count of the instances to be included.
+
+If you're using ActiveRecord (Rails) or DataMapper then <code>all</code> and <code>count</code> are already provided and you don't need to do anything unless you want to include a subset of records.  If you provide your own <code>find_for_sitemap</code> or <code>all</code> method then it should be able to handle the <code>:offset</code> and <code>:limit</code> options, in the same way that ActiveRecord and DataMapper handle them.  This is especially important if you have more than 50,000 URLs.
+
+=== URL Format
 
 To generate the URLs, BigSitemap will combine the constructor arguments with the <code>to_param</code> method of each instance returned (provided by ActiveRecord but not DataMapper).  If this method is not present, <code>id</code> will be used.  The URL is constructed as:
 
-<pre>
-  ":base_url/:path/:to_param" # (if to_param exists)
-  ":base_url/:path/:id"       # (if to_param does not exist)
-</pre>
+  :base_url/:path/:to_param (if to_param exists)
+  :base_url/:path/:id       (if to_param does not exist)
 
-### Sitemap Location
+=== Sitemap Location
 
 BigSitemap knows about the document root of Rails and Merb.  If you are using another framework then you can specify the document root with the <code>:document_root</code> option.  e.g.:
 
-<pre>
   BigSitemap.new(:base_url => 'http://example.com', :document_root => "#{FOO_ROOT}/httpdocs")
-</pre>
 
 By default, the sitemap files are created under <code>/sitemaps</code>.  You can modify this with the <code>:path</code> option:
 
-<pre>
   BigSitemap.new(:base_url => 'http://example.com', :path => 'google-sitemaps') # places Sitemaps under /google-sitemaps
-</pre>
 
-### Cleaning the Sitemaps Directory
+=== Cleaning the Sitemaps Directory
 
 Calling the <code>clean</code> method will remove all files from the Sitemaps directory.
 
-### Maximum Number of URLs
+=== Maximum Number of URLs
 
 Sitemaps will be split across several files if more than 50,000 records are returned.  You can customize this limit with the <code>:max_per_sitemap</code> option:
 
-<pre>
   BigSitemap.new(:base_url => 'http://example.com', :max_per_sitemap => 1000) # Max of 1000 URLs per Sitemap
-</pre>
 
-### Batched Database Queries
+=== Batched Database Queries
 
-The database is queried in batches to prevent large SQL select statements from locking the database for too long.  By default, the batch size is 1001 (not 1000 due to an obscure bug in DataMapper that appears when an offset of 37000 is used).  You can customize the batch size with the <code>:batch_size</code> option:
+The database is queried in batches to prevent large SQL select statements from locking the database for too long.  By default, the batch size is 1001 (not 1000 due to an obscure bug in DataMapper).  You can customize the batch size with the <code>:batch_size</code> option:
 
-<pre>
-  BigSitemap.new(:base_url => 'http://example.com, :batch_size => 5000) # Database is queried in batches of 5,000
-</pre>
+  BigSitemap.new(:base_url => 'http://example.com', :batch_size => 5000) # Database is queried in batches of 5,000
 
-### Search Engine Notification
+=== Search Engine Notification
 
 Google, Yahoo!, MSN and Ask are pinged once the Sitemap files are generated.  You can turn one or more of these off:
 
-<pre>
   BigSitemap.new(
     :base_url => 'http://example.com',
     :ping_google => false,
@@ -84,27 +79,26 @@ Google, Yahoo!, MSN and Ask are pinged once the Sitemap files are generated.  Yo
     :ping_msn    => false,
     :ping_ask    => false
   )
-</pre>
 
 You must provide an App ID in order to ping Yahoo! (more info at http://developer.yahoo.com/search/siteexplorer/V1/updateNotification.html):
 
-<pre>
   BigSitemap.new(:base_url => 'http://example.com', :yahoo_app_id => 'myYahooAppId') # Yahoo! will now be pinged
-</pre>
 
-## LIMITATIONS
+== LIMITATIONS
 
 If your database is likely to shrink during the time it takes to create the sitemap then you might run into problems (the final, batched SQL select will overrun by setting a limit that is too large since it is calculated from the count, which is queried at the very beginning).  Patches welcome!
 
-## TODO
+== TODO
 
-* Support for priority and changefreq (currently hard-coded to 'weekly')
+* Support for <code>priority</code>
+* Support for <code>changefreq</code> (currently hard-coded to <code>weekly</code>)
 
-## CREDITS
+== CREDITS
 
 Thanks to Alastair Brunton and Harry Love, who's work provided a starting point for this library.
 http://scoop.cheerfactory.co.uk/2008/02/26/google-sitemap-generator/
 
-## COPYRIGHT
+== COPYRIGHT
+
+Copyright (c) 2009 Stateless Systems (http://statelesssystems.com). See LICENSE for details.
 
-Copyright (c) 2009 Stateless Systems (http://statelesssystems.com). See LICENSE for details.

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 2
-:patch: 0
+:patch: 1
 :major: 0

data/lib/big_sitemap.rb

@@ -21,7 +21,7 @@ class BigSitemap
     @base_url        = options.delete(:base_url)
     @max_per_sitemap = options.delete(:max_per_sitemap) || 50000
     @batch_size      = options.delete(:batch_size) || 1001 # TODO: Set this to 1000 once DM offset 37000 bug is fixed
-    @web_path        = options.delete(:path) || 'sitemaps'
+    @web_path        = strip_leading_slash(options.delete(:path) || 'sitemaps')
     @ping_google     = options[:ping_google].nil? ? true : options.delete(:ping_google)
     @ping_yahoo      = options[:ping_yahoo].nil? ? true : options.delete(:ping_yahoo)
     @yahoo_app_id    = options.delete(:yahoo_app_id)
@@ -42,7 +42,7 @@ class BigSitemap
 
   def add(options)
     raise ArgumentError, ':model and :path options must be provided' unless options[:model] && options[:path]
-    @sources << options
+    @sources << options.update(:path => strip_leading_slash(options[:path]))
     self # Chainable
   end
 
@@ -127,6 +127,10 @@ class BigSitemap
   end
 
   private
+    def strip_leading_slash(str)
+      str.sub(/^\//, '')
+    end
+
     def pick_method(klass, candidates)
       method = nil
       candidates.each do |candidate|

data/test/big_sitemap_test.rb

@@ -112,12 +112,21 @@ class BigSitemapTest < Test::Unit::TestCase
       assert_equal 1, num_elements(first_sitemaps_model_file, 'changefreq')
       assert_equal 1, num_elements(second_sitemaps_model_file, 'changefreq')
     end
+
+    should 'strip leading slashes from controller paths' do
+      create_sitemap
+      @sitemap.add(:model => TestModel, :path => '/test_controller').generate
+      assert(
+        !elements(single_sitemaps_model_file, 'loc').first.text.match(/\/\/test_controller\//),
+        'URL does not contain a double-slash before the controller path'
+      )
+    end
   end
 
   context 'add method' do
     should 'be chainable' do
       create_sitemap
-      assert_equal BigSitemap, @sitemap.add({:model => TestModel, :path => 'test_controller'}).class
+      assert_equal BigSitemap, @sitemap.add(:model => TestModel, :path => 'test_controller').class
     end
   end
 
@@ -198,8 +207,12 @@ class BigSitemapTest < Test::Unit::TestCase
       {'s' => 'http://www.sitemaps.org/schemas/sitemap/0.9'}
     end
 
-    def num_elements(filename, el)
+    def elements(filename, el)
       data = Nokogiri::XML.parse(Zlib::GzipReader.open(filename).read)
-      data.search("//s:#{el}", ns).size
+      data.search("//s:#{el}", ns)
+    end
+
+    def num_elements(filename, el)
+      elements(filename, el).size
     end
 end

data/test/fixtures/test_model.rb

@@ -8,6 +8,10 @@ class TestModel
       self.find_for_sitemap.size
     end
 
+    def num_items
+      10
+    end
+
     def find_for_sitemap(options={})
       instances = []
       num_times = options.delete(:limit) || self.num_items

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: alexrabarts-big_sitemap
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Alex Rabarts
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-11 00:00:00 -07:00
+date: 2009-03-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,7 @@ extra_rdoc_files: []
 
 files: 
 - History.txt
-- README.markdown
+- README.rdoc
 - VERSION.yml
 - lib/big_sitemap.rb
 - test/big_sitemap_test.rb