Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Add support for reference points and update spec to file revision 720 (v1534879991178) #1386

Merged
merged 11 commits into from
Sep 2, 2018
Merged

Add support for reference points and update spec to file revision 720 (v1534879991178) #1386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e111fa4
Update spec to file revision 720 (v1534879991178)
westonruter Aug 30, 2018
549c7b0
Improve ability to see differences in sanitized markup
westonruter Aug 30, 2018
e9ffbcb
Add tests that intentionally fail, showing reference point problems
westonruter Aug 30, 2018
2eb230d
Eliminate whitelisted_attr_regex in favor of data-* attr check
westonruter Aug 30, 2018
596a0c7
Remove dead code: AMP_Rule_Spec::$node_types_to_remove_if_invalid
westonruter Aug 30, 2018
04ed6a7
Extract reference points from spec and use attr_spec_list on direct e…
westonruter Aug 31, 2018
002bda3
Fix special case of reference point attributes for amp-selector
westonruter Aug 31, 2018
38932ff
Split apart code from process_node into smaller get_rule_spec_list_to…
westonruter Aug 31, 2018
cb0fd56
Add tests for amp-viqeo-player, amp-image-slider, amp-pan-zoom, and a…
westonruter Aug 31, 2018
673206e
Fix comment regarding reference points being skipped
westonruter Aug 31, 2018
0a2916d
Improve docs for AMP_Tag_And_Attribute_Sanitizer::process_node()
westonruter Sep 2, 2018
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
48 changes: 42 additions & 6 deletions bin/amphtml-update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def GeneratePHP(out_dir):
logging.info('entering ...')
assert re.match(r'^[a-zA-Z_\-0-9]+$', out_dir), 'bad out_dir: %s' % out_dir

allowed_tags, attr_lists, versions = ParseRules(out_dir)
allowed_tags, attr_lists, reference_points, versions = ParseRules(out_dir)

#Generate the output
out = []
Expand All @@ -109,6 +109,7 @@ def GeneratePHP(out_dir):
GenerateAllowedTagsPHP(out, allowed_tags)
GenerateLayoutAttributesPHP(out, attr_lists)
GenerateGlobalAttributesPHP(out, attr_lists)
GenerateReferencePointsPHP(out, reference_points)
GenerateFooterPHP(out)

# join out array into a single string and remove unneeded whitespace
Expand Down Expand Up @@ -188,6 +189,15 @@ def GenerateGlobalAttributesPHP(out, attr_lists):
out.append('')
logging.info('... done')

def GenerateReferencePointsPHP(out, reference_points):
logging.info('entering ...')

# Output the reference points.
out.append('')
out.append('\tprivate static $reference_points = %s;' % Phpize( reference_points, 1 ).lstrip() )
out.append('')
logging.info('... done')

def GenerateFooterPHP(out):
logging.info('entering ...')

Expand Down Expand Up @@ -219,6 +229,20 @@ def GenerateFooterPHP(out):
return null;
}

/**
* Get reference point spec.
*
* @since 1.0
* @param string $tag_spec_name Tag spec name.
* @return array|null Reference point spec, or null if does not exist.
*/
public static function get_reference_point_spec( $tag_spec_name ) {
if ( isset( self::$reference_points[ $tag_spec_name ] ) ) {
return self::$reference_points[ $tag_spec_name ];
}
return null;
}

/**
* Get list of globally-allowed attributes.
*
Expand Down Expand Up @@ -258,6 +282,7 @@ def ParseRules(out_dir):

allowed_tags = {}
attr_lists = {}
reference_points = {}
versions = {}

specfile='%s/validator.protoascii' % out_dir
Expand Down Expand Up @@ -301,14 +326,15 @@ def ParseRules(out_dir):
if tag_spec.HasField('mandatory_parent') and tag_spec.mandatory_parent in mandatory_parent_blacklist and tag_spec.tag_name != 'HTML':
continue

# Ignore the special $REFERENCE_POINT tag
if '$REFERENCE_POINT' == tag_spec.tag_name:
continue

# Ignore deprecated tags
if tag_spec.HasField('deprecation'):
continue

# Handle the special $REFERENCE_POINT tag
if '$REFERENCE_POINT' == tag_spec.tag_name:
reference_points[ tag_spec.spec_name ] = GetTagSpec(tag_spec, attr_lists)
continue

# If we made it here, then start adding the tag_spec
if tag_spec.tag_name.lower() not in allowed_tags:
tag_list = []
Expand All @@ -322,7 +348,7 @@ def ParseRules(out_dir):
allowed_tags[UnicodeEscape(tag_spec.tag_name).lower()] = tag_list

logging.info('... done')
return allowed_tags, attr_lists, versions
return allowed_tags, attr_lists, reference_points, versions


def GetTagSpec(tag_spec, attr_lists):
Expand Down Expand Up @@ -400,6 +426,16 @@ def GetTagRules(tag_spec):
requires_extension_list.append(requires_extension)
tag_rules['requires_extension'] = requires_extension_list

if hasattr(tag_spec, 'reference_points') and len( tag_spec.reference_points ) != 0:
tag_reference_points = {}
for reference_point_spec in tag_spec.reference_points:
tag_reference_points[ reference_point_spec.tag_spec_name ] = {
"mandatory": reference_point_spec.mandatory,
"unique": reference_point_spec.unique
}
if len( tag_reference_points ) > 0:
tag_rules['reference_points'] = tag_reference_points

if hasattr(tag_spec, 'also_requires_tag_warning') and len( tag_spec.also_requires_tag_warning ) != 0:
also_requires_tag_warning_list = []
for also_requires_tag_warning in tag_spec.also_requires_tag_warning:
Expand Down
Loading