WIP: merging look and feel of scala-lang with doc site

.drone.yml

@@ -1,9 +1,6 @@
 pipeline:
   build:
-    image: scalaplatform/jdk8-ruby2-coursier:0.1
+    image: scalacenter/scala-rvm-jvm-coursier:2.0
     pull: true
     commands:
-      - bundle install
-      - ./scripts/run-tut.sh
-      - rm -r tut-tmp
-      - bundle exec jekyll build
+      - ./scripts/ci.sh

.drone.yml.sig

@@ -1 +1 @@
-eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgYnVpbGQ6CiAgICBpbWFnZTogc2NhbGFwbGF0Zm9ybS9qZGs4LXJ1YnkyLWNvdXJzaWVyOjAuMQogICAgcHVsbDogdHJ1ZQogICAgY29tbWFuZHM6CiAgICAgIC0gYnVuZGxlIGluc3RhbGwKICAgICAgLSAuL3NjcmlwdHMvcnVuLXR1dC5zaAogICAgICAtIHJtIC1yIHR1dC10bXAKICAgICAgLSBidW5kbGUgZXhlYyBqZWt5bGwgYnVpbGQK.uCV-tIDp9xbL2u2y27B9id6SL89dBfiiiTvVXYxHAbw
+eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgYnVpbGQ6CiAgICBpbWFnZTogamRrLXJ2bS1jb3Vyc2llcjpsYXRlc3QKICAgIHB1bGw6IHRydWUKICAgIGNvbW1hbmRzOgogICAgICAtIHNvdXJjZSB-Ly5wcm9maWxlCiAgICAgIC0gYnVuZGxlIGluc3RhbGwKICAgICAgLSAuL3NjcmlwdHMvcnVuLXR1dC5zaAogICAgICAtIHJtIC1yIHR1dC10bXAKICAgICAgLSBidW5kbGUgZXhlYyBqZWt5bGwgYnVpbGQK.7Rp37FEwRqAo85EdFYZh1PoyU8mxpFdEnpchWaQkHCc

.gitignore

@@ -1,4 +1,5 @@
 _site
+.ruby-version
 .DS_Store
 .project
 .settings
@@ -8,3 +9,4 @@ vendor/bundle
 .idea/
 /coursier
 /tut-tmp/
+.sass-cache/

Gemfile

@@ -1,2 +1,11 @@
 source 'https://rubygems.org'
-gem 'github-pages', group: :jekyll_plugins
+gem 'jekyll-redirect-from'
+
+# group :jekyll_plugins do
+#   gem 'hawkins'
+# end
+
+# ^ Useful for live reloading the site in your
+# browser during development. To use, uncomment
+# and do:
+# bundle exec jekyll liveserve --incremental

Gemfile.lock

@@ -1,173 +1,34 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.8)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
     addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
     colorator (1.1.0)
-    ethon (0.10.1)
-      ffi (>= 1.3.0)
-    execjs (2.7.0)
-    faraday (0.12.1)
-      multipart-post (>= 1.2, < 3)
     ffi (1.9.18)
     forwardable-extended (2.6.0)
-    gemoji (3.0.0)
-    github-pages (143)
-      activesupport (= 4.2.8)
-      github-pages-health-check (= 1.3.4)
-      jekyll (= 3.4.5)
-      jekyll-avatar (= 0.4.2)
-      jekyll-coffeescript (= 1.0.1)
-      jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.9.2)
-      jekyll-gist (= 1.4.0)
-      jekyll-github-metadata (= 2.4.0)
-      jekyll-mentions (= 1.2.0)
-      jekyll-optional-front-matter (= 0.1.2)
-      jekyll-paginate (= 1.1.0)
-      jekyll-readme-index (= 0.1.0)
-      jekyll-redirect-from (= 0.12.1)
-      jekyll-relative-links (= 0.4.1)
-      jekyll-sass-converter (= 1.5.0)
-      jekyll-seo-tag (= 2.2.3)
-      jekyll-sitemap (= 1.0.0)
-      jekyll-swiss (= 0.4.0)
-      jekyll-theme-architect (= 0.0.4)
-      jekyll-theme-cayman (= 0.0.4)
-      jekyll-theme-dinky (= 0.0.4)
-      jekyll-theme-hacker (= 0.0.4)
-      jekyll-theme-leap-day (= 0.0.4)
-      jekyll-theme-merlot (= 0.0.4)
-      jekyll-theme-midnight (= 0.0.4)
-      jekyll-theme-minimal (= 0.0.4)
-      jekyll-theme-modernist (= 0.0.4)
-      jekyll-theme-primer (= 0.3.0)
-      jekyll-theme-slate (= 0.0.4)
-      jekyll-theme-tactile (= 0.0.4)
-      jekyll-theme-time-machine (= 0.0.4)
-      jekyll-titles-from-headings (= 0.2.0)
-      jemoji (= 0.8.0)
-      kramdown (= 1.13.2)
-      liquid (= 3.0.6)
-      listen (= 3.0.6)
-      mercenary (~> 0.3)
-      minima (= 2.1.1)
-      rouge (= 1.11.1)
-      terminal-table (~> 1.4)
-    github-pages-health-check (1.3.4)
-      addressable (~> 2.3)
-      net-dns (~> 0.8)
-      octokit (~> 4.0)
-      public_suffix (~> 2.0)
-      typhoeus (~> 0.7)
-    html-pipeline (2.6.0)
-      activesupport (>= 2)
-      nokogiri (>= 1.4)
-    i18n (0.8.6)
-    jekyll (3.4.5)
+    jekyll (3.5.1)
       addressable (~> 2.4)
       colorator (~> 1.0)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
       kramdown (~> 1.3)
-      liquid (~> 3.0)
+      liquid (~> 4.0)
       mercenary (~> 0.3.3)
       pathutil (~> 0.9)
       rouge (~> 1.7)
       safe_yaml (~> 1.0)
-    jekyll-avatar (0.4.2)
-      jekyll (~> 3.0)
-    jekyll-coffeescript (1.0.1)
-      coffee-script (~> 2.2)
-    jekyll-default-layout (0.1.4)
-      jekyll (~> 3.0)
-    jekyll-feed (0.9.2)
-      jekyll (~> 3.3)
-    jekyll-gist (1.4.0)
-      octokit (~> 4.2)
-    jekyll-github-metadata (2.4.0)
-      jekyll (~> 3.1)
-      octokit (~> 4.0, != 4.4.0)
-    jekyll-mentions (1.2.0)
-      activesupport (~> 4.0)
-      html-pipeline (~> 2.3)
-      jekyll (~> 3.0)
-    jekyll-optional-front-matter (0.1.2)
-      jekyll (~> 3.0)
-    jekyll-paginate (1.1.0)
-    jekyll-readme-index (0.1.0)
-      jekyll (~> 3.0)
     jekyll-redirect-from (0.12.1)
       jekyll (~> 3.3)
-    jekyll-relative-links (0.4.1)
-      jekyll (~> 3.3)
     jekyll-sass-converter (1.5.0)
       sass (~> 3.4)
-    jekyll-seo-tag (2.2.3)
-      jekyll (~> 3.3)
-    jekyll-sitemap (1.0.0)
-      jekyll (~> 3.3)
-    jekyll-swiss (0.4.0)
-    jekyll-theme-architect (0.0.4)
-      jekyll (~> 3.3)
-    jekyll-theme-cayman (0.0.4)
-      jekyll (~> 3.3)
-    jekyll-theme-dinky (0.0.4)
-      jekyll (~> 3.3)
-    jekyll-theme-hacker (0.0.4)
-      jekyll (~> 3.3)
-    jekyll-theme-leap-day (0.0.4)
-      jekyll (~> 3.3)
-    jekyll-theme-merlot (0.0.4)
-      jekyll (~> 3.3)
-    jekyll-theme-midnight (0.0.4)
-      jekyll (~> 3.3)
-    jekyll-theme-minimal (0.0.4)
-      jekyll (~> 3.3)
-    jekyll-theme-modernist (0.0.4)
-      jekyll (~> 3.3)
-    jekyll-theme-primer (0.3.0)
-      jekyll (~> 3.3)
-    jekyll-theme-slate (0.0.4)
-      jekyll (~> 3.3)
-    jekyll-theme-tactile (0.0.4)
-      jekyll (~> 3.3)
-    jekyll-theme-time-machine (0.0.4)
-      jekyll (~> 3.3)
-    jekyll-titles-from-headings (0.2.0)
-      jekyll (~> 3.3)
     jekyll-watch (1.5.0)
       listen (~> 3.0, < 3.1)
-    jemoji (0.8.0)
-      activesupport (~> 4.0)
-      gemoji (~> 3.0)
-      html-pipeline (~> 2.2)
-      jekyll (>= 3.0)
-    kramdown (1.13.2)
-    liquid (3.0.6)
-    listen (3.0.6)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9.7)
+    kramdown (1.14.0)
+    liquid (4.0.0)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     mercenary (0.3.6)
-    mini_portile2 (2.1.0)
-    minima (2.1.1)
-      jekyll (~> 3.3)
-    minitest (5.10.2)
-    multipart-post (2.0.0)
-    net-dns (0.8.0)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
-    octokit (4.7.0)
-      sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.14.0)
       forwardable-extended (~> 2.6)
     public_suffix (2.0.5)
@@ -181,23 +42,12 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    thread_safe (0.3.6)
-    typhoeus (0.8.0)
-      ethon (>= 0.8.0)
-    tzinfo (1.2.3)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  github-pages
+  jekyll-redirect-from
 
 BUNDLED WITH
-   1.15.1
+   1.15.3

_ba/cheatsheets/index.md

@@ -0,0 +1,88 @@
+---
+layout: cheatsheet
+title: Scalacheat
+
+partof: cheatsheet
+
+by: Brendan O'Connor
+about: Zahvaljujući <a href="http://brenocon.com/">Brendan O'Connor</a>u ovaj cheatsheet teži da bude kratki pregled sintakse Scale. Licenca pripada Brendan O'Connor-u, pod CC-BY-SA 3.0 licencom.
+
+language: ba
+---
+
+###### Doprinio {{ page.by }}
+{{ page.about }}
+
+|  <span id="variables" class="h2">varijable</span>                                                                       |                 |
+|  `var x = 5`                                                                                             |  varijabla.       |
+|  <span class="label success">Dobro</span> `val x = 5`<br> <span class="label important">Loše</span> `x=6`  |  konstanta.       |
+|  `var x: Double = 5`                                                                                     |  eksplicitni tip.  |
+|  <span id="functions" class="h2">funkcije</span>                                                                       |                 |
+|  <span class="label success">Dobro</span> `def f(x: Int) = { x*x }`<br> <span class="label important">Loše</span> `def f(x: Int)   { x*x }` |  definicija funkcije. <br> skrivena greška: bez `=` ovo je procedura koja vraća `Unit`; uzrokuje zabunu. |
+|  <span class="label success">Dobro</span> `def f(x: Any) = println(x)`<br> <span class="label important">Loše</span> `def f(x) = println(x)` |  definicija funkcije. <br> sintaksna greška: potrebni su tipovi za svaki argument. |
+|  `type R = Double`                                                                                       |  pseudonim za tip.     |
+|  `def f(x: R)` ili<br> `def f(x: => R)`                                                                  |  poziv-po-vrijednosti. <br> poziv-po-imenu (lijeni parameteri). |
+|  `(x:R) => x*x`                                                                                          |  anonimna funkcija.  |
+|  `(1 to 5).map(_*2)` ili<br> `(1 to 5).reduceLeft( _+_ )`                                                |  anonimna funkcija: donja crta odgovara argumentu po poziciji. |
+|  `(1 to 5).map( x => x*x )`                                                                              |  anonimna funkcija: da bi koristili argument više od jednom, morate mu dati ime. |
+|  <span class="label success">Dobro</span> `(1 to 5).map(2*)`<br> <span class="label important">Loše</span> `(1 to 5).map(*2)` |  anonimna funkcija: vezana infiksna metoda. Koristite `2*_` zbog jasnoće. |
+|  `(1 to 5).map { x => val y=x*2; println(y); y }`                                                             |  anonimna funkcija: blokovski stil vraća vrijednost zadnjeg izraza. |
+|  `(1 to 5) filter {_%2 == 0} map {_*2}`                                                                  |  anonimne funkcije: pipeline stil (može i sa oblim zagradama). |
+|  `def compose(g:R=>R, h:R=>R) = (x:R) => g(h(x))` <br> `val f = compose({_*2}, {_-1})`                   |  anonimne funkcije: da bi proslijedili više blokova, potrebne su dodatne zagrade. |
+|  `val zscore = (mean:R, sd:R) => (x:R) => (x-mean)/sd`                                                   |  curry-jevanje, očita sintaksa. |
+|  `def zscore(mean:R, sd:R) = (x:R) => (x-mean)/sd`                                                       |  curry-jevanje, očita sintaksa. |
+|  `def zscore(mean:R, sd:R)(x:R) = (x-mean)/sd`                                                           |  curry-jevanje, sintaksni šećer (kratica). Ali onda: |
+|  `val normer = zscore(7, 0.4) _`                                                                          |  je potrebna prateća donja crta za parcijalnu primjenu, samo kod šećer (skraćene) verzije. |
+|  `def mapmake[T](g:T=>T)(seq: List[T]) = seq.map(g)`                                                     |  generički tip. |
+|  `5.+(3); 5 + 3` <br> `(1 to 5) map (_*2)`                                                               |  infiksni šećer. |
+|  `def sum(args: Int*) = args.reduceLeft(_+_)`                                                            |  varirajući broj argumenata (varargs). |
+|  <span id="packages" class="h2">paketi</span>                                                                         |                 |
+|  `import scala.collection._`                                                                             |  džoker (wildcard) import. |
+|  `import scala.collection.Vector` <br> `import scala.collection.{Vector, Sequence}`                      |  selektivni import. |
+|  `import scala.collection.{Vector => Vec28}`                                                             |  preimenujući import. |
+|  `import java.util.{Date => _, _}`                                                                       |  import svega iz `java.util` paketa osim `Date`. |
+|  `package pkg` _na početku fajla_ <br> `package pkg { ... }`                                             |  deklaracija paketa. |
+|  <span id="data_structures" class="h2">strukture podataka</span>                                                           |                 |
+|  `(1,2,3)`                                                                                               |  torka (tuple) literal (`Tuple3`). |
+|  `var (x,y,z) = (1,2,3)`                                                                                 |  destrukturirajuće vezivanje: otpakivanje torke podudaranjem uzoraka (pattern matching). |
+|  <span class="label important">Loše</span>`var x,y,z = (1,2,3)`                                           |  skrivena greška: svim varijablama dodijeljena cijela torka. |
+|  `var xs = List(1,2,3)`                                                                                  |  lista (nepromjenjiva). |
+|  `xs(2)`                                                                                                 |  indeksiranje zagradama ([slajdovi](http://www.slideshare.net/Odersky/fosdem-2009-1013261/27)). |
+|  `1 :: List(2,3)`                                                                                        |  cons. |
+|  `1 to 5` _isto kao_ `1 until 6` <br> `1 to 10 by 2`                                                      |  šećer za raspon (range). |
+|  `()` _(prazne zagrade)_                                                                                   |  jedina instanca Unit tipa (slično kao u C/Java void). |
+|  <span id="control_constructs" class="h2">kontrolne strukture</span>                                                     |                 |
+|  `if (check) happy else sad`                                                                             |  uslov. |
+|  `if (check) happy` _isto kao_ <br> `if (check) happy else ()`                                            |  sintaksni šećer za uslov. |
+|  `while (x < 5) { println(x); x += 1}`                                                                   |  while petlja. |
+|  `do { println(x); x += 1} while (x < 5)`                                                                |  do while petlja. |
+|  `import scala.util.control.Breaks._`<br>`breakable {`<br>`    for (x <- xs) {`<br>`        if (Math.random < 0.1) break`<br>`    }`<br>`}`|  break ([slajdovi](http://www.slideshare.net/Odersky/fosdem-2009-1013261/21)). |
+|  `for (x <- xs if x%2 == 0) yield x*10` _isto kao_ <br>`xs.filter(_%2 == 0).map(_*10)`                    |  for komprehensija: filter/map. |
+|  `for ((x,y) <- xs zip ys) yield x*y` _isto kao_ <br>`(xs zip ys) map { case (x,y) => x*y }`              |  for komprehensija: destrukturirajuće vezivanje. |
+|  `for (x <- xs; y <- ys) yield x*y` _isto kao_ <br>`xs flatMap {x => ys map {y => x*y}}`                  |  for komprehensija: međuproizvod (vektorski proizvod). |
+|  `for (x <- xs; y <- ys) {`<br>    `println("%d/%d = %.1f".format(x, y, x/y.toFloat))`<br>`}`                     |  for komprehensija: imperativ-asto.<br>[sprintf-stil.](http://java.sun.com/javase/6/docs/api/java/util/Formatter.html#syntax) |
+|  `for (i <- 1 to 5) {`<br>    `println(i)`<br>`}`                                                        |  for komprehensija: iteracija uključujući gornju granicu. |
+|  `for (i <- 1 until 5) {`<br>    `println(i)`<br>`}`                                                     |  for komprehensija: iteracija ne uključujući gornju granicu. |
+|  <span id="pattern_matching" class="h2">podudaranje uzoraka (pattern matching)</span>                                                         |                 |
+|  <span class="label success">Dobro</span> `(xs zip ys) map { case (x,y) => x*y }`<br> <span class="label important">Loše</span> `(xs zip ys) map( (x,y) => x*y )` |  slučaj korištenja u argumentima funkcije. |
+|  <span class="label important">Loše</span><br>`val v42 = 42`<br>`Some(3) match {`<br>`  case Some(v42) => println("42")`<br>`    case _ => println("Not 42")`<br>`}` |  "v42" interpretira se kao ime koje odgovara bilo kojoj vrijednosti Int, i "42" se prikazuje. |
+|  <span class="label success">Dobro</span><br>`val v42 = 42`<br>`Some(3) match {`<br>``    case Some(`v42`) => println("42")``<br>`case _ => println("Not 42")`<br>`}`  |  "\`v42\`" s kosim apostrofima interpretira se kao postojeća val `v42`, i "Not 42" se prikazuje. |
+|  <span class="label success">Dobro</span><br>`val UppercaseVal = 42`<br>`Some(3) match {`<br>`  case Some(UppercaseVal) => println("42")`<br>`    case _ => println("Not 42")`<br>`}` |  `UppercaseVal` tretira se kao postojeća val, a ne kao nova vrijednost uzorka, zato što počinje velikim slovom. Stoga, vrijednost u `UppercaseVal` se poredi sa `3`, i "Not 42" se prikazuje. |
+|  <span id="object_orientation" class="h2">objektna orijentisanost</span>                                                     |                 |
+|  `class C(x: R)` _isto kao_ <br>`class C(private val x: R)`<br>`var c = new C(4)`                         |  parameteri konstruktora - privatni. |
+|  `class C(val x: R)`<br>`var c = new C(4)`<br>`c.x`                                                      |  parameteri konstruktora - javni. |
+|  `class C(var x: R) {`<br>`assert(x > 0, "positive please")`<br>`var y = x`<br>`val readonly = 5`<br>`private var secret = 1`<br>`def this = this(42)`<br>`}`|<br>konstruktor je tijelo klase.<br>deklaracija javnog člana. <br> deklaracija dostupnog ali nepromjenjivog člana<br>deklaracija privatnog člana.<br>alternativni konstruktor.|
+|  `new{ ... }`                                                                                            |  anonimna klasa. |
+|  `abstract class D { ... }`                                                                              |  definicija apstraktne klase (ne može se kreirati). |
+|  `class C extends D { ... }`                                                                             |  definicija nasljedne klase. |
+|  `class D(var x: R)`<br>`class C(x: R) extends D(x)`                                                     |  nasljeđivanje i parameteri konstruktora (lista želja: automatsko prosljeđivanje parametara...).
+|  `object O extends D { ... }`                                                                            |  definicija singletona (kao modul). |
+|  `trait T { ... }`<br>`class C extends T { ... }`<br>`class C extends D with T { ... }`                  |  trejtovi.<br>interfejs-s-implementacijom. Bez parametara konstruktora. [Miksabilan]({{ site.baseurl }}/tutorials/tour/mixin-class-composition.html).
+|  `trait T1; trait T2`<br>`class C extends T1 with T2`<br>`class C extends D with T1 with T2`             |  više trejtova. |
+|  `class C extends D { override def f = ...}`	                                                           |  moraju se deklarisati prebrisane metode. |
+|  `new java.io.File("f")`                   	                                                           |  kreiranje objekta. |
+|  <span class="label important">Loše</span> `new List[Int]`<br> <span class="label success">Dobro</span> `List(1,2,3)` |  greška tipa: apstraktni tip. <br> umjesto toga, konvencija: fabrika istoimenog tipa. |
+|  `classOf[String]`                                                                                       |  literal za klasu. |
+|  `x.isInstanceOf[String]`                                                                                |  provjera tipa (runtime). |
+|  `x.asInstanceOf[String]`                                                                                |  kastovanje tipa (runtime). |
+|  `x: String`                                                                                             |  askripcija (compile time). |