coursegen 0.9.21 → 0.9.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b56c0b807e916341052ecd96905c1bc871865fee63f7c71815fcf9d7814d27b
-  data.tar.gz: 39f5a5c2f4dbd30a4e0c68c55d02e39dfa53fadaa22a468211fdb44a95216086
+  metadata.gz: d88ff591a425c369dbafa9d37f22cb535b3292414a2e02ec8de568b9abf6139d
+  data.tar.gz: c3192a4a0e560c12803e281336360c87b4d6b462bbb67967204d2ba18ad8ba23
 SHA512:
-  metadata.gz: 251bdf602d00a8cc6ad043768148ccf30fdc7a47b27c22050d2f014ce3c9b61736d4fb2ba1c990e485f33b9eb6ee28041ffe59edb971e87996fdb202e575999b
-  data.tar.gz: 17bf9af7c79f545d474b4f7b11e7145ed8ada2547443e387d25e04df860d94e501b275429f4301ef02458c53c0566eb1e1e076f81de2f3b8a407fc530a8dcffd
+  metadata.gz: dfbea249b45166567c595fe8882b4e9e9a748ca1d8d48eb19e26bd02b96f80d9b4bf65e74c0820854d0253c2bdf0e4462d2dda1fbac9c9a8270368bb23b5b88d
+  data.tar.gz: ddb8c0339de535890101fe8294c7faa0829a820efb8cb889e33f33a3b4a54c15282762592d57e006518a8b1d17c896bbabce9f4375f66ec0bc19be799a606bdc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    coursegen (0.9.21)
+    coursegen (0.9.24)
       activesupport
       adsf
       byebug
@@ -80,6 +80,7 @@ GEM
     lumberjack (1.2.8)
     memo_wise (1.5.0)
     method_source (1.0.0)
+    mini_portile2 (2.7.1)
     minitest (5.15.0)
     nanoc (4.12.4)
       addressable (~> 2.5)
@@ -119,7 +120,8 @@ GEM
       nanoc-cli (~> 4.11, >= 4.11.14)
       nanoc-core (~> 4.11, >= 4.11.14)
     nenv (0.3.0)
-    nokogiri (1.13.1-x86_64-darwin)
+    nokogiri (1.13.1)
+      mini_portile2 (~> 2.7.0)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -170,7 +172,11 @@ GEM
     zeitwerk (2.5.3)
 
 PLATFORMS
+  arm64-darwin-21
+  arm64-darwin-22
+  arm64-darwin-23
   x86_64-darwin-21
+  x86_64-darwin-22
 
 DEPENDENCIES
   bundler
@@ -179,4 +185,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   2.3.3
+   2.4.10

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

@@ -1,6 +1,5 @@
 # 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
@@ -75,9 +74,9 @@ module ContentHelpers
         <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>
+        <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}. #{style.class}"
@@ -101,7 +100,6 @@ module ContentHelpers
     end
   end
 
-
   def iconbadge1(icon, tooltip)
     %(<img src="/bootstrap/bootstrap-icons-1.0.0/#{icon}.svg" title="#{tooltip}" class="iconbadge">)
   end
@@ -359,11 +357,11 @@ module ContentHelpers
   end
 
   def source_begin(language)
-    "<pre class=\"#{language}\">"
+    "<pre><code class=\"#{language}\">"
   end
 
   def source_end
-    '</pre>'
+    '</code></pre>'
   end
 
   def postit_begin(title)

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

@@ -0,0 +1,21 @@
+class TableMarkupHelper
+  def self.begin properties
+    @th = TableHelper.new(properties)
+    ""
+  end
+
+  def self.headers(labels)
+    @th.headers(*labels.split("\;"))
+    ""
+  end
+
+  def self.row(cells)
+    @th.row(*cells.split("\;"))
+    ""
+  end
+
+  def self.end
+    @th.render
+  end
+end
+

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

@@ -2,39 +2,55 @@ include VisualHelpers
 
 Nanoc::Filter.define(:handle_shortcodes) do |content, _params = {}|
   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 + /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 + /image_random "(\w+)", "(\w+)"/.source)) { "<img src=\"https://picsum.photos/#{$1}/#{$2}.jpg\" /> "}
-      .gsub(Regexp.new(prefix.source + /image_rnd :(\w+), "(.+)", "(.+)"/.source)) { random_image($1, $2, $3) }
-      .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 + /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
+  content
+    .gsub(Regexp.new(prefix.source + /callout :(\w+), "(.+)", "(.+)"/.source)) do
+    callout(Regexp.last_match(2),
+            Regexp.last_match(3), Regexp.last_match(1))
+  end
+    .gsub(Regexp.new(prefix.source + /deliverable (.+)$/.source)) { deliverable(Regexp.last_match(1)) }
+    .gsub(Regexp.new(prefix.source + /discussion "(.+)"/.source)) { discussion_box(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 + /h4 (.+)$/.source), "#### \\1 ")
+    .gsub(Regexp.new(prefix.source + /h5 (.+)$/.source)) { "<h5>#{Regexp.last_match(1)}</h5>" }
+    .gsub(Regexp.new(prefix.source + /image :(\w+)$/.source)) { "<img src=\"/content/topics/images/#{Regexp.last_match(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/#{Regexp.last_match(2)}.jpg\" class=\"img-thumbnail d-block mx-auto\" style=\"height:#{Regexp.last_match(1)}px;\"/>" }
+    .gsub(Regexp.new(prefix.source + /quote (.+)$/.source), "<blockquote class=\"pretty\">\\1</blockquote>")
+    .gsub(Regexp.new(prefix.source + /lecture_end/.source), end_of_lecture)
+    .gsub(Regexp.new(prefix.source + /li (.+)$/.source)) { "<li>#{Regexp.last_match(1)}</li>" }
+    .gsub(Regexp.new(prefix.source + /partbadge/.source), partbadge)
+    .gsub(Regexp.new(prefix.source + /pdfbadge/.source), pdfbadge)
+    .gsub(Regexp.new(prefix.source + /image_random "(\w+)", "(\w+)"/.source)) { "<img src=\"https://picsum.photos/#{Regexp.last_match(1)}/#{Regexp.last_match(2)}.jpg\" /> "}
+    .gsub(Regexp.new(prefix.source + /image_rnd :(\w+), "(.+)", "(.+)"/.source)) do
+    random_image(Regexp.last_match(1),
+                 Regexp.last_match(2), Regexp.last_match(3))
+  end
+    .gsub(Regexp.new(prefix.source + /section_link :(\w+), :(\w+)/.source)) do
+    link_to_section(Regexp.last_match(1),
+                    Regexp.last_match(2))
+  end
+    .gsub(Regexp.new(prefix.source + /section_include :(\w+), :(\w+)/.source)) do
+    include_from_section(Regexp.last_match(1),
+                         Regexp.last_match(2))
+  end
+    .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-" + Regexp.last_match(1)) }
+    .gsub(Regexp.new(prefix.source + /source_end/.source), source_end)
+    .gsub(Regexp.new(prefix.source + /team_deliverable (.+)$/.source)) { team_deliverable(Regexp.last_match(1)) }
+    .gsub(Regexp.new(prefix.source + /teambadge/.source), teambadge)
+    .gsub(Regexp.new(prefix.source + /topic_include :(\w+)$/.source)) { include_topic(Regexp.last_match(1)) }
+    .gsub(Regexp.new(prefix.source + /topic_link :(\w+)/.source)) { link_to_topic(Regexp.last_match(1)) }
+    .gsub(Regexp.new(prefix.source + /ul_begin :(\w+)/.source)) { "<ul class=\"#{Regexp.last_match(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)) { %(<iframe width="560" height="315" src="#{Regexp.last_match(1)}"></iframe>) }
+    .gsub(Regexp.new(prefix.source + /zipbadge/.source), zipbadge)
+    .gsub(Regexp.new(prefix.source + /tbegin "(.+)"$/.source)) { TableMarkupHelper.begin(Regexp.last_match(1));}
+    .gsub(Regexp.new(prefix.source + /thead "(.+)"$/.source)) {TableMarkupHelper.headers(Regexp.last_match(1));}
+    .gsub(Regexp.new(prefix.source + /trow "(.+)"$/.source)) {TableMarkupHelper.row(Regexp.last_match(1));}
+    .gsub(Regexp.new(prefix.source + /tend/.source)) { TableMarkupHelper.end ;}
+end

data/lib/coursegen/version.rb

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

data/lib/coursegen.rb

@@ -12,6 +12,7 @@ require 'coursegen/course/helpers/list_of_helpers'
 require 'coursegen/course/helpers/formatting_helpers'
 require 'coursegen/course/helpers/bootstrap_markup'
 require 'coursegen/course/helpers/table_helpers'
+require 'coursegen/course/helpers/table_markup_helper'
 require 'coursegen/course/helpers/navigation_helpers'
 require 'coursegen/course/data/section'
 require 'coursegen/course/data/toc'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coursegen
 version: !ruby/object:Gem::Version
-  version: 0.9.21
+  version: 0.9.24
 platform: ruby
 authors:
 - Pito Salas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-02 00:00:00.000000000 Z
+date: 2023-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -284,6 +284,7 @@ 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/table_markup_helper.rb
 - lib/coursegen/course/helpers/visual_helpers.rb
 - lib/coursegen/course/lib/helpers_.rb
 - lib/coursegen/course/lib/ical_adaptor.rb
@@ -366,7 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Use Nanoc to build courses and deploy them to S3