lib/octopress-docs.rb in octopress-docs-0.0.7 vs lib/octopress-docs.rb in octopress-docs-0.0.8

- old
+ new

@@ -55,18 +55,12 @@ i['url'].split('/').size } end def self.add_plugin_docs(plugin) - plugin_doc_pages = [] options = plugin_options(plugin) - find_doc_pages(options).each do |doc| - unless doc =~ /^_/ - opts = options.merge({file: doc, dir: options[:docs_path]}) - plugin_doc_pages << add_doc_page(opts) - end - end + plugin_doc_pages = add_asset_docs(options) # If there is no docs index page, set the reame as the index page has_index = !plugin_doc_pages.select {|d| d.file =~ /^index/ }.empty? plugin_doc_pages << add_root_plugin_doc(plugin, 'readme', index: !has_index) @@ -110,10 +104,11 @@ def self.add(options) options[:docs] ||= %w{readme changelog} options[:docs_path] ||= File.join(options[:dir], 'assets', 'docs') docs = [] docs.concat add_root_docs(options) + docs.concat add_asset_docs(options) docs.compact! end def self.add_root_docs(options) root_docs = [] @@ -145,9 +140,20 @@ @docs[options[:slug]] << page page end private + + def self.add_asset_docs(options) + docs = [] + find_doc_pages(options).each do |doc| + unless doc =~ /^_/ + opts = options.merge({file: doc, dir: options[:docs_path]}) + docs << add_doc_page(opts) + end + end + docs + end def self.find_doc_pages(options) full_dir = options[:docs_path] glob_assets(full_dir).map do |file| file.sub(full_dir+'/', '')