(PDOC-184) custom_type back to resource_type

This commit is contained in:
Eric Putnam 2018-02-13 16:15:08 -08:00
parent 176d6d4d8c
commit db88cd9857
No known key found for this signature in database
GPG Key ID: 3FB595AA224A7751
6 changed files with 10 additions and 10 deletions

View File

@ -5,7 +5,7 @@ module PuppetStrings::Markdown
require_relative 'markdown/puppet_classes' require_relative 'markdown/puppet_classes'
require_relative 'markdown/functions' require_relative 'markdown/functions'
require_relative 'markdown/defined_types' require_relative 'markdown/defined_types'
require_relative 'markdown/custom_types' require_relative 'markdown/resource_types'
require_relative 'markdown/table_of_contents' require_relative 'markdown/table_of_contents'
# generates markdown documentation # generates markdown documentation
@ -15,7 +15,7 @@ module PuppetStrings::Markdown
final << PuppetStrings::Markdown::TableOfContents.render final << PuppetStrings::Markdown::TableOfContents.render
final << PuppetStrings::Markdown::PuppetClasses.render final << PuppetStrings::Markdown::PuppetClasses.render
final << PuppetStrings::Markdown::DefinedTypes.render final << PuppetStrings::Markdown::DefinedTypes.render
final << PuppetStrings::Markdown::CustomTypes.render final << PuppetStrings::Markdown::ResourceTypes.render
final << PuppetStrings::Markdown::Functions.render final << PuppetStrings::Markdown::Functions.render
final final

View File

@ -1,9 +1,9 @@
require 'puppet-strings/markdown/base' require 'puppet-strings/markdown/base'
module PuppetStrings::Markdown module PuppetStrings::Markdown
class CustomType < Base class ResourceType < Base
def initialize(registry) def initialize(registry)
@template = 'custom_type.erb' @template = 'resource_type.erb'
super(registry, 'type') super(registry, 'type')
end end

View File

@ -1,7 +1,7 @@
require_relative 'custom_type' require_relative 'resource_type'
module PuppetStrings::Markdown module PuppetStrings::Markdown
module CustomTypes module ResourceTypes
# @return [Array] list of resource types # @return [Array] list of resource types
def self.in_rtypes def self.in_rtypes
@ -11,7 +11,7 @@ module PuppetStrings::Markdown
def self.render def self.render
final = in_rtypes.length > 0 ? "## Resource types\n\n" : "" final = in_rtypes.length > 0 ? "## Resource types\n\n" : ""
in_rtypes.each do |type| in_rtypes.each do |type|
final << PuppetStrings::Markdown::CustomType.new(type).render final << PuppetStrings::Markdown::ResourceType.new(type).render
end end
final final
end end
@ -20,7 +20,7 @@ module PuppetStrings::Markdown
final = [] final = []
in_rtypes.each do |type| in_rtypes.each do |type|
final.push(PuppetStrings::Markdown::CustomType.new(type).toc_info) final.push(PuppetStrings::Markdown::ResourceType.new(type).toc_info)
end end
final final

View File

@ -3,7 +3,7 @@ module PuppetStrings::Markdown
def self.render def self.render
puppet_classes = PuppetStrings::Markdown::PuppetClasses.toc_info puppet_classes = PuppetStrings::Markdown::PuppetClasses.toc_info
puppet_defined_types = PuppetStrings::Markdown::DefinedTypes.toc_info puppet_defined_types = PuppetStrings::Markdown::DefinedTypes.toc_info
puppet_resource_types = PuppetStrings::Markdown::CustomTypes.toc_info puppet_resource_types = PuppetStrings::Markdown::ResourceTypes.toc_info
puppet_functions = PuppetStrings::Markdown::Functions.toc_info puppet_functions = PuppetStrings::Markdown::Functions.toc_info
template = File.join(File.dirname(__FILE__),"templates/table_of_contents.erb") template = File.join(File.dirname(__FILE__),"templates/table_of_contents.erb")

View File

@ -216,7 +216,7 @@ SOURCE
describe 'rendering markdown to a file' do describe 'rendering markdown to a file' do
it 'should output the expected markdown content' do it 'should output the expected markdown content' do
File.open('/Users/eric.putnam/src/puppet-strings/md.md', 'w') do |file| Tempfile.open('md') do |file|
PuppetStrings::Markdown.render(file.path) PuppetStrings::Markdown.render(file.path)
expect(File.read(file.path)).to eq(baseline) expect(File.read(file.path)).to eq(baseline)
end end