Merge branch 'master' of https://github.com/schemaorg/schemaorg

* 'master' of https://github.com/schemaorg/schemaorg: (76 commits)
  Added tests for correct operation of traverseForHTML & traverseForJSONLD functions
  Updated for contentRating / Rating tweak.
  Added Rating as expected of contentRating, for schemaorg#1935 Thanks @vholland!
  Noted alias of HTML from rdf:HTML, schemaorg#1634
  alias HTML to rdf:HTML (schemaorg#1634)
  Obvious 404 fixes from issue (schemaorg#1901) (schemaorg#1930)
  Changes to move to https only (for UI, not for vocab URIs) (schemaorg#1932)
  Fix to docs/tree.jsonld causing crash
  2018 -> 2017, fixes schemaorg#1929 Thanks @Aaranged :)
  Removed duplicate entries, and added a summary. schemaorg#1891
  Updated to cover all changes in 3.4.
  More release notes.
  Added lots of release notes, converted from git.
  Update releases.html
  One-liner for creating release note entries.
  Working on conversion of 900+ lines of changes into release note format. For schemaorg#1891 release 3.4.
  Tweaks to image tag, changed "mp4" to "jpg", added alt. /cc schemaorg#1922
  Small fix to howto html samples (schemaorg#1922)
  Fixes for the HowTo sample (schemaorg#1919)
  Fix physician subclass (schemaorg#1911)
  ...

# Conflicts:
#	app.yaml

Author: Martin Alvarez-Espinar

README.md

@@ -7,23 +7,43 @@ This is the Schema.org project repository. It contains all the schemas, examples
 Issues and proposals are managed here by participants of the [W3C Schema.org Community Group](https://www.w3.org/community/schemaorg/). If you are interested to participate please
 join the group at the [W3C](https://www.w3.org/community/schemaorg/), introduce yourself and find or file issues here that engage your interest. If you are new to Git and GitHub, there's a useful [introduction to Github](https://www.w3.org/2006/tools/wiki/Github) in the W3C Wiki.
 
-[Issue #1](https://github.com/schemaorg/schemaorg/issues/1) in Github is an entry point for release planning. It 
+[Issue #1](https://github.com/schemaorg/schemaorg/issues/1) in Github is an entry point for release planning. It
 should provide an overview of upcoming work, in terms of broad themes, specific issues and release milestones.
 
 With every release, we change the default Github branch to match the code name for the release.
-[Issue #1](https://github.com/schemaorg/schemaorg/issues/1) will link to per-release entry points, or else navigate issues via label or milestone within Github. 
-Every change to the site comes via discussions here. Substantive changes are recorded in our [release notes](https://schema.org/docs/releases.html). 
-A preview of the [draft new release notes](http://webschemas.org/docs/releases.html) can be found as part of the test site for our next release. 
-Every month or so, after final review by the Schema.org Steering Group, we make a formal release. 
+[Issue #1](https://github.com/schemaorg/schemaorg/issues/1) will link to per-release entry points, or else navigate issues via label or milestone within Github.
+Every change to the site comes via discussions here. Substantive changes are recorded in our [release notes](https://schema.org/docs/releases.html).
+A preview of the [draft new release notes](http://webschemas.org/docs/releases.html) can be found as part of the test site for our next release.
+Every month or so, after final review by the Schema.org Steering Group, we make a formal release.
 
 Regarding CC and opensource licenses for documents and software, see our [FAQ entry](https://schema.org/docs/faq.html#18).
 
+Proposing schemas
+=================
+
+We are always interested in practical suggestions for improvements to schema.org, and our collection of schemas has been [growing gradually](http://schema.org/docs/releases.html) since our launch in 2011.
+
+We try to prioritize simple fixes and improvements to our existing schemas, examples and documentation over the addition of new vocabulary,
+and we are most likely to add new schemas when there is evidence that some large-scale consuming application will make use of the data.
+
+Note that Schema.org does *not* attempt to capture the full detail of Web content; it is necessarily a simplification of a more complex reality. This means that there will be many cases where adding more detail to Schema.org will look possible. However, in the interests of keeping Schema.org simple and usable for publishers and webmasters, we will often choose not to add such detail. Schema.org uses Web standards such as JSON-LD, Microdata and RDFa to
+allow for [independent extension](http://schema.org/docs/extension.html) (for example, see [GS1's vocabulary](http://gs1.org/voc)).
+
+ * Suggestions for improvements are always welcome here - please search for older discussions (including closed issues) before opening a new issue.
+ * We particularly value improvements to existing definitions, examples and text, to clarify how schema.org vocabulary is used in practice.
+ * Please don't be surprised or offended if you raise an issue proposing new schemas and it is marked by the project team as "[noted](https://github.com/schemaorg/schemaorg/issues?q=is%3Aissue+label%3A%22Closed+and+Noted+%28and+possibly+Queued%29%22+is%3Aclosed)" then closed. We have 100s of issues discussing possible improvements, and to keep things manageable we adopt the convention of noting then closing issues that are not likely to be immediately explored.
+ * While many Schema.org improvements have been proposed via Github's "[Pull request](https://help.github.com/articles/about-pull-requests/)" mechanism (see also our list of [PRs](https://github.com/schemaorg/schemaorg/pulls)), please do not undertake any substantial development work without agreeing it with the project team here first.
+ * All Pull Requests should reference specific issues that they're fixes or solutions for. This lets the schema.org community discuss problems and topics without it being tied too closely to a specific (and easily outdated) proposed fix.
+ * Please note that some changes are much easier to make than others: the wording/phrasing in definitions is relatively easy to amend, whereas the exact spelling of a type or property ('Person', 'startDate' etc.) is much more disruptive to change.
+ * There are many other projects developing schemas and ontologies for the Web, e.g. [Wikidata](http://wikidata.org/) or the vocabulary projects in the [Linked Data](http://lov.okfn.org/) community. Many of these projects go into more expressive detail than is possible for a project like Schema.org. To keep Schema.org manageable, we have a strong bias towards designs that are grounded in large scale usage on the Web, in particular [usage](https://github.com/schemaorg/schemaorg/issues/652) by data-consuming applications since these in turn motivate data publishers. Other schema initiatives have different priorities and make different tradeoffs. 
+
 See more on ["How we work"](https://schema.org/docs/howwework.html)
 
+
 Software
 ========
 
-For most collaborators, all you need to know about the software is how to run it. Essentially you will need to have the Python version of Google App Engine SDK running on the platform of your choice. You can then make test builds of schema.org running on your own machine accessible as http://localhost:8080/ or else post them on appspot.com for collaboration. See the [Appengine documentation](https://cloud.google.com/appengine/docs) for details. 
+For most collaborators, all you need to know about the software is how to run it. Essentially you will need to have the Python version of Google App Engine SDK running on the platform of your choice. You can then make test builds of schema.org running on your own machine accessible as http://localhost:8080/ or else post them on appspot.com for collaboration. See the [Appengine documentation](https://cloud.google.com/appengine/docs) for details.
 
 More information about the software is also available in [SOFTWARE_README.md](SOFTWARE_README.md)
 
@@ -57,7 +77,7 @@ Github Branch naming
 
 https://schema.org/docs/releases.html lists releases by working codename and release name.
 
-e.g. successor to https://schema.org/docs/releases.html#v1.91 was code-named sdo-venkman, 
+e.g. successor to https://schema.org/docs/releases.html#v1.91 was code-named sdo-venkman,
 and eventually became https://schema.org/docs/releases.html#v1.92
 
 You can therefore see candidate draft release notes in the Git repository at docs/releases.html
@@ -66,10 +86,10 @@ You can therefore see candidate draft release notes in the Git repository at doc
 Notes
 =====
 
-This documentation concerns the software codebase rather than schema.org itself. 
+This documentation concerns the software codebase rather than schema.org itself.
 
 However do note that labels, comments, and documentation should use US English (in the code
-and schemas), if a choice between English variants is needed. Please aim for international 
+and schemas), if a choice between English variants is needed. Please aim for international
 English wherever possible.
 
 See also: https://twitter.com/schemaorg_dev

api.py

@@ -1078,6 +1078,7 @@ def GetJsonLdContext(layers='core'):
         jsonldcontext = "{\n  \"@context\": {\n"
         jsonldcontext += "        \"type\": \"@type\",\n"
         jsonldcontext += "        \"id\": \"@id\",\n"
+        jsonldcontext += "        \"HTML\": { \"@id\": \"rdf:HTML\" },\n"
         jsonldcontext += "        \"@vocab\": \"http://schema.org/\",\n"
         jsonldcontext += namespaces
 

apimarkdown.py

@@ -1,3 +1,7 @@
+import logging
+logging.basicConfig(level=logging.INFO) # dev_appserver.py --log_level debug .
+log = logging.getLogger(__name__)
+
 import markdown2
 from markdown2 import Markdown
 import re
@@ -26,15 +30,20 @@ def parse(self,source,preservePara=False):
         source = source.strip()
         source = source.replace("\\n","\n")
     	try:
-    		self.parselock.acquire()
-    		ret = self._md.convert(source)
+            self.parselock.acquire()
+            ret = self._md.convert(source)
     	finally:
     		self.parselock.release()
 
         if not preservePara:
             #Remove wrapping <p> </p>\n that Markdown2 adds by default
             if len(ret) > 7 and ret.startswith("<p>") and ret.endswith("</p>\n"):
                 ret = ret[3:len(ret)-5]
+            
+            ret = ret.replace("<p>","")
+            ret = ret.replace("</p>","<br/><br/>")
+            if ret.endswith("<br/><br/>"):
+                ret = ret[:len(ret)-10]
 
         return self.parseWiklinks(ret)
 

apirdflib.py

@@ -23,6 +23,8 @@
 
 ATTIC = 'attic'
 VOCAB = "http://schema.org"
+VOCABLEN = len(VOCAB)
+ALTVOCAB = "https://schema.org"
 STORE = rdflib.Dataset()
 #Namespace mapping#############
 nss = {'core': 'http://schema.org/'}
@@ -55,10 +57,18 @@ def queryGraph():
                 QUERYGRAPH.bind('rdfa', 'http://www.w3.org/ns/rdfa#')
                 QUERYGRAPH.bind('dct', 'http://purl.org/dc/terms/')
                 QUERYGRAPH.bind('schema', 'http://schema.org/')
+                altSameAs(QUERYGRAPH)
         finally:
             RDFLIBLOCK.release()
     return QUERYGRAPH
 
+def altSameAs(graph):
+    sameAs = URIRef("%s/sameAs" % VOCAB)
+    for sub in graph.subjects(None,None):
+        if sub.startswith(VOCAB):
+            #log.info("%s >>>> %s " % (sub,"%s%s" % (ALTVOCAB,sub[VOCABLEN:])))
+            graph.add( (sub,sameAs,URIRef("%s%s" % (ALTVOCAB,sub[VOCABLEN:]))) )
+            
 def loadNss():
     global NSSLoaded
     global nss

app.yaml

@@ -1,12 +1,16 @@
+<<<<<<< HEAD
 application: sdo-athletics
 #application: schemaorgae
+=======
+#application: schemaorgae
+#application: webschemas
+>>>>>>> 4ee318d3729096659337e314ba10944ce991bd67
 
-version: 1
+#version: 1
 module: default
 runtime: python27
 api_version: 1
 threadsafe: true
-
 
 #automatic_scaling: #Only applicable for appengine accounts with billing enabled
 #  min_idle_instances: 2
@@ -84,6 +88,48 @@ handlers:
 - url: /version/
   script: sdoapp.app
 
+- url: /version/(.*/.*\.rdfa)
+  mime_type: text/html
+  static_files: data/releases/\1
+  upload: data/releases/(.*/.*\.rdfa)
+  application_readable: True
+
+- url: /version/(.*/.*\.ttl)
+  mime_type: application/x-turtle
+  static_files: data/releases/\1
+  upload: data/releases/(.*/.*\.ttl)
+  application_readable: True
+
+- url: /version/(.*/.*\.jsonld)
+  mime_type: application/ld+json
+  static_files: data/releases/\1
+  upload: data/releases/(.*/.*\.jsonld)
+  application_readable: True
+
+- url: /version/(.*/.*\.rdf)
+  mime_type: application/rdf+xml
+  static_files: data/releases/\1
+  upload: data/releases/(.*/.*\.rdf)
+  application_readable: True
+ 
+- url: /version/(.*/.*\.nt)
+  mime_type: application/n-triples
+  static_files: data/releases/\1
+  upload: data/releases/(.*/.*\.nt)
+  application_readable: True
+
+- url: /version/(.*/.*\.nq)
+  mime_type: application/n-quads
+  static_files: data/releases/\1
+  upload: data/releases/(.*/.*\.nq)
+  application_readable: True
+
+- url: /version/(.*/.*\.csv)
+  mime_type: text/csv
+  static_files: data/releases/\1
+  upload: data/releases/(.*/.*\.csv)
+  application_readable: True
+
 - url: /version/*/*
   static_dir: data/releases/
   application_readable: True

data/examples.txt

@@ -390,7 +390,7 @@ MICRODATA:
   "flashPlayer_719", "358", "16", "6", "#FFFFFF");fo.addVariable("url","http://media.freesound.org/data/0/previews/719__elmomo__12oclock_girona_preview.mp3");fo.addVariable("autostart", "0");fo.write("flashcontent_719");
 </script>
 
-<meta itemprop="encodingFormat" content="mp3" />
+<meta itemprop="encodingFormat" content="audio/mpeg" />
  <meta itemprop="contentUrl" content="http://media.freesound.org/data/0/previews/719__elmomo__12oclock_girona_preview.mp3" />
 
 <span class="description">
@@ -409,7 +409,7 @@ RDFA:
   "flashPlayer_719", "358", "16", "6", "#FFFFFF");fo.addVariable("url","http://media.freesound.org/data/0/previews/719__elmomo__12oclock_girona_preview.mp3");fo.addVariable("autostart", "0");fo.write("flashcontent_719");
 </script>
 
-<meta property="encodingFormat" content="mp3" />
+<meta property="encodingFormat" content="audio/mpeg" />
  <meta property="contentUrl" content="http://media.freesound.org/data/0/previews/719__elmomo__12oclock_girona_preview.mp3" />
 
 <span class="description">
@@ -427,7 +427,7 @@ JSON:
   "contentUrl": "http://media.freesound.org/data/0/previews/719__elmomo__12oclock_girona_preview.mp3",
   "description": "Recorded on a terrace of Girona a sunday morning",
   "duration": "T0M15S",
-  "encodingFormat": "mp3",
+  "encodingFormat": "audio/mpeg",
   "name": "12oclock_girona.mp3"
 }
 </script>
@@ -8854,7 +8854,7 @@ JSON:
 }
 </script>
 
-TYPES: accessibilityFeature, accessibilityHazard, fileFormat
+TYPES: accessibilityFeature, accessibilityHazard, encodingFormat
 
 PRE-MARKUP:
 <img src="png"
@@ -8866,7 +8866,7 @@ MICRODATA:
  <meta itemprop="accessibilityFeature" content="longDescription">
  <meta itemprop="accessibilityHazard" content="noFlashingHazard">
  <meta itemprop="accessibilityHazard" content="noMotionSimulationHazard">
- <meta itemprop="fileFormat" content="image/png">
+ <meta itemprop="encodingFormat" content="image/png">
 <img src="png"
   alt="standards. toothbrushes. don't ask" longdesc="927desc.html">
 </figure>
@@ -8877,7 +8877,7 @@ RDFA:
  <meta property="accessibilityFeature" content="longDescription">
  <meta property="accessibilityHazard" content="noFlashingHazard">
  <meta property="accessibilityHazard" content="noMotionSimulationHazard">
- <meta property="fileFormat" content="image/png">
+ <meta property="encodingFormat" content="image/png">
 <img src="png"
   alt="standards. toothbrushes. don't ask" longdesc="927desc.html">
 </figure>
@@ -8886,7 +8886,7 @@ JSON:
 
 No Json example available
 
-TYPES: fileFormat, accessibilityHazard, accessibilityFeature, accessibilityControl, accessibilityAPI
+TYPES: encodingFormat, accessibilityHazard, accessibilityFeature, accessibilityControl, accessibilityAPI
 
 PRE-MARKUP:
 [A basic presentation in HTML]
@@ -8899,10 +8899,10 @@ MICRODATA:
    <meta itemprop="accessibilityHazard" content="noSoundHazard"/>
    <meta itemprop="accessibilityFeature" content="longDescription"/>
    <meta itemprop="accessibilityFeature" content="alternativeText"/>
-   <meta itemprop="fileFormat" content="text/html"/>
-   <meta itemprop="fileFormat" content="image/png"/>
-   <meta itemprop="fileFormat" content="text/css"/>
-   <meta itemprop="fileFormat" content="text/javascript"/>
+   <meta itemprop="encodingFormat" content="text/html"/>
+   <meta itemprop="encodingFormat" content="image/png"/>
+   <meta itemprop="encodingFormat" content="text/css"/>
+   <meta itemprop="encodingFormat" content="text/javascript"/>
    <meta itemprop="accessibilityAPI" content="ARIA"/>
    <meta itemprop="accessibilityAPI" content="UIA"/>
    <meta itemprop="accessibilityControl" content="fullKeyboardControl"/>
@@ -8920,10 +8920,10 @@ RDFA:
    <meta property="accessibilityHazard" content="noSoundHazard"/>
    <meta property="accessibilityFeature" content="longDescription"/>
    <meta property="accessibilityFeature" content="alternativeText"/>
-   <meta property="fileFormat" content="text/html"/>
-   <meta property="fileFormat" content="image/png"/>
-   <meta property="fileFormat" content="text/css"/>
-   <meta property="fileFormat" content="text/javascript"/>
+   <meta property="encodingFormat" content="text/html"/>
+   <meta property="encodingFormat" content="image/png"/>
+   <meta property="encodingFormat" content="text/css"/>
+   <meta property="encodingFormat" content="text/javascript"/>
    <meta property="accessibilityAPI" content="ARIA"/>
    <meta property="accessibilityAPI" content="UIA"/>
    <meta property="accessibilityControl" content="fullKeyboardControl"/>
@@ -8945,7 +8945,7 @@ JSON:
  "accessibilityFeature" : [
         "alternativeText" , "longDescription" ] ,
 
- "fileFormat" : [
+ "encodingFormat" : [
         "text/html" , "image/png" ,
         "text/javascript" , "text/css" ] ,
 
@@ -9540,7 +9540,7 @@ JSON:
 {
     "@context": "http://schema.org",
     "@type": "Question",
-    "text": "What is attr_accessor in Ruby?",
+    "name": "What is attr_accessor in Ruby?",
     "upvoteCount": "196",
     "text": "I am having difficulty understanding Ruby attr_accessors, can someone explain them?",
     "dateCreated": "2010-11-04T20:07Z",

data/ext/health-lifesci/med-health-core.rdfa

@@ -336,7 +336,7 @@
 <link property="http://schema.org/isPartOf" href="http://health-lifesci.schema.org" />
 </div>
 
-<div typeof="http://schema.org/MedicalSpecialty" resource="http://schema.org/OccupationalTherapy">
+<div typeof="rdfs:Class" resource="http://schema.org/OccupationalTherapy">
   <span class="h" property="rdfs:label">OccupationalTherapy</span>
   <span property="rdfs:comment">A treatment of people with physical, emotional, or social problems, using purposeful activity to help them overcome or learn to deal with their problems.</span>
   <span>Subclass of: <a property="rdfs:subClassOf" href="http://schema.org/MedicalTherapy">MedicalTherapy</a></span>

data/ext/pending/issue-1156.rdfa

@@ -6,6 +6,12 @@
 	- 13 new properties (5 being subproperties of existing properties)
 -->
 
+<!--
+	October 2017 :
+		- narrowed the range of legislationJurisdiction to AdministrativeArea rather than Place
+		- broaden the range of legislationIdentifier to include URL, to match with the description of the property.
+-->
+
 <!--
 	September 2017 :
 		- deleted inverse properties
@@ -82,6 +88,7 @@
   <link property="rdfs:subPropertyOf" href="http://schema.org/identifier" />
 	<span>Domain: <a property="http://schema.org/domainIncludes" href="http://schema.org/Legislation">Legislation</a></span>
   <span>Range: <a property="http://schema.org/rangeIncludes" href="http://schema.org/Text">Text</a></span>
+  <span>Range: <a property="http://schema.org/rangeIncludes" href="http://schema.org/URL">URL</a></span>
   <span>Close Match:  <a property="skos:closeMatch" href="http://data.europa.eu/eli/ontology#id_local">eli:id_local</a></span>
   <span>Source:  <a property="dc:source" href="http://publications.europa.eu/mdr/eli/index.html">ELI</a></span>
 </div>
@@ -166,7 +173,7 @@
 	<link property="rdfs:subPropertyOf" href="http://schema.org/spatialCoverage" />
   <span>Domain: <a property="http://schema.org/domainIncludes" href="http://schema.org/Legislation">Legislation</a></span>
   <span>Range: <a property="http://schema.org/rangeIncludes" href="http://schema.org/Text">Text</a></span>
-  <span>Range: <a property="http://schema.org/rangeIncludes" href="http://schema.org/Place">Place</a></span>
+  <span>Range: <a property="http://schema.org/rangeIncludes" href="http://schema.org/AdministrativeArea">AdministrativeArea</a></span>
   <span>Exact Match:  <a property="skos:exactMatch" href="http://data.europa.eu/eli/ontology#jurisdiction">eli:jurisdiction</a></span>
   <span>Source:  <a property="dc:source" href="http://publications.europa.eu/mdr/eli/index.html">ELI</a></span>
   <link property="owl:equivalentProperty" href="http://data.europa.eu/eli/ontology#jurisdiction"/>