summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSeba Gamboa <[email protected]>2015-09-24 18:30:12 -0300
committerSeba Gamboa <[email protected]>2015-09-24 18:30:12 -0300
commit5a6d8a0131140873fa1cd37bd3d76b0b06d633ae (patch)
tree16e82d4640e8e8e90f3b98fa3104f74cad73bc66
parentc1f2404de71e9a8f73271b05f59a225728212069 (diff)
downloadyard-mruby-5a6d8a0131140873fa1cd37bd3d76b0b06d633ae.tar.gz
yard-mruby-5a6d8a0131140873fa1cd37bd3d76b0b06d633ae.zip
Renamed include to headers
-rw-r--r--lib/yard/mruby/code_objects.rb2
-rw-r--r--lib/yard/mruby/code_objects/headers_root.rb11
-rw-r--r--lib/yard/mruby/code_objects/namespace_object.rb16
-rw-r--r--lib/yard/mruby/handlers/header/base.rb2
-rw-r--r--templates/default/fulldoc/html/setup.rb4
-rw-r--r--templates/default/headersroot/html/headers_list.erb (renamed from templates/default/includedirectory/html/headers_list.erb)0
-rw-r--r--templates/default/headersroot/html/setup.rb (renamed from templates/default/includedirectory/html/setup.rb)0
7 files changed, 15 insertions, 20 deletions
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/includedirectory/html/headers_list.erb b/templates/default/headersroot/html/headers_list.erb
index 1b524aa..1b524aa 100644
--- a/templates/default/includedirectory/html/headers_list.erb
+++ b/templates/default/headersroot/html/headers_list.erb
diff --git a/templates/default/includedirectory/html/setup.rb b/templates/default/headersroot/html/setup.rb
index 5945ae4..5945ae4 100644
--- a/templates/default/includedirectory/html/setup.rb
+++ b/templates/default/headersroot/html/setup.rb