Merge pull request #684 from jvican/master

Fix #607: Improve build times drastically

.travis.yml

@@ -16,4 +16,4 @@ before_script: chmod +x coursier
 script:
 - ./scripts/run-tut.sh
 - rm -r tut-tmp
-- travis_wait 30 bundle exec jekyll build
+- bundle exec jekyll build

_includes/tutorial-tour-list.txt

@@ -1,20 +1,15 @@
-{% for pg in site.pages %}
-  {% if pg.tutorial == "scala-tour" and pg.outof and pg.language == page.language %}
-    {% assign totalPagesTour = pg.outof %}
-  {% endif %}
-{% endfor %}
+{% assign sorted_tour_posts = site.categories.tour | sort: 'num' %}
+{% assign tour_posts_size = sorted_tour_posts | size %}
 
-{% if totalPagesTour %}
+{% if tour_posts_size %}
   <ul>
-  {% for i in (1..totalPagesTour) %}
-    {% for pg in site.pages %}
-      {% if pg.tutorial == "scala-tour" and pg.num and pg.num == i and pg.language == page.language %}
+    {% for pg in sorted_tour_posts %}
+      {% if pg.language == page.language %}
         <li class="tour-of-scala {% if page.title == pg.title %} current-page {% endif %}">
           <a href="{{ pg.url }}">{{ pg.title }}</a>
         </li>
       {% endif %}
     {% endfor %}
-  {% endfor %}
   </ul>
 {% else %} **ERROR**. Couldn't find the total number of pages in this set of tutorial articles. Have you declared the `outof` tag in your YAML front matter?
 {% endif %}

_layouts/tutorial.html

@@ -1,5 +1,6 @@
 ---
-layout: default
+layout: post
+permalink: /tutorials/:categories/:title/
 ---
 {% include header.txt %}
 <div class="wrapper">
@@ -10,8 +11,8 @@
 
       <div class="span10">{% if page.title %}<h1>{{ page.title }}</h1>{% else %}<h1>{{ site.title }}</h1>{% endif %}</div>
 
-      {% for pg in site.pages %}
-        {% if pg.tutorial == "scala-tour" and pg.languages %}
+      {% for pg in site.categories.tour %}
+        {% if pg.languages %}
           {% assign languages = pg.languages %}
         {% endif %}
       {% endfor %}

ba/tutorials/tour/abstract-types.md → ba/tutorials/tour/_posts/2017-02-13-abstract-types.md

@@ -5,6 +5,7 @@ title: Apstraktni tipovi
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 22
 outof: 33
 language: ba

ba/tutorials/tour/annotations.md → ba/tutorials/tour/_posts/2017-02-13-annotations.md

@@ -5,6 +5,7 @@ title: Anotacije
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 31
 outof: 33
 language: ba

ba/tutorials/tour/anonymous-function-syntax.md → ba/tutorials/tour/_posts/2017-02-13-anonymous-function-syntax.md

@@ -5,6 +5,7 @@ title: Sintaksa anonimnih funkcija
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 6
 outof: 33
 language: ba

ba/tutorials/tour/automatic-closures.md → ba/tutorials/tour/_posts/2017-02-13-automatic-closures.md

@@ -5,6 +5,7 @@ title: Automatska konstrukcija tipno zavisnih closura (zatvarajućih funkcija)
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 30
 outof: 33
 language: ba

ba/tutorials/tour/case-classes.md → ba/tutorials/tour/_posts/2017-02-13-case-classes.md

@@ -5,6 +5,7 @@ title: Case klase
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 30
 outof: 33
 language: ba

ba/tutorials/tour/classes.md → ba/tutorials/tour/_posts/2017-02-13-classes.md

@@ -5,6 +5,7 @@ title: Klase
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 3
 outof: 33
 language: ba

ba/tutorials/tour/compound-types.md → ba/tutorials/tour/_posts/2017-02-13-compound-types.md

@@ -5,6 +5,7 @@ title: Složeni tipovi
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 23
 outof: 33
 language: ba

ba/tutorials/tour/currying.md → ba/tutorials/tour/_posts/2017-02-13-currying.md

@@ -5,6 +5,7 @@ title: Curry-jevanje
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 9
 outof: 33
 language: ba

ba/tutorials/tour/default-parameter-values.md → ba/tutorials/tour/_posts/2017-02-13-default-parameter-values.md

@@ -5,6 +5,7 @@ title: Podrazumijevane vrijednosti parametara
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 32
 outof: 33
 language: ba

ba/tutorials/tour/explicitly-typed-self-references.md → ba/tutorials/tour/_posts/2017-02-13-explicitly-typed-self-references.md

@@ -5,6 +5,7 @@ title: Eksplicitno tipizirane samo-reference
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 24
 outof: 33
 language: ba

ba/tutorials/tour/extractor-objects.md → ba/tutorials/tour/_posts/2017-02-13-extractor-objects.md

@@ -5,6 +5,7 @@ title: Ekstraktor objekti
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 15
 outof: 33
 language: ba

ba/tutorials/tour/generic-classes.md → ba/tutorials/tour/_posts/2017-02-13-generic-classes.md

@@ -5,6 +5,7 @@ title: Generičke klase
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 17
 outof: 33
 language: ba

ba/tutorials/tour/higher-order-functions.md → ba/tutorials/tour/_posts/2017-02-13-higher-order-functions.md

@@ -5,6 +5,7 @@ title: Funkcije višeg reda
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 7
 outof: 33
 language: ba

ba/tutorials/tour/implicit-conversions.md → ba/tutorials/tour/_posts/2017-02-13-implicit-conversions.md

@@ -5,6 +5,7 @@ title: Implicitne konverzije
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 26
 outof: 33
 language: ba

ba/tutorials/tour/implicit-parameters.md → ba/tutorials/tour/_posts/2017-02-13-implicit-parameters.md

@@ -5,6 +5,7 @@ title: Implicitni parametri
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 25
 outof: 33
 language: ba

ba/tutorials/tour/inner-classes.md → ba/tutorials/tour/_posts/2017-02-13-inner-classes.md

@@ -5,6 +5,7 @@ title: Unutarnje klase
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 21
 outof: 33
 language: ba

ba/tutorials/tour/local-type-inference.md → ba/tutorials/tour/_posts/2017-02-13-local-type-inference.md

@@ -5,6 +5,7 @@ title: Lokalno zaključivanje tipova (type inference)
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 28
 outof: 33
 language: ba

ba/tutorials/tour/lower-type-bounds.md → ba/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md

@@ -5,6 +5,7 @@ title: Donja granica tipa
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 20
 outof: 33
 language: ba

ba/tutorials/tour/mixin-class-composition.md → ba/tutorials/tour/_posts/2017-02-13-mixin-class-composition.md

@@ -5,6 +5,7 @@ title: Kompozicija mixin klasa
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 5
 outof: 33
 language: ba

ba/tutorials/tour/named-parameters.md → ba/tutorials/tour/_posts/2017-02-13-named-parameters.md

@@ -5,6 +5,7 @@ title: Imenovani parametri
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 33
 outof: 33
 language: ba

ba/tutorials/tour/nested-functions.md → ba/tutorials/tour/_posts/2017-02-13-nested-functions.md

@@ -5,6 +5,7 @@ title: Ugniježdene funkcije
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 8
 outof: 33
 language: ba

ba/tutorials/tour/operators.md → ba/tutorials/tour/_posts/2017-02-13-operators.md

@@ -5,6 +5,7 @@ title: Operatori
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 29
 outof: 33
 language: ba

ba/tutorials/tour/pattern-matching.md → ba/tutorials/tour/_posts/2017-02-13-pattern-matching.md

@@ -5,6 +5,7 @@ title: Podudaranje uzoraka (pattern matching)
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 11
 
 outof: 33

ba/tutorials/tour/polymorphic-methods.md → ba/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md

@@ -5,6 +5,7 @@ title: Polimorfne metode
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 27
 
 outof: 33

ba/tutorials/tour/regular-expression-patterns.md → ba/tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md

@@ -5,6 +5,7 @@ title: Regularni izrazi
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 14
 
 outof: 33

ba/tutorials/tour/sequence-comprehensions.md → ba/tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md

@@ -5,6 +5,7 @@ title: Komprehensije sekvenci
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 16
 outof: 33
 language: ba

ba/tutorials/tour/singleton-objects.md → ba/tutorials/tour/_posts/2017-02-13-singleton-objects.md

@@ -5,6 +5,7 @@ title: Singlton objekti
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 12
 
 outof: 33

ba/tutorials/tour/tour-of-scala.md → ba/tutorials/tour/_posts/2017-02-13-tour-of-scala.md

@@ -5,6 +5,7 @@ title: Uvod
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 1
 outof: 33
 language: ba

ba/tutorials/tour/traits.md → ba/tutorials/tour/_posts/2017-02-13-traits.md

@@ -5,6 +5,7 @@ title: Trejtovi
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 4
 outof: 33
 language: ba

ba/tutorials/tour/unified-types.md → ba/tutorials/tour/_posts/2017-02-13-unified-types.md

@@ -5,6 +5,7 @@ title: Sjedinjeni tipovi
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 2
 outof: 33
 language: ba

ba/tutorials/tour/upper-type-bounds.md → ba/tutorials/tour/_posts/2017-02-13-upper-type-bounds.md

@@ -5,6 +5,7 @@ title: Gornja granica tipa
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 19
 outof: 33
 language: ba

ba/tutorials/tour/variances.md → ba/tutorials/tour/_posts/2017-02-13-variances.md

@@ -5,6 +5,7 @@ title: Varijanse
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 18
 outof: 33
 language: ba

ba/tutorials/tour/xml-processing.md → ba/tutorials/tour/_posts/2017-02-13-xml-processing.md

@@ -5,6 +5,7 @@ title: Procesiranje XML-a
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 13
 outof: 33
 language: ba

de/tutorials/tour/polymorphic-methods.md → de/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md

@@ -5,6 +5,7 @@ title: Polymorphe Methoden
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 21
 language: de
 ---

es/tutorials/tour/abstract-types.md → es/tutorials/tour/_posts/2017-02-13-abstract-types.md

@@ -5,6 +5,7 @@ title: Tipos Abstractos
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 2
 outof: 33
 language: es

es/tutorials/tour/annotations.md → es/tutorials/tour/_posts/2017-02-13-annotations.md

@@ -5,6 +5,7 @@ title: Anotaciones
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 3
 language: es
 ---

es/tutorials/tour/anonymous-function-syntax.md → es/tutorials/tour/_posts/2017-02-13-anonymous-function-syntax.md

@@ -5,6 +5,7 @@ title: Sintaxis de funciones anónimas
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 14
 language: es
 ---

es/tutorials/tour/automatic-closures.md → es/tutorials/tour/_posts/2017-02-13-automatic-closures.md

@@ -5,6 +5,7 @@ title: Construcción de closures automáticas
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 16
 language: es
 ---

es/tutorials/tour/case-classes.md → es/tutorials/tour/_posts/2017-02-13-case-classes.md

@@ -5,6 +5,7 @@ title: Clases Case
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 5
 language: es
 ---

es/tutorials/tour/classes.md → es/tutorials/tour/_posts/2017-02-13-classes.md

@@ -5,6 +5,7 @@ title: Clases
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 4
 language: es
 ---

es/tutorials/tour/compound-types.md → es/tutorials/tour/_posts/2017-02-13-compound-types.md

@@ -5,6 +5,7 @@ title: Tipos Compuestos
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 6
 language: es
 ---

es/tutorials/tour/currying.md → es/tutorials/tour/_posts/2017-02-13-currying.md

@@ -5,6 +5,7 @@ title: Currying
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 15
 language: es
 ---

es/tutorials/tour/default-parameter-values.md → es/tutorials/tour/_posts/2017-02-13-default-parameter-values.md

@@ -5,6 +5,7 @@ title: Valores de parámetros por defecto
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 34
 language: es
 ---