schemaorg · mfhepp · Oct 2, 2015 · Oct 16, 2015 · Nov 5, 2015 · Nov 5, 2015
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
-
+.DS_Store
 *.pyc
diff --git a/RELEASING.TXT b/RELEASING.TXT
@@ -97,14 +97,11 @@ Then generate N-Triples version:
 Use of rdfa2nq with extensions:
 
 
-
-TODO: explain where all-layers.nq comes from (cat'ing the others)
 TODO: list optional tasks post-launch (blog, email, refresh dydra sparql db etc.).
 
 
 
 
-
 1) General preconditions / process and QA for release.
 
 1-a) Steering Group have signed off on changes and release plan,
@@ -148,3 +145,74 @@ python library is also needed: 'sudo easy_install rdflib' should do it.
 representative pages of each type appear to be in a healthy state.
 
 e.g. see http://webschemas.org/docs/qa.html
+
+2.) Final checks
+
+There is often some final tweaking, bugs, etc. When things settle down, a
+final round of sanity-check tests is useful:
+
+* Run again: PYTHONPATH=/usr/local/google_appengine ./scripts/run_tests.py
+* Run again 'git status', confirm no uncommited files or changes.
+* Run again: './scripts/updateAppEngine.sh' for development/upstream site sync.
+
+3.) Merge release branch into master
+
+3a.) Get changes into master branch on github
+
+Use GitHub Web UI to create a pull request. For example to merge the
+release branch sdo-phobos into master, we set the base branch 'master' and
+compare 'sdo-phobos'. If you get this backwards you should see nothing to do,
+because there ought to be no changes in master that we lack in the later
+sdo-phobos branch.
+
+Note also that if someone else has already (e.g. mistakenly) filed a pull request
+between the same pair of branches, Github will try to recycle that one (including
+their description) instead of give you a new one with proper name, description.
+Workaround is to close that PR (keeping track of any open issue it raises).
+
+Result should be "danbri  wants to merge 205 commits into master from sdo-phobos"
+or similar. Check the Commits and Files changed tabs. If it looks plausible
+(e.g. Showing  55 changed files  with 79,679 additions and 820 deletions.) we
+can proceed with merging.
+
+3b) Get merged changes back into your working colorOpacity
+
+I do 'git checkout master'; 'git pull --all'. You may know of other
+incantations. See also http://xkcd.com/1597/
+
+4.) Publish from a clean checkout of 'master' branch to schema.org.
+
+Either by editing app.yaml to make sure 'application: schemaorgae' is active,
+or by passing the name of the live appengine ID on the commandline. Currently
+@rvguha (as Steering Group chair) and @danbri (as Community Group chair and
+webmaster / dogsbody) have write access to the corresponding appengine account.
+
+ * e.g. run: appcfg.py update . -A schemaorgae
+ * inspect console output for something like:
+  * 03:35 PM Completed update of app: schemaorgae, version: 1
+ * Count to ten. Check http://schema.org/ and the 'releases' link.
+
+5.) Related post-release tasks.
+
+* Let the Community Group and Steering Group know.
+* Blog post.
+* There's a SPARQL database at DYDRA that can load NQuad dumps from
+https://github.com/schemaorg/schemaorg/blob/sdo-phobos/data/releases/2.2/all-layers.nq
+* Make a new per-release branch, reserve an appspot.com account for it.
+* Configure GitHub with the new default branch.
+  See https://github.com/schemaorg/schemaorg/settings/branches
+* Update issue tracker moving issues to new releases.
+ * Close issues that were addressed in this release.
+ * Make careful considered adjustment to expected release for the rest. Or
+   just tag them all for the next release.
+* Update git release tags (TODO: we have no history of handling this yet).
+
+For example, if we are in 'master' and 'git status' shows it in a clean state,
+
+* git checkout -b sdo-deimos
+* This tells us we can do:
+ *     git push --set-upstream origin sdo-deimos
+
+> To https://github.com/schemaorg/schemaorg.git
+>  * [new branch]      sdo-deimos -> sdo-deimos
+> Branch sdo-deimos set up to track remote branch sdo-deimos from origin.
diff --git a/app.yaml b/app.yaml
@@ -1,12 +1,12 @@
 #application: schemaorgae
 #application: webschemas
-application: sdo-phobos
+application: sdo-deimos
 
 version: 1
 runtime: python27
 api_version: 1
 #threadsafe: true
-threadsafe: true
+threadsafe: false
 
 handlers:
 

diff --git a/data/examples.txt b/data/examples.txt
@@ -1260,7 +1260,7 @@ JSON:
 }
 </script>
 
-TYPES: #eg-13 Recipe,NutritionInformation, image,datePublished,prepTime,cookTime,recipeYield,recipeIngredient,calories,fatContent
+TYPES: #eg-13 Recipe,NutritionInformation, image,datePublished,prepTime,cookTime,recipeYield,recipeIngredient,calories,fatContent, suitableForDiet, LowFatDiet, RestrictedDiet
 
 PRE-MARKUP:
 
@@ -1274,6 +1274,7 @@ This classic banana bread recipe comes from my mom -- the walnuts add a nice
 Prep Time: 15 minutes
 Cook time: 1 hour
 Yield: 1 loaf
+Tags: Low fat
 
 Nutrition facts:
 240 calories, 9 grams fat
@@ -1308,6 +1309,7 @@ MICRODATA:
   Prep Time: <meta itemprop="prepTime" content="PT15M">15 minutes
   Cook time: <meta itemprop="cookTime" content="PT1H">1 hour
   Yield: <span itemprop="recipeYield">1 loaf</span>
+  Tags: <link itemprop="suitableForDiet" href="http://schema.org/LowFatDiet" />Low fat
 
   <div itemprop="nutrition"
     itemscope itemtype="http://schema.org/NutritionInformation">
@@ -1353,6 +1355,7 @@ RDFA:
   Prep Time: <meta property="prepTime" content="PT15M">15 minutes
   Cook time: <meta property="cookTime" content="PT1H">1 hour
   Yield: <span property="recipeYield">1 loaf</span>
+  Tags: <link property="suitableForDiet" href="http://schema.org/LowFatDiet" />Low Fat
 
   <div property="nutrition" typeof="NutritionInformation">
     Nutrition facts:
@@ -1410,7 +1413,8 @@ JSON:
   },
   "prepTime": "PT15M",
   "recipeInstructions": "Preheat the oven to 350 degrees. Mix in the ingredients in a bowl. Add the flour last. Pour the mixture into a loaf pan and bake for one hour.",
-  "recipeYield": "1 loaf"
+  "recipeYield": "1 loaf",
+  "suitableForDiet": "http://schema.org/LowFatDiet"
 }
 </script>
 

diff --git a/data/schema.rdfa b/data/schema.rdfa
@@ -2863,7 +2863,10 @@
 
     <div typeof="rdfs:Class" resource="http://schema.org/Recipe">
       <span class="h" property="rdfs:label">Recipe</span>
-      <span property="rdfs:comment">A recipe.</span>
+      <span property="rdfs:comment">A recipe. For dietary restrictions covered by the recipe,
+      a few common restrictions are enumerated via &lt;a href="/suitableForDiet"&gt;suitableForDiet&lt;/a&gt;.
+      The &lt;a href="/keywords"&gt;keywords&lt;/a&gt; property can also be used to add more detail.
+    </span>
        <span>Subclass of: <a property="rdfs:subClassOf" href="http://schema.org/CreativeWork">CreativeWork</a></span>
     </div>
 
@@ -2897,6 +2900,67 @@
        <span>Subclass of: <a property="rdfs:subClassOf" href="http://schema.org/FoodEstablishment">FoodEstablishment</a></span>
     </div>
 
+    <div typeof="rdfs:Class" resource="http://schema.org/RestrictedDiet">
+      <span class="h" property="rdfs:label">RestrictedDiet</span>
+      <span property="rdfs:comment">A diet restricted to certain foods or preparations for cultural, religious, health or lifestyle reasons. </span>
+       <span>Subclass of: <a property="rdfs:subClassOf" href="http://schema.org/Enumeration">Enumeration</a></span>
+    </div>
+
+    <div typeof="http://schema.org/RestrictedDiet" resource="http://schema.org/DiabeticDiet">
+      <span class="h" property="rdfs:label">DiabeticDiet</span>
+      <span property="rdfs:comment">A diet appropriate for people with diabetes.</span>
+    </div>
+
+    <div typeof="http://schema.org/RestrictedDiet" resource="http://schema.org/GlutenFreeDiet">
+      <span class="h" property="rdfs:label">GlutenFreeDiet</span>
+      <span property="rdfs:comment">A diet exclusive of gluten.</span>
+    </div>
+
+    <div typeof="http://schema.org/RestrictedDiet" resource="http://schema.org/HalalDiet">
+      <span class="h" property="rdfs:label">HalalDiet</span>
+      <span property="rdfs:comment">A diet conforming to Islamic dietary practices.</span>
+    </div>
+
+    <div typeof="http://schema.org/RestrictedDiet" resource="http://schema.org/HinduDiet">
+      <span class="h" property="rdfs:label">HinduDiet</span>
+      <span property="rdfs:comment">A diet conforming to Hindu dietary practices, in particular, beef-free.</span>
+    </div>
+
+    <div typeof="http://schema.org/RestrictedDiet" resource="http://schema.org/KosherDiet">
+      <span class="h" property="rdfs:label">KosherDiet</span>
+      <span property="rdfs:comment">A diet conforming to Jewish dietary practices.</span>
+    </div>
+
+    <div typeof="http://schema.org/RestrictedDiet" resource="http://schema.org/LowCalorieDiet">
+      <span class="h" property="rdfs:label">LowCalorieDiet</span>
+      <span property="rdfs:comment">A diet focused on reduced calorie intake.</span>
+    </div>
+
+    <div typeof="http://schema.org/RestrictedDiet" resource="http://schema.org/LowFatDiet">
+      <span class="h" property="rdfs:label">LowFatDiet</span>
+      <span property="rdfs:comment">A diet focused on reduced fat and cholesterol intake.</span>
+    </div>
+
+    <div typeof="http://schema.org/RestrictedDiet" resource="http://schema.org/LowLactoseDiet">
+      <span class="h" property="rdfs:label">LowLactoseDiet</span>
+      <span property="rdfs:comment">A diet appropriate for people with lactose intolerance.</span>
+    </div>
+
+    <div typeof="http://schema.org/RestrictedDiet" resource="http://schema.org/LowSaltDiet">
+      <span class="h" property="rdfs:label">LowSaltDiet</span>
+      <span property="rdfs:comment">A diet focused on reduced sodium intake.</span>
+    </div>
+
+    <div typeof="http://schema.org/RestrictedDiet" resource="http://schema.org/VeganDiet">
+      <span class="h" property="rdfs:label">VeganDiet</span>
+      <span property="rdfs:comment">A diet exclusive of all animal products.</span>
+    </div>
+
+    <div typeof="http://schema.org/RestrictedDiet" resource="http://schema.org/VegetarianDiet">
+      <span class="h" property="rdfs:label">VegetarianDiet</span>
+      <span property="rdfs:comment">A diet exclusive of animal meat.</span>
+    </div>
+
     <div typeof="rdfs:Class" resource="http://schema.org/Review">
       <span class="h" property="rdfs:label">Review</span>
       <span property="rdfs:comment">A review of an item - for example, of a restaurant, movie, or store.</span>
@@ -9428,6 +9492,12 @@ Note that Event uses startDate/endDate instead of startTime/endTime, even when d
       <span>Domain: <a property="http://schema.org/domainIncludes" href="http://schema.org/PeopleAudience">PeopleAudience</a></span>
       <span>Range: <a property="http://schema.org/rangeIncludes" href="http://schema.org/Number">Number</a></span>
     </div>
+    <div typeof="rdf:Property" resource="http://schema.org/suitableForDiet">
+      <span class="h" property="rdfs:label">suitableForDiet</span>
+      <span property="rdfs:comment">Indicates a dietary restriction or guideline for which this recipe is suitable, e.g. diabetic, halal etc.</span>
+      <span>Domain: <a property="http://schema.org/domainIncludes" href="http://schema.org/Recipe">Recipe</a></span>
+      <span>Range: <a property="http://schema.org/rangeIncludes" href="http://schema.org/RestrictedDiet">RestrictedDiet</a></span>
+    </div>
     <div typeof="rdf:Property" resource="http://schema.org/superEvent">
       <span class="h" property="rdfs:label">superEvent</span>
       <span property="rdfs:comment">An event that this event is a part of. For example, a collection of individual music performances might each have a music festival as their superEvent.</span>
@@ -12600,6 +12670,29 @@ Typical unit code(s): C62 for persons </span>
   <span>Subclass of: <a property="rdfs:subClassOf" href="http://schema.org/Intangible">Intangible</a></span>
 </div>
 
+<!-- Compound price extension from GoodRelations -->
+<div typeof="rdfs:Class" resource="http://schema.org/CompoundPriceSpecification">
+        <span class="h" property="rdfs:label">CompoundPriceSpecification</span>
+        <span property="rdfs:comment">A compound price specification is one that bundles multiple prices that all apply in combination for different dimensions of consumption. Use the name property of the attached unit price specification for indicating the dimension of a price component (e.g. "electricity" or "final cleaning").</span>
+        <span>Subclass of: <a property="rdfs:subClassOf" href="http://schema.org/PriceSpecification">PriceSpecification</a></span>
+        <span>Source:  <a property="dc:source" href="http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_GoodRelationsClass">GoodRelationsClass</a></span>
+</div>
+
+<div typeof="rdf:Property" resource="http://schema.org/priceComponent">
+    <span class="h" property="rdfs:label">priceComponent</span>
+    <span property="rdfs:comment">This property links to all UnitPriceSpecification nodes that apply in parallel for the CompoundPriceSpecification node.</span>
+    <span>Domain: <a property="http://schema.org/domainIncludes" href="http://schema.org/CompoundPriceSpecification">CompoundPriceSpecification</a></span>
+    <span>Range: <a property="http://schema.org/rangeIncludes" href="http://schema.org/UnitPriceSpecification">UnitPriceSpecification</a></span>
+    <span>Source:  <a property="dc:source" href="http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_GoodRelationsProperties">GoodRelationsProperty</a></span>
+</div>
+
+<div typeof="rdf:Property" resource="http://schema.org/referenceQuantity">
+    <span class="h" property="rdfs:label">referenceQuantity</span>
+    <span property="rdfs:comment">The reference quantity for which a certain price applies, e.g. 1 EUR per 4 kWh of electricity. This property is a replacement for unitOfMeasurement for the advanced cases where the price does not relate to a standard unit.</span>
+    <span>Domain: <a property="http://schema.org/domainIncludes" href="http://schema.org/UnitPriceSpecification">UnitPriceSpecification</a></span>
+    <span>Range: <a property="http://schema.org/rangeIncludes" href="http://schema.org/QuantitativeValue">QuantitativeValue</a></span>
+    <span>Source:  <a property="dc:source" href="http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_GoodRelationsProperties">GoodRelationsProperty</a></span>
+</div>
 
 <!-- property name goes in schema:name -->
 <!-- unstructured textual properties or human-readable version should go in schema:description -->