coursegen 0.1.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7767efe0f0922d4233f551ebb90445600cd83657
-  data.tar.gz: 9696951cb26d33b6b0e2e4b28d920a61791470f9
+  metadata.gz: 9b322dd02a98ca5645c7d05ccf2719621d839e81
+  data.tar.gz: 483636c23919921450427154eb2e1e024381fc97
 SHA512:
-  metadata.gz: a59dd38377282f5891a3cd2d26aec4e4a634946441d7d1638d5fc8361b55a04bd8145e4aafc1428dfabe2d06620ea57eae45b1c6763370565fb0da5eb4438914
-  data.tar.gz: 67a52800d30c4864082aad2d7574c382e506dcfdf2cc19f704586915be3eb8684ef1e0272663f3eee1de59b9d47d4976ec64e10dd3d9d47820e8d8b6804c4779
+  metadata.gz: 019dbe06a5ea815dd3bbca53a0c8308bfd2465dffff50c9b29da8caedfdd710c3c211441531e31562c4037058e65078cadda60c1e1d979047b7e2fec8a417698
+  data.tar.gz: 4054045714a2daf7044cf0f4e67f988cd3b536abbf234f36883536ad33d00bac758ff9df106fa964d71d2dd6f26f0782493a3d9d3be02e6a4d6539791c5691aa

data/Gemfile.lock

@@ -1,80 +1,93 @@
 PATH
   remote: .
   specs:
-    coursegen (0.0.7)
+    coursegen (0.3.0)
       activesupport
       adsf
       cri
       guard
       guard-shell
+      icalendar
       kramdown
-      nanoc
+      nanoc (~> 4.0.0rc2)
       nokogiri
-      pry
+      pry-byebug
       rubytree
       thor
+      tzinfo
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.7)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.4)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     adsf (1.2.0)
       rack (>= 1.0.0)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
+    byebug (5.0.0)
+      columnize (= 0.9.0)
     coderay (1.1.0)
     colored (1.2)
-    cri (2.6.1)
+    columnize (0.9.0)
+    cri (2.7.0)
       colored (~> 1.2)
-    ffi (1.9.6)
+    ffi (1.9.10)
     formatador (0.2.5)
-    guard (2.8.2)
+    guard (2.13.0)
       formatador (>= 0.2.4)
-      listen (~> 2.7)
+      listen (>= 2.7, <= 4.0)
       lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
       pry (>= 0.9.12)
+      shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-shell (0.7.0)
+    guard-compat (1.2.1)
+    guard-shell (0.7.1)
       guard (>= 2.0.0)
-    hitimes (1.2.2)
-    i18n (0.6.11)
-    json (1.8.1)
-    kramdown (1.5.0)
-    listen (2.8.0)
-      celluloid (>= 0.15.2)
+      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)
     method_source (0.8.2)
-    mini_portile (0.6.1)
-    minitest (5.4.3)
-    nanoc (3.7.3)
+    mini_portile (0.6.2)
+    minitest (5.8.0)
+    nanoc (4.0.0rc2)
       cri (~> 2.3)
-    nokogiri (1.6.4.1)
+    nenv (0.2.0)
+    nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
+    notiffany (0.0.7)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.5.2)
-    rake (10.3.2)
-    rb-fsevent (0.9.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.4)
+    rubytree (0.9.6)
       json (~> 1.8)
-      structured_warnings (~> 0.1)
+      structured_warnings (~> 0.2)
+    shellany (0.0.1)
     slop (3.6.0)
-    structured_warnings (0.1.4)
+    structured_warnings (0.2.0)
     thor (0.19.1)
-    thread_safe (0.3.4)
-    timers (4.0.1)
-      hitimes
+    thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -85,3 +98,6 @@ DEPENDENCIES
   bundler
   coursegen!
   rake
+
+BUNDLED WITH
+   1.10.5

data/coursegen.gemspec

@@ -22,16 +22,17 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
 
 
-  spec.add_dependency "nanoc"
+  spec.add_dependency "nanoc", '~> 4.0.0rc2'
   spec.add_dependency "thor"
   spec.add_dependency "rubytree"
   spec.add_dependency "cri"
-  spec.add_dependency "pry"
+  spec.add_dependency "pry-byebug"
   spec.add_dependency "nokogiri"
   spec.add_dependency "activesupport"
   spec.add_dependency "kramdown"
   spec.add_dependency "adsf"
   spec.add_dependency "guard"
   spec.add_dependency "guard-shell"
-
+  spec.add_dependency "tzinfo"
+  spec.add_dependency "icalendar"
 end

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

@@ -11,7 +11,7 @@ class CItem
 
   # Callable with nitem=nil to create a mock
   def initialize nitem=nil, ident=nil, type=nil, order=nil
-    if nitem != nil
+    if !nitem.nil?
       raise ArgumentError, "invalid CItem contruction" unless ident.nil?
       @nitem = nitem
       defaults_from_nitem @nitem
@@ -53,6 +53,20 @@ class CItem
     @lecture_date.strftime('%a %b %-d') unless @lecture_date.nil?
   end
 
+  def schedule_start_date_time
+    if !@lecture_date.nil?
+      schedule = Toc.instance.section(@section).schedule
+      lecture_date + schedule.start_time
+    end
+  end
+
+  def schedule_end_date_time
+    if !@lecture_date.nil?
+      schedule = Toc.instance.section(@section).schedule
+      lecture_date + schedule.end_time
+    end
+  end
+
   def lecture_number_s
     "#{@section.singularize} #{@lecture_number.to_s}"
   end
@@ -75,18 +89,20 @@ class CItem
   end
 
   def parse_identifier ident
-    parts = ident.split("/")
-    @section ||= parts[2] 
-    parsed_title = parts[-1].match(/^((\d*)_)?([^\/]*)$/)
+    parts = ident.to_s.split("/")
+    @section ||= parts[2]
+    #parsed_title = parts[-1].match(/^((\d*)_)?([^\/]*)$/)
+    parsed_title = parts[-1].match(/^((\d*)_)?(\w*)/)
     raise RuntimeError, "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..-1].join('/')}/"
+      @subsection = "/#{parts[1..-2].join('/')}/"
+#      @subsection = "/#{parts[1..-1].join('/')}/"
     elsif @type == "page"
       @subsection = "/#{parts[1..-2].join('/')}/"
-    end 
+    end
   end
 end

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

@@ -30,8 +30,16 @@ class DataAdaptor
       citem.desc
     when :homework
       citem.homework
+    when :start_date_time
+      citem.schedule_start_date_time
+    when :end_date_time
+      citem.schedule_end_date_time
+    when :full_desc
+      desc = citem.desc || ""
+      hw = citem.homework || ""
+      desc + ". HW: " + hw
     else
       "error!"
     end
   end
-end
+end

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

@@ -16,6 +16,10 @@ class Lectures < Section
 		true
 	end
 
+	def schedule
+		@schedule
+	end
+
 	def build_tree
 		lecture_num = 1
 		@root = Tree::TreeNode.new("root", "root")
@@ -23,7 +27,7 @@ class Lectures < Section
 			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)) 
+				@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))
@@ -41,11 +45,11 @@ class Lectures < Section
 	end
 
 	def treenode_of citem
-		@root.find do 
-			|tree_node| 
+		@root.find do
+			|tree_node|
 				if citem.type == "subsection"
 					citem.subsection == tree_node.name
-				else 
+				else
 					citem.identifier == tree_node.name
 				end
 		end
@@ -75,8 +79,13 @@ class Lectures < Section
 
 protected
 
+#
+# 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
-		@citems.sort_by! { |i| [ lookup_citem_by_identifier(i.subsection).order, ((i.type == "page" ? 100 : 1 ) * i.order) ] }
+		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
 
 end

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

@@ -19,8 +19,8 @@ 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 RunimeError, "#{sname}: duplicate referenced in section \"#{@section}\"" if matches.length != 1
+	  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
 
@@ -57,14 +57,15 @@ class Section
 	protected
 
   def lookup_citem_by_identifier identifier
-    res = @citems.select { |i| i.identifier == identifier }
-    raise RuntimeError, "lookup by identifier failed #{identifier}" if res.length != 1
+    res = @citems.select { |i| i.identifier.to_s == identifier }
+    fail "TOC#lookup_citem_by_identifier failed to find: '#{identifier}'"  if res.length != 1
+#		binding.pry if res.length != 1
     res[0]
   end
 
   # Remove citems that don't belong in this section, or are hidden
 	def section_filter citems
-		filtered_citems = citems.map do 
+		filtered_citems = citems.map do
 			|citem|
   		citem.section == @section && !citem.hidden? ? citem : nil
   	end

data/lib/coursegen/course/data/toc.rb

@@ -15,7 +15,7 @@ class Toc
 
   def build_sections items
     @sections = {}
-    @section_config.each do 
+    @section_config.each do
       |sect|
       selector = sect.selector.to_s
       if sect.options[:type] == :lecture
@@ -35,7 +35,7 @@ class Toc
     items.each do
       |nitem|
       citem = CItem.new(nitem)
-      @map_n2c[nitem] = citem
+      @map_n2c[nitem.identifier] = citem
     end
   end
 
@@ -44,11 +44,15 @@ class Toc
   end
 
   def n2c nitem
-    @map_n2c[nitem]
+    @map_n2c[nitem.identifier]
   end
 
   def lookup_citem the_sect, item_short_name
-    section(the_sect).find_by_short_name(item_short_name)
+    section = section(the_sect)
+    raise "Toc.lookup_citem: Unknown section: `#{the_sect}`" if (section.nil?)
+    citem = section.find_by_short_name(item_short_name)
+    raise "Toc.lookup_citem: Unknown short name: `#{item_short_name}`" if citem.nil?
+    return citem
   end
 
   def reset
@@ -57,7 +61,7 @@ class Toc
 
   def section selector
     section = @sections[selector]
-    raise RuntimeError, "Invalid Section: #{selector}" if section.nil?
+    fail "TOC.section: Unknown section: #{selector}" if section.nil?
     section
   end
 
@@ -69,7 +73,7 @@ class Toc
 
 
   def find_next_forn(nitem)
-    p = find_next_for(n2c(nitem)) 
+    p = find_next_for(n2c(nitem))
     fail "find_next_forn" if p.nil?
     p
   end
@@ -108,8 +112,6 @@ class Toc
     end
   end
 
-
-
   def index_in_section item
     section_for(item).find_index(item)
   end

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

@@ -2,18 +2,18 @@ module ContentHelpers
 
   def include_topic item_symbol
       incorporated_topic = lookup_nitem("topics", item_symbol.to_s)
-      Toc.instance.record_inclusion @item, incorporated_topic
-      items[incorporated_topic.identifier].compiled_content
+#      Toc.instance.record_inclusion @item, incorporated_topic
+      items[incorporated_topic.identifier.to_s].compiled_content
   end
 
   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].compiled_content
+    items[incorporated_item.identifier.to_s].compiled_content
   end
 
   def lookup_nitem the_sect, short_name
-      Toc.instance.lookup_citem(the_sect, short_name).nitem
+    citem = Toc.instance.lookup_citem(the_sect, short_name).nitem
   end
 
   def link_to_doc label, file_name

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

@@ -0,0 +1,8 @@
+module ICalFeedHelpers
+  def generate_ical source
+    data_adaptor = DataAdaptor.new(source)
+    ical_adaptor = ICalAdaptor.new()
+    schedule_feed = ScheduleFeed.new(ical_adaptor, data_adaptor)
+    schedule_feed.render
+  end
+end

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

@@ -73,7 +73,8 @@ class ListOf
 
   def cell_content_string(row_id, col_selector, detail:)
     if (col_selector == :title && detail)
-      link_to_unless_current(row_id.nitem[:title], row_id.identifier)
+#      link_to_unless_current(row_id.nitem[:title], row_id.identifier)
+      link_to_unless_current(row_id.nitem[:title], row_id)
     elsif (col_selector == :date)
       @data.cell_value(row_id, col_selector).strftime("%b %-d")
     else
@@ -82,7 +83,7 @@ class ListOf
   end
 
   def include_row?(row_id)
-    include_by_row_type?(row_id) && include_by_subsection_path?(row_id) 
+    include_by_row_type?(row_id) && include_by_subsection_path?(row_id)
   end
 
   def include_by_row_type?(row_id)
@@ -97,4 +98,4 @@ class ListOf
     row_id.type == "subsection"
   end
 
-end
+end

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

@@ -6,7 +6,7 @@ module NavigationHelpers
 
   def link_to_next_lecture
     the_item = Toc.instance.find_next_forn(@item)
-    link_to(the_item.title, the_item.identifier)
+    link_to(the_item.title, the_item)
   end
 
   def link_to_topic item_symbol
@@ -38,8 +38,9 @@ module NavigationHelpers
   end
 
   def link_to_section section_symbol, item_symbol
-  	the_item = lookup_nitem(section_symbol.to_s, item_symbol.to_s)
-		link_to_unless_current(the_item[:title], the_item.identifier)
+	   the_item = lookup_nitem(section_symbol.to_s, item_symbol.to_s)
+		#link_to_unless_current(the_item[:title], the_item.identifier)
+    link_to(the_item[:title], the_item)
 	end
 
 	def link_to_next toc, item

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

@@ -1,4 +1,5 @@
 module SidebarHelpers
+
   def section_helper title:nil, selector:nil
     sect = Toc.instance.section(selector)
     @sect_def = Toc.instance.section_def(selector)
@@ -23,7 +24,7 @@ module SidebarHelpers
     "<ul class=\"tree\">
       <li>
         <label class=\"tree-toggler level2\">
-          #{collapsed_indicator(sect.content.collapsed?)} 
+          #{collapsed_indicator(sect.content.collapsed?)}
           #{sect.content.title}
         </label>
         #{subsection(sect, sect.content.collapsed?)}
@@ -51,7 +52,7 @@ module SidebarHelpers
     disp_clause = sect.collapsed? ? "display: none" : "display: block"
     str = "<ul class=\"tree\" style=\"#{disp_clause}\">"
     str = sect.reduce(str) { |acc, item| acc + flat_section_item_link(item) }
-    str += "</ul>" 
+    str += "</ul>"
   end
 
   def flat_section_item_link citem

data/lib/coursegen/course/lib/helpers_.rb

@@ -4,6 +4,7 @@ include NavigationHelpers
 include LectureHelpers
 include SidebarHelpers
 include ListOfHelpers
+include ICalFeedHelpers
 include Nanoc::Helpers::Rendering
 include Nanoc::Helpers::LinkTo
 include Nanoc::Helpers::Tagging

data/lib/coursegen/course/lib/ical_adaptor.rb

@@ -0,0 +1,34 @@
+require 'icalendar'
+require 'icalendar/tzinfo'
+require 'icalendar/value'
+
+class ICalAdaptor
+  def initialize
+    @cal = Icalendar::Calendar.new
+    tzid = "America/New_York"
+    tz = TZInfo::Timezone.get tzid
+    @cal.add_timezone tz.ical_timezone(Time.now)
+  end
+
+  def feed_begin
+  end
+
+  def feed_end
+  end
+
+  def feed_event(title, dt_start, dt_end, desc, url)
+    event = Icalendar::Event.new
+    event.dtstart = dt_start
+#    event.dtstart = Icalendar::Values::DateOrDateTime.new(dt_start, tzid: 'UTC').call
+    event.dtend = dt_end
+#    event.dtend = Icalendar::Values::DateOrDateTime.new(dt_end, tzid: 'UTC').call
+    event.summary = title
+    event.description = desc
+#    event.url = url
+    @cal.add_event(event)
+  end
+
+  def feed_render
+    @cal.to_ical
+  end
+end

data/lib/coursegen/course/lib/search_data_generator.rb

@@ -9,7 +9,7 @@ class SearchIndex
         { title:  clean_string(item.title),
           text:   clean_string(nok_parse_inner_text),
           tags:   "",
-          loc:  item.nitem.rep_named(:default).path }
+          loc:  item.nitem.reps[:default].path }
     end
   end
 
@@ -19,9 +19,9 @@ class SearchIndex
 
   def include_in_index?(citem)
     skiplist = Regexp.union([/\/tipuesearch_logic\/.*/, /\/bootstrap\/.*/, /\/config\/.*/, /\/tipuesearch\/.*/])
-    citem.type == "page" && 
+    citem.type == "page" &&
       !citem.nitem.binary? &&
-      !citem.identifier.match(skiplist)  
+      !citem.identifier.to_s.match(skiplist)
   end
 
-end
+end

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

@@ -1,13 +1,16 @@
 # Define schedule scheme for a lecture series
 
 class ScheduleDef
-		attr_reader :first_day, :weekdays, :number, :skips
+		attr_reader :first_day, :weekdays, :number, :skips, :start_time, :end_time
 
-		def initialize first_day: nil, weekdays: nil, number: nil, skips: []
+		def initialize(first_day: nil, weekdays: nil, number: nil,
+									 skips: [], start_time: "12:15", end_time: "13:15")
 			@first_day = first_day
 			@weekdays = weekdays
 			@number = number
 			@skips = skips
+			@start_time = start_time
+			@end_time = end_time
 		end
 
 end

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

@@ -0,0 +1,30 @@
+# Used in generating iCal feed. Given a data_adapter (who knows how to get data out and iterate across things) and a feed_builder (who knows how to turn that data into some kind of feed), produce the feed. This same class could also generate, for example, an RSs feed.
+
+class ScheduleFeed
+  def initialize feed_builder, data_adapter
+    @feed_builder = feed_builder
+    @data = data_adapter
+  end
+
+  def render
+    @feed_builder.feed_begin
+    render_all_events
+    @feed_builder.feed_end
+    @feed_builder.feed_render
+  end
+
+  def render_all_events
+    @data.rows do |row_id|
+      render_event(row_id) unless row_id.type == "subsection"
+    end
+  end
+
+  def render_event row_id
+    title = COURSE_ABBREV + ": " + @data.cell_value(row_id, :title)
+    dt_start = @data.cell_value(row_id, :start_date_time)
+    dt_end = @data.cell_value(row_id, :end_date_time)
+    desc = @data.cell_value(row_id, :full_desc)
+    url = @data.cell_value(row_id, :url)
+    @feed_builder.feed_event(title, dt_start, dt_end, desc, url)
+  end
+end

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

@@ -3,16 +3,20 @@ WEEKDAYS = {  sunday: 0,    monday: 1,    tuesday: 2,
 
 # Calculate days on which each event occurs, based on the configuration info
 class Scheduler
+  attr_reader :start_time, :end_time
+
   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: [])
+  def setup_from_args(start: nil, weekdays: nil, number: nil, skips: [],
+                      start_time: 0, end_time: 0)
     if start.nil?
       @start = nil
       return
     end
-    convert_and_verify_arguments(start, weekdays, number, skips)
+    convert_and_verify_arguments(start, weekdays, number,
+                                 skips, start_time, end_time)
     @weekdays.sort!
     recalc_event_map
   end
@@ -23,7 +27,7 @@ class Scheduler
       return
     end
     setup_from_args(start: sdef.first_day, weekdays: sdef.weekdays,
-                    number: sdef.number, skips: sdef.skips)
+                    number: sdef.number, skips: sdef.skips, start_time: sdef.start_time, end_time: sdef.end_time)
   end
 
   def event_date_by_index(ind)
@@ -57,22 +61,33 @@ class Scheduler
     end
   end
 
-  def convert_and_verify_arguments(start, weekdays, number, skips)
+  def convert_and_verify_arguments(start, weekdays, number, skips,
+                                   start_time, end_time)
     @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")
 
-    raise ArgumentError, "Scheduler: invalid weekdays" unless weekdays.all? { |wd| WEEKDAYS.include? wd } 
+    raise ArgumentError, "Scheduler: invalid weekdays" unless weekdays.all? { |wd| WEEKDAYS.include? wd }
 
     @weekdays = weekdays.map { |wd| WEEKDAYS[wd]}
     raise ArgumentError, "Scheduler: Start date is not on one of the weekdays" unless @weekdays.include? @start_date.cwday
     raise ArgumentError, "Scheduler: Skip date is not on a valid weekday" if !@skips.reduce(true) { |accum, skip| accum && @weekdays.include?(skip.cwday) }
-  end
 
-private
+    @start_time = time_span_to_seconds(start_time)
+    @end_time = time_span_to_seconds(end_time)
+  end
 
   def string_to_date(string_date)
     Date.strptime(string_date, "%b-%d-%Y") rescue  fail "string to date in scheduler.rb"
+  end
 
+  def strings_to_date_time(string_date, string_time)
+    DateTime.strptime(string_date + " " + string_time, "%b-%d-%Y %H:%M")
   end
+
+  def time_span_to_seconds(string_time)
+    result = string_time.match(/(\d\d):(\d\d)/)
+    result[1].to_i.hours + result[2].to_i.minutes
+  end
+
 end