coursegen 0.9.11 → 0.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e5bfea8622cbc1c9680e2181bad901038c5b80d78408435f1dd61cc1178734f
-  data.tar.gz: 556a69a646eb3813602b6c523fde1520bbfe08d668b95c9e5efe21aa27afaaae
+  metadata.gz: 3122a6f1e196dc736ad8bb5559088b8a23268a75acf77ea556f8f3c0622de90b
+  data.tar.gz: d2c72e6dc943f818d444e314b6c1ff7eea0fae1e96b09d87c053b29e6797e958
 SHA512:
-  metadata.gz: 92b011b383f53d14e4873f62a2918296942b5deae03c129d66b137140ebf794dc52bb51323f5c6a2ecd4f39b109ddcb18a7a94931c77c45e079b5453ece3d031
-  data.tar.gz: 0d65a6abdc52f22290b0bbe379bffb1ed787c0ae2fe9596f7b838e244c0839c259506857f6db1135985cfc63bd886d3da9335893502d7b157241fb078cf667f4
+  metadata.gz: 03b6891fa609a2fd40fa083f7e2c7865ec29b9c31f12b8792b8feb68099391cb57fa883d5cdf0141cc75b9a303d7b864bb5869ebbd00085af415b75aeed109d2
+  data.tar.gz: 4ae5c38eeb4b5ed3c9c0018dab732a34a9780abb3298414a2fb3775842adc75b8d700e3dac6fc05724e42403d2e429706362d3bc74b14096a74bd2c77d733409

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    coursegen (0.9.11)
+    coursegen (0.9.16)
       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,27 @@ 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)
     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 +85,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 +98,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 +105,7 @@ 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-x86_64-darwin)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -114,7 +113,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 +124,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 +134,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 +145,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/content_helpers.rb

@@ -67,19 +67,20 @@ module ContentHelpers
     HTMLSTRING
   end
 
-  def callout(title, body, style=:big)
-    if (style == :big)
+  def callout(title, body, style="big")
+    style = style.to_s if style.class != String
+    if (style == "big")
       %(<div class="jumbotron py-1 border border-primary border-rounded-lg">
         <h1 class="display-5">#{title}</h1>
         <p class="lead">#{body}</p></div>)
-    elsif (style == :small)
+    elsif (style == "small")
       <<~HTMLSTRING
       <div class="callout border border-primary rounded p-2 m-3">
       <span class="badge badge-pill badge-primary">#{title}</span>#{body}
       </div>
       HTMLSTRING
     else
-      "error in callout call #{style}"
+      "error in callout call: .#{style}. #{style.class}"
     end
   end
 

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

@@ -1,31 +1,30 @@
 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 + /slide_title (.+)$/.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), "<%= 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\") %>")
-
-
-
-  end
+    prefix = /:/
+    content
+      .gsub(Regexp.new(prefix.source + /callout :(\w+), \"(.+)\", \"(.+)\"/.source)) { callout($2, $3, $1) }
+      .gsub(Regexp.new(prefix.source + /deliverable (.+)$/.source), "<%= deliverable( \"\\1\") %>")
+      .gsub(Regexp.new(prefix.source + /discussion_box (.+)$/.source), "<%= discussion_box( \"\\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 + /h4 (.+)$/.source), "#### \\1 ")
+      .gsub(Regexp.new(prefix.source + /image :(\w+)/.source), "<img src=\"/content/topics/images/\\1.jpg\" class=\"img-thumbnail\" style=\"height:300px;\"/>")
+      .gsub(Regexp.new(prefix.source + /lecture_end/.source), end_of_lecture)
+      .gsub(Regexp.new(prefix.source + /partbadge/.source), partbadge)
+      .gsub(Regexp.new(prefix.source + /pdfbadge/.source), pdfbadge)
+      .gsub(Regexp.new(prefix.source + /section_link :(\w+) :(\w+)/.source)) { link_to_section($1, $2) }
+      .gsub(Regexp.new(prefix.source + /slide_bigtitle (.+)$/.source), "<slide_break></slide_break>\n\n## \\1")
+      .gsub(Regexp.new(prefix.source + /slide_break/.source),  "<slide_break></slide_break>")
+      .gsub(Regexp.new(prefix.source + /slide_subtitle (.+)$/.source), "<slide_break></slide_break>\n\n#### \\1")
+      .gsub(Regexp.new(prefix.source + /slide_title (.+)$/.source), "<slide_break></slide_break>\n\n### \\1")
+      .gsub(Regexp.new(prefix.source + /source_begin :(.+)$/.source)) { 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 + /teambadge/.source), teambadge)
+      .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 + /youtube \"(.+)\"$/.source)) {  %Q!<iframe width="560" height="315" src="#{$1}"></iframe>! }
+      .gsub(Regexp.new(prefix.source + /zipbadge/.source), zipbadge)
+end

data/lib/coursegen/version.rb

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

metadata

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