mizuho 0.9.12 → 0.9.13

data/bin/mizuho

@@ -1,4 +1,23 @@
 #!/usr/bin/env ruby
+# Copyright (c) 2008-2013 Hongli Lai
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 require File.expand_path(File.dirname(__FILE__) + "/../lib/mizuho")
 require 'optparse'
 require 'rubygems'
@@ -45,6 +64,13 @@ parser = OptionParser.new do |opts|
 	opts.on("-o", "--output FILE", String, "Specify the output filename.") do |value|
 		options[:output] = value
 	end
+	opts.on("--index", "Generate a full-text index.") do
+		options[:index] = true
+	end
+	opts.on("--no-run", "Do not run Asciidoc. Developer option#{nl}" <<
+		"only, don't use.") do
+		options[:no_run] = true
+	end
 end
 begin
 	parser.parse!

data/lib/mizuho.rb

@@ -24,7 +24,7 @@ module Mizuho
 	TEMPLATES_DIR = "#{SOURCE_ROOT}/templates"
 	ASCIIDOC      = "#{SOURCE_ROOT}/asciidoc/asciidoc.py"
 	
-	VERSION_STRING = "0.9.12"
+	VERSION_STRING = "0.9.13"
 	
 	if $LOAD_PATH.first != LIBDIR
 		$LOAD_PATH.unshift(LIBDIR)

data/lib/mizuho/generator.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2008-2012 Hongli Lai
+# Copyright (c) 2008-2013 Hongli Lai
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -22,6 +22,7 @@ require 'nokogiri'
 require 'mizuho'
 require 'mizuho/source_highlight'
 require 'mizuho/id_map'
+require 'mizuho/utils'
 
 module Mizuho
 
@@ -38,7 +39,10 @@ class Generator
 		@conf_file   = options[:conf_file]
 		@attributes  = options[:attributes] || []
 		@enable_topbar     = options[:topbar]
+		@no_run            = options[:no_run]
 		@commenting_system = options[:commenting_system]
+		@index             = options[:index]
+		@index_filename    = options[:index_filename] || default_index_filename(input)
 		if @commenting_system == 'juvia'
 			require_options(options, :juvia_url, :juvia_site_key)
 		end
@@ -53,7 +57,10 @@ class Generator
 				warn "No ID map file, generating one (#{@id_map_file})..."
 			end
 		end
-		self.class.run_asciidoc(@input_file, @output_file, @icons_dir, @conf_file, @attributes)
+		if !@no_run
+			self.class.run_asciidoc(@input_file, @output_file, @icons_dir,
+				@conf_file, @attributes)
+		end
 		transform(@output_file)
 		if @commenting_system
 			@id_map.save(@id_map_file)
@@ -71,9 +78,7 @@ class Generator
 		args = [
 			"python", ASCIIDOC,
 			"-b", "html5",
-			"-a", "toc",
 			"-a", "theme=flask",
-			"-a", "toclevels=3",
 			"-a", "icons",
 			"-n"
 		]
@@ -112,6 +117,13 @@ private
 			File.basename(input, File.extname(input)) +
 			".idmap.txt"
 	end
+
+	def default_index_filename(input)
+		return File.dirname(input) +
+			"/" +
+			File.basename(input, File.extname(input)) +
+			".index.sqlite3"
+	end
 	
 	def warn(message)
 		STDERR.puts(message)
@@ -119,36 +131,85 @@ private
 	
 	def transform(filename)
 		File.open(filename, 'r+') do |f|
-			doc = Nokogiri.HTML(f)
-			head = (doc / "head")[0]
-			body = (doc / "body")[0]
+			doc   = Nokogiri.HTML(f)
+			head  = (doc / "head")[0]
+			body  = (doc / "body")[0]
 			title = (doc / "title")[0].text
-			preamble = (doc / "#preamble")[0]
-			toctitle = (doc / "#toctitle")[0]
+			header_div = (doc / "#header")[0]
+			headers    = (doc / "#content" / "h1, h2, h3, h4")
 			
 			head.add_child(stylesheet_tag)
 			
+			# Add commenting balloons.
 			if @commenting_system
-				headers = (doc / "#content h2, #content h3, #content h4")
+				titles = []
+				headers.each do |header|
+					if header['class'] !~ /float/
+						titles << header.text
+					end
+				end
+				@id_map.generate_associations(titles)
 				headers.each do |header|
-					header['data-comment-topic'] = @id_map.associate(header.text)
-					header.add_previous_sibling(create_comment_balloon)
+					if header['class'] !~ /float/
+						titles << header.text
+						header['data-comment-topic'] = @id_map.associations[header.text]
+						header.add_previous_sibling(create_comment_balloon)
+					end
 				end
 			end
 			
+			# Add top bar.
 			if @enable_topbar
 				body.children.first.add_previous_sibling(topbar(title))
 			end
+
+			# Add Mizuho Javascript.
 			body.add_child(javascript_tag)
-			
-			if preamble
+
+			# Move preamble from content area to header area.
+			if preamble = (doc / "#preamble")[0]
 				preamble.remove
-				preamble_copy = (doc / "#header > h1")[0].add_next_sibling(preamble.to_s)[0]
-				preamble_copy['id'] = 'preamble'
+				header_div.add_child(preamble)
 			end
 			
+			# Create a TOC after the preamble.
+			toc_div = header_div.add_child(%Q{<div id="toc"></div>})[0]
 			if @commenting_system
-				toctitle.add_previous_sibling(create_comment_balloon)
+				# Add a commenting balloon to the TOC title.
+				toc_div.add_child(create_comment_balloon)
+			end
+			toc_div.add_child(%Q{<div id="toctitle">Table of Contents</div>})
+			headers.each do |header|
+				if header['class'] !~ /float/
+					level = header.name.scan(/\d+/).first
+					div  = toc_div.add_child("<div class=\"foo toclevel#{level}\"></div>")[0]
+					link = div.add_child("<a></a>")[0]
+					link['href'] = '#' + header['id']
+					link.content = header.text
+				end
+			end
+
+			if @enable_topbar
+				# Add invisible spans before each header so that anchor jumps
+				# don't hide the header behind the top bar.
+				# http://nicolasgallagher.com/jump-links-and-viewport-positioning/
+				headers.each do |header|
+					span = header.add_previous_sibling('<span class="anchor_helper"></span>')[0]
+					span['id'] = header['data-anchor'] = header['id']
+					header.remove_attribute('id')
+				end
+			end
+
+			if @index
+				# Add docid attributes to headers.
+				headers.each do |header|
+					next if header['class'] =~ /float/
+					docid = Utils.title_to_docid(header.text)
+					header['data-docid'] = docid.to_s
+					header['class'] = "#{header['class']} docid-#{docid}".strip
+				end
+
+				create_search_index(headers, @index_filename)
 			end
 			
 			f.rewind
@@ -238,6 +299,61 @@ private
 		end
 		exit 1 if fail
 	end
+
+	def gather_content(header)
+		result = []
+		elem = header
+		while true
+			elem = elem.next_sibling
+			if !elem || elem.name =~ /^h/i
+				break
+			else
+				text = elem.text.strip
+				if !text.empty?
+					text.gsub!(/\r?\n/, " ")
+					result << text
+				end
+			end
+		end
+		return result.join(" ")
+	end
+
+	def create_search_index(headers, filename)
+		require 'sqlite3'
+		db = SQLite3::Database.new("#{filename}.tmp")
+		db.transaction do
+			db.execute(%q{
+				CREATE VIRTUAL TABLE book USING fts4(
+					title TEXT NOT NULL,
+					content TEXT NOT NULL,
+					content="",
+					tokenize=porter
+				)
+			})
+			db.execute(%q{
+				CREATE TABLE version(
+					version INTEGER NOT NULL
+				)
+			})
+			db.execute("INSERT INTO version VALUES(1)")
+			db.prepare("INSERT INTO book(docid, title, content) VALUES(?, ?, ?)") do |stmt|
+				headers.each do |header|
+					next if header['class'] =~ /float/
+					title = header.text.strip
+					docid = Utils.title_to_docid(title)
+					content = gather_content(header)
+					stmt.execute(docid, title, content)
+				end
+			end
+		end
+		db.execute("INSERT INTO book(book) VALUES('optimize')")
+		db.execute("VACUUM")
+		db.close
+		File.rename("#{filename}.tmp", filename)
+	rescue Exception => e
+		File.unlink("#{filename}.tmp") rescue nil
+		raise e
+	end
 end
 
 end

data/lib/mizuho/id_map.rb

@@ -19,6 +19,7 @@
 # THE SOFTWARE.
 
 require 'mizuho/fuzzystringmatch'
+require 'mizuho/utils'
 
 module Mizuho
 
@@ -26,6 +27,8 @@ class IdMap
 	class AlreadyAssociatedError < StandardError
 	end
 
+	include Utils
+
 	URANDOM = File.open("/dev/urandom", "rb")
 	MATCHER = JaroWinklerPure.new
 	BANNER =
@@ -43,17 +46,14 @@ class IdMap
 		"# and that Mizuho has found an ID which appears to be associated with that\n" <<
 		"# section. You should check whether it is correct, and if not, fix it.\n\n"
 
-	attr_reader :entries
+	attr_reader :entries, :associations
 
 	def initialize
 		@entries = {}
+		@associations = {}
 		#@namespace = slug(File.basename(filename, File.extname(filename)))
 	end
 
-	def [](title)
-		return @entries[title]
-	end
-
 	def load(filename_or_io)
 		@entries.clear
 		open_io(filename_or_io, :read) do |io|
@@ -101,16 +101,73 @@ class IdMap
 			f.write(output)
 		end
 	end
+
+	def generate_associations(titles)
+		@associations = {}
+
+		# Associate exact matches.
+		titles = titles.reject do |title|
+			if (entry = @entries[title]) && !entry.associated?
+				entry.associated = true
+				@associations[title] = entry.id
+				true
+			else
+				false
+			end
+		end
+
+		# For the remaining titles, associate with moved or similar-looking entry.
+		titles.reject! do |title|
+			if entry = find_moved(title)
+				@entries.delete(entry.title)
+				@entries[title] = entry
+				entry.title = title
+				entry.associated = true
+				entry.fuzzy = false
+				@associations[title] = entry.id
+				true
+			else
+				false
+			end
+		end
+
+		# For the remaining titles, associate with similar-looking entry.
+		titles.reject! do |title|
+			if entry = find_similar(title)
+				@entries.delete(entry.title)
+				@entries[title] = entry
+				entry.title = title
+				entry.associated = true
+				entry.fuzzy = true
+				@associations[title] = entry.id
+				true
+			else
+				false
+			end
+		end
+
+		# For the remaining titles, create new entries.
+		titles.each do |title|
+			id = create_unique_id(title)
+			add(title, id, false, true)
+			@associations[title] = id
+		end
+	end
 	
-	def associate(title)
+	def xassociate(title)
 		if entry = @entries[title]
 			if entry.associated?
-				raise AlreadyAssociatedError, "Cannot associate an already-associated title"
+				raise AlreadyAssociatedError, "Cannot associate an already associated title (#{title.inspect})"
 			else
 				entry.associated = true
 				id = entry.id
 			end
 		elsif (moved_entry = find_moved(title)) || (similar_entry = find_similar(title))
+			if moved_entry
+				puts "moved entry: #{title.inspect} -> #{moved_entry.title.inspect}"
+			elsif similar_entry
+				puts "similar entry: #{title.inspect} -> #{similar_entry.title.inspect}"
+			end
 			entry = (moved_entry || similar_entry)
 			@entries.delete(entry.title)
 			@entries[title] = entry
@@ -152,11 +209,11 @@ private
 		alias associated? associated
 		
 		def <=>(other)
-			if (a = IdMap.extract_chapter(title)) &&
-			   (b = IdMap.extract_chapter(other.title))
+			if (a = Utils.extract_chapter(title)) &&
+			   (b = Utils.extract_chapter(other.title))
 				# Sort by chapter whenever possible.
-				a[0] = IdMap.chapter_to_int_array(a[0])
-				b[0] = IdMap.chapter_to_int_array(b[0])
+				a[0] = Utils.chapter_to_int_array(a[0])
+				b[0] = Utils.chapter_to_int_array(b[0])
 				return a <=> b
 			else
 				return title <=> other.title
@@ -232,31 +289,6 @@ private
 		end
 	end
 
-	# Given a title with a chapter number, e.g. "6.1 Installation using tarball",
-	# splits the two up.
-	def self.extract_chapter(title)
-		title =~ /^((\d+\.)*) (.+)$/
-		chapter = $1
-		pure_title = $3
-		if !chapter.nil? && !chapter.empty? && pure_title && !pure_title.empty?
-			return [chapter, pure_title]
-		else
-			return nil
-		end
-	end
-
-	def extract_chapter(title)
-		return IdMap.extract_chapter(title)
-	end
-
-	def self.chapter_to_int_array(chapter)
-		return chapter.split('.').map { |x| x.to_i }
-	end
-
-	def chapter_to_int_array(chapter)
-		return IdMap.chapter_to_int_array(chapter)
-	end
-
 	def slug(text)
 		text = text.downcase
 		text.gsub!(/^(\d+\.)+ /, '')

data/lib/mizuho/utils.rb

@@ -0,0 +1,65 @@
+# Copyright (c) 2013 Hongli Lai
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+module Mizuho
+
+module Utils
+	extend self
+
+	def self.included(klass)
+		# When included into another class, make sure that Utils
+		# methods are made private.
+		public_instance_methods(false).each do |method_name|
+			klass.send(:private, method_name)
+		end
+	end
+
+	# Given a title with a chapter number, e.g. "6.1 Installation using tarball",
+	# splits the two up.
+	def extract_chapter(title)
+		title =~ /^((\d+\.)*) (.+)$/
+		chapter = $1
+		pure_title = $3
+		if !chapter.nil? && !chapter.empty? && pure_title && !pure_title.empty?
+			return [chapter, pure_title]
+		else
+			return nil
+		end
+	end
+
+	def chapter_to_int_array(chapter)
+		return chapter.split('.').map { |x| x.to_i }
+	end
+
+	def title_to_docid(title)
+		chapter, pure_title = extract_chapter(title)
+		p title
+		numbers = chapter_to_int_array(chapter)
+		result = 0
+		bit_offset = 0
+		numbers.each do |num|
+			result = result | (num << bit_offset)
+			bit_offset += 5
+		end
+		return result
+	end
+end
+
+end

data/templates/mizuho.css

@@ -1,5 +1,7 @@
 body {
-	margin: 1em 10% 1em 10%;
+	margin: 1em auto 1em auto;
+	padding: 0 1em 0 1em;
+	max-width: 800px;
 }
 
 a.image {
@@ -78,6 +80,10 @@ a.image {
 	margin: 2em;
 }
 
+pre {
+	overflow: auto;
+}
+
 @media print {
 	body {
 		font-size: 18pt;

data/templates/topbar.css

@@ -114,3 +114,12 @@
 	border-bottom-left-radius: 0;
 	border-bottom-right-radius: 0;
 }
+
+/* http://nicolasgallagher.com/jump-links-and-viewport-positioning/ */
+.anchor_helper {
+	position: relative;
+	display: block;
+	top: -50px;
+	width: 1px;
+	height: 1px;
+}

data/templates/topbar.js

@@ -8,6 +8,7 @@ Mizuho.initializeTopBar = $.proxy(function() {
 	var isMobileDevice = this.isMobileDevice();
 	var timerId;
 	
+	// Create the floating table of contents used in the top bar.
 	var $floattoc = $('<div id="floattoc"></div>').html($('#toc').html());
 	$floattoc.find('#toctitle').remove();
 	$floattoc.find('.comments').remove();
@@ -26,6 +27,8 @@ Mizuho.initializeTopBar = $.proxy(function() {
 		self.internalLinkClicked(this, event);
 	});
 	
+	// Callback for when the user clicks on the Table of Contents
+	// button on the top bar.
 	function showFloatingToc() {
 		var scrollUpdateTimerId;
 		
@@ -118,6 +121,9 @@ Mizuho.initializeTopBar = $.proxy(function() {
 		$window.bind('scroll', onScroll);
 	}
 	
+	// Called whenever the user scrolls. Updates the title of the
+	// Table of Contents button in the top bar to the section that
+	// the user is currently reading.
 	function update() {
 		if ($title.offset().top + $title.height() < $document.scrollTop()) {
 			if (!$topbar.is(':visible')) {
@@ -161,6 +167,7 @@ Mizuho.initializeTopBar = $.proxy(function() {
 		}, 100);
 	}
 	
+	
 	if (isMobileDevice) {
 		// Mobile devices don't support position fixed.
 		$topbar.css('position', 'absolute');

data/test/id_map_spec.rb

@@ -29,133 +29,116 @@ describe IdMap do
 		@id_map = IdMap.new
 	end
 
-	describe "#associate" do
-		describe "if the given title is not in the map" do
-			describe "if no similar titles exist in the map" do
-				before :each do
-					@id1 = @id_map.associate "Installation"
-					@id2 = @id_map.associate "Installation on Linux"
-					@id3 = @id_map.associate "Configuration"
-				end
-
-				it "returns a new unique ID" do
-					@id1.should_not == @id2
-					@id1.should_not == @id3
-				end
-
-				it "marks the entry as associated" do
-					@id_map["Installation"].should be_associated
-					@id_map["Installation on Linux"].should be_associated
-					@id_map["Configuration"].should be_associated
-				end
-
-				it "doesn't mark the corresponding entry as fuzzy" do
-					@id_map["Installation"].should_not be_fuzzy
-					@id_map["Installation on Linux"].should_not be_fuzzy
-					@id_map["Configuration"].should_not be_fuzzy
-				end
+	describe "#generate_associations" do
+		describe "if no similar titles exist in the map" do
+			before :each do
+				@id_map.generate_associations(["Installation",
+					"Installation on Linux", "Configuration"])
+				@id1 = @id_map.associations["Installation"]
+				@id2 = @id_map.associations["Installation on Linux"]
+				@id3 = @id_map.associations["Configuration"]
 			end
 
-			describe "if the same title exists in the map, but with a different section number" do
-				before :each do
-					@entry1 = @id_map.add("1.2. Installation using a tarball", nil, false, false)
-					@entry2 = @id_map.add("5.6. Installation using a tarball", nil, false, false)
-					@entry3 = @id_map.add("6.0. Installation using a tarball", nil, false, false)
-					@id1 = @id_map.associate "5.4. Installation using a tarball"
-					@id2 = @id_map.associate "2.1. Installation using a tarball"
-				end
-
-				it "associates with the title whose section number is closest to the new section number" do
-					@id1.should == @entry2.id
-					@id2.should == @entry1.id
-				end
-
-				it "changes the original entries' titles" do
-					@entry1.title.should == "2.1. Installation using a tarball"
-					@entry2.title.should == "5.4. Installation using a tarball"
-					@entry3.title.should == "6.0. Installation using a tarball"
-				end
-
-				it "marks the corresponding entry as associated" do
-					@entry1.should be_associated
-					@entry2.should be_associated
-					@entry3.should_not be_associated
-				end
-
-				it "doesn't mark the corresponding entry as fuzzy" do
-					@entry1.should_not be_fuzzy
-					@entry2.should_not be_fuzzy
-					@entry3.should_not be_fuzzy
-				end
+			it "returns a new unique ID" do
+				@id1.should_not == @id2
+				@id1.should_not == @id3
 			end
 
-			describe "if one or more similar titles exist in the map" do
-				before :each do
-					@entry1 = @id_map.add("Installation using a tarball", nil, false, false)
-					@entry2 = @id_map.add("Installation using a Linux tarball", nil, false, false)
-				end
-
-				it "associates with the most similar title and returns its ID" do
-					@id3 = @id_map.associate "Installation using tarball"
-					@id3.should == @entry1.id
-					@entry1.title.should == "Installation using tarball"
-				end
-
-				it "only associates with a title that hasn't been associated before" do
-					@entry1.associated = true
-					@id3 = @id_map.associate "Installation using tarball"
-					@id3.should == @entry2.id
-				end
-
-				it "marks the corresponding entry as associated" do
-					@id_map.associate "Installation using tarball"
-					@id_map["Installation using tarball"].should be_associated
-				end
-
-				it "marks the corresponding entry as fuzzy" do
-					@id_map.associate "Installation using tarball"
-					@id_map["Installation using tarball"].should be_fuzzy
-				end
+			it "marks the entry as associated" do
+				@id_map.entries["Installation"].should be_associated
+				@id_map.entries["Installation on Linux"].should be_associated
+				@id_map.entries["Configuration"].should be_associated
 			end
 
-			specify "title matching is case-insensitive" do
-				entry1 = @id_map.add("INSTALLATION USING A TARBALL", nil, false, false)
-				id = @id_map.associate "installation using tarball"
-				id.should == entry1.id
+			it "doesn't mark the corresponding entry as fuzzy" do
+				@id_map.entries["Installation"].should_not be_fuzzy
+				@id_map.entries["Installation on Linux"].should_not be_fuzzy
+				@id_map.entries["Configuration"].should_not be_fuzzy
 			end
 		end
 
-		describe "if the given title is in the map and it hasn't been associated before" do
+		describe "if the same title exists in the map, but with a different section number" do
 			before :each do
-				@entry = @id_map.add("Installation", nil, false, false)
+				@entry1 = @id_map.add("1.2. Installation using a tarball", nil, false, false)
+				@entry2 = @id_map.add("5.6. Installation using a tarball", nil, false, false)
+				@entry3 = @id_map.add("6.0. Installation using a tarball", nil, false, false)
+				@id_map.generate_associations(["5.4. Installation using a tarball",
+					"2.1. Installation using a tarball"])
+				@id1 = @id_map.associations["5.4. Installation using a tarball"]
+				@id2 = @id_map.associations["2.1. Installation using a tarball"]
 			end
 
-			it "returns that title's previous ID" do
-				id = @id_map.associate "Installation"
-				id.should == @entry.id
+			it "associates with the title whose section number is closest to the new section number" do
+				@id1.should == @entry2.id
+				@id2.should == @entry1.id
 			end
 
-			it "marks the entry as associated" do
-				@id_map.associate "Installation"
-				@entry.should be_associated
+			it "changes the original entries' titles" do
+				@entry1.title.should == "2.1. Installation using a tarball"
+				@entry2.title.should == "5.4. Installation using a tarball"
+				@entry3.title.should == "6.0. Installation using a tarball"
+			end
+
+			it "marks the corresponding entry as associated" do
+				@entry1.should be_associated
+				@entry2.should be_associated
+				@entry3.should_not be_associated
+			end
+
+			it "doesn't mark the corresponding entry as fuzzy" do
+				@entry1.should_not be_fuzzy
+				@entry2.should_not be_fuzzy
+				@entry3.should_not be_fuzzy
+			end
+		end
+
+		describe "if one or more similar titles exist in the map" do
+			before :each do
+				@entry1 = @id_map.add("Installation using a tarball", nil, false, false)
+				@entry2 = @id_map.add("Installation using a Linux tarball", nil, false, false)
 			end
 
-			it "preserves the entry's fuzziness" do
-				@id_map.associate "Installation"
-				@entry.should_not be_fuzzy
+			it "associates with the most similar title and returns its ID" do
+				@id_map.generate_associations(["Installation using tarball"])
+				@id3 = @id_map.associations["Installation using tarball"]
+				@id3.should == @entry1.id
+				@entry1.title.should == "Installation using tarball"
+			end
+
+			it "only associates with a title that hasn't been associated before" do
+				@entry1.associated = true
+				@id_map.generate_associations(["Installation using tarball"])
+				@id3 = @id_map.associations["Installation using tarball"]
+				@id3.should == @entry2.id
+			end
 
-				@entry2 = @id_map.add("Installation 2", nil, true, false)
-				@id_map.associate "Installation 2"
-				@entry2.should be_fuzzy
+			it "marks the corresponding entry as associated" do
+				@id_map.generate_associations(["Installation using tarball"])
+				@id_map.entries["Installation using tarball"].should be_associated
+			end
+
+			it "marks the corresponding entry as fuzzy" do
+				@id_map.generate_associations(["Installation using tarball"])
+				@id_map.entries["Installation using tarball"].should be_fuzzy
 			end
 		end
 
-		describe "if the given title is in the map and it has been associated before" do
-			it "raises an error" do
-				@entry = @id_map.add("Installation", nil, false, true)
-				lambda { @id_map.associate "Installation" }.should raise_error(IdMap::AlreadyAssociatedError)
+		describe "if a one title has a similar match, but a later title has an exact match" do
+			it "associates the later title with the exact match, then associates the first title with the similar match" do
+				@id_map.add("Hello Dear World", "id-1", false, false)
+				@id_map.add("Hallaa Dear World", "id-2", false, false)
+				@id_map.generate_associations(["Helloo Dear World", "Hello Dear World"])
+				@id_map.associations["Helloo Dear World"].should == "id-2"
+				@id_map.associations["Hello Dear World"].should == "id-1"
 			end
 		end
+
+		specify "title matching is case-insensitive" do
+			entry1 = @id_map.add("INSTALLATION USING A TARBALL", nil, false, false)
+			@id_map.generate_associations(["installation using tarball"])
+			id = @id_map.associations["installation using tarball"]
+			id.should == entry1.id
+		end
 	end
 
 	describe "entries" do
@@ -193,17 +176,17 @@ describe IdMap do
 
 			@id_map.entries.should have(3).items
 			
-			entry = @id_map["Installation"]
+			entry = @id_map.entries["Installation"]
 			entry.title.should == "Installation"
 			entry.id.should == "installation-1"
 			entry.should_not be_fuzzy
 
-			entry = @id_map["Configuration"]
+			entry = @id_map.entries["Configuration"]
 			entry.title.should == "Configuration"
 			entry.id.should == "configuration-2"
 			entry.should_not be_fuzzy
 
-			entry = @id_map["Troubleshooting"]
+			entry = @id_map.entries["Troubleshooting"]
 			entry.title.should == "Troubleshooting"
 			entry.id.should == "troubleshooting-1"
 			entry.should be_fuzzy

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mizuho
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.9.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-20 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A documentation formatting tool. Mizuho converts Asciidoc input files
   into nicely outputted HTML, possibly one file per chapter. Multiple templates are
   supported, so you can write your own.
@@ -46,6 +62,7 @@ files:
 - lib/mizuho/generator.rb
 - lib/mizuho/id_map.rb
 - lib/mizuho/source_highlight.rb
+- lib/mizuho/utils.rb
 - lib/mizuho.rb
 - test/generator_spec.rb
 - test/id_map_spec.rb
@@ -60,6 +77,7 @@ files:
 - templates/juvia.js
 - templates/mizuho.css
 - templates/mizuho.js
+- templates/toc.html
 - templates/topbar.css
 - templates/topbar.html
 - templates/topbar.js