Skip to content

Commit

Permalink
More naming and snapshot/differential cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@p2
p2 committed Dec 19, 2014
1 parent 116a573 commit f34e6bd
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 46 deletions.
5 changes: 5 additions & 0 deletions Swift/FHIRElement.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ import Foundation
*/
public class FHIRElement
{
/// The name of the resource or element
public class var resourceName: String {
get { return "Element" }
}

/// This should be `extension` but it is a keyword in Swift; renamed to `fhirExtension`.
public var fhirExtension: [Extension]?

Expand Down
4 changes: 0 additions & 4 deletions Swift/FHIRResource.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ import Foundation
*/
public class FHIRResource: FHIRElement
{
public class var resourceName: String {
get { return "Resource" }
}

/** If this instance was read from a server, this is the identifier that was used. */
public var _localId: String?

Expand Down
95 changes: 53 additions & 42 deletions fhirspec.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,25 +98,32 @@ def as_module_name(self, name):
return name.lower() if name and self.settings.resource_modules_lowercase else name

def as_class_name(self, classname):
if not classname or len(classname) < 2:
raise Exception('Class names should at least be 2 chars long, have "{}"'.format(classname))
if not classname or 0 == len(classname):
return None
mapped = self.settings.classmap.get(classname, classname)
uppercased = mapped[:1].upper() + mapped[1:]
return uppercased

def class_name_for_type(self, type_name, main_resource=False):
def mapped_name_for_type(self, type_name, main_resource=False):
if type_name is None:
if main_resource:
type_name = self.settings.resource_default_base
else:
type_name = self.settings.contained_default_base
return self.as_class_name(type_name)
return self.settings.resource_default_base
return self.settings.contained_default_base
return type_name

def class_name_for_profile(self, profile_name):
def class_name_for_type(self, type_name, main_resource=False):
mappedname = self.mapped_name_for_type(type_name, main_resource)
return self.as_class_name(mappedname)

def mapped_name_for_profile(self, profile_name):
if not profile_name:
return None
type_name = profile_name.split('/')[-1] # may be the full Profile URI, like http://hl7.org/fhir/Profile/MyProfile
return self.class_name_for_type(type_name)
return self.mapped_name_for_type(type_name)

def class_name_for_profile(self, profile_name):
mappedname = self.mapped_name_for_profile(profile_name)
return self.as_class_name(mappedname)

def class_name_is_native(self, class_name):
return True if class_name in self.settings.natives else False
Expand Down Expand Up @@ -193,7 +200,7 @@ def __init__(self, spec, filepath):
self.targetname = None
self.structure = None
self._element_map = None
self.snapshot_main = None
self.main_element = None
self._class_map = {}
self.classes = []
self._did_finalize = False
Expand Down Expand Up @@ -225,22 +232,23 @@ def read_profile(self):
return

# extract all snapshot elements
if self.structure.snapshot is not None:
struct = self.structure.differential or self.structure.snapshot
if struct is not None:
self._element_map = {}
for elem_dict in self.structure.snapshot:
for elem_dict in struct:
element = FHIRProfileElement(self, elem_dict)
self._element_map[element.path] = element

# establish hierarchy (may move to extra loop in case elements are no longer in order)
if self.snapshot_main is None:
self.snapshot_main = element
if self.main_element is None:
self.main_element = element
parent = self._element_map.get(element.parent_name)
if parent:
parent.add_child(element)

# create classes and class properties
if self.snapshot_main is not None:
snap_class, subs = self.snapshot_main.create_class()
if self.main_element is not None:
snap_class, subs = self.main_element.create_class()
if snap_class is None:
raise Exception('The main snapshot element did not create a class')

Expand Down Expand Up @@ -343,6 +351,7 @@ def __init__(self, profile, profile_dict):
self.base = None
self.subclass_of = None
self.snapshot = None
self.differential = None

self.parse_from(profile_dict)

Expand All @@ -358,6 +367,8 @@ def parse_from(self, json_dict):
# find element definitions
if 'snapshot' in json_dict:
self.snapshot = json_dict['snapshot'].get('element', [])
if 'differential' in json_dict:
self.differential = json_dict['differential'].get('element', [])


class FHIRProfileElement(object):
Expand All @@ -382,9 +393,9 @@ def __init__(self, profile, element_dict):
self.parent_name = None
self.definition = None
self.is_main_profile_element = False
self.is_resource = False
self.represents_class = False

self._real_name = None
self._real_path = None
self._superclass_name = None

Expand All @@ -398,8 +409,6 @@ def parse_from(self, element_dict):
if self.path == self.profile.structure.type:
self.represents_class = True
self.is_main_profile_element = True
if not self.profile.structure.base or '/Element' != self.profile.structure.base[-8:]:
self.is_resource = True

self.definition = FHIRElementDefinition(self, element_dict)

Expand All @@ -409,10 +418,16 @@ def parse_from(self, element_dict):
if '-' in self.prop_name:
self.prop_name = ''.join([n[:1].upper() + n[1:] for n in self.prop_name.split('-')])

@property
def real_name(self):
if self._real_name is None:
self._real_name = self.definition.name or self.path
return self._real_name

@property
def real_path(self):
if self._real_path is None:
name = self.definition.name or self.path
name = self.real_name
if self.parent:
name = self.parent.real_path + '.' + name
self._real_path = name
Expand Down Expand Up @@ -440,21 +455,22 @@ def create_class(self):
class_name = self.name_if_class()
subs = []
cls, did_create = fhirclass.FHIRClass.for_element(self)
for child in self.children:
properties = child.as_properties()
if properties is not None:

# collect subclasses
sub, subsubs = child.create_class()
if sub is not None:
subs.append(sub)
if subsubs is not None:
subs.extend(subsubs)

# add properties to class
if did_create:
for prop in properties:
cls.add_property(prop)
if self.children is not None:
for child in self.children:
properties = child.as_properties()
if properties is not None:

# collect subclasses
sub, subsubs = child.create_class()
if sub is not None:
subs.append(sub)
if subsubs is not None:
subs.extend(subsubs)

# add properties to class
if did_create:
for prop in properties:
cls.add_property(prop)

return cls, subs

Expand Down Expand Up @@ -501,9 +517,7 @@ def as_properties(self):
# MARK: Name Utils

def name_of_resource(self):
if self.is_resource:
return self.profile.spec.class_name_for_type(self.prop_name)
return None
return self.profile.spec.mapped_name_for_type(self.real_name)

def name_if_class(self):
""" Determines the class-name that the element would have if it was
Expand All @@ -528,13 +542,10 @@ def superclass_name(self):
type_code = None

if self.is_main_profile_element and self.profile.structure.subclass_of is not None:
# print(self.path, 'SUB', self.profile.structure.subclass_of)
type_code = self.profile.structure.subclass_of
elif len(tps) > 0:
# print(self.path, 'TYP', tps[0].code)
type_code = tps[0].code
# else: # type stays None, which will apply the default class name
# print(self.path, 'ELS', self.is_main_profile_element, self.is_resource, self.profile.spec.class_name_for_type(type_code, self.is_main_profile_element))
# else type stays None, which will apply the default class name
self._superclass_name = self.profile.spec.class_name_for_type(type_code, self.is_main_profile_element)

return self._superclass_name
Expand Down

0 comments on commit f34e6bd

Please sign in to comment.