From 5a6d8a0131140873fa1cd37bd3d76b0b06d633ae Mon Sep 17 00:00:00 2001
From: Seba Gamboa <me@sagmor.com>
Date: Thu, 24 Sep 2015 18:30:12 -0300
Subject: Renamed include to headers

---
 lib/yard/mruby/code_objects.rb                           |  2 +-
 lib/yard/mruby/code_objects/headers_root.rb              | 11 +++++++++++
 lib/yard/mruby/code_objects/namespace_object.rb          | 16 ----------------
 lib/yard/mruby/handlers/header/base.rb                   |  2 +-
 templates/default/fulldoc/html/setup.rb                  |  4 ++--
 templates/default/headersroot/html/headers_list.erb      |  1 +
 templates/default/headersroot/html/setup.rb              | 10 ++++++++++
 templates/default/includedirectory/html/headers_list.erb |  1 -
 templates/default/includedirectory/html/setup.rb         | 10 ----------
 9 files changed, 26 insertions(+), 31 deletions(-)
 create mode 100644 lib/yard/mruby/code_objects/headers_root.rb
 delete mode 100644 lib/yard/mruby/code_objects/namespace_object.rb
 create mode 100644 templates/default/headersroot/html/headers_list.erb
 create mode 100644 templates/default/headersroot/html/setup.rb
 delete mode 100644 templates/default/includedirectory/html/headers_list.erb
 delete mode 100644 templates/default/includedirectory/html/setup.rb

diff --git a/lib/yard/mruby/code_objects.rb b/lib/yard/mruby/code_objects.rb
index 65b2dd5..07dbf8b 100644
--- a/lib/yard/mruby/code_objects.rb
+++ b/lib/yard/mruby/code_objects.rb
@@ -1,4 +1,4 @@
-require_relative 'code_objects/namespace_object'
+require_relative 'code_objects/headers_root'
 require_relative 'code_objects/header_object'
 require_relative 'code_objects/function_object'
 require_relative 'code_objects/define_object'
diff --git a/lib/yard/mruby/code_objects/headers_root.rb b/lib/yard/mruby/code_objects/headers_root.rb
new file mode 100644
index 0000000..45806ff
--- /dev/null
+++ b/lib/yard/mruby/code_objects/headers_root.rb
@@ -0,0 +1,11 @@
+module YARD::MRuby::CodeObjects
+
+  class HeadersRoot < YARD::CodeObjects::NamespaceObject
+    def headers
+      children
+    end
+  end
+
+  HEADERS_ROOT = HeadersRoot.new(:root, "headers")
+
+end
diff --git a/lib/yard/mruby/code_objects/namespace_object.rb b/lib/yard/mruby/code_objects/namespace_object.rb
deleted file mode 100644
index 896b84b..0000000
--- a/lib/yard/mruby/code_objects/namespace_object.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-module YARD::MRuby::CodeObjects
-
-  class NamespaceObject < YARD::CodeObjects::NamespaceObject
-    def value ; nil ; end
-  end
-
-  class IncludeDirectory < NamespaceObject
-    def headers
-      children
-    end
-  end
-
-  INCLUDE_DIRECTORY = IncludeDirectory.new(:root, "include")
-  ## YARD::Registry.register INCLUDE_DIRECTORY
-
-end
diff --git a/lib/yard/mruby/handlers/header/base.rb b/lib/yard/mruby/handlers/header/base.rb
index 42178d0..1f3f16e 100644
--- a/lib/yard/mruby/handlers/header/base.rb
+++ b/lib/yard/mruby/handlers/header/base.rb
@@ -8,7 +8,7 @@ module YARD::MRuby::Handlers
         path = path.gsub(/^.*include\//,'')
 
         headers[path] ||= begin
-                            header = HeaderObject.new(INCLUDE_DIRECTORY, path)
+                            header = HeaderObject.new(HEADERS_ROOT, path)
                             register header
                             header
                           end
diff --git a/templates/default/fulldoc/html/setup.rb b/templates/default/fulldoc/html/setup.rb
index 81ac35c..cd2e29a 100644
--- a/templates/default/fulldoc/html/setup.rb
+++ b/templates/default/fulldoc/html/setup.rb
@@ -1,7 +1,7 @@
 def init
   super
 
-   YARD::MRuby::CodeObjects::INCLUDE_DIRECTORY.tap do |root|
+   YARD::MRuby::CodeObjects::HEADERS_ROOT.tap do |root|
 
      # Generates the requirements splash page with the 'include' template
      serialize root
@@ -49,7 +49,7 @@ end
 def class_list(root = Registry.root)
   return super unless root == Registry.root
 
-  include_namespace = YARD::MRuby::CodeObjects::INCLUDE_DIRECTORY
+  include_namespace = YARD::MRuby::CodeObjects::HEADERS_ROOT
   root.instance_eval { children.delete include_namespace }
   out = super(root)
   root.instance_eval { children.push include_namespace }
diff --git a/templates/default/headersroot/html/headers_list.erb b/templates/default/headersroot/html/headers_list.erb
new file mode 100644
index 0000000..1b524aa
--- /dev/null
+++ b/templates/default/headersroot/html/headers_list.erb
@@ -0,0 +1 @@
+<h1>All headers</h1>
diff --git a/templates/default/headersroot/html/setup.rb b/templates/default/headersroot/html/setup.rb
new file mode 100644
index 0000000..5945ae4
--- /dev/null
+++ b/templates/default/headersroot/html/setup.rb
@@ -0,0 +1,10 @@
+def init
+  super
+  sections.push :headers_list
+
+  @namespace = object
+end
+
+def headers
+  object.headers
+end
diff --git a/templates/default/includedirectory/html/headers_list.erb b/templates/default/includedirectory/html/headers_list.erb
deleted file mode 100644
index 1b524aa..0000000
--- a/templates/default/includedirectory/html/headers_list.erb
+++ /dev/null
@@ -1 +0,0 @@
-<h1>All headers</h1>
diff --git a/templates/default/includedirectory/html/setup.rb b/templates/default/includedirectory/html/setup.rb
deleted file mode 100644
index 5945ae4..0000000
--- a/templates/default/includedirectory/html/setup.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-def init
-  super
-  sections.push :headers_list
-
-  @namespace = object
-end
-
-def headers
-  object.headers
-end
-- 
cgit v1.2.3