RubyGems - sdoc - Versions diffs - 0.3.2 → 0.3.3 - Mend

sdoc 0.3.2 → 0.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (47) hide show

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

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	<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="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>
+	<script type="text/javascript" charset="utf-8">
+    function placeholder() {
+        if ($('<input type="text">')[0].placeholder !== undefined) return;
+        $('#search-label').click(function() {
+            $('#search').focus();
+            $('#search-label').hide();
+        });
+        $('#search').focus(function() {
+            $('#search-label').hide();
+        });
+        $('#search').blur(function() {
+            this.value == '' && $('#search-label').show()
+        });
+        $('#search')[0].value == '' && $('#search-label').show();
+    }
+    $(function() {
+        placeholder();
+        $('#links').hide();
+        var panel = new Searchdoc.Panel($('#panel'), search_data, tree, top.frames[1]);
+        $('#search').focus();
+        var s = window.parent.location.search.match(/\?q=([^&]+)/);
+        if (s) {
+            s = decodeURIComponent(s[1]).replace(/\+/g, ' ');
+            if (s.length > 0)
+            {
+                $('#search').val(s);
+                panel.search(s, true);
+            }
+        }
+    })
+	</script>
+</head>
+<body>
+    <div class="panel panel_tree" id="panel">
+        <div class="header">
+            <div>
+                <label for="search" id="search-label" style="display: none">Search</label>
+                <table>
+                <tr><td>
+                    <input type="Search" placeholder="Search" autosave="searchdoc" results="10" id="search" autocomplete="off"/>
+                </td></tr>
+            </table></div>
+        </div>
+        <div class="tree">
+            <ul>
+            </ul>
+        </div>
+        <div class="result">
+            <ul>
+            </ul>
+        </div>
+    </div>
+    <a href="links.html" id="links">index</a>
+</body>
+</html>

data/lib/rdoc/generator/template/sdoc/se_index.rhtml ADDED Viewed

@@ -0,0 +1,8 @@
+<html>
+    <head>File index</head>
+    <body>
+    <% @files.each do |file| %>
+      <a href="../<%= file.path %>"><%= file.relative_name %></a>
+    <% end %>
+    </body>
+</html>

data/lib/sdoc/generator.rb CHANGED Viewed

@@ -85,6 +85,7 @@ class RDoc::Generator::SDoc
       options.se_index = false
     end
     opt.separator nil
   end
   def initialize(options)
@@ -93,15 +94,8 @@ class RDoc::Generator::SDoc
       @options.diagram = false
     end
     @github_url_cache = {}
-    @options.template = 'direct' if @options.template == 'sdoc'
-    template = @options.template
-    templ_dir = self.class.template_dir_for template
-    raise RDoc::Error, "could not find template #{template.inspect}" unless
-    templ_dir
-    @template_dir = Pathname.new File.expand_path(templ_dir)
+    @template_dir = Pathname.new(options.template_dir)
     @basedir = Pathname.pwd.expand_path
   end
@@ -128,17 +122,6 @@ class RDoc::Generator::SDoc
     FILE_DIR
   end
-  def self.template_dir_for template
-    $LOAD_PATH.map do |path|
-      GENERATOR_DIRS.map do |dir|
-        File.join path, dir, 'template', template
-      end
-    end.flatten.find do |dir|
-      File.directory? dir
-    end
-  end
   protected
   ### Output progress information if debugging is enabled
   def debug_msg( *msg )

data/lib/sdoc/templatable.rb CHANGED Viewed

@@ -25,7 +25,8 @@ module SDoc::Templatable
   ### current context. Adds all +local_assigns+ to context
   def include_template(template_name, local_assigns = {})
     source = local_assigns.keys.map { |key| "#{key} = local_assigns[:#{key}];" }.join
-    eval("#{source};templatefile = @template_dir + template_name;eval_template(templatefile, binding)")
+    templatefile = @template_dir + template_name
+    eval("#{source};eval_template(templatefile, binding)")
   end
 	### Load and render the erb template in the given +templatefile+ within the

data/sdoc.gemspec CHANGED Viewed

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.name = "sdoc"
-  s.version = "0.3.2"
+  s.version = "0.3.3"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vladimir Kolesnikov"]

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sdoc
 version: !ruby/object:Gem::Version
-  hash: 23
+  hash: 21
   prerelease: false
   segments:
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors:
 - Vladimir Kolesnikov
@@ -67,30 +67,51 @@ files:
 - bin/sdoc
 - bin/sdoc-merge
 - lib/rdoc/discover.rb
+- lib/rdoc/generator/template/merge/index.rhtml
+- lib/rdoc/generator/template/rails/_context.rhtml
+- lib/rdoc/generator/template/rails/_head.rhtml
+- lib/rdoc/generator/template/rails/class.rhtml
+- lib/rdoc/generator/template/rails/file.rhtml
+- lib/rdoc/generator/template/rails/index.rhtml
+- lib/rdoc/generator/template/rails/resources/apple-touch-icon.png
+- lib/rdoc/generator/template/rails/resources/css/github.css
+- lib/rdoc/generator/template/rails/resources/css/main.css
+- lib/rdoc/generator/template/rails/resources/css/panel.css
+- lib/rdoc/generator/template/rails/resources/css/reset.css
+- lib/rdoc/generator/template/rails/resources/favicon.ico
+- lib/rdoc/generator/template/rails/resources/i/arrows.png
+- lib/rdoc/generator/template/rails/resources/i/results_bg.png
+- lib/rdoc/generator/template/rails/resources/i/tree_bg.png
+- lib/rdoc/generator/template/rails/resources/js/highlight.pack.js
+- lib/rdoc/generator/template/rails/resources/js/jquery-1.3.2.min.js
+- lib/rdoc/generator/template/rails/resources/js/jquery-effect.js
+- lib/rdoc/generator/template/rails/resources/js/main.js
+- lib/rdoc/generator/template/rails/resources/js/searchdoc.js
+- lib/rdoc/generator/template/rails/resources/panel/index.html
+- lib/rdoc/generator/template/rails/se_index.rhtml
+- lib/rdoc/generator/template/sdoc/_context.rhtml
+- lib/rdoc/generator/template/sdoc/_head.rhtml
+- lib/rdoc/generator/template/sdoc/class.rhtml
+- lib/rdoc/generator/template/sdoc/file.rhtml
+- lib/rdoc/generator/template/sdoc/index.rhtml
+- lib/rdoc/generator/template/sdoc/resources/apple-touch-icon.png
+- lib/rdoc/generator/template/sdoc/resources/css/github.css
+- lib/rdoc/generator/template/sdoc/resources/css/main.css
+- lib/rdoc/generator/template/sdoc/resources/css/panel.css
+- lib/rdoc/generator/template/sdoc/resources/css/reset.css
+- lib/rdoc/generator/template/sdoc/resources/favicon.ico
+- lib/rdoc/generator/template/sdoc/resources/i/arrows.png
+- lib/rdoc/generator/template/sdoc/resources/i/results_bg.png
+- lib/rdoc/generator/template/sdoc/resources/i/tree_bg.png
+- lib/rdoc/generator/template/sdoc/resources/js/highlight.pack.js
+- lib/rdoc/generator/template/sdoc/resources/js/jquery-1.3.2.min.js
+- lib/rdoc/generator/template/sdoc/resources/js/jquery-effect.js
+- lib/rdoc/generator/template/sdoc/resources/js/main.js
+- lib/rdoc/generator/template/sdoc/resources/js/searchdoc.js
+- lib/rdoc/generator/template/sdoc/resources/panel/index.html
+- lib/rdoc/generator/template/sdoc/se_index.rhtml
 - lib/sdoc.rb
 - lib/sdoc/generator.rb
-- lib/sdoc/generator/template/direct/_context.rhtml
-- lib/sdoc/generator/template/direct/_head.rhtml
-- lib/sdoc/generator/template/direct/class.rhtml
-- lib/sdoc/generator/template/direct/file.rhtml
-- lib/sdoc/generator/template/direct/index.rhtml
-- lib/sdoc/generator/template/direct/resources/apple-touch-icon.png
-- lib/sdoc/generator/template/direct/resources/css/github.css
-- lib/sdoc/generator/template/direct/resources/css/main.css
-- lib/sdoc/generator/template/direct/resources/css/panel.css
-- lib/sdoc/generator/template/direct/resources/css/reset.css
-- lib/sdoc/generator/template/direct/resources/favicon.ico
-- lib/sdoc/generator/template/direct/resources/i/arrows.png
-- lib/sdoc/generator/template/direct/resources/i/results_bg.png
-- lib/sdoc/generator/template/direct/resources/i/tree_bg.png
-- lib/sdoc/generator/template/direct/resources/js/highlight.pack.js
-- lib/sdoc/generator/template/direct/resources/js/jquery-1.3.2.min.js
-- lib/sdoc/generator/template/direct/resources/js/jquery-effect.js
-- lib/sdoc/generator/template/direct/resources/js/main.js
-- lib/sdoc/generator/template/direct/resources/js/searchdoc.js
-- lib/sdoc/generator/template/direct/resources/panel/index.html
-- lib/sdoc/generator/template/direct/se_index.rhtml
-- lib/sdoc/generator/template/merge/index.rhtml
 - lib/sdoc/github.rb
 - lib/sdoc/helpers.rb
 - lib/sdoc/merge.rb