fnando-bookmaker 0.0.9 → 0.0.10

data/History.txt

@@ -47,4 +47,9 @@
 	
 == 0.0.9 2008-07-25
 * 1 bug fix
-	* Toc#to_s raised an error if book had no h2-h6 tags (thanks @rferraz)
+	* Toc#to_s raised an error if book had no h2-h6 tags (thanks @rferraz)
+
+== 0.0.10
+* 2 bug fixes
+	* generator was ignoring directories inside chapter
+	* repeated titles are now numerated to keep id uniqueness 

data/lib/bookmaker/base.rb

@@ -99,10 +99,20 @@ module Bookmaker
       return [contents, nil] unless Object.const_defined?('Hpricot') && Object.const_defined?('Unicode')
       
       doc = Hpricot(contents)
+      counter = {}
 
       (doc/"h2, h3, h4, h5, h6").each do |node|
         title = node.inner_text
         permalink = Bookmaker::Base.to_permalink(title)
+        
+        # initialize and increment counter
+        counter[permalink] ||= 0
+        counter[permalink] += 1
+        
+        # set a incremented permalink if more than one occurrence
+        # is found
+        permalink = "#{permalink}-#{counter[permalink]}" if counter[permalink] > 1
+        
         node.set_attribute(:id, permalink)
       end
       
@@ -125,14 +135,15 @@ module Bookmaker
       # first, get all chapters; then, get all parsed markdown
       # files from this chapter and group them into a <div class="chapter"> tag
       Dir.entries(text_dir).sort.each do |dirname|
-        next if %w(. ..).include?(dirname) || File.file?(text_dir + "/#{dirname}")
+        # ignore files and some directories
+        next if %w(. .. .svn .git).include?(dirname) || File.file?(text_dir + "/#{dirname}")
         
         # gets all parsed markdown files to wrap in a 
         # chapter element
         chapter = ""
         
         # merge all markdown and textile files into a single list
-        markup_files = Dir["#{text_dir}/#{dirname}/*.markdown"] + Dir["#{text_dir}/#{dirname}/*.textile"]
+        markup_files = Dir["#{text_dir}/#{dirname}/**/*.markdown"] + Dir["#{text_dir}/#{dirname}/**/*.textile"]
         
         # no files, so skip it!
         next if markup_files.empty?

data/lib/bookmaker/tasks.rb

@@ -63,13 +63,24 @@ namespace :book do
   task :titles => :html do
     contents = File.new(Bookmaker::Base.html_path).read
     doc = Hpricot(contents)
+    counter = {}
 
     titles = (doc/"h2, h3, h4, h5, h6").collect do |node|
       title = node.inner_text
-      [title, Bookmaker::Base.to_permalink(title)]
+      permalink = Bookmaker::Base.to_permalink(title)
+      
+      # initialize and increment counter
+      counter[permalink] ||= 0
+      counter[permalink] += 1
+      
+      # set a incremented permalink if more than one occurrence
+      # is found
+      permalink = "#{permalink}-#{counter[permalink]}" if counter[permalink] > 1
+      
+      [title, permalink]
     end
     
-    titles.sort_by {|items| items.first }.each do |items|
+    titles.sort_by {|items| items.last }.each do |items|
       puts items.first
       puts %(##{items.last})
       puts

data/lib/bookmaker/version.rb

@@ -2,7 +2,7 @@ module Bookmaker #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 9
+    TINY  = 10
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fnando-bookmaker
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Nando Vieira