sdoc 0.3.11 → 0.3.14

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Vladimir Kolesnikov
+Copyright (c) 2011 Vladimir Kolesnikov
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -19,3 +19,92 @@ 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.
 
+
+
+Darkfish RDoc HTML Generator
+
+Copyright (c) 2007, 2008, Michael Granger. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the author/s, nor the names of the project's
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+RDoc is copyrighted free software.
+
+You can redistribute it and/or modify it under either the terms of the GPL
+version 2 (see the file GPL), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+          modifications to Usenet or an equivalent medium, or by allowing
+          the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or binary form,
+     provided that you do at least ONE of the following:
+
+       a) distribute the binaries and library files of the software,
+          together with instructions (in the manual page or equivalent)
+          on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+          the software.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under these terms.
+
+     For the list of those files and their copying conditions, see the
+     file LEGAL.
+
+  5. The scripts and library files supplied as input to or produced as
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them,
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.

data/bin/sdoc

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby -KU
-require File.dirname(__FILE__) + '/../lib/sdoc' # add extensions
+require 'sdoc'
 
 begin
   ARGV.push('--format=sdoc') if ARGV.grep(/\A(-f|--fmt|--format|-r|-R|--ri|--ri-site)\b/).empty?

data/lib/rdoc/generator/template/rails/resources/css/reset.css

@@ -33,11 +33,6 @@ q:before, q:after {
 	content: none;
 }
 
-/* remember to define focus styles! */
-:focus {
-	outline: 0;
-}
-
 /* remember to highlight inserts somehow! */
 ins {
 	text-decoration: none;

data/lib/rdoc/generator/template/rails/resources/js/searchdoc.js

@@ -131,193 +131,6 @@ function scrollIntoView(element, view) {
     }
 }
 
-
-// searcher.js --------------------------------------------
-
-Searchdoc.Searcher = function(data) {
-    this.data = data;
-    this.handlers = [];
-}
-
-Searchdoc.Searcher.prototype = new function() {
-    var CHUNK_SIZE = 1000, // search is performed in chunks of 1000 for non-bloking user input
-        MAX_RESULTS = 100, // do not try to find more than 100 results
-        huid = 1, suid = 1,
-        runs = 0;
-
-
-    this.find = function(query) {
-        var queries = splitQuery(query),
-            regexps = buildRegexps(queries),
-            highlighters = buildHilighters(queries),
-            state = { from: 0, pass: 0, limit: MAX_RESULTS, n: suid++},
-            _this = this;
-        this.currentSuid = state.n;
-    
-        if (!query) return;
-    
-        var run = function() {
-            // stop current search thread if new search started
-            if (state.n != _this.currentSuid) return;
-            
-            var results = performSearch(_this.data, regexps, queries, highlighters, state),
-                hasMore = (state.limit > 0 && state.pass < 3);
-                
-            triggerResults.call(_this, results, !hasMore);
-            if (hasMore) {
-                setTimeout(run, 2);
-            }
-            runs++;
-        };
-        runs = 0;
-        
-        // start search thread
-        run();
-    }
-
-    /*  ----- Events ------  */
-    this.ready = function(fn) {
-        fn.huid = huid;
-        this.handlers.push(fn);
-    }
-
-    /*  ----- Utilities ------  */
-    function splitQuery(query) {
-        return jQuery.grep(query.split(/(\s+|\(\)?)/), function(string) { return string.match(/\S/) });
-    }
-
-    function buildRegexps(queries) {
-        return jQuery.map(queries, function(query) { return new RegExp(query.replace(/(.)/g, '([$1])([^$1]*?)'), 'i') });
-    }
-
-    function buildHilighters(queries) {
-        return jQuery.map(queries, function(query) {
-            return jQuery.map( query.split(''), function(l, i){ return '\u0001$' + (i*2+1) + '\u0002$' + (i*2+2) } ).join('')
-        });
-    }
-
-    // function longMatchRegexp(index, longIndex, regexps) {
-    //     for (var i = regexps.length - 1; i >= 0; i--){
-    //         if (!index.match(regexps[i]) && !longIndex.match(regexps[i])) return false;
-    //     };
-    //     return true;
-    // }
-    
-    
-    /*  ----- Mathchers ------  */
-    function matchPass1(index, longIndex, queries, regexps) {
-        if (index.indexOf(queries[0]) != 0) return false;
-        for (var i=1, l = regexps.length; i < l; i++) {
-            if (!index.match(regexps[i]) && !longIndex.match(regexps[i])) return false;
-        };
-        return true;
-    }
-
-    function matchPass2(index, longIndex, queries, regexps) {
-        if (index.indexOf(queries[0]) == -1) return false;
-        for (var i=1, l = regexps.length; i < l; i++) {
-            if (!index.match(regexps[i]) && !longIndex.match(regexps[i])) return false;
-        };
-        return true;
-    }
-    
-    function matchPassRegexp(index, longIndex, queries, regexps) {
-        if (!index.match(regexps[0])) return false;
-        for (var i=1, l = regexps.length; i < l; i++) {
-            if (!index.match(regexps[i]) && !longIndex.match(regexps[i])) return false;
-        };
-        return true;
-    }
-
-
-    /*  ----- Highlighters ------  */
-    function highlightRegexp(info, queries, regexps, highlighters) {
-        var result = createResult(info);
-        for (var i=0, l = regexps.length; i < l; i++) {
-            result.title = result.title.replace(regexps[i], highlighters[i]);
-            if (i > 0)
-                result.namespace = result.namespace.replace(regexps[i], highlighters[i]);
-        };
-        return result;
-    }
-    
-    function hltSubstring(string, pos, length) {
-        return string.substring(0, pos) + '\u0001' + string.substring(pos, pos + length) + '\u0002' + string.substring(pos + length);
-    }
-    
-    function highlightQuery(info, queries, regexps, highlighters) {
-        var result = createResult(info), pos = 0, lcTitle = result.title.toLowerCase();
-        pos = lcTitle.indexOf(queries[0]);
-        if (pos != -1) {
-            result.title = hltSubstring(result.title, pos, queries[0].length);
-        }
-        for (var i=1, l = regexps.length; i < l; i++) {
-            result.title = result.title.replace(regexps[i], highlighters[i]);
-            result.namespace = result.namespace.replace(regexps[i], highlighters[i]);
-        };
-        return result;
-    }
-
-    function createResult(info) {
-        var result = {};
-        result.title = info[0];
-        result.namespace = info[1];
-        result.path = info[2];
-        result.params = info[3];
-        result.snippet = info[4];
-        result.badge = info[6];
-        return result;
-    }
-
-    /*  ----- Searching ------  */
-    function performSearch(data, regexps, queries, highlighters, state) {
-        var searchIndex = data.searchIndex, // search by title first and then by source
-            longSearchIndex = data.longSearchIndex,
-            info = data.info,
-            result = [],
-            i = state.from, 
-            l = searchIndex.length,
-            togo = CHUNK_SIZE,
-            matchFunc, hltFunc;
-            
-        while (state.pass < 3 && state.limit > 0 && togo > 0) {
-            if (state.pass == 0) {
-                matchFunc = matchPass1;
-                hltFunc = highlightQuery;
-            } else if (state.pass == 1) {
-                matchFunc = matchPass2;
-                hltFunc = highlightQuery;
-            } else if (state.pass == 2) {
-                matchFunc = matchPassRegexp;
-                hltFunc = highlightRegexp;
-            }
-            
-            for (; togo > 0 && i < l && state.limit > 0; i++, togo--) {
-                if (info[i].n == state.n) continue;
-                if (matchFunc(searchIndex[i], longSearchIndex[i], queries, regexps)) {
-                    info[i].n = state.n;
-                    result.push(hltFunc(info[i], queries, regexps, highlighters));
-                    state.limit--;
-                }
-            };
-            if (searchIndex.length <= i) {
-                state.pass++;
-                i = state.from = 0;
-            } else {
-                state.from = i;
-            }
-        }
-        return result;
-    }
-    
-    function triggerResults(results, isLast) {
-        jQuery.each(this.handlers, function(i, fn) { fn.call(this, results, isLast) })
-    }
-}    
-
-
-
-
 // panel.js -----------------------------------------------
 
 Searchdoc.Panel = function(element, data, tree, frame) {
@@ -328,7 +141,7 @@ Searchdoc.Panel = function(element, data, tree, frame) {
     this.$current = null;
     this.$view = this.$result.parent();
     this.data = data;
-    this.searcher = new Searchdoc.Searcher(data.index);
+    this.searcher = new Searcher(data.index);
     this.tree = new Searchdoc.Tree($('.tree', element), tree, this);
     this.init();
 }

data/lib/rdoc/generator/template/rails/resources/panel/index.html

@@ -7,7 +7,8 @@
 	<title>search index</title>
 	<link rel="stylesheet" href="../css/reset.css" type="text/css" media="screen" charset="utf-8" />
 	<link rel="stylesheet" href="../css/panel.css" type="text/css" media="screen" charset="utf-8" />
-	<script src="search_index.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../js/search_index.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../js/searcher.js" type="text/javascript" charset="utf-8"></script>
 	<script src="tree.js" type="text/javascript" charset="utf-8"></script>
 	<script src="../js/jquery-1.3.2.min.js" type="text/javascript" charset="utf-8"></script>
 	<script src="../js/searchdoc.js" type="text/javascript" charset="utf-8"></script>

data/lib/rdoc/generator/template/sdoc/resources/css/reset.css

@@ -33,11 +33,6 @@ q:before, q:after {
 	content: none;
 }
 
-/* remember to define focus styles! */
-:focus {
-	outline: 0;
-}
-
 /* remember to highlight inserts somehow! */
 ins {
 	text-decoration: none;

data/lib/rdoc/generator/template/sdoc/resources/js/searchdoc.js

@@ -131,193 +131,6 @@ function scrollIntoView(element, view) {
     }
 }
 
-
-// searcher.js --------------------------------------------
-
-Searchdoc.Searcher = function(data) {
-    this.data = data;
-    this.handlers = [];
-}
-
-Searchdoc.Searcher.prototype = new function() {
-    var CHUNK_SIZE = 1000, // search is performed in chunks of 1000 for non-bloking user input
-        MAX_RESULTS = 100, // do not try to find more than 100 results
-        huid = 1, suid = 1,
-        runs = 0;
-
-
-    this.find = function(query) {
-        var queries = splitQuery(query),
-            regexps = buildRegexps(queries),
-            highlighters = buildHilighters(queries),
-            state = { from: 0, pass: 0, limit: MAX_RESULTS, n: suid++},
-            _this = this;
-        this.currentSuid = state.n;
-    
-        if (!query) return;
-    
-        var run = function() {
-            // stop current search thread if new search started
-            if (state.n != _this.currentSuid) return;
-            
-            var results = performSearch(_this.data, regexps, queries, highlighters, state),
-                hasMore = (state.limit > 0 && state.pass < 3);
-                
-            triggerResults.call(_this, results, !hasMore);
-            if (hasMore) {
-                setTimeout(run, 2);
-            }
-            runs++;
-        };
-        runs = 0;
-        
-        // start search thread
-        run();
-    }
-
-    /*  ----- Events ------  */
-    this.ready = function(fn) {
-        fn.huid = huid;
-        this.handlers.push(fn);
-    }
-
-    /*  ----- Utilities ------  */
-    function splitQuery(query) {
-        return jQuery.grep(query.split(/(\s+|\(\)?)/), function(string) { return string.match(/\S/) });
-    }
-
-    function buildRegexps(queries) {
-        return jQuery.map(queries, function(query) { return new RegExp(query.replace(/(.)/g, '([$1])([^$1]*?)'), 'i') });
-    }
-
-    function buildHilighters(queries) {
-        return jQuery.map(queries, function(query) {
-            return jQuery.map( query.split(''), function(l, i){ return '\u0001$' + (i*2+1) + '\u0002$' + (i*2+2) } ).join('')
-        });
-    }
-
-    // function longMatchRegexp(index, longIndex, regexps) {
-    //     for (var i = regexps.length - 1; i >= 0; i--){
-    //         if (!index.match(regexps[i]) && !longIndex.match(regexps[i])) return false;
-    //     };
-    //     return true;
-    // }
-    
-    
-    /*  ----- Mathchers ------  */
-    function matchPass1(index, longIndex, queries, regexps) {
-        if (index.indexOf(queries[0]) != 0) return false;
-        for (var i=1, l = regexps.length; i < l; i++) {
-            if (!index.match(regexps[i]) && !longIndex.match(regexps[i])) return false;
-        };
-        return true;
-    }
-
-    function matchPass2(index, longIndex, queries, regexps) {
-        if (index.indexOf(queries[0]) == -1) return false;
-        for (var i=1, l = regexps.length; i < l; i++) {
-            if (!index.match(regexps[i]) && !longIndex.match(regexps[i])) return false;
-        };
-        return true;
-    }
-    
-    function matchPassRegexp(index, longIndex, queries, regexps) {
-        if (!index.match(regexps[0])) return false;
-        for (var i=1, l = regexps.length; i < l; i++) {
-            if (!index.match(regexps[i]) && !longIndex.match(regexps[i])) return false;
-        };
-        return true;
-    }
-
-
-    /*  ----- Highlighters ------  */
-    function highlightRegexp(info, queries, regexps, highlighters) {
-        var result = createResult(info);
-        for (var i=0, l = regexps.length; i < l; i++) {
-            result.title = result.title.replace(regexps[i], highlighters[i]);
-            if (i > 0)
-                result.namespace = result.namespace.replace(regexps[i], highlighters[i]);
-        };
-        return result;
-    }
-    
-    function hltSubstring(string, pos, length) {
-        return string.substring(0, pos) + '\u0001' + string.substring(pos, pos + length) + '\u0002' + string.substring(pos + length);
-    }
-    
-    function highlightQuery(info, queries, regexps, highlighters) {
-        var result = createResult(info), pos = 0, lcTitle = result.title.toLowerCase();
-        pos = lcTitle.indexOf(queries[0]);
-        if (pos != -1) {
-            result.title = hltSubstring(result.title, pos, queries[0].length);
-        }
-        for (var i=1, l = regexps.length; i < l; i++) {
-            result.title = result.title.replace(regexps[i], highlighters[i]);
-            result.namespace = result.namespace.replace(regexps[i], highlighters[i]);
-        };
-        return result;
-    }
-
-    function createResult(info) {
-        var result = {};
-        result.title = info[0];
-        result.namespace = info[1];
-        result.path = info[2];
-        result.params = info[3];
-        result.snippet = info[4];
-        result.badge = info[6];
-        return result;
-    }
-
-    /*  ----- Searching ------  */
-    function performSearch(data, regexps, queries, highlighters, state) {
-        var searchIndex = data.searchIndex, // search by title first and then by source
-            longSearchIndex = data.longSearchIndex,
-            info = data.info,
-            result = [],
-            i = state.from, 
-            l = searchIndex.length,
-            togo = CHUNK_SIZE,
-            matchFunc, hltFunc;
-            
-        while (state.pass < 3 && state.limit > 0 && togo > 0) {
-            if (state.pass == 0) {
-                matchFunc = matchPass1;
-                hltFunc = highlightQuery;
-            } else if (state.pass == 1) {
-                matchFunc = matchPass2;
-                hltFunc = highlightQuery;
-            } else if (state.pass == 2) {
-                matchFunc = matchPassRegexp;
-                hltFunc = highlightRegexp;
-            }
-            
-            for (; togo > 0 && i < l && state.limit > 0; i++, togo--) {
-                if (info[i].n == state.n) continue;
-                if (matchFunc(searchIndex[i], longSearchIndex[i], queries, regexps)) {
-                    info[i].n = state.n;
-                    result.push(hltFunc(info[i], queries, regexps, highlighters));
-                    state.limit--;
-                }
-            };
-            if (searchIndex.length <= i) {
-                state.pass++;
-                i = state.from = 0;
-            } else {
-                state.from = i;
-            }
-        }
-        return result;
-    }
-    
-    function triggerResults(results, isLast) {
-        jQuery.each(this.handlers, function(i, fn) { fn.call(this, results, isLast) })
-    }
-}    
-
-
-
-
 // panel.js -----------------------------------------------
 
 Searchdoc.Panel = function(element, data, tree, frame) {
@@ -328,7 +141,8 @@ Searchdoc.Panel = function(element, data, tree, frame) {
     this.$current = null;
     this.$view = this.$result.parent();
     this.data = data;
-    this.searcher = new Searchdoc.Searcher(data.index);
+    this.searcher = new Searcher(data.index);
+
     this.tree = new Searchdoc.Tree($('.tree', element), tree, this);
     this.init();
 }

data/lib/rdoc/generator/template/sdoc/resources/panel/index.html

@@ -7,7 +7,8 @@
 	<title>search index</title>
 	<link rel="stylesheet" href="../css/reset.css" type="text/css" media="screen" charset="utf-8" />
 	<link rel="stylesheet" href="../css/panel.css" type="text/css" media="screen" charset="utf-8" />
-	<script src="search_index.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../js/search_index.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../js/searcher.js" type="text/javascript" charset="utf-8"></script>
 	<script src="tree.js" type="text/javascript" charset="utf-8"></script>
 	<script src="../js/jquery-1.3.2.min.js" type="text/javascript" charset="utf-8"></script>
 	<script src="../js/searchdoc.js" type="text/javascript" charset="utf-8"></script>

data/lib/sdoc/generator.rb

@@ -2,27 +2,19 @@ require 'rubygems'
 require 'erb'
 require 'pathname'
 require 'fileutils'
-require 'rdoc/markup/to_html'
-if Gem.available? "json"
+if Gem::Specification.respond_to?(:find_by_name) ? Gem::Specification::find_by_name("json") : Gem.available?("json")
   gem "json", ">= 1.1.3"
 else
   gem "json_pure", ">= 1.1.3"
 end
 require 'json'
-require 'sanitize'
 
 require 'sdoc/github'
 require 'sdoc/templatable'
 require 'sdoc/helpers'
 require 'rdoc'
-require 'rdoc/rdoc'
-require 'rdoc/generator'
 
 class RDoc::ClassModule
-  def document_self_or_methods
-    document_self || method_list.any?{ |m| m.document_self }
-  end
-
   def with_documentation?
     document_self_or_methods || classes_and_modules.any?{ |c| c.with_documentation? }
   end
@@ -116,20 +108,14 @@ class RDoc::Generator::SDoc
 
   GENERATOR_DIRS = [File.join('sdoc', 'generator')]
 
-  # Used in js to reduce index sizes
-  TYPE_CLASS  = 1
-  TYPE_METHOD = 2
-  TYPE_FILE   = 3
-
   TREE_FILE = File.join 'panel', 'tree.js'
-  SEARCH_INDEX_FILE = File.join 'panel', 'search_index.js'
 
   FILE_DIR = 'files'
   CLASS_DIR = 'classes'
 
   RESOURCES_DIR = File.join('resources', '.')
 
-  attr_reader :basedir
+  attr_reader :base_dir
 
   attr_reader :options
 
@@ -169,18 +155,20 @@ class RDoc::Generator::SDoc
     @github_url_cache = {}
 
     @template_dir = Pathname.new(options.template_dir)
-    @basedir = Pathname.pwd.expand_path
+    @base_dir = Pathname.pwd.expand_path
+
+    @json_index = RDoc::Generator::JsonIndex.new self, options
   end
 
   def generate(top_levels)
-    @outputdir = Pathname.new(@options.op_dir).expand_path(@basedir)
+    @outputdir = Pathname.new(@options.op_dir).expand_path(@base_dir)
     @files = top_levels.sort
     @classes = RDoc::TopLevel.all_classes_and_modules.sort
 
     # Now actually write the output
     copy_resources
     generate_class_tree
-    generate_search_index
+    @json_index.generate top_levels
     generate_file_files
     generate_class_files
     generate_index_file
@@ -216,8 +204,8 @@ class RDoc::Generator::SDoc
   ### Recursivly build class tree structure
   def generate_class_tree_level(classes, visited = {})
     tree = []
-    classes.select do |klass| 
-      !visited[klass] && klass.with_documentation? 
+    classes.select do |klass|
+      !visited[klass] && klass.with_documentation?
     end.sort.each do |klass|
       visited[klass] = true
       item = [
@@ -231,30 +219,6 @@ class RDoc::Generator::SDoc
     tree
   end
 
-  ### Create search index for all classes, methods and files
-  ### Wite it as json
-  def generate_search_index
-    debug_msg "Generating search index"
-
-    index = {
-      :searchIndex => [],
-      :longSearchIndex => [],
-      :info => []
-    }
-
-    add_class_search_index(index)
-    add_method_search_index(index)
-    add_file_search_index(index)
-
-    debug_msg "  writing search index to %s" % SEARCH_INDEX_FILE
-    data = {
-      :index => index
-    }
-    File.open(SEARCH_INDEX_FILE, "w", 0644) do |f|
-      f.write('var search_data = '); f.write(data.to_json(:max_nesting => 0))
-    end unless $dryrun
-  end
-
   ### Add files to search +index+ array
   def add_file_search_index(index)
     debug_msg "  generating file search index"
@@ -366,16 +330,15 @@ class RDoc::Generator::SDoc
     default = @files.first.path
     return default unless @options.main_page
 
-    # Handle attempts to hit class docs directly
+    # Transform class name to file path
     if @options.main_page.include?("::")
-      return "%s/%s.html" % [class_dir, @options.main_page.gsub("::", "/")]
-    end
-    if file = @files.find { |f| f.full_name == @options.main_page }
-      return file.path
+      slashed = @options.main_page.sub(/^::/, "").gsub("::", "/")
+      "%s/%s.html" % [ class_dir, slashed ]
+    elsif file = @files.find { |f| f.full_name == @options.main_page }
+      file.path
+    else
+      default
     end
-
-    # Nothing else worked, so stick with the default
-    return default
   end
 
   ### Create index.html with frameset
@@ -396,39 +359,6 @@ class RDoc::Generator::SDoc
     self.render_template( templatefile, binding(), outfile )
   end
 
-  ### Strip comments on a space after 100 chars
-  def snippet(str)
-
-    str ||= ''
-    if str =~ /^(?>\s*)[^\#]/
-      content = str
-    else
-      content = str.gsub(/^\s*(#+)\s*/, '')
-    end
-
-    # Get a plain string with no markup.
-    content = Sanitize.clean(RDoc::Markup::ToHtml.new.convert(content))
-    content = content.sub(/^(.{100,}?)\s.*/m, "\\1").gsub(/\r?\n/m, ' ')
-
-    begin
-      content.to_json(:max_nesting => 0)
-    rescue # might fail on non-unicode string
-      begin
-        content = Iconv.conv('latin1//ignore', "UTF8", content) # remove all non-unicode chars
-        content.to_json(:max_nesting => 0)
-      rescue
-        content = '' # something hugely wrong happend
-      end
-    end
-    content
-  end
-
-  ### Build search index key
-  def search_string(string)
-    string ||= ''
-    string.downcase.gsub(/\s/,'')
-  end
-
   ### Copy all the resource files to output dir
   def copy_resources
     resoureces_path = @template_dir + RESOURCES_DIR

data/sdoc.gemspec

@@ -2,35 +2,30 @@
 
 Gem::Specification.new do |s|
   s.name = "sdoc"
-  s.version = "0.3.11"
+  s.version = "0.3.14"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vladimir Kolesnikov"]
-  s.date = %q{2011-09-27}
   s.description = %q{rdoc generator html with javascript search index.}
   s.summary = %q{rdoc html with javascript search index.}
   s.homepage = %q{http://github.com/voloko/sdoc}
   s.email = %q{voloko@gmail.com}
 
-  s.platform                  = Gem::Platform::RUBY
-  s.rubygems_version          = %q{1.3.6}
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if
+    s.respond_to? :required_rubygems_version=
 
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = ["README.rdoc"]
 
-  s.add_runtime_dependency('rdoc', "~> 3")
-  s.add_runtime_dependency('sanitize', '~> 2')
+  s.add_runtime_dependency('rdoc', "~> 3.10")
   if defined?(JRUBY_VERSION)
     s.platform = Gem::Platform.new(['universal', 'java', nil])
     s.add_runtime_dependency("json_pure", ">= 1.1.3")
   else
     s.add_runtime_dependency("json", ">= 1.1.3")
-  end    
+  end
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sdoc
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 3
-  - 11
-  version: 0.3.11
+  - 14
+  version: 0.3.14
 platform: ruby
 authors: 
 - Vladimir Kolesnikov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-27 00:00:00 -07:00
+date: 2011-10-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,30 +26,17 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 19
         segments: 
         - 3
-        version: "3"
+        - 10
+        version: "3.10"
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sanitize
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -61,7 +48,7 @@ dependencies:
         - 3
         version: 1.1.3
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 description: rdoc generator html with javascript search index.
 email: voloko@gmail.com
 executables: