coursegen 0.3.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b322dd02a98ca5645c7d05ccf2719621d839e81
-  data.tar.gz: 483636c23919921450427154eb2e1e024381fc97
+  metadata.gz: 4aa75e9754a6ce6c2062f4c37aab0846397a9412
+  data.tar.gz: 634163b939293459d18e57444f41919b3317d277
 SHA512:
-  metadata.gz: 019dbe06a5ea815dd3bbca53a0c8308bfd2465dffff50c9b29da8caedfdd710c3c211441531e31562c4037058e65078cadda60c1e1d979047b7e2fec8a417698
-  data.tar.gz: 4054045714a2daf7044cf0f4e67f988cd3b536abbf234f36883536ad33d00bac758ff9df106fa964d71d2dd6f26f0782493a3d9d3be02e6a4d6539791c5691aa
+  metadata.gz: 10a00235c1a6e719df5ddf44006d46c1df8f2979151a3b0cf8a48ef97c0e726db41b62a4e1ea619133db69854f2a55c94189aa9dec2bfd4e1aa0429d6dabc639
+  data.tar.gz: b7eb6b5220879501cc8996d40c7ac960d1e5d9a41734090fe90831409090d90b51424ea141a4b537e2ac023a43c4c50dd322184f2d80313d82b6178bfbbe519d

data/.gitignore

@@ -1,3 +1,4 @@
 pkg/*
 *.gem
-.idea/*
+.idea/*
+*.log

data/Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    coursegen (0.3.0)
+    coursegen (0.4.2)
       activesupport
       adsf
+      byebug
       cri
       guard
       guard-shell
       icalendar
       kramdown
-      nanoc (~> 4.0.0rc2)
+      nanoc
       nokogiri
-      pry-byebug
       rubytree
       thor
       tzinfo
@@ -19,26 +19,25 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.4)
+    activesupport (5.1.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    adsf (1.2.0)
+    adsf (1.2.1)
       rack (>= 1.0.0)
-    byebug (5.0.0)
-      columnize (= 0.9.0)
-    coderay (1.1.0)
+    byebug (9.0.6)
+    coderay (1.1.1)
     colored (1.2)
-    columnize (0.9.0)
-    cri (2.7.0)
+    concurrent-ruby (1.0.5)
+    cri (2.9.1)
       colored (~> 1.2)
-    ffi (1.9.10)
+    ddplugin (1.0.1)
+    ffi (1.9.18)
     formatador (0.2.5)
-    guard (2.13.0)
+    guard (2.14.1)
       formatador (>= 0.2.4)
-      listen (>= 2.7, <= 4.0)
+      listen (>= 2.7, < 4.0)
       lumberjack (~> 1.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
@@ -49,46 +48,51 @@ GEM
     guard-shell (0.7.1)
       guard (>= 2.0.0)
       guard-compat (~> 1.0)
-    i18n (0.7.0)
-    icalendar (2.3.0)
-    json (1.8.3)
-    kramdown (1.8.0)
-    listen (3.0.3)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.9)
+    hamster (3.0.0)
+      concurrent-ruby (~> 1.0)
+    i18n (0.8.6)
+    icalendar (2.4.1)
+    json (1.8.6)
+    kramdown (1.14.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.8.2)
-    mini_portile (0.6.2)
-    minitest (5.8.0)
-    nanoc (4.0.0rc2)
-      cri (~> 2.3)
-    nenv (0.2.0)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    notiffany (0.0.7)
+    mini_portile2 (2.2.0)
+    minitest (5.10.3)
+    nanoc (4.8.2)
+      cri (~> 2.8)
+      ddplugin (~> 1.0)
+      hamster (~> 3.0)
+      ref (~> 2.0)
+    nenv (0.3.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    pry (0.10.1)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.2.0)
-      byebug (~> 5.0)
-      pry (~> 0.10)
-    rack (1.6.4)
-    rake (10.4.2)
-    rb-fsevent (0.9.5)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    rubytree (0.9.6)
+    rack (2.0.3)
+    rake (11.3.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    ref (2.0.0)
+    ruby_dep (1.5.0)
+    rubytree (0.9.7)
       json (~> 1.8)
       structured_warnings (~> 0.2)
     shellany (0.0.1)
     slop (3.6.0)
-    structured_warnings (0.2.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    structured_warnings (0.3.0)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -100,4 +104,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   1.10.5
+   1.15.3

data/coursegen.gemspec

@@ -21,12 +21,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
 
-
-  spec.add_dependency "nanoc", '~> 4.0.0rc2'
+  spec.add_dependency "nanoc"
   spec.add_dependency "thor"
   spec.add_dependency "rubytree"
   spec.add_dependency "cri"
-  spec.add_dependency "pry-byebug"
   spec.add_dependency "nokogiri"
   spec.add_dependency "activesupport"
   spec.add_dependency "kramdown"
@@ -35,4 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "guard-shell"
   spec.add_dependency "tzinfo"
   spec.add_dependency "icalendar"
+  spec.add_dependency "byebug"
 end

data/deleteme.rb

@@ -0,0 +1,2 @@
+classs ViewGen
+      de

data/lib/coursegen/cli.rb

@@ -1,7 +1,7 @@
 require 'thor'
 require 'coursegen/templates'
 require 'nanoc'
-require './cg_config.rb' if File.exists? 'cg_config.rb'
+require './cg_config.rb' if File.exist? 'cg_config.rb'
 
 module CourseGen
   class CLI < Thor
@@ -47,9 +47,11 @@ module CourseGen
 
     no_commands do
       def check_valid_directory
-        CourseGen::Templates.new.valid_cg_directory? ? 
-          say("Valid cg directory") :
+        if CourseGen::Templates.new.valid_cg_directory?
+          say("Valid cg directory")
+        else
           error("Invalid cg directory")
+        end
       end
     end
   end

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

@@ -1,23 +1,25 @@
+require 'byebug'
 require 'active_support/inflector'
 
 #
 # Coursegen Item decorates Nanoc Item
 #
 class CItem
-
   attr_reader :order, :section, :subsection, :subsection_citem, :title,
-              :type, :identifier, :short_name, :status, :nitem, :css_class, :homework, :desc
-  attr_accessor :lecture_number, :lecture_date
+              :type, :identifier, :short_name, :status, :nitem, :css_class, :homework, :desc, :cat
+  attr_accessor :lecture_number, :lecture_date, :start_time, :end_time
 
   # Callable with nitem=nil to create a mock
-  def initialize nitem=nil, ident=nil, type=nil, order=nil
+  def initialize(nitem=nil, ident=nil, type=nil, order=nil)
     if !nitem.nil?
-      raise ArgumentError, "invalid CItem contruction" unless ident.nil?
+      # path to create a real citem
+      fail ArgumentError, "invalid CItem contruction" unless ident.nil?
       @nitem = nitem
-      defaults_from_nitem @nitem
+      defaults_from_nitem
       parse_identifier @nitem.identifier
     else
-      raise ArgumentError, "invalid CItem contruction" unless nitem.nil?
+      # path to create a mock citem
+      fail ArgumentError, "invalid CItem contruction" unless nitem.nil?
       @nitem = nil
       @status = nil
       @type = type
@@ -33,15 +35,11 @@ class CItem
     if @nitem.nil?
       false
     else
-      @nitem[:status] == 'hidden' || %w(css min.css js png).include?(@nitem[:extension])
+      @nitem[:status] == 'hidden' || %w(css min.css js pdf png).include?(@nitem[:extension])
     end
   end
 
-  def path
-    @nitem.path
-  end
-
-  def is_lecture?
+  def lecture?
     !@lecture_date.nil?
   end
 
@@ -54,26 +52,26 @@ class CItem
   end
 
   def schedule_start_date_time
-    if !@lecture_date.nil?
-      schedule = Toc.instance.section(@section).schedule
-      lecture_date + schedule.start_time
-    end
+    return if @lecture_date.nil?
+    # schedule = Toc.instance.section(@section).schedule
+    # lecture_date + schedule.start_time
+    lecture_date + @start_time
   end
 
   def schedule_end_date_time
-    if !@lecture_date.nil?
-      schedule = Toc.instance.section(@section).schedule
-      lecture_date + schedule.end_time
-    end
+    return if @lecture_date.nil?
+    # schedule = Toc.instance.section(@section).schedule
+    # lecture_date + schedule.end_time
+    lecture_date + @end_time
   end
 
   def lecture_number_s
-    "#{@section.singularize} #{@lecture_number.to_s}"
+    "#{@section.singularize} #{@lecture_number}"
   end
 
   private
 
-  def defaults_from_nitem(nitem)
+  def defaults_from_nitem
     @type = @nitem[:type] || 'page'
     fail ArgumentError, 'Invalid page type' unless ["page", "subsection"].include? @type
 
@@ -86,21 +84,22 @@ class CItem
     @css_class = @nitem[:css_class]
     @homework = @nitem[:homework]
     @desc = @nitem[:desc]
+    @cat = @nitem[:cat]
   end
 
-  def parse_identifier ident
+  def parse_identifier(ident)
     parts = ident.to_s.split("/")
     @section ||= parts[2]
-    #parsed_title = parts[-1].match(/^((\d*)_)?([^\/]*)$/)
+    # parsed_title = parts[-1].match(/^((\d*)_)?([^\/]*)$/)
     parsed_title = parts[-1].match(/^((\d*)_)?(\w*)/)
-    raise RuntimeError, "Invalid item title" if parsed_title.nil?
+    fail "Invalid item title" if parsed_title.nil?
 
     @order ||= parsed_title[2].to_i
     @short_name = parsed_title[3]
     @title ||= short_name
     if @type == "subsection"
       @subsection = "/#{parts[1..-2].join('/')}/"
-#      @subsection = "/#{parts[1..-1].join('/')}/"
+      # @subsection = "/#{parts[1..-1].join('/')}/"
     elsif @type == "page"
       @subsection = "/#{parts[1..-2].join('/')}/"
     end

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

@@ -1,10 +1,12 @@
+# Standard way to access information to be used in a list_of()
 class DataAdaptor
   def initialize(source)
     @section = Toc.instance.section(source)
   end
 
   # column_selector is one of: :number, :date, :title, :homework
-  COL_NAMES = { number: "#", date: "lecture date", title: "title", homework: "homework", desc: "description"}
+  COL_NAMES = {number: "#", date: "lecture date", title: "title",
+                homework: "homework", desc: "description", cat: "category"}
 
   def column_name(column_selector)
     COL_NAMES[column_selector]
@@ -38,6 +40,8 @@ class DataAdaptor
       desc = citem.desc || ""
       hw = citem.homework || ""
       desc + ". HW: " + hw
+    when :cat
+      citem.cat
     else
       "error!"
     end

data/lib/coursegen/course/data/lectures.rb

@@ -1,91 +1,103 @@
 require 'tree'
 
 class Lectures < Section
-	def initialize(sect, citems, schedule=nil, collapsed=false)
-		super sect, citems, collapsed
-		@schedule = schedule || ::Scheduler.new
-		@citems = sort_items
-		build_tree
-	end
+  def initialize(sect, citems, schedule=nil, collapsed=false)
+    super sect, citems, collapsed
+    @schedule = schedule || ::Scheduler.new
+    @citems = sort_items
+    build_tree
+  end
 
-	def has_subsections?
-		true
-	end
+  def has_subsections?
+    true
+  end
 
-	def has_lecture_numbers?
-		true
-	end
+  def has_lecture_numbers?
+    true
+  end
 
-	def schedule
-		@schedule
-	end
+  def schedule
+    @schedule
+  end
 
-	def build_tree
-		lecture_num = 1
-		@root = Tree::TreeNode.new("root", "root")
-		@citems.each do |i|
-			i.lecture_number = lecture_num
-			i.lecture_date = @schedule.event_date_by_index(lecture_num - 1) # Lecture numbers are base 1
-			if i.type == "subsection"
-				@root.add(Tree::TreeNode.new(i.subsection, i))
-			elsif i.type == "page"
-				parent_tree_node = parent_node_of(i)
-				parent_tree_node.add(Tree::TreeNode.new(i.identifier, i))
-				lecture_num += 1
-			else
-				raise ArgumentError, "invalid lecture page type of #{i.type}for #{i.title}"
-			end
-		end
-	end
+  def build_tree
+    lecture_num = 1
+    @root = Tree::TreeNode.new("root", "root")
+    @citems.each do |i|
+      i.lecture_number = lecture_num
+      i.lecture_date = @schedule.event_date_by_index(lecture_num - 1) # Lecture numbers are base 1
+      i.start_time = @schedule.event_start_times[lecture_num - 1]
+      i.end_time = @schedule.event_end_times[lecture_num - 1]
+      if i.type == "subsection"
+        @root.add(Tree::TreeNode.new(i.subsection, i))
+      elsif i.type == "page"
+        parent_tree_node = parent_node_of(i)
+        parent_tree_node.add(Tree::TreeNode.new(i.identifier, i))
+        lecture_num += 1
+      else
+        raise ArgumentError, "invalid lecture page type of #{i.type}for #{i.title}"
+      end
+    end
+  end
 
-	def parent_node_of citem
-		parent_node = @root[citem.subsection]
-		raise  RuntimeError, "Cant find section for item: #{citem.identifier}" if parent_node.nil?
-		parent_node
-	end
+  def parent_node_of citem
+    parent_node = @root[citem.subsection]
+    raise  RuntimeError, "Cant find section for item: #{citem.identifier}" if parent_node.nil?
+    parent_node
+  end
 
-	def treenode_of citem
-		@root.find do
-			|tree_node|
-				if citem.type == "subsection"
-					citem.subsection == tree_node.name
-				else
-					citem.identifier == tree_node.name
-				end
-		end
-	end
+  def treenode_of citem
+    @root.find do |tree_node|
+      if citem.type == "subsection"
+        citem.subsection == tree_node.name
+      else
+        citem.identifier == tree_node.name
+      end
+    end
+  end
 
-	def subsections
-		@root.children
-	end
+  def subsections
+    @root.children
+  end
 
-	def next_for(citem)
-		next_node = treenode_of(citem).next_sibling
-		if !next_node.nil?
-			next_node.content
-		else
-			citem
-		end
-	end
+  def next_for(citem)
+    next_node = treenode_of(citem).next_sibling
+    if !next_node.nil?
+      next_node.content
+    else
+      citem
+    end
+  end
 
-	def previous_for(citem)
-		prev_node = treenode_of(citem).previous_sibling
-		if !prev_node.nil?
-			prev_node.content
-		else
-			citem
-		end
-	end
+  def previous_for(citem)
+    prev_node = treenode_of(citem).previous_sibling
+    if !prev_node.nil?
+      prev_node.content
+    else
+      citem
+    end
+  end
 
-protected
+  protected
+
+# @TODO: once there are skips, this calcluation doesn't work anymore!
+  def get_time(times, lect_num)
+    if times.nil?
+      "0"
+    else
+      times[(lect_num % 3) - 1]
+    end
+  end
 
 #
 # Sort all the items in this section: First by the ordering of the subseciton
 # that the item belongs to, and second by the item's own indicated order.
 #
-	def sort_items
-		new_citems = @citems.sort_by { |i| [ lookup_citem_by_identifier(i.subsection+"index.html").order, ((i.type == "page" ? 100 : 1 ) * i.order) ] }
-		@items = new_citems
-	end
-
+  def sort_items
+    new_citems = @citems.sort_by do |i|
+      [lookup_citem_by_identifier(i.subsection + "index.html").order,
+       ((i.type == "page" ? 100 : 1) * i.order)]
+    end
+    @items = new_citems
+  end
 end

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

@@ -1,60 +1,61 @@
 require 'forwardable'
-require 'pry'
+require 'byebug'
 
 class Section
-	extend Forwardable
-	attr_reader :section
-	def_delegators :@citems, :[], :count, :each, :sort!, :reduce
+  extend Forwardable
+  attr_reader :section
+  def_delegators :@citems, :[], :count, :each, :sort!, :reduce
 
-	def initialize (sect, citems, collapsed)
-		@section = sect
-		@collapsed = collapsed
-		@citems = section_filter(citems)
-		sort_pages
-	end
+  def initialize(sect, citems, collapsed)
+    @section = sect
+    @collapsed = collapsed
+    @citems = section_filter(citems)
+    sort_pages
+  end
 
-	def find_index(citem)
-		@citems.find_index(citem)
-	end
+  def find_index(citem)
+    @citems.find_index(citem)
+  end
 
-	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 RunimeError, "'#{sname}': duplicate referenced in section \"#{@section}\"" if matches.length != 1
-		matches[0]
-	end
+  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}': duplicate referenced in section \"#{@section}\"" if matches.length != 1
+    matches[0]
+  end
 
-	def [](ind)
-		@citems[ind]
-	end
+  def [](ind)
+    @citems[ind]
+  end
 
-	def next_for(citem)
-		index = @citems.find_index(citem)
-		raise ArgumentError, "invalid citem in next_for" if index.nil?
-		new_index = [index, @citems.length-2].min
-		@citems[new_index+1]
-	end
+  def next_for(citem)
+    index = @citems.find_index(citem)
+    raise ArgumentError, "invalid citem in next_for" if index.nil?
+    new_index = [index, @citems.length - 2].min
+    @citems[new_index + 1]
+  end
 
-	def previous_for(citem)
-		index = @citems.find_index(citem)
-		raise ArgumentError, "invalid citem in next_for" if index.nil?
-		new_index = [index, 1].max
-		@citems[new_index-1]
-	end
+  def previous_for(citem)
+    index = @citems.find_index(citem)
+    byebug if index.nil? 
+    raise ArgumentError, "invalid citem in previous_for" if index.nil?
+    new_index = [index, 1].max
+    @citems[new_index - 1]
+  end
 
-	def has_subsections?
-		false
-	end
+  def has_subsections?
+    false
+  end
 
-	def has_lecture_numbers?
-		false
-	end
+  def has_lecture_numbers?
+    false
+  end
 
-	def collapsed?
-		@collapsed
-	end
+  def collapsed?
+    @collapsed
+  end
 
-	protected
+  protected
 
   def lookup_citem_by_identifier identifier
     res = @citems.select { |i| i.identifier.to_s == identifier }
@@ -64,15 +65,14 @@ class Section
   end
 
   # Remove citems that don't belong in this section, or are hidden
-	def section_filter citems
-		filtered_citems = citems.map do
-			|citem|
-  		citem.section == @section && !citem.hidden? ? citem : nil
-  	end
-  	filtered_citems.compact
+  def section_filter citems
+    filtered_citems = citems.map do |citem|
+      citem.section == @section && !citem.hidden? ? citem : nil
+    end
+    filtered_citems.compact
   end
 
-	def sort_pages
-		@citems.sort! { |a,b| a.order <=> b.order } rescue fail "sort_pages in section.rb"
-	end
+  def sort_pages
+    @citems.sort! { |a,b| a.order <=> b.order } rescue fail "sort_pages in section.rb"
+  end
 end