coursegen 0.7.1 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cbb8c92d9286443400bc58faf5177ff3d146b2b05e41575f5e5884c0993c92f
-  data.tar.gz: 17838a1463efab4249cb1cdd1d8d5d78600bc3c66173b4f19d39165d8bec9810
+  metadata.gz: 2e9403029aa45dfc8bf3dc63e07b8fdec5c10dedc74ff77d48043e8a61ac1bdb
+  data.tar.gz: 257ec234d1ea117bf214ba4231d56fce4c561514d8d59161c39873502deab8aa
 SHA512:
-  metadata.gz: 6addf58a4a5f1d156a7f72e1eeb7ed572713d9e311d7894d222ef0e21189a0e5d84ac66d3df9f71ee287d79883991a3d866a94b42943f64fc996a372e264cccb
-  data.tar.gz: 90b3bb4e3b38a15d2deb5cd7abb18bfa6689f4b1a988244f9e386405365c632488bc8230d4c119b93f5c5c5c692fc86bae47583f08de51f8001b002945b8b93c
+  metadata.gz: b643b2ef9603c77fb13d4239a788c857d82c90dba2caa25137065e4b780e0c8868ce356e7257ab582686b6bf2b95a882f53c07208d324e1f8738697bee41f1db
+  data.tar.gz: 9df9e0a79160473a63f201352aaf047b4c08383be236b1b98cf1902bc90c211018765db85658b5b26abd945ddd5678995634b1f067f62b36f5996d3256a60215

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    coursegen (0.6.2)
+    coursegen (0.7.6)
       activesupport
       adsf
       byebug
@@ -19,29 +19,29 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.0)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    adsf (1.4.0)
+    adsf (1.4.1)
       rack (>= 1.0.0, < 3.0.0)
-    byebug (10.0.2)
+    byebug (11.0.1)
     coderay (1.1.2)
     colored (1.2)
-    concurrent-ruby (1.0.5)
-    cri (2.10.1)
+    concurrent-ruby (1.1.5)
+    cri (2.15.3)
       colored (~> 1.2)
-    ddmemoize (1.0.0a3)
-      ddtelemetry (= 1.0.0a2)
+    ddmemoize (1.0.0)
+      ddmetrics (~> 1.0)
       ref (~> 2.0)
-    ddplugin (1.0.1)
-    ddtelemetry (1.0.0a2)
-    ffi (1.9.25)
+    ddmetrics (1.0.1)
+    ddplugin (1.0.2)
+    ffi (1.10.0)
     formatador (0.2.5)
-    guard (2.14.2)
+    guard (2.15.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -56,53 +56,61 @@ GEM
       guard-compat (~> 1.0)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    i18n (1.0.1)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    icalendar (2.4.1)
-    json (2.1.0)
-    kramdown (1.16.2)
+    icalendar (2.5.3)
+      ice_cube (~> 0.16)
+    ice_cube (0.16.3)
+    json (2.2.0)
+    json_schema (0.20.4)
+    kramdown (2.1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    lumberjack (1.0.12)
-    method_source (0.9.0)
-    mini_portile2 (2.3.0)
+    lumberjack (1.0.13)
+    method_source (0.9.2)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
-    nanoc (4.8.19)
+    nanoc (4.11.0)
       addressable (~> 2.5)
-      cri (~> 2.8)
-      ddmemoize (= 1.0.0a3)
+      cri (~> 2.15)
+      ddmemoize (~> 1.0)
+      ddmetrics (~> 1.0)
       ddplugin (~> 1.0)
-      ddtelemetry (= 1.0.0a2)
       hamster (~> 3.0)
+      json_schema (~> 0.19)
+      parallel (~> 1.12)
       ref (~> 2.0)
       slow_enumerator_tools (~> 1.0)
+      tomlrb (~> 1.2)
     nenv (0.3.0)
-    nokogiri (1.8.4)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.2)
+      mini_portile2 (~> 2.4.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    pry (0.11.3)
+    parallel (1.17.0)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.0.2)
-    rack (2.0.5)
-    rake (11.3.0)
+    public_suffix (3.0.3)
+    rack (2.0.7)
+    rake (12.3.2)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
     ref (2.0.0)
     ruby_dep (1.5.0)
-    rubytree (1.0.0)
+    rubytree (1.0.1)
       json (~> 2.1)
       structured_warnings (~> 0.3)
     shellany (0.0.1)
     slow_enumerator_tools (1.1.0)
     structured_warnings (0.3.0)
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
+    tomlrb (1.2.8)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
 
@@ -115,4 +123,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

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

@@ -6,7 +6,7 @@ require 'active_support/inflector'
 #
 class CItem
   attr_reader :order, :section, :subsection, :subsection_citem, :title,
-              :type, :identifier, :short_name, :status, :nitem, :css_class, :homework, :desc, :cat
+              :type, :identifier, :short_name, :status, :nitem, :css_class, :homework, :desc, :cat, :assigned
   attr_accessor :lecture_number, :lecture_date, :start_time, :end_time
 
   # Callable with nitem=nil to create a mock
@@ -85,6 +85,7 @@ class CItem
     @homework = @nitem[:homework]
     @desc = @nitem[:desc]
     @cat = @nitem[:cat]
+    @assigned = @nitem[:assigned]
   end
 
   def parse_identifier(ident)

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

@@ -32,6 +32,8 @@ class DataAdaptor
       citem.desc
     when :homework
       citem.homework
+    when :assigned
+      citem.assigned
     when :start_date_time
       citem.schedule_start_date_time
     when :end_date_time

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

@@ -1,54 +1,55 @@
 # Helpers to be used to annotate content
+require 'byebug'
 module ContentHelpers
-  def include_topic item_symbol
+  def include_topic(item_symbol)
     incorporated_topic = lookup_nitem("topics", item_symbol.to_s)
     items[incorporated_topic.identifier.to_s].compiled_content
   end
 
-  def include_page item_symbol
+  def include_page(item_symbol)
     incorporated_topic = lookup_nitem("pages", item_symbol.to_s)
     items[incorporated_topic.identifier.to_s].compiled_content
   end
 
-  def include_background item_symbol
+  def include_background(item_symbol)
     incorporated_topic = lookup_nitem("background", item_symbol.to_s)
     items[incorporated_topic.identifier.to_s].compiled_content
   end
 
-  def include_intro item_symbol
+  def include_intro(item_symbol)
     incorporated_topic = lookup_nitem("intro", item_symbol.to_s)
     items[incorporated_topic.identifier.to_s].compiled_content
   end
 
-  def include_from_section sect_symbol, item_symbol
+  def include_from_section(sect_symbol, item_symbol)
     incorporated_item = lookup_nitem(sect_symbol.to_s, item_symbol.to_s)
     Toc.instance.record_inclusion @item, incorporated_item
     items[incorporated_item.identifier.to_s].compiled_content
   end
 
-  def lookup_nitem the_sect, short_name
+  def lookup_nitem(the_sect, short_name)
     Toc.instance.lookup_citem(the_sect, short_name).nitem
   end
 
-  def link_to_doc label, file_name
+  def link_to_doc(label, file_name)
     "<a href=\"/docs/#{file_name}\">#{label}</a>"
   end
 
-  def toc_link_to item
+  def toc_link_to(item)
     link_to_unless_current item[:title], item
   end
 
-  def bold_red string
+  def bold_red(string)
     "<span style=\"color: red; font-style: italic;\">#{string}</span>"
   end
 
-  def italic_red string
+  def italic_red(string)
     " *#{string}*{: style=\"color: red\"} "
   end
 
-  def ir string; italic_red(string); end
+  def ir(string); italic_red(string); end
 
-  def callout title, body
+  def callout(title, body)
     <<-HTMLSTRING
 <div class="well well-sm">
 <span class="themebg label label-primary">#{title}</span>#{body}
@@ -56,11 +57,11 @@ module ContentHelpers
 HTMLSTRING
   end
 
-  def textbadge text, tooltip
+  def textbadge(text, tooltip)
     %(<span class="label label-info" data-toggle="tooltip" data-placement="top" title="#{tooltip}">#{text}</span>)
   end
 
-  def iconbadge icon, tooltip
+  def iconbadge(icon, tooltip)
     %(<span class="glyphicon glyphicon-#{icon} themefg" data-toggle="tooltip" data-placement="top" title="#{tooltip}"></span>)
   end
 
@@ -77,11 +78,11 @@ HTMLSTRING
   end
 
   def zipbadge
-    iconbadge("briefcase", "Submit code as a .zip file")
+    iconbadge("briefcase", "Submit work as an attachment")
   end
 
   def partbadge
-    iconbadge("check", "Graded for participation only")
+    iconbadge("check", "Graded for participation only - pass/fail")
   end
 
   def timebadge
@@ -92,8 +93,7 @@ HTMLSTRING
     iconbadge("tent", "Team Deliverable")
   end
 
-
-  def include_image_old filename_string, extra_class: nil
+  def include_image_old(filename_string, extra_class: nil)
     css_class = "img-responsive"
     css_class += " img-" + extra_class unless extra_class.nil?
     <<-HTMLSTRING
@@ -101,7 +101,7 @@ HTMLSTRING
     HTMLSTRING
   end
 
-  def include_image filename_string, extra: ""
+  def include_image(filename_string, extra: "")
     <<-HTMLSTRING
 <div class="row">
   <div class="col-md-offset-2 col-md-8">
@@ -111,7 +111,13 @@ HTMLSTRING
   HTMLSTRING
   end
 
-  def important string = ":"
+  def image(filename_string, extra: "")
+    <<-HTMLSTRING
+    <img src="/content/topics/images/#{filename_string}" class="img-responsive img-thumbnail" #{extra}/>
+    HTMLSTRING
+  end
+
+  def important(string = ":")
     <<-HTMLSTRING
     <div class="cg-important">
         #{string}
@@ -119,17 +125,17 @@ HTMLSTRING
     HTMLSTRING
   end
 
-  def nb string = ":"
+  def nb(string = ":")
     <<-HTMLSTRING
     <div class="label label-info">#{string}</div>
     HTMLSTRING
   end
 
-  def tbd string = ""
+  def tbd(string = "")
     "*[TO BE DETERMINED#{string}]*{: style=\"color: red\"}"
   end
 
-  def deliverable string, append=""
+  def deliverable(string, append = "")
     "*Deliverable:*{: style=\"color: red\"} #{string + append} "
   end
 
@@ -141,20 +147,23 @@ HTMLSTRING
     deliverable(string, " *(pdf with name and hw number, graded for participation only)*")
   end
 
-  def team_deliverable string
+  def team_deliverable(string)
     "*Team Deliverable:*{: style=\"color: red\"} *#{string}*"
   end
 
-  def discussion string
+  def discussion(string)
     "*Discussion:*{: style=\"color: blue\"} *#{string}*"
   end
 
-  def discussion_box string
+  def discussion_box(string)
     %(<div class="alert alert-info"><strong>Discussion:</strong> #{string}</div>)
   end
 
-  def homework_hdr
-    "#### Homework due for today"
+  def homework_hdr(show_legend: :on)
+    body = "#### Homework due for today"
+    legend = "\n**Legend**: #{partbadge}: Participation (pass/fail) | #{pdfbadge}: PDF | #{teambadge}: Team | #{zipbadge}:  Attachment"
+    body += legend if show_legend == :on
+    body
   end
 
   def carousel(filenames)
@@ -175,7 +184,7 @@ HTMLSTRING
   end
 
   def carousel_new(filenames)
-    carousel_work(filenames.map {|filename| "/content/topics/images/" + filename })
+    carousel_work(filenames.map { |filename| "/content/topics/images/" + filename })
   end
 
   def carousel_work(filenames)
@@ -218,32 +227,31 @@ HTMLSTRING
     "~~~~~~\n {: .language-python}"
   end
 
-  def ruby_string str
+  def ruby_string(str)
     ruby_begin + "\n" + str + "\n" + ruby_end
   end
 
-  def python_string str
+  def python_string(str)
     python_begin + "\n" + str + "\n" + python_end
   end
 
-  def include_ruby name
+  def include_ruby(name)
     filename = Dir.pwd + "/content/content/topics/scripts/" + name.to_s + ".rb"
     filecontents = File.new(filename).read
     ruby_string filecontents
   end
 
-  def include_python name
+  def include_python(name)
     filename = Dir.pwd + "/content/content/topics/robotcode/" + name.to_s + ".py"
     filecontents = File.new(filename).read
     ruby_string filecontents
   end
 
-
   def code_begin
     "\n~~~~~~"
   end
 
-  def code_end lang=""
+  def code_end(lang = "")
     str = "~~~~~~\n"
     if ["ruby", "css", "java", "html"].include? lang
       str += "{: .language-#{lang}}"
@@ -251,13 +259,47 @@ HTMLSTRING
     str
   end
 
-  def code_string str
+  def code_string(str)
     code_begin + "\n" + str + code_end
   end
 
-  def include_code name
+  def include_code(name)
     filename = Dir.pwd + "/content/content/topics/scripts/" + name
     filecontents = File.new(filename).read
     code_string filecontents
   end
+
+  def postit_begin title
+    "<div class=\"postit\">" + "<h5>" + title + "</h5>"
+  end
+
+  def postit_end
+    "</div>"
+  end
+
+  def ul_begin
+    "<ul>"
+  end
+
+  def ul_end
+    "</ul>"
+  end
+
+  def ul body
+    "<ul>#{body}</ul>"
+  end
+
+  def list_items *items
+    items.reduce("") do |s, i|
+      if i.start_with?("<ul>")
+        s + i
+      else
+        s + "<li>" + i + "</li>"
+      end
+    end
+  end
+
+  def lab_note(title)
+    "<h5 style=\"font-family:cursive; font-weight:bold; font-szie:18px; color: red;\">#{title}</h5>"
+  end
 end

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

@@ -9,6 +9,7 @@ module ListOfHelpers
   #     :number
   #     :title
   #     :homeworks
+  #     :assigned
 
   def list_of(source:, rows:, cols:, subsections: [], items:)
     markup_adaptor = BootstrapMarkup.new