coursegen 0.9.9 → 0.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03f1cff6597ed85fbcde71668cb790bb234d1c529d69e8dd5b2590b8fdbb029c
-  data.tar.gz: 17b93ad8dda84b6a73ea6f1f9c7ae01a2e8380ee693bf34b6823bfd2f0416724
+  metadata.gz: 323d99c6b17448ab319c85d6d4b7aa1693cd3cd275c9191084ed2ef93d477ae7
+  data.tar.gz: a64214599a18d924b7ed56af2744efb92d066dad4a5cc00dfd1f8bc6cf444a59
 SHA512:
-  metadata.gz: 471215f376cbd6990e4ae3fd1f0929e809c9f933019ca9398719d23bb79344cfd6725625bb4a2f515c88db5a90ea8b4553da16525822b115828cab79c8c78745
-  data.tar.gz: d5d69b84ef364720ac4172e8906bbff350f838b8481c7d49aca9893634460f9698beedfc9005469257e06cc28c12b581deb42d7b88fe58207f4b416ed4ba96e1
+  metadata.gz: 4661ab161dbca8e58bee2f4df3e673c7e0e5ffc716acb56f3a12be2fcb5520e80b96dca93750ee01518bbe25b0873168103c574edba520a6b6bc03ad41b1c3ab
+  data.tar.gz: 63a9b31a4ccaf865bc0eecfdca6666f4de06fbaf4fc83dc7b89778a33db96799e757f8119f10700e56b6b622db373fa86ad6c8bb44cb939913057d53af438156

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    coursegen (0.9.9)
+    coursegen (0.9.14)
       activesupport
       adsf
       byebug
@@ -19,7 +19,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3)
+    activesupport (6.1.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -40,7 +40,7 @@ GEM
     ddmetrics (1.0.1)
     ddplugin (1.0.3)
     diff-lcs (1.4.4)
-    ffi (1.14.2)
+    ffi (1.15.0)
     formatador (0.2.5)
     guard (2.16.2)
       formatador (>= 0.2.4)
@@ -57,27 +57,28 @@ GEM
       guard-compat (~> 1.0)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    icalendar (2.7.0)
+    icalendar (2.7.1)
       ice_cube (~> 0.16)
     ice_cube (0.16.3)
-    json (2.3.0)
-    json_schema (0.20.9)
-    kramdown (2.3.0)
+    json (2.5.1)
+    json_schema (0.21.0)
+    kramdown (2.3.1)
       rexml
-    listen (3.4.1)
+    listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
+    mini_portile2 (2.5.0)
     minitest (5.14.4)
-    nanoc (4.11.23)
+    nanoc (4.12.1)
       addressable (~> 2.5)
       colored (~> 1.2)
       nanoc-checking (~> 1.0)
-      nanoc-cli (= 4.11.23)
-      nanoc-core (= 4.11.23)
+      nanoc-cli (= 4.12.1)
+      nanoc-core (= 4.12.1)
       nanoc-deploying (~> 1.0)
       parallel (~> 1.12)
       tty-command (~> 0.8)
@@ -85,12 +86,12 @@ GEM
     nanoc-checking (1.0.1)
       nanoc-cli (~> 4.11, >= 4.11.15)
       nanoc-core (~> 4.11, >= 4.11.15)
-    nanoc-cli (4.11.23)
+    nanoc-cli (4.12.1)
       cri (~> 2.15)
       diff-lcs (~> 1.3)
-      nanoc-core (= 4.11.23)
+      nanoc-core (= 4.12.1)
       zeitwerk (~> 2.1)
-    nanoc-core (4.11.23)
+    nanoc-core (4.12.1)
       concurrent-ruby (~> 1.1)
       ddmemoize (~> 1.0)
       ddmetrics (~> 1.0)
@@ -98,7 +99,6 @@ GEM
       hamster (~> 3.0)
       json_schema (~> 0.19)
       slow_enumerator_tools (~> 1.0)
-      tomlrb (~> 1.2)
       tty-platform (~> 0.2)
       zeitwerk (~> 2.1)
     nanoc-deploying (1.0.1)
@@ -106,7 +106,8 @@ GEM
       nanoc-cli (~> 4.11, >= 4.11.15)
       nanoc-core (~> 4.11, >= 4.11.15)
     nenv (0.3.0)
-    nokogiri (1.11.1-x86_64-darwin)
+    nokogiri (1.11.2)
+      mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -114,7 +115,7 @@ GEM
     parallel (1.20.1)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    pry (0.13.1)
+    pry (0.14.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
@@ -125,7 +126,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     ref (2.0.0)
-    rexml (3.2.3)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -135,10 +136,10 @@ GEM
     rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.1)
+    rspec-support (3.10.2)
     rubytree (1.0.0)
       json (~> 2.1)
       structured_warnings (~> 0.3)
@@ -146,9 +147,8 @@ GEM
     slow_enumerator_tools (1.1.0)
     structured_warnings (0.4.0)
     thor (1.1.0)
-    tomlrb (1.3.0)
     tty-color (0.6.0)
-    tty-command (0.10.0)
+    tty-command (0.10.1)
       pastel (~> 0.8)
     tty-platform (0.3.0)
     tty-which (0.4.2)

data/lib/coursegen/course/helpers/visual_helpers.rb

@@ -2,7 +2,7 @@ module VisualHelpers
 
   def end_of_lecture(type=:thatsall)
     if (type == :thatsall)
-      %(<slide_break></slide_break><hr/><%= include_image "/content/topics/images/thatsallfolks.jpg" %>)
+      "<slide_break></slide_break>" + include_image("/content/topics/images/thatsallfolks.jpg")
     end
   end
 end

data/lib/coursegen/course/lib/nanoc_filters.rb

@@ -3,17 +3,24 @@ include VisualHelpers
 Nanoc::Filter.define(:handle_shortcodes) do |content, _params = {}|
   prefix = /:/
   content
-    .gsub(/^\$\$TOPIC_INCLUDE :(\w+)$/) { "<%= include_topic( :#{Regexp.last_match(1)}) %>" }
-    .gsub(/\$\$TOPIC_LINK :(\w+)$/) { "<%= link_to_topic( :#{Regexp.last_match(1)}) %>" }
-    .gsub(/^\$\$SLIDE_TITLE (.+)$/) { "<slide_break></slide_break>\n\n### #{Regexp.last_match(1)}" }
-    .gsub(/^\$\$SLIDE_BREAK$/) { "<slide_break></slide_break>" }
-    .gsub(/^\$\$LECTURE_END$/) { end_of_lecture }
-    .gsub(/^\$\$LECTURE_BEGIN (.+)$/) { "## #{Regexp.last_match(1)} "}
     .gsub(Regexp.new(prefix.source + /h1 (.+)$/.source), "# \\1 ")
     .gsub(Regexp.new(prefix.source + /h2 (.+)$/.source), "## \\1 ")
     .gsub(Regexp.new(prefix.source + /h3 (.+)$/.source), "### \\1 ")
-    .gsub(Regexp.new(prefix.source + /topic_include :(\w+)$/.source), "<%= include_topic( :\\1) %>")
-    .gsub(Regexp.new(prefix.source + /topic_link :(\w+)$/.source), "<%= link_to_topic( :\\1) %>")
+    .gsub(Regexp.new(prefix.source + /topic_include :(\w+)$/.source)) { |match| include_topic($1) }
+    .gsub(Regexp.new(prefix.source + /topic_link :(\w+)/.source)) { |match| link_to_topic($1) }
+    .gsub(Regexp.new(prefix.source + /section_link :(\w+) :(\w+)/.source)) { |match| link_to_section($1, $2) }
     .gsub(Regexp.new(prefix.source + /slide_title (.+)$/.source), "<slide_break></slide_break>\n\n### \\1")
+    .gsub(Regexp.new(prefix.source + /slide_bigtitle (.+)$/.source), "<slide_break></slide_break>\n\n## \\1")
     .gsub(Regexp.new(prefix.source + /lecture_end/.source), end_of_lecture)
+    .gsub(Regexp.new(prefix.source + /deliverable (.+)$/.source), "<%= deliverable( \"\\1\") %>")
+    .gsub(Regexp.new(prefix.source + /pdfbadge/.source), pdfbadge)
+    .gsub(Regexp.new(prefix.source + /partbadge/.source), partbadge)
+    .gsub(Regexp.new(prefix.source + /teambadge/.source), teambadge)
+    .gsub(Regexp.new(prefix.source + /zipbadge/.source), zipbadge)
+    .gsub(Regexp.new(prefix.source + /slide_break/.source),  "<slide_break></slide_break>")
+    .gsub(Regexp.new(prefix.source + /source_begin :(.+)$/.source)) { |match| source_begin ( ":language-"+$1) }
+    .gsub(Regexp.new(prefix.source + /source_end/.source), source_end)
+    .gsub(Regexp.new(prefix.source + /team_deliverable (.+)$/.source), "<%= team_deliverable( \"\\1\") %>")
+    .gsub(Regexp.new(prefix.source + /discussion_box (.+)$/.source), "<%= discussion_box( \"\\1\") %>")
+
   end

data/lib/coursegen/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Coursegen
-  VERSION = '0.9.9'
+  VERSION = '0.9.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coursegen
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.14
 platform: ruby
 authors:
 - Pito Salas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2021-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler