Merge pull request #5 from NDrive/add-recursive-folder-doc-reader

Enables read files inside folders

lib/api_docs/views/_controller_index.haml

@@ -1,4 +1,4 @@
 %div
   = preserve do
     :markdown
-      #{File.read(File.join(ApiDocs.config.docs_path.join("#{controller}.md")))}
+      #{mardown_data}

lib/api_docs/views/index.haml

@@ -12,23 +12,23 @@
         %ul.nav.nav-list#api-doc-nav
           - controllers.each_with_index do |(controller, actions), ci|
             %li.nav-header{:class => (ci == 0) ? 'active' : ''}
-              - if markdown_not_exist?(controller)
+              - if actions.header_content.nil?
                 =controller.gsub(/\W/, '_').humanize.titleize
               - else
                 %a{ href: "##{controller.gsub(/\W/, '_')}", :data => {:toggle => 'tab'} }= controller.gsub(/\W/, '_').humanize.titleize
-            - actions.each_with_index do |(action, data), ai|
-              %li{:class => (ci == 0 && ai == 0 && markdown_not_exist?(controller)) ? 'active' : ''}
+            - actions.content.each_with_index do |(action, data), ai|
+              %li{:class => (ci == 0 && ai == 0 && actions.header_content.nil?) ? 'active' : ''}
                 - tab_id = "#{controller.gsub(/\W/, '_')}_#{action}"
                 %a{ href: "##{tab_id}", :data => {:toggle => 'tab'} }= action.humanize.titleize
       .span10
         .tab-content
           - controllers.each_with_index do |(controller, actions), ci|
-            - actions.each_with_index do |(action, data), ai|
+            - actions.content.each_with_index do |(action, data), ai|
               - tab_id = "#{controller.gsub(/\W/, '_')}_#{action}"
-              .tab-pane{:id => tab_id, :class => (ci == 0 && ai == 0 && markdown_not_exist?(controller)) ? 'active' : ''}
+              .tab-pane{:id => tab_id, :class => (ci == 0 && ai == 0 && actions.header_content.nil?) ? 'active' : ''}
                 - data.each do |_, data|
                   = haml :_action, locals: {action: data}
             - tab_global = "#{controller.gsub(/\W/, '_')}"
-            - unless markdown_not_exist?(controller)
+            - if actions.header_content.present?
               .tab-pane{:id => tab_global, :class => (ci == 0) ? 'active' : ''}
-                = haml :_controller_index, locals: {controller: controller}
+                = haml :_controller_index, locals: {mardown_data: actions.header_content}

lib/api_docs/web.rb

@@ -17,8 +17,8 @@ class Web < Sinatra::Base
     helpers do
       def controllers
         @controllers ||= begin
-          Dir.glob(ApiDocs.config.docs_path.join('*.yml')).sort.inject({}) do |memo, file_path|
-            memo[File.basename(file_path, '.yml')] = YAML.load_file(file_path)
+          Dir.glob(ApiDocs.config.docs_path.join('**/*.yml')).sort.inject({}) do |memo, file_path|
+            memo[File.basename(file_path, '.yml')] = Content.new(file_path)
             memo
           end
         end
@@ -48,7 +48,20 @@ def markdown_not_exist? controller_name
     get '/' do
       haml :index
     end
-
   end
 
+  class Content < Struct.new(:file_path)
+    def content
+      YAML.load_file(file_path)
+    end
+
+    def header_content
+      File.exist?(markdown_path) ? File.read(markdown_path) : nil
+    end
+
+    private
+    def markdown_path
+      file_path.gsub(File.extname(file_path), ".md")
+    end
+  end
 end