cartographer 1.1.1 → 1.2.0

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.2.0 / 2011-03-29
+
+* Directories are now skipped.
+
 === 1.1.1 / 2011-03-29
 
 * URI escaping for paths

data/lib/cartographer.rb

@@ -24,7 +24,7 @@ require 'nokogiri'
 # See Cartographer and Cartographer::URL RDoc for more information.
 #
 class Cartographer
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 
   ##
   # List of Cartographer::URL objects
@@ -76,13 +76,12 @@ class Cartographer
   #
   def add_tree(base_path)
     Find.find(base_path) do |path|
+      next if File.directory?(path)
+
       new_path = path.sub %r!^#{Regexp.escape base_path}!, ''
       uri = root_uri.dup
-      stat = File.stat(path)
 
-      if File.directory?(path)
-        new_path += "/"
-      end
+      stat = File.stat(path)
 
       if block_given?
         new_path = yield new_path

data/test/test_cartographer.rb

@@ -76,24 +76,24 @@ class TestCartographer < MiniTest::Unit::TestCase
     sm.add_tree(File.expand_path("test"))
 
     xml = Nokogiri::XML.parse(sm.to_xml)
-    assert_equal [ "http://example.org/", "http://example.org/test_cartographer.rb" ],
+    assert_equal [ "http://example.org/test_cartographer.rb" ],
       xml.root.xpath('//xmlns:loc', xml.root.namespaces).map(&:content)
     
     sm = Cartographer.new("http://example.org", "always")
     sm.add_tree(File.expand_path("test"))
     
     xml = Nokogiri::XML.parse(sm.to_xml)
-    assert_equal [ "http://example.org/", "http://example.org/test_cartographer.rb" ],
+    assert_equal [ "http://example.org/test_cartographer.rb" ],
       xml.root.xpath('//xmlns:loc', xml.root.namespaces).map(&:content)
     
-    assert_equal [ "always", "always" ],
+    assert_equal [ "always" ],
       xml.root.xpath('//xmlns:changefreq', xml.root.namespaces).map(&:content)
 
     sm = Cartographer.new("http://example.org")
     sm.add_tree(File.expand_path("test")) { |x| x.sub(/\.rb$/, '/') }
     
     xml = Nokogiri::XML.parse(sm.to_xml)
-    assert_equal [ "http://example.org/", "http://example.org/test_cartographer/" ],
+    assert_equal [ "http://example.org/test_cartographer/" ],
       xml.root.xpath('//xmlns:loc', xml.root.namespaces).map(&:content)
   end
 

metadata

@@ -2,7 +2,7 @@
 name: cartographer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors: 
 - Erik Hollensbe