Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Same name type and provider #61

Merged
merged 2 commits into from
Sep 21, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class PuppetX::PuppetLabs::Strings::YARD::Handlers::PuppetProviderHandler < YARD
provider_name = statement[i+1].jump(:ident).source
type_name = statement.jump(:symbol).first.source

obj = ProviderObject.new(:root, provider_name)
obj = ProviderObject.new(:root, "#{provider_name}_provider")

docstring = nil
features = []
Expand Down Expand Up @@ -83,6 +83,7 @@ class PuppetX::PuppetLabs::Strings::YARD::Handlers::PuppetProviderHandler < YARD
obj.confines = confines
obj.defaults = defaults
obj.type_name = type_name
obj.header_name = provider_name

register_docstring(obj, docstring, nil)
register obj
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class PuppetX::PuppetLabs::Strings::YARD::Handlers::PuppetTypeHandler < YARD::Ha
parameter_details = []
property_details = []
features = []
obj = TypeObject.new(:root, name) do |o|
obj = TypeObject.new(:root, "#{name}_type") do |o|
# FIXME: This block gets yielded twice for whatever reason
parameter_details = []
property_details = []
Expand Down Expand Up @@ -137,6 +137,7 @@ class PuppetX::PuppetLabs::Strings::YARD::Handlers::PuppetTypeHandler < YARD::Ha
obj.parameter_details = parameter_details
obj.property_details = property_details
obj.features = features
obj.header_name = name

register obj
# Register docstring after the object. If the object already has a
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,13 @@ def namespace_list(opts = {})
end
children.reject {|c| c.nil? }.sort_by {|child| child.path }.map do |child|
if namespace_types.include? child.type
name = child.namespace.is_a?(CodeObjects::Proxy) ? child.path : child.name
if child.namespace.is_a?(CodeObjects::Proxy)
name = child.path
elsif child.is_a?(PuppetX::PuppetLabs::Strings::YARD::CodeObjects::TypeObject) || child.is_a?(PuppetX::PuppetLabs::Strings::YARD::CodeObjects::ProviderObject)
name = child.header_name
else
name = child.name
end
has_children = child.respond_to?(:children) && run_verifier(child.children).any? {|o| o.is_a?(CodeObjects::NamespaceObject) }
out << "<li>"
out << "<a class='toggle'></a> " if has_children
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ def init
item.name == object.name and item.namespace === PuppetX::PuppetLabs::Strings::YARD::CodeObjects::PuppetNamespaceObject
end
if parents.length == 0
require 'pry'; binding.pry
@template_helper = TemplateHelper.new
@template_helper.check_parameters_match_docs object
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ def init
@html_helper = HTMLHelper.new
end

def header
@header_text = object.header_name

erb(:header)
end

def command_details
@command_details = object.commands
erb(:command_details)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ def init
@html_helper = HTMLHelper.new
end

def header
@header_text = object.header_name

erb(:header)
end

def provider_details
type_name = object.name.to_s
@providers = YARD::Registry.all(:provider).select { |t| t.type_name == type_name }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
include StringsSpec::Parsing

def the_type()
YARD::Registry.at("file")
YARD::Registry.at("file_type")
end

it "should have the proper docstring" do
Expand Down