coursegen 0.9.16 → 0.9.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3122a6f1e196dc736ad8bb5559088b8a23268a75acf77ea556f8f3c0622de90b
-  data.tar.gz: d2c72e6dc943f818d444e314b6c1ff7eea0fae1e96b09d87c053b29e6797e958
+  metadata.gz: b9e50dd8f2b15ca41a4c6be41dfe795e9a3c7871b1e896ddef82f762718d59d8
+  data.tar.gz: f5a2be3d2bc475daf08563ed50f15b77c55a9f26f4f257dc50087b0e1a1e4739
 SHA512:
-  metadata.gz: 03b6891fa609a2fd40fa083f7e2c7865ec29b9c31f12b8792b8feb68099391cb57fa883d5cdf0141cc75b9a303d7b864bb5869ebbd00085af415b75aeed109d2
-  data.tar.gz: 4ae5c38eeb4b5ed3c9c0018dab732a34a9780abb3298414a2fb3775842adc75b8d700e3dac6fc05724e42403d2e429706362d3bc74b14096a74bd2c77d733409
+  metadata.gz: 981fb239270a51fac320818ddf0abe44c3ca7eb01af82c513870538d4b47039d59701df3e39c85d90ebf4ca3e023f7616fb28a1da73c314c857c6daf09a62e59
+  data.tar.gz: 3bf6c039b808f349ea6f6613b896ddcc2b5d569582c4f90b7cdee3df61e9a374b4846c4afc591d61743e71682ed60bf5415f528d7aeef85ac85b0ab21248488c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    coursegen (0.9.16)
+    coursegen (0.9.20)
       activesupport
       adsf
       byebug
@@ -11,6 +11,7 @@ PATH
       icalendar
       kramdown
       nanoc
+      nanoc-live
       nokogiri
       rubytree
       thor
@@ -19,20 +20,26 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3.1)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    adsf (1.4.5)
+    adsf (1.4.6)
       rack (>= 1.0.0, < 3.0.0)
+    adsf-live (1.4.6)
+      adsf (~> 1.3)
+      em-websocket (~> 0.5)
+      eventmachine (~> 1.2)
+      listen (~> 3.0)
+      rack-livereload (~> 0.3)
     byebug (11.1.3)
     coderay (1.1.3)
     colored (1.2)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     cri (2.15.11)
     ddmemoize (1.0.0)
       ddmetrics (~> 1.0)
@@ -40,24 +47,29 @@ GEM
     ddmetrics (1.0.1)
     ddplugin (1.0.3)
     diff-lcs (1.4.4)
-    ffi (1.15.0)
-    formatador (0.2.5)
-    guard (2.16.2)
+    em-websocket (0.5.2)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    eventmachine (1.2.7)
+    ffi (1.15.4)
+    formatador (0.3.0)
+    guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      pry (>= 0.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
-    guard-shell (0.7.1)
+    guard-shell (0.7.2)
       guard (>= 2.0.0)
       guard-compat (~> 1.0)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    i18n (1.8.10)
+    http_parser.rb (0.6.0)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     icalendar (2.7.1)
       ice_cube (~> 0.16)
@@ -66,18 +78,18 @@ GEM
     json_schema (0.21.0)
     kramdown (2.3.1)
       rexml
-    listen (3.5.1)
+    listen (3.7.0)
       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.12.1)
+    nanoc (4.12.2)
       addressable (~> 2.5)
       colored (~> 1.2)
       nanoc-checking (~> 1.0)
-      nanoc-cli (= 4.12.1)
-      nanoc-core (= 4.12.1)
+      nanoc-cli (= 4.12.2)
+      nanoc-core (= 4.12.2)
       nanoc-deploying (~> 1.0)
       parallel (~> 1.12)
       tty-command (~> 0.8)
@@ -85,12 +97,12 @@ GEM
     nanoc-checking (1.0.1)
       nanoc-cli (~> 4.11, >= 4.11.15)
       nanoc-core (~> 4.11, >= 4.11.15)
-    nanoc-cli (4.12.1)
+    nanoc-cli (4.12.2)
       cri (~> 2.15)
       diff-lcs (~> 1.3)
-      nanoc-core (= 4.12.1)
+      nanoc-core (= 4.12.2)
       zeitwerk (~> 2.1)
-    nanoc-core (4.12.1)
+    nanoc-core (4.12.2)
       concurrent-ruby (~> 1.1)
       ddmemoize (~> 1.0)
       ddmetrics (~> 1.0)
@@ -104,8 +116,13 @@ GEM
       nanoc-checking (~> 1.0)
       nanoc-cli (~> 4.11, >= 4.11.15)
       nanoc-core (~> 4.11, >= 4.11.15)
+    nanoc-live (1.0.0)
+      adsf-live (~> 1.4)
+      listen (~> 3.0)
+      nanoc-cli (~> 4.11, >= 4.11.14)
+      nanoc-core (~> 4.11, >= 4.11.14)
     nenv (0.3.0)
-    nokogiri (1.11.2-x86_64-darwin)
+    nokogiri (1.12.5-x86_64-darwin)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -113,14 +130,16 @@ GEM
     parallel (1.20.1)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    pry (0.14.0)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
-    rake (13.0.3)
-    rb-fsevent (0.10.4)
+    rack-livereload (0.3.17)
+      rack
+    rake (13.0.6)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     ref (2.0.0)
@@ -149,10 +168,10 @@ GEM
     tty-command (0.10.1)
       pastel (~> 0.8)
     tty-platform (0.3.0)
-    tty-which (0.4.2)
+    tty-which (0.5.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.2)
 
 PLATFORMS
   ruby
@@ -164,4 +183,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   2.1.4
+   2.2.23

data/coursegen.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'icalendar'
   spec.add_dependency 'kramdown'
   spec.add_dependency 'nanoc'
+  spec.add_dependency 'nanoc-live'
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'rubytree'
   spec.add_dependency 'thor'

data/lib/coursegen/course/data/citem.rb

@@ -1,5 +1,6 @@
 require 'byebug'
 require 'active_support/inflector'
+require 'date'
 
 #
 # Coursegen Item decorates Nanoc Item
@@ -93,10 +94,26 @@ class CItem
     @slides = @nitem[:slides]
     @lectref = @nitem[:lectref]
     @reading = @nitem[:reading]
-    @due = @nitem[:due]
+    @due = parse_date(@nitem[:due])
 
   end
 
+  def parse_date(datestring)
+    if datestring.nil? || datestring == "TBD"
+      val = Date.parse("jan-1-1985")
+    else 
+    # Date.parse(datestring)
+      val = Date.strptime(datestring, "%m/%d/%y")
+    end
+    # if val.nil?
+    #   puts "Nil date: #{datestring} #{@title}"
+    # end
+    val
+  rescue
+    puts("bad parse date: #{datestring}")
+    nil
+  end
+
   def parse_identifier(ident)
     parts = ident.to_s.split("/")
     @section ||= parts[2]

data/lib/coursegen/course/data/data_adaptor.rb

@@ -36,6 +36,8 @@ class DataAdaptor
       citem.homework
     when :assigned
       citem.assigned
+    when :cat
+      citem.cat
     when :start_date_time
       citem.schedule_start_date_time
     when :end_date_time
@@ -44,8 +46,6 @@ class DataAdaptor
       desc = citem.desc || ''
       hw = citem.homework || ''
       desc + '. HW: ' + hw
-    when :cat
-      citem.cat
     when :lectref
       citem.lectref
     when :hwref

data/lib/coursegen/course/data/section.rb

@@ -19,7 +19,7 @@ class Section
 
   def find_by_short_name(sname)
     matches = @citems.select { |c| sname == c.short_name }
-    raise RuntimeError,"'#{sname}': invalid reference in section \"#{@section}\"" if matches.length == 0
+    raise RuntimeError, "'#{sname}': invalid reference in section \"#{@section}\"" if matches.length == 0
     raise RuntimeError, "'#{sname}': duplicate referenced in section \"#{@section}\"" if matches.length != 1
     matches[0]
   end
@@ -73,6 +73,16 @@ class Section
   end
 
   def sort_pages
-    @citems.sort! { |a,b| a.order <=> b.order } rescue fail "sort_pages in section.rb"
+    @citems.sort! { |a,b| a.order <=> b.order} rescue fail "sort_pages in section.rb"
+    # @citems.sort! do |a, b|
+    #   comp = a.order <=> b.order
+    #   if !(a.due.nil? || b.due.nil?)
+    #     if a.due.class != Date || b.due.class != Date
+    #       puts "sort_pages_type #{a.title} #{b.title} #{a.class} #{b.class}"
+    #     end
+    #     comp = a.due <=> b.due
+    #   end
+    #   comp
+    # end
   end
 end

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

@@ -5,8 +5,8 @@ class BootstrapMarkup
     @str = ''
   end
 
-  def table_begin(css_class = 'table-condensed')
-    @str << "<table class=\"table x #{css_class}\">"
+  def table_begin(css_class = 'table-sm')
+    @str << "<table class=\"table #{css_class}\">"
   end
 
   def table_end

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

@@ -1,6 +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
@@ -67,7 +67,7 @@ module ContentHelpers
     HTMLSTRING
   end
 
-  def callout(title, body, style="big")
+  def callout3(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">
@@ -84,6 +84,24 @@ module ContentHelpers
     end
   end
 
+  def callout(title, body, style="big")
+    style = style.to_s if style.class != String
+    if (style == "big")
+      %(<div class="callout callout-big">
+        <h1 class="display-5">#{title}</h1>
+        <p class="lead">#{body}</p></div>)
+    elsif (style == "small")
+      <<~HTMLSTRING
+        <div class="callout callout-small">
+          <span class="callout-badge">#{title}</span>#{body}
+        </div>
+      HTMLSTRING
+    else
+      "error in callout call: .#{style}. #{style.class}"
+    end
+  end
+
+
   def iconbadge1(icon, tooltip)
     %(<img src="/bootstrap/bootstrap-icons-1.0.0/#{icon}.svg" title="#{tooltip}" class="iconbadge">)
   end
@@ -194,10 +212,14 @@ module ContentHelpers
     "*Discussion:*{: style=\"color: blue\"} *#{string}*"
   end
 
-  def discussion_box(string)
+  def discussion_box1(string)
     %(<div class="alert alert-info"><strong>Discussion:</strong> #{string}</div>)
   end
 
+  def discussion_box(string)
+    %(<div class="discussionbox"><strong>Discussion:</strong> #{string}</div>)
+  end
+
   def homework_hdr(show_legend: :on)
     body = '## Homework due for today'
     legend = "\n**Legend**: #{partbadge}: Participation (pass/fail) | #{pdfbadge}: PDF | #{teambadge}: Team | #{zipbadge}:  Attachment"

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

@@ -29,7 +29,7 @@ class ListOf
 
   # Render renders the underlying lecture table.
   def render
-    @mark.table_begin
+    @mark.table_begin("table-striped table-sm table-responsive table-hover")
     generate_headers
     generate_rows
     @mark.table_end
@@ -53,7 +53,6 @@ class ListOf
   def generate_rows
     @data.rows do |row_id|
       next unless include_row?(row_id)
-
       if subsection_hdr?(row_id)
         generate_summary_row(row_id)
       else
@@ -108,11 +107,11 @@ class ListOf
   end
 
   def include_by_row_type?(row_id)
-    @rows.include?(row_id.type)
+    tf = @rows.include?(row_id.type)
   end
 
   def include_by_subsection_path?(row_id)
-    @subsections.empty? || @subsections.include?(row_id.subsection)
+    tf = @subsections.empty? || @subsections.include?(row_id.subsection)
   end
 
   def subsection_hdr?(row_id)

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

@@ -1,4 +1,5 @@
 # ListOfHelpers is used to create a lecture table.
+
 module ListOfHelpers
   # List_of creates and renders a lecture table based on the given info.
   #

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

@@ -1,15 +1,12 @@
 # Class TableHelper provides methods for creating a table.
 class TableHelper
-  def initialize(*property)
-    @prop = property
+  def initialize(css_styles)
+    @css_styles = css_styles
     @bm = BootstrapMarkup.new
   end
 
   def headers(*labels)
-    css_style = ''
-    css_style += ' table-condensed' if @prop.include? :normal
-    css_style += ' table-bordered' if @prop.include? :bordered
-    @bm.table_begin(css_style)
+    @bm.table_begin(@css_styles)
     @bm.headers_begin
     labels.each do |h|
       @bm.header_begin

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

@@ -2,7 +2,10 @@ module VisualHelpers
 
   def end_of_lecture(type=:thatsall)
     if (type == :thatsall)
-      "<slide_break></slide_break>" + include_image("/content/topics/images/thatsallfolks.jpg")
+      part1 = "<slide_break></slide_break>\n\n"
+      part2 = "## See you next time!!\n\n"
+      part3 = "<img src=\"/content/topics/images/thatsallfolks.jpg\" class=\"img-thumbnail d-block mx-auto\" style=\"height:300px;\"/>"
+      part1 + part2 + part3
     end
   end
 end

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

@@ -1,30 +1,37 @@
 include VisualHelpers
 
 Nanoc::Filter.define(:handle_shortcodes) do |content, _params = {}|
-    prefix = /:/
+  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 + /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 + /h5 (.+)$/.source)) { "<h5>#{$1}</h5>" }
+      .gsub(Regexp.new(prefix.source + /image :(\w+)$/.source)) { "<img src=\"/content/topics/images/#{$1}.jpg\" class=\"img-thumbnail d-block mx-auto\" style=\"height:300px;\"/>" }
+      .gsub(Regexp.new(prefix.source + /image :(\w+), :(\w+)$/.source)) { "<img src=\"/content/topics/images/#{$2}.jpg\" class=\"img-thumbnail d-block mx-auto\" style=\"height:#{$1}px;\"/>" }
       .gsub(Regexp.new(prefix.source + /lecture_end/.source), end_of_lecture)
+      .gsub(Regexp.new(prefix.source + /li (.+)$/.source)) { "<li>#{$1}</li>" }
       .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 + /section_link :(\w+), :(\w+)/.source)) { link_to_section($1, $2) }
+      .gsub(Regexp.new(prefix.source + /section_include :(\w+), :(\w+)/.source)) { include_from_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 + /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 + /ul_begin :(\w+)/.source)) { "<ul class=\"#{$1}\">" }
+      .gsub(Regexp.new(prefix.source + /ul_begin$/.source)) { "<ul>" }
+      .gsub(Regexp.new(prefix.source + /ul_end$/.source)) { "</ul>" }
       .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.16'
+  VERSION = '0.9.20'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coursegen
 version: !ruby/object:Gem::Version
-  version: 0.9.16
+  version: 0.9.20
 platform: ruby
 authors:
 - Pito Salas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2021-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nanoc-live
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -352,7 +366,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Use Nanoc to build courses and deploy them to S3