coursegen 0.9.2 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9cb3cbe909c32d021c79b9c28bb7563364d92e2469a6504c249739b7599416a
-  data.tar.gz: 7481e0ff4afd182159ed69342ea5bc22852c37b41105c0f4b61147fdf88ae1bc
+  metadata.gz: 6e795fda87f36793e17eacef4c0f6215b71c737acd921470f7328e311738f5b2
+  data.tar.gz: 657d2df1548654f5fb29ada51658878ac5eb87e056a42c8bfd96fda31952c783
 SHA512:
-  metadata.gz: 944004fe2d95fec10e224c42b9b0979c669b1bbe276aaba06de92d7c1e1d37ad9bb1defff4ecf662dc2669b2c5a61438211a4fa2e7ebcdc5ab48d8997fd45f3a
-  data.tar.gz: '0268bf1102d9297e7cee57b6808e1e712df5ea79b231fbd5f6955a2594329ae80a11da95f67418a72336275ab289050c2bb8561aff9a57839d0430b467e8b983'
+  metadata.gz: 03a0a6ed44e0e53ad19fdd2709123efb44527f2d2928365db32f518b59971ffddbb7079f442786677ae54a4f86fc686a452b2930a14841db2fd829e00ac752d2
+  data.tar.gz: d3596fcd8741f91ea19b2ffcfb4c428665740ac956e9e33b12a64819421dd86c7088081bfec792ffb13a4687a021d0ef743a0c06ed6ac7db010972bf8d3f5ca6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    coursegen (0.9.2)
+    coursegen (0.9.8)
       activesupport
       adsf
       byebug
@@ -19,29 +19,28 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
+    activesupport (6.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    adsf (1.4.3)
+    adsf (1.4.5)
       rack (>= 1.0.0, < 3.0.0)
     byebug (11.1.3)
     coderay (1.1.3)
     colored (1.2)
-    concurrent-ruby (1.1.6)
-    cri (2.15.10)
+    concurrent-ruby (1.1.8)
+    cri (2.15.11)
     ddmemoize (1.0.0)
       ddmetrics (~> 1.0)
       ref (~> 2.0)
     ddmetrics (1.0.1)
-    ddplugin (1.0.2)
+    ddplugin (1.0.3)
     diff-lcs (1.4.4)
-    equatable (0.6.1)
-    ffi (1.13.1)
+    ffi (1.14.2)
     formatador (0.2.5)
     guard (2.16.2)
       formatador (>= 0.2.4)
@@ -58,41 +57,41 @@ GEM
       guard-compat (~> 1.0)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    i18n (1.8.3)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    icalendar (2.6.1)
+    icalendar (2.7.0)
       ice_cube (~> 0.16)
     ice_cube (0.16.3)
     json (2.3.0)
-    json_schema (0.20.8)
-    kramdown (2.2.1)
+    json_schema (0.20.9)
+    kramdown (2.3.0)
       rexml
-    listen (3.2.1)
+    listen (3.4.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.5)
+    lumberjack (1.2.8)
     method_source (1.0.0)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    nanoc (4.11.16)
+    minitest (5.14.4)
+    nanoc (4.11.23)
       addressable (~> 2.5)
       colored (~> 1.2)
       nanoc-checking (~> 1.0)
-      nanoc-cli (= 4.11.16)
-      nanoc-core (= 4.11.16)
+      nanoc-cli (= 4.11.23)
+      nanoc-core (= 4.11.23)
       nanoc-deploying (~> 1.0)
       parallel (~> 1.12)
       tty-command (~> 0.8)
       tty-which (~> 0.4)
-    nanoc-checking (1.0.0)
+    nanoc-checking (1.0.1)
       nanoc-cli (~> 4.11, >= 4.11.15)
       nanoc-core (~> 4.11, >= 4.11.15)
-    nanoc-cli (4.11.16)
+    nanoc-cli (4.11.23)
       cri (~> 2.15)
       diff-lcs (~> 1.3)
-      nanoc-core (= 4.11.16)
+      nanoc-core (= 4.11.23)
       zeitwerk (~> 2.1)
-    nanoc-core (4.11.16)
+    nanoc-core (4.11.23)
+      concurrent-ruby (~> 1.1)
       ddmemoize (~> 1.0)
       ddmetrics (~> 1.0)
       ddplugin (~> 1.0)
@@ -102,61 +101,60 @@ GEM
       tomlrb (~> 1.2)
       tty-platform (~> 0.2)
       zeitwerk (~> 2.1)
-    nanoc-deploying (1.0.0)
+    nanoc-deploying (1.0.1)
       nanoc-checking (~> 1.0)
       nanoc-cli (~> 4.11, >= 4.11.15)
       nanoc-core (~> 4.11, >= 4.11.15)
     nenv (0.3.0)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.11.1-x86_64-darwin)
+      racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.19.1)
-    pastel (0.7.4)
-      equatable (~> 0.6)
+    parallel (1.20.1)
+    pastel (0.8.0)
       tty-color (~> 0.5)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.5)
-    rack (2.2.2)
-    rake (13.0.1)
+    public_suffix (4.0.6)
+    racc (1.5.2)
+    rack (2.2.3)
+    rake (13.0.3)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     ref (2.0.0)
-    rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rexml (3.2.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.1)
     rubytree (1.0.0)
       json (~> 2.1)
       structured_warnings (~> 0.3)
     shellany (0.0.1)
     slow_enumerator_tools (1.1.0)
     structured_warnings (0.4.0)
-    thor (1.0.1)
-    thread_safe (0.3.6)
+    thor (1.1.0)
     tomlrb (1.3.0)
-    tty-color (0.5.1)
-    tty-command (0.9.0)
-      pastel (~> 0.7.0)
+    tty-color (0.6.0)
+    tty-command (0.10.0)
+      pastel (~> 0.8)
     tty-platform (0.3.0)
     tty-which (0.4.2)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    zeitwerk (2.3.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

data/lib/coursegen.rb

@@ -4,6 +4,7 @@ require 'nokogiri'
 
 require 'coursegen/version'
 require 'coursegen/course/helpers/sidebar_helpers'
+require 'coursegen/course/helpers/visual_helpers'
 require 'coursegen/course/helpers/lecture_helpers'
 require 'coursegen/course/helpers/content_helpers'
 require 'coursegen/course/helpers/logging_helpers'
@@ -26,6 +27,8 @@ require 'coursegen/course/lib/ical_adaptor'
 require 'coursegen/course/helpers/list_of'
 require 'coursegen/course/helpers/ical_feed_helpers'
 require 'coursegen/course/lib/helpers_'
+require 'coursegen/course/lib/nanoc_filters.rb'
+
 
 # Coursegen is a course curriculum site generator based on nanoc, with
 # support for sections, lectures, code examples, homeworks, course

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

@@ -1,5 +1,6 @@
 # ContentHelpers is used to annotate content.
 module ContentHelpers
+  
   def include_topic(item_symbol)
     incorporated_topic = lookup_nitem('topics', item_symbol.to_s)
     items[incorporated_topic.identifier.to_s].compiled_content
@@ -50,7 +51,7 @@ module ContentHelpers
     italic_red(string)
   end
 
-  def callout_1(title, body)
+  def callout1(title, body)
     <<~HTMLSTRING
       <div class="well well-sm callout">
       <span class="themebg label label-primary">#{title}</span>#{body}
@@ -58,7 +59,7 @@ module ContentHelpers
     HTMLSTRING
   end
 
-  def callout_2(title, body)
+  def callout2(title, body)
     <<~HTMLSTRING
       <div class="callout border border-primary rounded p-2 m-3">
       <span class="badge badge-pill badge-primary">#{title}</span>#{body}
@@ -66,20 +67,34 @@ module ContentHelpers
     HTMLSTRING
   end
 
-  def callout(title, body)
-    %(<div class="jumbotron py-1 border border-primary border-rounded-lg">
-       <h1 class="display-5">#{title}</h1>
-       <p class="lead">#{body}</p></div>)
+  def callout(title, body, style=:big)
+    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)
+      <<~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}"
+    end
   end
 
   def iconbadge1(icon, tooltip)
     %(<img src="/bootstrap/bootstrap-icons-1.0.0/#{icon}.svg" title="#{tooltip}" class="iconbadge">)
   end
 
-  def iconbadge(icon, tooltip)
-    %(<svg class="bi iconbadge" title="#{tooltip}" data-placement="top" data-title="#{tooltip}" data-toggle="tooltip" fill="blue"><use xlink:href="/bootstrap/bootstrap-icons-1.0.0/bootstrap-icons.svg##{icon}"/></svg>)
+  def iconbadge3(icon, tooltip, shorttext="")
+    %(<svg class="iconbadge bi" title="#{tooltip}" data-placement="top" data-title="#{tooltip}" data-toggle="tooltip" fill="blue"><use xlink:href="/bootstrap/bootstrap-icons-1.0.0/bootstrap-icons.svg##{icon}"/></svg>#{shorttext})
   end
-  
+
+  def iconbadge(icon, tooltip, shorttext="")
+    %(<svg class="iconbadge bi" title="#{tooltip}" data-placement="top" data-title="#{tooltip}" data-toggle="tooltip" fill="blue"><use xlink:href="/bootstrap/bootstrap-icons-1.0.0/bootstrap-icons.svg##{icon}"/></svg><span class="icontext" >#{shorttext}</span>)
+  end
+
   def textbadge(text, tooltip)
     %(<span class="label label-info" data-toggle="tooltip" data-placement="top" title="#{tooltip}">#{text}</span>)
   end
@@ -89,31 +104,31 @@ module ContentHelpers
   end
 
   def pdfbadge
-    iconbadge('file-earmark-richtext-fill', 'Submit a pdf file')
+    iconbadge('file-earmark-richtext-fill', 'Submit a pdf file', "pdf")
   end
 
   def codebadge
-    iconbadge('file-code-fill', 'Work on code in your portfolio')
+    iconbadge('file-code-fill', 'Work on code in your portfolio', "portfolio")
   end
 
   def cloudbadge
-    iconbadge('cloud-fill', 'Work on code in your portfolio')
+    iconbadge('cloud-fill', 'Work on code in your portfolio', 'portfolio')
   end
 
   def zipbadge
-    iconbadge('file-earmark-zip-fill', 'Submit work as an attachment')
+    iconbadge('file-earmark-zip-fill', 'Submit work in a zipfile', 'zip')
   end
 
   def partbadge
-    iconbadge('heart-half', 'Graded for participation only - pass/fail')
+    iconbadge('heart-half', 'Graded for participation only - pass/fail', 'participation')
   end
 
   def timebadge
-    iconbadge('alarm-fill', 'Must be submitted first thing on day of class')
+    iconbadge('alarm-fill', 'Must be submitted first thing on day of class', 'early submit')
   end
 
   def teambadge
-    iconbadge('people-fill', 'Team Deliverable')
+    iconbadge('people-fill', 'Team Deliverable', 'team deliverable')
   end
 
   def include_image_old(filename_string, extra_class: nil)
@@ -200,8 +215,8 @@ module ContentHelpers
   #     body << %(" class="img-polaroid" alt=""></div>)
   #     counter += 1
   #   end
-  #   body << %(</div> <a class="left carousel-control" href="#myCarousel" data-slide="prev">‹</a>
-  #               <a class="right carousel-control" href="#myCarousel" data-slide="next">›</a>
+  #   body << %(</div> <a class="left carousel-control" href="#myCarousel" data-slide="prev"></a>
+  #               <a class="right carousel-control" href="#myCarousel" data-slide="next"></a>
   #           </div>)
   #   body
   # end
@@ -234,7 +249,7 @@ module ContentHelpers
   #   body
   # end
 
-  def carousel_V4(filenames)
+  def carousel_v4(filenames)
     body = <<~HEREDOC
       <div id="carouselExampleControls" class="carousel slide" data-ride="carousel">
         <div class="carousel-inner">

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

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

data/lib/coursegen/course/lib/helpers_.rb

@@ -6,6 +6,7 @@ include SidebarHelpers
 include ListOfHelpers
 include ICalFeedHelpers
 include FormattingHelpers
+include VisualHelpers
 include Nanoc::Helpers::Rendering
 include Nanoc::Helpers::LinkTo
-include Nanoc::Helpers::Tagging
+include Nanoc::Helpers::Tagging

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

@@ -0,0 +1,9 @@
+include VisualHelpers
+
+Nanoc::Filter.define(:handle_shortcodes) do |content, _params = {}|
+  content
+    .gsub(/^\$\$INCLUDE_TOPIC :(\w+)$/) { "<%= include_topic( :#{$1}) %>" }
+    .gsub(/^\$\$SLIDE_TITLE (.+)$/) { "<slide_break></slide_break>\n\n### #{$1}" }
+    .gsub(/^\$\$SLIDE_BREAK$/) { "<slide_break></slide_break>" }
+    .gsub(/^\$\$END_OF_LECTURE$/) { end_of_lecture }
+end

data/lib/coursegen/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coursegen
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.8
 platform: ruby
 authors:
 - Pito Salas
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2021-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -270,8 +270,10 @@ files:
 - lib/coursegen/course/helpers/navigation_helpers.rb
 - lib/coursegen/course/helpers/sidebar_helpers.rb
 - lib/coursegen/course/helpers/table_helpers.rb
+- lib/coursegen/course/helpers/visual_helpers.rb
 - lib/coursegen/course/lib/helpers_.rb
 - lib/coursegen/course/lib/ical_adaptor.rb
+- lib/coursegen/course/lib/nanoc_filters.rb
 - lib/coursegen/course/lib/search_data_generator.rb
 - lib/coursegen/course/schedule/schedule_def.rb
 - lib/coursegen/course/schedule/schedule_feed.rb
@@ -335,7 +337,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -350,8 +352,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Use Nanoc to build courses and deploy them to S3
 test_files: