scala · heathermiller · Jul 13, 2017 · Jan 9, 2017 · Jan 9, 2017 · Jan 10, 2017
diff --git a/.bundle/config b/.bundle/config
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@ _site/
 .DS_Store
 /bundle-vendor/bundle/
 /.jekyll-metadata
+.bundle
+/.idea
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ sudo: false
 
 language: ruby
 rvm:
-  - 2.2
+  - 2.4.0
 
 # for faster builds
 cache: bundler

diff --git a/Gemfile b/Gemfile
@@ -1,2 +1,6 @@
 source 'https://rubygems.org'
-gem 'github-pages', '>=104', group: :jekyll_plugins
+ruby '2.4.0'
+gem 'jekyll'
+gem 'kramdown'
+gem 'rack-jekyll'
+gem 'rake'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,61 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.7)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.4.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.10.0)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
     colorator (1.1.0)
-    ethon (0.9.1)
-      ffi (>= 1.3.0)
-    execjs (2.7.0)
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.9.14)
+    ffi (1.9.17)
     forwardable-extended (2.6.0)
-    gemoji (2.1.0)
-    github-pages (104)
-      activesupport (= 4.2.7)
-      github-pages-health-check (= 1.2.0)
-      jekyll (= 3.3.0)
-      jekyll-avatar (= 0.4.2)
-      jekyll-coffeescript (= 1.0.1)
-      jekyll-feed (= 0.8.0)
-      jekyll-gist (= 1.4.0)
-      jekyll-github-metadata (= 2.2.0)
-      jekyll-mentions (= 1.2.0)
-      jekyll-paginate (= 1.1.0)
-      jekyll-redirect-from (= 0.11.0)
-      jekyll-sass-converter (= 1.3.0)
-      jekyll-seo-tag (= 2.1.0)
-      jekyll-sitemap (= 0.12.0)
-      jekyll-swiss (= 0.4.0)
-      jemoji (= 0.7.0)
-      kramdown (= 1.11.1)
-      liquid (= 3.0.6)
-      listen (= 3.0.6)
-      mercenary (~> 0.3)
-      minima (= 2.0.0)
-      rouge (= 1.11.1)
-      terminal-table (~> 1.4)
-    github-pages-health-check (1.2.0)
-      addressable (~> 2.3)
-      net-dns (~> 0.8)
-      octokit (~> 4.0)
-      public_suffix (~> 1.4)
-      typhoeus (~> 0.7)
-    html-pipeline (2.4.2)
-      activesupport (>= 2)
-      nokogiri (>= 1.4)
-    i18n (0.7.0)
-    jekyll (3.3.0)
+    jekyll (3.4.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
       jekyll-sass-converter (~> 1.0)
@@ -66,80 +17,43 @@ GEM
       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-feed (0.8.0)
-      jekyll (~> 3.3)
-    jekyll-gist (1.4.0)
-      octokit (~> 4.2)
-    jekyll-github-metadata (2.2.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-paginate (1.1.0)
-    jekyll-redirect-from (0.11.0)
-      jekyll (>= 2.0)
-    jekyll-sass-converter (1.3.0)
-      sass (~> 3.2)
-    jekyll-seo-tag (2.1.0)
-      jekyll (~> 3.3)
-    jekyll-sitemap (0.12.0)
-      jekyll (~> 3.3)
-    jekyll-swiss (0.4.0)
+    jekyll-sass-converter (1.5.0)
+      sass (~> 3.4)
     jekyll-watch (1.5.0)
       listen (~> 3.0, < 3.1)
-    jemoji (0.7.0)
-      activesupport (~> 4.0)
-      gemoji (~> 2.0)
-      html-pipeline (~> 2.2)
-      jekyll (>= 3.0)
-    json (1.8.3)
-    kramdown (1.11.1)
+    kramdown (1.13.2)
     liquid (3.0.6)
-    listen (3.0.6)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9.7)
+    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.0.0)
-    minitest (5.9.1)
-    multipart-post (2.0.0)
-    net-dns (0.8.0)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
-    octokit (4.4.1)
-      sawyer (~> 0.7.0, >= 0.5.3)
     pathutil (0.14.0)
       forwardable-extended (~> 2.6)
-    public_suffix (1.5.3)
+    public_suffix (2.0.5)
+    rack (1.6.5)
+    rack-jekyll (0.5.0)
+      jekyll (>= 1.3)
+      listen (>= 1.3)
+      rack (~> 1.5)
+    rake (12.0.0)
     rb-fsevent (0.9.8)
-    rb-inotify (0.9.7)
+    rb-inotify (0.9.8)
       ffi (>= 0.5.0)
     rouge (1.11.1)
     safe_yaml (1.0.4)
-    sass (3.4.22)
-    sawyer (0.7.0)
-      addressable (>= 2.3.5, < 2.5)
-      faraday (~> 0.8, < 0.10)
-    terminal-table (1.7.3)
-      unicode-display_width (~> 1.1.1)
-    thread_safe (0.3.5)
-    typhoeus (0.8.0)
-      ethon (>= 0.8.0)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.1.1)
+    sass (3.4.23)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  github-pages (>= 104)
+  jekyll
+  kramdown
+  rack-jekyll
+  rake
+
+RUBY VERSION
+   ruby 2.4.0p0
 
 BUNDLED WITH
-   1.13.6
+   1.14.3
diff --git a/Procfile b/Procfile
@@ -0,0 +1 @@
+web: vendor/bin/heroku-php-apache2 ./site
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ It's a static site generated by [Jekyll](https://github.com/mojombo/jekyll), and
 
 ## Dependencies
 
-This site uses a Jekyll, a Ruby framework. The required Jekyll version is 3.3.0.
+This site uses a Jekyll, a Ruby framework. The required Jekyll version is 3.4.0.
 
 ## Building the site
 
@@ -33,9 +33,9 @@ you used to run Jekyll.
 
 ### Option 2) Building with global Jekyll
 
-Install Jekyll 3.3.0 on your system using RubyGems:
+Install Jekyll 3.4.0 on your system using RubyGems:
 
-    gem install jekyll -v 3.3.0
+    gem install jekyll -v 3.4.0
 
 After cloning, `cd` into the directory where you cloned this repository and run:
 
@@ -97,7 +97,34 @@ The least error-prone way to link between documents, to link to local images, or
 
 Here, `{{ site.baseurl }}` is a site-wide variable that represents the root directory of the static site. So, to display the Scala logo image, located in `img/scala-logo.png`, one must simply write: `![Img alt text]({{ site.baseurl }}/resources/img/scala-logo.png)`
 
+## Permalinks
 
+In this new version of the scala-lang site we've tried to follow a `pretty permalink` style, so that any generated page will have an permalink finishing in a slash character (`/`). This will tell Jekyll to build that particular page as an `index.html` inside a folder with a name as specified in the provided permalink. i.e.: if a page has a permalink as follows:
+
+`permalink: /what-is-scala/`
+
+This will tell Jekyll to create a `what-is-scala` folder, with an `index.html` file inside. Links to this page will refer to the `{{site.baseurl}}/what-is-scala/`.
+
+## Custom collections and data
+
+In the previous version of the site, data used in different pages was contained in categorized blogs. This has been changed to use custom collections. Every custom collection is a folder starting with an underscore character (`_`), containing a `markdown` file for each member of the collection. As any markdown containing a page in the site, it starts with a YAML front matter containing the data for this item, and can optionally contain markdown text to be rendered as html.
+
+Right now there are no collections being rendered as specific pages in the site (they're only consumed internally as static data), but in the future this can be changed by specifying the global `output: true` variable in the `_config.yml` custom collections section. You'll also need to specify a layout by using the `defaults` settings in the `_config.yml` file. i.e.:
+
+```
+defaults:
+  - scope:
+      path: ""
+      type: collection_name
+    values:
+      layout: layout_name
+```
+
+To access data from a custom collection just refer to `site.<collection_name>`. The collection's name will be the name of its folder sans the underscore character. i.e.: to access the data inside `_downloads`, you can do it as follows:
+
+`site.downloads`
+
+Some of the data has been also modelled as YAML files inside the `_data` folder. Generally for data that is used throughout the site (i.e: the navigation bar links).
 
 ## Resources and Workflow
 

diff --git a/Rakefile b/Rakefile
@@ -0,0 +1,5 @@
+namespace :assets do
+  task :precompile do
+    puts `bundle exec jekyll build --destination ./site`
+  end
+end
diff --git a/_books/1-programming-in-scala-3rd.md b/_books/1-programming-in-scala-3rd.md
@@ -0,0 +1,12 @@
+---
+title: "Programming in Scala, 3rd ed"
+link: http://booksites.artima.com/programming_in_scala_3ed
+image: /resources/img/books/ProgrammingInScala.gif
+status: Updated for Scala 2.12
+authors: ["Martin Odersky", "Lex Spoon", "Bill Benners"]
+publisher: 
+---
+
+(First edition [available for free online reading](http://www.artima.com/pins1ed/))
+
+Being co-written by the language's designer, Martin Odersky, you will find it provides additional depth and clarity to the diverse features of the language. The book provides both an authoritative reference for Scala and a systematic tutorial covering all the features in the language. Once you are familiar with the basics of Scala you will appreciate having this source of invaluable examples and precise explanations of Scala on hand. The book is available from [Artima](http://booksites.artima.com/programming_in_scala_3ed). Award winning book - [Jolt Productivity award](http://www.drdobbs.com/joltawards/232601431) for Technical Books.
diff --git a/_books/2-scala-for-the-impatient.md b/_books/2-scala-for-the-impatient.md
@@ -0,0 +1,22 @@
+---
+title: "Scala for the Impatient"
+link: http://www.horstmann.com/scala/index.html
+image: /resources/img/books/scala_for_the_impatient.png
+status: Available Now
+authors: ["Cay S. Horstmann"]
+publisher: Addison-Wesley
+publisherLink: https://heuk.pearson.com/about-us.html/Addison-Wesley/
+---
+
+What you get:
+
+* A rapid introduction to Scala for programmers who are competent in Java, C#, or C++
+* Blog-length chunks of information that you can digest quickly
+* An organization that you'll find useful as a quick reference
+
+What you don't get:
+
+* An introduction into programming or object-oriented design
+* Religion about the superiority of one paradigm or another
+* Cute or academic examples
+* Mind-numbing details about syntax minutiae
diff --git a/_books/3-programming-scala.md b/_books/3-programming-scala.md
@@ -0,0 +1,11 @@
+---
+title: "Programming Scala"
+link: http://shop.oreilly.com/product/0636920033073.do
+image: /resources/img/books/ProgrammingScala-final-border.gif
+status: Updated for Scala 2.11
+authors: ["Alex Payne", "Dean Wampler"]
+publisher: O’Reilly
+publisherLink: http://www.oreilly.com/
+---
+
+Both are industry experts, Alex Payne being the lead API programmer at Twitter, a social networking service based on Scala. O’Reilly, the publisher, writes: "Learn how to be more productive with Scala, a new multi-paradigm language for the Java Virtual Machine (JVM) that integrates features of both object-oriented and functional programming. With this book, you'll discover why Scala is ideal for highly scalable, component-based applications that support concurrency and distribution. You'll also learn how to leverage the wealth of Java class libraries to meet the practical needs of enterprise and Internet projects more easily."
diff --git a/_books/4-functional-programming-in-scala.md b/_books/4-functional-programming-in-scala.md
@@ -0,0 +1,11 @@
+---
+title: "Functional Programming in Scala"
+link: https://www.manning.com/books/functional-programming-in-scala
+image: /resources/img/books/FPiS_93x116.png
+status: Available now
+authors: ["Paul Chiusano", "Rúnar Bjarnason"]
+publisher: Manning
+publisherLink: http://www.manning.com/
+---
+
+"Functional programming (FP) is a style of software development emphasizing functions that don't depend on program state... Functional Programming in Scala is a serious tutorial for programmers looking to learn FP and apply it to the everyday business of coding. The book guides readers from basic techniques to advanced topics in a logical, concise, and clear progression. In it, you'll find concrete examples and exercises that open up the world of functional programming." 
diff --git a/_books/5-scala-in-depth.md b/_books/5-scala-in-depth.md
@@ -0,0 +1,11 @@
+---
+title: "Scala in Depth"
+link: http://www.manning.com/suereth
+image: /resources/img/books/icon_Scala_in_Depth_93x116.png
+status: Available now
+authors: ["Joshua D. Suereth"]
+publisher: Manning
+publisherLink: http://www.manning.com/
+---
+
+"While information about the Scala language is abundant, skilled practitioners, great examples, and insight into the best practices of the community are harder to find. Scala in Depth bridges that gap, preparing you to adopt Scala successfully for real world projects. Scala in Depth is a unique new book designed to help you integrate Scala effectively into your development process. By presenting the emerging best practices and designs from the Scala community, it guides you though dozens of powerful techniques example by example. There's no heavy-handed theory here-just lots of crisp, practical guides for coding in Scala." 
diff --git a/_books/6-scala-puzzlers.md b/_books/6-scala-puzzlers.md
@@ -0,0 +1,11 @@
+---
+title: "Scala Puzzlers"
+link: http://www.artima.com/shop/scala_puzzlers
+image: /resources/img/books/icon_Scala_in_Depth_93x116.png
+status: Available now
+authors: ["Andrew Phillips", "Nermin Šerifović"]
+publisher: Artima Press
+publisherLink: http://www.artima.com/index.jsp
+---
+
+"Getting code to do what we want it to do is perhaps the essence of our purpose as developers. So there are few things more intriguing or important than code that we think we understand, but that behaves rather contrary to our expectations. Scala Puzzlers is a collection of such examples in Scala. It is not only an entertaining and instructive way of understanding this highly expressive language better. It will also help you recognize many counter-intuitive traps and pitfalls and prevent them from inflicting further production bug hunt stress on Scala developers."
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ sudo: false @@
     language: ruby
     rvm:
-      - 2.2
+      - 2.4.0
     # for faster builds
     cache: bundler
@@ Expand Down @@