move V6 patch and medical, usageinfo drafts into master (#2456)

* Reinstated 301 redirect to https

* Fixed typo: Recommendation not Recommended.

* Add in tweaks to OPTIONS request response headers

* Drafting implementation of MediaReview for discussion. /cc #2450

* Updated mediaAuthenticityCategory label.

* Added disclaimer. /cc #2450

* updated so that label matches id.

* usageInfo and acquireLicensePage properties #2454

Co-authored-by: Richard Wallis <rjw@dataliberate.com>

data/ext/pending/issue-2450.rdfa

@@ -0,0 +1,62 @@
+<div>
+
+  <div typeof="rdfs:Class" resource="http://schema.org/MediaReview">
+    <span>Subclass of: <a property="rdfs:subClassOf" href="http://schema.org/Review">Review</a></span>
+    <span class="h" property="rdfs:label">MediaReview</span>
+    <span property="rdfs:comment">(editorial work in progress, this definition is incomplete and unreviewed)
+    A [[MediaReview]] is a more specialized form of Review dedicated to the evaluation of media content online, typically in the context of fact-checking and misinformation.
+    For more general reviews of media in the broader sense, use [[UserReview]], [[CriticReview]] or other [[Review]] types.</span>
+    <span property="schema:category">issue-2450</span>
+    <a property="dc:source" href="https://github.com/schemaorg/schemaorg/issues/2450">#2450</a>
+    <link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
+  </div>
+
+  <!--
+ how do we point to the /itemReviewed vs it has a /review property -->
+ in ClaimReview we use .itemReviewed pointing to a /Claim here, should we point to the VideoObject or the page that embeds it?
+ we want to point to these for each MediaObject: URL(s) + Original Media URL(s) + Original Media Context
+ MediaObject has /contentUrl
+ (we wouldn't use /mainEntity or /mainEntityOfPage because the video is no being described).
+  -->
+
+
+  <div typeof="rdfs:Class" resource="http://schema.org/MediaManipulationRatingEnumeration">
+    <span>Category: <span property="schema:category">issue-2450</span></span>
+    <span class="h" property="rdfs:label">MediaManipulationRatingEnumeration</span>
+    <span property="rdfs:comment">(editorial work in progress, this definition is incomplete and unreviewed) MediaManipulationRatingEnumeration classifies a number of ways in which a media item (video, image, audio) can be manipulated, taking into account the context within which they are published or presented.</span>
+    <span>Subclass of: <a property="rdfs:subClassOf" href="http://schema.org/Enumeration">Enumeration</a></span>
+    <link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
+    <span>Source:  <a property="dc:source" href="https://github.com/schemaorg/schemaorg/issues/2450">#2450</a></span>
+  </div>
+
+
+
+    <div typeof="http://schema.org/MediaManipulationRatingEnumeration" resource="http://schema.org/AuthenticContent">
+      <span>Category: <span property="schema:category">issue-2450</span></span>
+      <span class="h" property="rdfs:label">AuthenticContent</span>
+      <span property="rdfs:comment">AuthenticMediaObject: An unaltered image that is presented in an accurate way.</span>
+      <link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
+      <span>Source:  <a property="dc:source" href="https://github.com/schemaorg/schemaorg/issues/2450">#2450</a></span>
+    </div>
+    <div typeof="http://schema.org/MediaManipulationRatingEnumeration" resource="http://schema.org/MissingContext">
+      <span>Category: <span property="schema:category">issue-2450</span></span>
+      <span class="h" property="rdfs:label">MissingContext</span>
+      <span property="rdfs:comment">MissingContext: ...</span>
+      <link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
+      <span>Source:  <a property="dc:source" href="https://github.com/schemaorg/schemaorg/issues/2450">#2450</a></span>
+    </div>
+
+ <!-- todo: Cropped, Transformed, Image Macro, Edited -->
+ <!-- do we have a code for AuthenticVideo AuthenticImage AuthenticXyz etc? -->
+
+  <div typeof="rdf:Property" resource="http://schema.org/mediaAuthenticityCategory">
+    <span>Category: <span property="schema:category">issue-2450</span></span>
+    <span class="h" property="rdfs:label">mediaAuthenticityCategory</span>
+    <span property="rdfs:comment">Indicates a MediaManipulationRatingEnumeration classification of a media object (in the context of how it was published or shared).</span>
+    <span>domainIncludes: <a property="http://schema.org/domainIncludes" href="http://schema.org/MediaReview">MediaReview</a></span>
+    <span>rangeIncludes: <a property="http://schema.org/rangeIncludes" href="http://schema.org/MediaManipulationRatingEnumeration">MediaManipulationRatingEnumeration</a></span>
+    <link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
+    <span>Source:  <a property="dc:source" href="https://github.com/schemaorg/schemaorg/issues/2450">#2450</a></span>
+  </div>
+
+</div>

data/ext/pending/issue-2454.rdfa

@@ -0,0 +1,28 @@
+<div>
+
+    <div typeof="rdf:Property" resource="http://schema.org/usageInfo">
+        <span class="h" property="rdfs:label">usageInfo</span>
+        <span property="rdfs:comment">The schema.org [[usageInfo]] property indicates further information about a [[CreativeWork]]. This property is applicable both to works that are freely available and to those that require payment or other transactions. It can reference additional information e.g. community expectations on preferred linking and citation conventions, as well as purchasing details. For something that can be commercially licensed, usageInfo can provide detailed, resource-specific information about licensing options.
+
+This property can be used alongside the license property which indicates license(s) applicable to some piece of content. The usageInfo property can provide information about other licensing options, e.g. acquiring commercial usage rights for an image that is also available under non-commercial creative commons licenses.</span>
+        <span>Domain: <a property="http://schema.org/domainIncludes" href="http://schema.org/CreativeWork">CreativeWork</a></span>
+        <span>Range: <a property="http://schema.org/rangeIncludes" href="http://schema.org/CreativeWork">CreativeWork</a></span>
+        <span>Range: <a property="http://schema.org/rangeIncludes" href="http://schema.org/URL">URL</a></span>
+        <span>Category: <span property="schema:category">issue-2454</span></span>
+        <link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
+        <span>Source:  <a property="dc:source" href="https://github.com/schemaorg/schemaorg/issues/2454">#2454</a></span>
+    </div>
+
+    <div typeof="rdf:Property" resource="http://schema.org/acquireLicensePage">
+        <span class="h" property="rdfs:label">acquireLicensePage</span>
+        <span property="rdfs:comment">Indicates a page documenting how licenses can be purchased or otherwise acquired, for the current item.</span>
+        <span>Domain: <a property="http://schema.org/domainIncludes" href="http://schema.org/CreativeWork">CreativeWork</a></span>
+        <span>Range: <a property="http://schema.org/rangeIncludes" href="http://schema.org/CreativeWork">CreativeWork</a></span>
+        <span>Range: <a property="http://schema.org/rangeIncludes" href="http://schema.org/URL">URL</a></span>
+        <span>Category: <span property="schema:category">issue-2454</span></span>
+        issue-894.rdfa:  <link property="rdfs:subPropertyOf" href="http://schema.org/usageInfo" />
+        <link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
+        <span>Source:  <a property="dc:source" href="https://github.com/schemaorg/schemaorg/issues/2454">#2454</a></span>
+    </div>
+
+</div>

handlers-secure.yaml

@@ -0,0 +1,176 @@
+
+handlers:
+
+- url: /robots.txt
+  static_files: site/docs/robots.txt
+  upload: site/docs/robots.txt
+  application_readable: True
+  mime_type: text/plain
+  secure: always
+  redirect_http_response_code: 301
+
+
+- url: /favicon.ico
+  static_files: site/docs/favicon.ico
+  upload: site/docs/favicon.ico
+  application_readable: True
+  mime_type: image/x-icon
+  secure: always
+  redirect_http_response_code: 301
+
+
+# To avoid: "Could not guess mimetype for docs/schemaorg.owl.  Using application/octet-stream."
+- url: /docs/schema_org_rdfa.html
+  static_files: site/data/schema.rdfa
+  upload: site/data/schema.rdfa
+  application_readable: True
+  mime_type: text/html
+  secure: always
+  redirect_http_response_code: 301
+
+- url: /docs/jsonldcontext.json.*
+  script: sdoapp.app
+  secure: always
+  redirect_http_response_code: 301
+
+- url: /docs/full.*.html
+  script: sdoapp.app
+  secure: always
+  redirect_http_response_code: 301
+
+- url: /docs/schemas.html
+  script: sdoapp.app
+  secure: always
+  redirect_http_response_code: 301
+
+- url: /docs/developers.html
+  script: sdoapp.app
+  secure: always
+  redirect_http_response_code: 301
+
+- url: /docs/tree.json.*
+  script: sdoapp.app
+  secure: always
+  redirect_http_response_code: 301
+
+- url: /admin/refresh
+  login: required
+  script: sdoapp.app
+  secure: always
+  redirect_http_response_code: 301
+
+# Use for /docs when PAGESTOREMODE not set to CLOUDSTORE
+#- url: /docs
+  #static_dir: docs
+  #application_readable: True
+
+# Use for /docs when PAGESTOREMODE set to CLOUDSTORE
+- url: /docs
+  script: sdoapp.app
+  secure: always
+  redirect_http_response_code: 301
+
+- url: /admin
+  static_dir: admin
+  application_readable: True
+  secure: always
+  redirect_http_response_code: 301
+
+#- url: /
+#  static_files: static/index.html
+#  upload: static/index.html
+#  application_readable: True
+
+- url: /search_files
+  static_dir: static/search_files
+  secure: always
+  redirect_http_response_code: 301
+
+- url: /version/latest/.*
+  script: sdoapp.app
+  secure: always
+  redirect_http_response_code: 301
+
+- url: /(version/[^/]*/)$
+  script: sdoapp.app
+  secure: always
+  redirect_http_response_code: 301
+
+- url: /(version/([^/]*))$
+  script: sdoapp.app
+  secure: always
+  redirect_http_response_code: 301
+
+- url: /version/
+  script: sdoapp.app
+  secure: always
+  redirect_http_response_code: 301
+
+- url: /version/(.*/.*\.rdfa)
+  mime_type: text/html
+  static_files: site/data/releases/\1
+  upload: site/data/releases/(.*/.*\.rdfa)
+  application_readable: True
+  secure: always
+  redirect_http_response_code: 301
+
+- url: /version/(.*/.*\.ttl)
+  mime_type: application/x-turtle
+  static_files: site/data/releases/\1
+  upload: site/data/releases/(.*/.*\.ttl)
+  application_readable: True
+  secure: always
+  redirect_http_response_code: 301
+
+- url: /version/(.*/.*\.jsonld)
+  mime_type: application/ld+json
+  static_files: site/data/releases/\1
+  upload: site/data/releases/(.*/.*\.jsonld)
+  application_readable: True
+  secure: always
+  redirect_http_response_code: 301
+
+- url: /version/(.*/.*\.rdf)
+  mime_type: application/rdf+xml
+  static_files: site/data/releases/\1
+  upload: site/data/releases/(.*/.*\.rdf)
+  application_readable: True
+  secure: always
+  redirect_http_response_code: 301
+
+- url: /version/(.*/.*\.nt)
+  mime_type: application/n-triples
+  static_files: site/data/releases/\1
+  upload: site/data/releases/(.*/.*\.nt)
+  application_readable: True
+  secure: always
+  redirect_http_response_code: 301
+
+- url: /version/(.*/.*\.nq)
+  mime_type: application/n-quads
+  static_files: site/data/releases/\1
+  upload: site/data/releases/(.*/.*\.nq)
+  application_readable: True
+  secure: always
+  redirect_http_response_code: 301
+
+- url: /version/(.*/.*\.csv)
+  mime_type: text/csv
+  static_files: site/data/releases/\1
+  upload: site/data/releases/(.*/.*\.csv)
+  application_readable: True
+  secure: always
+  redirect_http_response_code: 301
+
+- url: /version/*/*
+  static_dir: site/data/releases/
+  application_readable: True
+  secure: always
+  redirect_http_response_code: 301
+
+- url: /.*
+  script: sdoapp.app
+  secure: always
+  redirect_http_response_code: 301
+
+

runpythonpostprepare.sh

@@ -5,6 +5,17 @@ set -u
 PWD="`pwd`"
 PROG="`basename $0`"
 
+
+if [  ${SECUREHTTP+"false"} ] #If $SECUREHTTP is set, use the handlers-secure.yaml
+then
+    echo "$PROG: Copying handlers-secure.yaml to handlers.yaml - https 301 redirect"
+    cp ./handlers-secure.yaml sdopythonapp/site/handlers.yaml
+else
+    echo "$PROG: Copying handlers.yaml to handlers.yaml - http or https"
+    cp ./handlers.yaml sdopythonapp/site/handlers.yaml
+fi
+echo
+
 if [ -d "sdopythonapp/site/docs" ] #If we have a local fileset to play with (ie. Not remote)
 then
     echo
@@ -17,4 +28,4 @@ then
         cp docs/robots.txt sdopythonapp/site/docs/robots.txt
     fi
     echo
-fi
+fi

scripts/deployschema.org.sh

@@ -57,5 +57,6 @@ then
 fi
 
 
+export SECUREHTTP="YES" #ensure we end up with a handlers.yaml with https redirects
 sdopythonapp/runscripts/runpythondeploy.sh $EXE $MIG -p schemaorgae -y schemaorg.yaml