coursegen 0.3.1 → 0.4.2

data/lib/coursegen/course/schedule/scheduler.rb

@@ -1,22 +1,22 @@
-WEEKDAYS = {  sunday: 0,    monday: 1,    tuesday: 2,
-              wednesday: 3, thursday: 4,  friday: 5,  saturday: 6 }
+WEEKDAYS = {sunday: 0, monday: 1, tuesday: 2,
+              wednesday: 3, thursday: 4, friday: 5, saturday: 6}
 
 # Calculate days on which each event occurs, based on the configuration info
 class Scheduler
-  attr_reader :start_time, :end_time
+  attr_reader :start_time, :end_time, :start_times, :end_times, :event_start_times, :event_end_times
 
   def self.add_weeks(the_date, number)
     the_date.to_date + Integer(number) * 7
   end
 
   def setup_from_args(start: nil, weekdays: nil, number: nil, skips: [],
-                      start_time: 0, end_time: 0)
+                      start_time: 0, end_time: 0, start_times: [], end_times: [])
     if start.nil?
       @start = nil
       return
     end
     convert_and_verify_arguments(start, weekdays, number,
-                                 skips, start_time, end_time)
+                                 skips, start_time, end_time, start_times, end_times)
     @weekdays.sort!
     recalc_event_map
   end
@@ -27,7 +27,7 @@ class Scheduler
       return
     end
     setup_from_args(start: sdef.first_day, weekdays: sdef.weekdays,
-                    number: sdef.number, skips: sdef.skips, start_time: sdef.start_time, end_time: sdef.end_time)
+                    number: sdef.number, skips: sdef.skips, start_time: sdef.start_time, end_time: sdef.end_time, start_times: sdef.start_times, end_times: sdef.end_times)
   end
 
   def event_date_by_index(ind)
@@ -43,18 +43,23 @@ class Scheduler
   def recalc_event_map
     return if self.null?
     @event_dates = []
+    @event_start_times = []
+    @event_end_times = []
     wkdy_of_start = @start_date.cwday
     wkday_index = @weekdays.find_index(wkdy_of_start)
     curr_event_date = @start_date
-    @number.times do
-      |i|
-      @event_dates << curr_event_date unless @skips.include? curr_event_date
+    @number.times do |i|
+      unless @skips.include? curr_event_date
+        @event_dates << curr_event_date
+        @event_start_times << @start_times[wkday_index]
+        @event_end_times << @end_times[wkday_index]
+      end
       if @weekdays.length == 1
         curr_event_date += 7
-      elsif wkday_index < @weekdays.length-1
+      elsif wkday_index < @weekdays.length - 1
         wkday_index += 1
-        curr_event_date += @weekdays[wkday_index] - @weekdays[wkday_index-1]
-      elsif wkday_index == @weekdays.length-1
+        curr_event_date += @weekdays[wkday_index] - @weekdays[wkday_index - 1]
+      elsif wkday_index == @weekdays.length - 1
         wkday_index = 0 # wrap
         curr_event_date += 7 + @weekdays.first - @weekdays.last
       end
@@ -62,7 +67,7 @@ class Scheduler
   end
 
   def convert_and_verify_arguments(start, weekdays, number, skips,
-                                   start_time, end_time)
+                                   start_time, end_time, start_times, end_times)
     @number = number + skips.length
     @start_date = string_to_date(start)
     @skips = skips.map { |d| string_to_date(d) } rescue raise(ArgumentError, "Scheduler: Invalid skip date")
@@ -75,6 +80,8 @@ class Scheduler
 
     @start_time = time_span_to_seconds(start_time)
     @end_time = time_span_to_seconds(end_time)
+    @start_times = start_times.map { |x| time_span_to_seconds(x)}
+    @end_times = end_times.map { |x| time_span_to_seconds(x)}
   end
 
   def string_to_date(string_date)

data/lib/coursegen/version.rb

@@ -1,3 +1,3 @@
 module Coursegen
-  VERSION = "0.3.1"
+  VERSION = "0.4.2"
 end

data/lib/coursegen.rb

@@ -1,16 +1,16 @@
 require 'nokogiri'
 
-require "coursegen/version"
-require "coursegen/course/helpers/sidebar_helpers"
-require "coursegen/course/helpers/lecture_helpers"
-require "coursegen/course/helpers/content_helpers"
-require "coursegen/course/helpers/logging_helpers"
-require "coursegen/course/helpers/list_of_helpers"
+require 'coursegen/version'
+require 'coursegen/course/helpers/sidebar_helpers'
+require 'coursegen/course/helpers/lecture_helpers'
+require 'coursegen/course/helpers/content_helpers'
+require 'coursegen/course/helpers/logging_helpers'
+require 'coursegen/course/helpers/list_of_helpers'
 require 'coursegen/course/helpers/bootstrap_markup'
 require 'coursegen/course/helpers/table_helpers'
-require "coursegen/course/helpers/navigation_helpers"
-require "coursegen/course/data/section"
-require "coursegen/course/data/toc"
+require 'coursegen/course/helpers/navigation_helpers'
+require 'coursegen/course/data/section'
+require 'coursegen/course/data/toc'
 require 'coursegen/course/data/citem'
 require 'coursegen/course/schedule/schedule_def'
 require 'coursegen/course/data/section_def'
@@ -24,6 +24,7 @@ require 'coursegen/course/helpers/list_of'
 require 'coursegen/course/helpers/ical_feed_helpers'
 require 'coursegen/course/lib/helpers_'
 
+
 module Coursegen
   # Your code goes here...
 end

data/spec/play_spec.rb

@@ -1,23 +1,19 @@
 require_relative "./spec_helper.rb"
 describe "Does it work?" do
-	before do
-		@abc = 1
-	mocks1_templates =
-		[["/lectures/intro/wonders/", "subsection", 0],
-			["/lectures/intro/wonders/page2/", "page", 1],
-			["/lectures/intro/wonders/page3/", "page", 2],
-		 ["/lectures/intro/wonder2/", "subsection", 1],
-			["/lectures/intro/wonder2/page22/", "page", 1],
-			["/lectures/intro/wonder2/page32/", "page",2 ]
-		]
-		binding.pry
-	@citems1 = mocks1_templates.map { |i, t, o| CItem.new(nil, i, t, o) }
-	@sect = Lectures.new "intro", @citems1
-	end
+  before do
+    @abc = 1
+    mocks1_templates =
+      [["/lectures/intro/wonders/", "subsection", 0],
+      ["/lectures/intro/wonders/page2/", "page", 1],
+      ["/lectures/intro/wonders/page3/", "page", 2],
+      ["/lectures/intro/wonder2/", "subsection", 1],
+      ["/lectures/intro/wonder2/page22/", "page", 1],
+      ["/lectures/intro/wonder2/page32/", "page", 2]]
+    @citems1 = mocks1_templates.map { |i, t, o| CItem.new(nil, i, t, o) }
+    @sect = Lectures.new "intro", @citems1
+  end
 
-
-	it "correctly counts subsections" do
-		binding.pry
-		expect (@abc).to eq 1
-	end
+  it "correctly counts subsections" do
+    expect (@abc).to eq 1
+  end
 end

data/spec/scheduler_spec.rb

@@ -7,75 +7,71 @@ def s2d(string_date)
 end
 
 describe Scheduler do
-	let(:sched) {Scheduler.new}
-	let(:target_date) {"nov-25-2013"}
-	let(:target_date_bin) { s2d(target_date) }
+  let(:sched) {Scheduler.new}
+  let(:target_date) {"nov-25-2013"}
+  let(:target_date_bin) { s2d(target_date) }
 
-	describe "Single day scheduler"	do
-		it "knows date for first event" do
-			sched.setup_from_args(start: target_date, weekdays: [:monday], number: 1)
-			a_date = sched.event_date_by_index 0
-			expect(a_date).to eq target_date_bin
-		end
+  describe "Single day scheduler"  do
+    it "knows date for first event" do
+      sched.setup_from_args(start: target_date, weekdays: [:monday], number: 1)
+      a_date = sched.event_date_by_index 0
+      expect(a_date).to eq target_date_bin
+    end
 
-		it "knows date for second event" do
-			sched.setup_from_args(start: target_date, weekdays: [:monday] ,number: 2)
-			a_date = sched.event_date_by_index 1
-			expect(a_date).to eq target_date_bin + 7
-		end
-	end
+    it "knows date for second event" do
+      sched.setup_from_args(start: target_date, weekdays: [:monday], number: 2)
+      a_date = sched.event_date_by_index 1
+      expect(a_date).to eq target_date_bin + 7
+    end
+  end
 
-	describe "Double day scheduler" do
-		it "knows date for first event" do
-			sched.setup_from_args(start: target_date, weekdays: [:monday, :tuesday] ,number: 1)
-			a_date = sched.event_date_by_index 0
-			expect(a_date).to eq target_date_bin
-		end
+  describe "Double day scheduler" do
+    it "knows date for first event" do
+      sched.setup_from_args(start: target_date, weekdays: [:monday, :tuesday], number: 1)
+      a_date = sched.event_date_by_index 0
+      expect(a_date).to eq target_date_bin
+    end
 
-		it "knows date for second event" do
-			sched.setup_from_args(start: target_date, weekdays: [:monday, :tuesday] ,number: 2)
-			a_date = sched.event_date_by_index 1
-			expect(a_date).to eq target_date_bin + 1
-		end
+    it "knows date for second event" do
+      sched.setup_from_args(start: target_date, weekdays: [:monday, :tuesday], number: 2)
+      a_date = sched.event_date_by_index 1
+      expect(a_date).to eq target_date_bin + 1
+    end
 
-		it "knows date for third event" do
-			sched.setup_from_args(start: target_date, weekdays: [:monday, :tuesday] ,number: 3)
-			a_date = sched.event_date_by_index 2
-			expect(a_date).to eq target_date_bin + 7
-		end
+    it "knows date for third event" do
+      sched.setup_from_args(start: target_date, weekdays: [:monday, :tuesday], number: 3)
+      a_date = sched.event_date_by_index 2
+      expect(a_date).to eq target_date_bin + 7
+    end
 
-		it "knows date for fourth event" do
-			sched.setup_from_args(start: target_date, weekdays: [:monday, :tuesday] ,number: 4)
-			a_date = sched.event_date_by_index 3
-			expect(a_date).to eq target_date_bin + 7 + 1
-		end
-	end
+    it "knows date for fourth event" do
+      sched.setup_from_args(start: target_date, weekdays: [:monday, :tuesday], number: 4)
+      a_date = sched.event_date_by_index 3
+      expect(a_date).to eq target_date_bin + 7 + 1
+    end
+  end
 
-	describe "Tripple day scheduler" do
-		it "knows date for first event" do
-			sched.setup_from_args(start: target_date, weekdays: [:monday, :wednesday, :friday], number: 1)
-			a_date = sched.event_date_by_index 0
-			expect(a_date).to eq target_date_bin
-		end
-		it "knows date for second event" do
-			sched.setup_from_args(start: target_date, weekdays: [:monday, :wednesday, :friday], number: 2)
-			a_date = sched.event_date_by_index 1
-			expect(a_date).to eq target_date_bin + 2
-		end
+  describe "Tripple day scheduler" do
+    it "knows date for first event" do
+      sched.setup_from_args(start: target_date, weekdays: [:monday, :wednesday, :friday], number: 1)
+      a_date = sched.event_date_by_index 0
+      expect(a_date).to eq target_date_bin
+    end
+    it "knows date for second event" do
+      sched.setup_from_args(start: target_date, weekdays: [:monday, :wednesday, :friday], number: 2)
+      a_date = sched.event_date_by_index 1
+      expect(a_date).to eq target_date_bin + 2
+    end
 
-		it "knows date for third event" do
-			sched.setup_from_args(start: target_date, weekdays: [:monday, :wednesday, :friday], number: 3)
-			a_date = sched.event_date_by_index 2
-			expect(a_date).to eq target_date_bin + 4
-		end
-		it "knows date for fourth event" do
-			sched.setup_from_args(start: target_date, weekdays: [:monday, :wednesday, :friday], number: 4)
-			a_date = sched.event_date_by_index 3
-			expect(a_date).to eq target_date_bin + 7
-		end
-
-
-	end
+    it "knows date for third event" do
+      sched.setup_from_args(start: target_date, weekdays: [:monday, :wednesday, :friday], number: 3)
+      a_date = sched.event_date_by_index 2
+      expect(a_date).to eq target_date_bin + 4
+    end
+    it "knows date for fourth event" do
+      sched.setup_from_args(start: target_date, weekdays: [:monday, :wednesday, :friday], number: 4)
+      a_date = sched.event_date_by_index 3
+      expect(a_date).to eq target_date_bin + 7
+    end
+  end
 end
-
-

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'rspec'
-require 'pry-byebug'
+require 'byebug'
 require './lib/coursegen/course/data/section'
 require './lib/coursegen/course/data/toc'
 require './lib/coursegen/course/data/lectures'

data/spec/toc_spec.rb

@@ -1,86 +1,84 @@
 require_relative "./spec_helper.rb"
 
 class MockItem
-	attr_accessor :identifier, :attributes
-	def initialize name, att = {}
-		@attributes = { :section => "lectures" }.merge(att)
-		@identifier = name
-	end
+  attr_accessor :identifier, :attributes
+  def initialize name, att = {}
+    @attributes = {section: "lectures"}.merge(att)
+    @identifier = name
+  end
 
-	def [](index)
-		@attributes[index]
-	end
+  def [](index)
+    @attributes[index]
+  end
 
-	def self.gen (names)
-		items = []
-		order = [5,2,12,4,8,3,1,6]
-		names.each { |nm| items << MockItem.new(nm, {order: order.pop}) }
-		items
-	end
+  def self.gen(names)
+    items = []
+    order = [5, 2, 12, 4, 8, 3, 1, 6]
+    names.each { |nm| items << MockItem.new(nm, {order: order.pop}) }
+    items
+  end
 end
 
 describe Toc do
-	context "simple sections" do
-		let(:items) {
-				MockItem.gen(
-				 		%w(/content/lectures/hypotheses/ 
-				 			/content/lectures/ideation/
-				 			/content/lectures/lean_immersion/welcome/
-				 			/content/lectures/lean_startup/) ) }
+  context "simple sections" do
+    let(:items) do
+      MockItem.gen(
+        %w(/content/lectures/hypotheses/
+               /content/lectures/ideation/
+               /content/lectures/lean_immersion/welcome/
+               /content/lectures/lean_startup/))
+    end
 
-		it "initializes" do
-			toc = Toc.instance
-			toc.reset
-			toc.prepare items, [SectionDef.new("Lectures", "lectures", type: :section)]
-		end
-	end
+    it "initializes" do
+      toc = Toc.instance
+      toc.reset
+      toc.prepare items, [SectionDef.new("Lectures", "lectures", type: :section)]
+    end
+  end
 
-	context "a little more complicated" do
+  context "a little more complicated" do
+    describe "next and previous methods" do
+      let(:items) do
+        MockItem.gen(%w(/content/lectures/a/
+                        /content/lectures/b/
+                        /content/lectures/c/
+                        /content/lectures/d/))
+      end
 
-		describe "next and previous methods" do
-			let(:items) {
-				MockItem.gen(%w(/content/lectures/a/ 
-												/content/lectures/b/ 
-												/content/lectures/c/
-												/content/lectures/d/) )
-			}
+      before(:each) do
+        @toc = Toc.instance
+        @toc.reset
+        @toc.prepare items, [SectionDef.new("Lectures", "lectures", type: :section)]
+      end
 
-			before (:each) do 
-				@toc = Toc.instance
-				@toc.reset
-				@toc.prepare items, [SectionDef.new("Lectures", "lectures", type: :section)]
-			end
+      it "next" do
+        sect = @toc.section("lectures")
+        cprev = sect[1]
+        c_plus_one = @toc.find_next_for(cprev)
+        expect(c_plus_one.title).to eq sect[2].title
+      end
 
-			it "next" do
-				sect = @toc.section("lectures")
-				cprev = sect[1]
-				c_plus_one = @toc.find_next_for(cprev)
-				expect(c_plus_one.title).to eq sect[2].title
-			end
+      it "prev" do
+        sect = @toc.section("lectures")
+        cprev = sect[2]
+        c_plus_one = @toc.find_previous_for(cprev)
+        expect(c_plus_one.title).to eq sect[1].title
+      end
+    end
+  end
 
-			it "prev"  do
-				sect = @toc.section("lectures")
-				cprev = sect[2]
-				c_plus_one = @toc.find_previous_for(cprev)
-				expect(c_plus_one.title).to eq sect[1].title
-			end
-		end
-	end
+  context "lookup and access methods" do
+    let(:items) do
+      MockItem.gen(%w(/content/lectures/a/
+                      /content/lectures/b/
+                      /content/lectures/c/
+                      /content/lectures/d/))
+    end
 
-	context "lookup and access methods" do
-		let(:items) {
-			MockItem.gen(%w(/content/lectures/a/
-											/content/lectures/b/ 
-											/content/lectures/c/
-											/content/lectures/d/) )
-		}
-
-		before (:each) do 
-			@toc = Toc.instance
-			@toc.reset
-			@toc.prepare items, [SectionDef.new("Lectures", "lectures", type: :section)]
-		end
-
-
-	end
-end
+    before(:each) do
+      @toc = Toc.instance
+      @toc.reset
+      @toc.prepare items, [SectionDef.new("Lectures", "lectures", type: :section)]
+    end
+  end
+end

data/tech_debt.md

@@ -8,6 +8,3 @@
 * Clean up the placement of the .js files for the search stuff. It's a bit messy
 
 ### Features
-
-* Add a macro for <%= link_to_next_lecture %>
-* Add a way to automatically generate a list of homeworks on a single page

data/templates/Guardfile

@@ -2,8 +2,8 @@
 #   watch(%r{file/path}) { `command(s)` }
 #
 guard :shell do
-  clearing :on
-  directories %w(. /mydev/cg-topics)
+   clearing :on
+   directories %w(. /mydev/cg-topics)
   watch(/.erb/) { |m| `cg compile` }
   watch(/(cg_config.rb|Rules)/) { |m| `cg reset; cg compile`}
 end

data/templates/body_footer.html

@@ -0,0 +1,8 @@
+<div class="container">
+  <div class="row">
+    <div class="col-xs-12">
+      <footer><%= COPYRIGHT_STRING %></footer>
+      </div>
+  </div>
+</div>
+

data/templates/body_header.html.erb

@@ -0,0 +1,6 @@
+<h3 class="body-header">
+	<%= citem.title %>
+	<% if citem.lecture? %>
+		<small class="pull-right">(<%= citem.lecture_date_s %>, <%= citem.lecture_number_s.to_s %>)</small>
+	<% end %>
+</h3>

data/templates/cg_config.rb

@@ -9,13 +9,14 @@ COURSE_LONG_NAME = "Sample Coursegen Course"
 COURSE_ABBREV = "SC"
 
 LECTURES_SCHEDULE_CONFIG = ScheduleDef.new(
-		first_day: "aug-11-2015",
-		weekdays: [:tuesday, :friday],
-		number: 26,
-		skips: [],
-		start_time: "15:00",
-		end_time: "16:20")
-
+  first_day: "jan-17-2017",
+  weekdays: [:tuesday, :wednesday, :thursday],
+  start_times: ["15:30", "14:00", "15:30"],
+  end_times: ["16:50", "16:00", "16:50"],
+  number: 39,
+  start_time: "15:30",
+  end_time: "16:50",
+  skips: ["feb-9-2017", "feb-21-2017", "feb-22-2017", "feb-23-2017", "apr-11-2017", "apr-12-2017", "apr-13-2017", "apr-18-2017", "apr-19-2017"])
 
 # Sections in the right hand margin of the page
 SECTION_CONFIG = [

data/templates/content/bootstrap/css/custom.css

@@ -1,19 +1,24 @@
 @import url(//fonts.googleapis.com/css?family=Telex);
 
-.navbar-inverse {
-	background-color: black;
+.themefg {
+  color: rgb(47, 86, 111);
 }
 
-.navbar a.navbar-brand {
+.themebg {
+  background-color: rgb(47, 86, 111);
+}
+
+.navbar a.navbar-title {
 	color: white;
 	padding-top: 7px;
 }
- 
+
 .navbar {
 	min-height: 35px;
 	margin-bottom: 1px;
 }
 
+
 .navbar a:hover {
 	color: white;
 }
@@ -23,6 +28,13 @@
 	color: light-blue;
 }
 
+.navbar-title {
+  float: left;
+  height: 30px;
+  font-size: 18px;
+  line-height: 20px
+}
+
 .navbar .input-group-sm input{
 	height: 22px;
 	width: 150px;
@@ -38,6 +50,10 @@ h3 {
 	margin-bottom: 15px;
 }
 
+h3.body-header {
+  margin-bottom: -5px;
+}
+
 h4 {
 	margin-top: 20px;
 	border-top: gainsboro solid 1px;
@@ -98,7 +114,7 @@ footer {
 }
 
 .glyphicon-small {
-    font-size: 10px; 
+    font-size: 10px;
 }
 
 /* Search Page */
@@ -178,8 +194,10 @@ div.tipue_search_content_loc a {
 	background-color: #f3f3f3;
 }
 
-
-
+.helpful
+{
+  visibility: hidden;
+}
 
 @media (max-width: 980px) {
 
@@ -190,4 +208,3 @@ div.tipue_search_content_loc a {
 	  padding-right: 5px;
 	}
 }
-

data/templates/content/content/intro/course_toc.md.erb

@@ -1,4 +1,4 @@
 ---
 title: List of lectures
 ---
-<%= list_of(source: "lectures", rows: ["subsection","page"], cols: [:number, :date, :title, :desc, :homework]) %>
+<%= list_of(source: "lectures", rows: ["subsection","page"], cols: [:number, :date, :title, :desc, :homework], items: @items) %>