Skip to content

Organize XmlNode vs. XmlFile types#19

Merged
dLobatog merged 1 commit intoOpenSCAP:masterfrom
akofink:files-refactoring
Oct 14, 2019
Merged

Organize XmlNode vs. XmlFile types#19
dLobatog merged 1 commit intoOpenSCAP:masterfrom
akofink:files-refactoring

Conversation

@akofink
Copy link
Copy Markdown
Collaborator

@akofink akofink commented Oct 9, 2019

I hope you will find this much more organized and easier to work with. It's organized in the following manner:

XmlFile classes for dealing with the different Xccdf XML files :

  • DatastreamFile
  • TestResultFile # this used to be OpenscapParser::Base
  • TailoringFile

XmlNode classes which match a capitalized Xccdf type in XML (i.e. <Profile /> not <profile />):

  • Benchmark
  • Profile
  • Rule
  • RuleIdentifier
  • RuleReference
  • TestResult
  • RuleResult
  • Tailoring

Modules for parsing the various XmlNode types from XmlFile types:

  • Benchmarks
  • Profiles
  • Rules
  • RuleReferences
  • TestResults
  • RuleResults
  • Tailorings

Signed-off-by: Andrew Kofink akofink@redhat.com

Comment thread lib/openscap_parser/datastream_file.rb Outdated
@xprazak2
Copy link
Copy Markdown
Collaborator

The new structure looks pretty neat.

Copy link
Copy Markdown
Contributor

@dLobatog dLobatog left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@xprazak2
Copy link
Copy Markdown
Collaborator

Needs a rebase.

Signed-off-by: Andrew Kofink <akofink@redhat.com>
@akofink
Copy link
Copy Markdown
Collaborator Author

akofink commented Oct 11, 2019

Rebased

@dLobatog dLobatog merged commit 8eeb6a5 into OpenSCAP:master Oct 14, 2019
@akofink akofink deleted the files-refactoring branch October 14, 2019 15:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants