rhs-schedule 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45d9d22b1f06bf65d5f7f19cbb0f865696c07088
-  data.tar.gz: 83e50e970284e01b6812b0b35e0600fa0a0dcefa
+  metadata.gz: d78ca9524a73504524f2f92521fa48d1e90db7f9
+  data.tar.gz: 373349b5453a766fedff74cf46cfd97390c26231
 SHA512:
-  metadata.gz: e4935fae5a8bb3fa729b7b5e49be49b18958aef622af9192a401ed0b055e10b44d6bcf5ceafde6e4eb97718a76b60a796cdfd96db41021c9b3132fc371337578
-  data.tar.gz: 26dc3d276c130f0a6b552ce4233389478a66d1324c1edeb09a630090071acb2b6b96fe7e150f770c71a04e90f01cc2f6e7d8389248f3b2f3133c318b797339c0
+  metadata.gz: 5a0dcb14e0d91cff691032cc93b62600b26ced05271d9669db658a570949694fd6f1478c6349940bf9a195850adf6e8f1c1fdfd0bd2955ad22999ede2e8e511c
+  data.tar.gz: c927c5441c7e426bf98061aed9f9f276efc7a94b7ce7c8d747f498560e414e25d07cff162162237a983e1fa66239f8955d821515764fec7398ff5b4d5c297fae

data/lib/rhs-schedule.rb

@@ -6,7 +6,7 @@ require_relative 'rhs-schedule/period'
 require_relative 'rhs-schedule/exports'
 require_relative 'rhs-schedule/errors'
 
-VERSION = '0.3.0'.freeze
+VERSION = '0.5.0'.freeze
 
 # 05/25/16 08:50 AM
 DATE_FORMAT = '%m/%d/%y'.freeze
@@ -18,6 +18,7 @@ class ScheduleSystem
   include Exports
 
   attr_reader :schedule_days
+  attr_reader :class_days
 
   # Creates a new ScheduleSystem by parsing the schedule text file passed to it. 
   # If it cannot read the file the program aborts.
@@ -28,7 +29,7 @@ class ScheduleSystem
     abort "Cannot find schedule text file at '#{path}'. Please download it from http://intranet.regis.org/downloads/outlook_calendar_import/outlook_schedule_download.cfm." unless File.file? path
 
     @path = path
-    @classdays = []
+    @class_days = {}
     @schedule_days = {}
     parse
     super(self) # Initialize the exports with the parsed schedule
@@ -50,8 +51,7 @@ class ScheduleSystem
   # Displays formatted info on the current day, including it's schedule day and classes in order.
   def today
     #false_date = Date.strptime('05/20/16', DATE_FORMAT)
-    @classdays.find { |cd| cd.schedule_day == @schedule_days[Date.parse(Time.now.to_s)]}
-    #@classdays.find { |cd| cd.schedule_day == @schedule_days[false_date] }
+    @class_days[@schedule_days[Date.parse(Time.now.to_s)]]
   end
 
   # Outputs a JSON object of all class days and their schedule days into the given file.
@@ -94,7 +94,6 @@ class ScheduleSystem
         
         lines.each do |line|
           next if line.include? 'Start Date' or line.strip.empty?
-
           # Split the line and remove all the unnecessary values
           values = line.split("\t")
 
@@ -109,6 +108,8 @@ class ScheduleSystem
             ps << vital
           end
         end
+
+        puts ps.count { |values| values.any? { |v| v.include? 'Practicum' } }
       end
 
       puts "Found #{ps.length} periods for #{sds.length} class days"
@@ -117,8 +118,8 @@ class ScheduleSystem
       handled = [] # Holds what schedules have been made
       @schedule_days.each do |date, sd|
         next if handled.include? sd
+        lines = ps.find_all { |values| values[0].gsub(/\n/, "") == date.strftime(DATE_FORMAT) }
 
-        lines = ps.find_all { |values| values[0] == date.strftime(DATE_FORMAT) }
         next if lines.empty?
         create_class_day sd, lines
         handled << sd
@@ -132,6 +133,7 @@ class ScheduleSystem
     end
 
     def create_class_day sd, lines
+
       periods = []
       lines.each do |values|
         # [date, start time, end time, class name, location]
@@ -145,7 +147,7 @@ class ScheduleSystem
 
       day = ScheduleDay.new(sd, periods)
       fill_periods day
-      @classdays << day
+      @class_days[sd] = day
     end
 
     # Take a just created periods list and fill in the holes (lunch and frees)
@@ -172,6 +174,4 @@ class ScheduleSystem
       filled << Period.new('Afternoon Advisement', DateTime.strptime('2:50 PM', TIME_FORMAT), DateTime.strptime('3:00 PM', TIME_FORMAT), 'Advisement')
       day.periods = filled
     end
-
-    
 end

data/lib/rhs-schedule/period.rb

@@ -1,6 +1,8 @@
 class Period
   attr_reader :start_time
   attr_reader :end_time
+  attr_reader :course_title
+  attr_reader :location
 
   def initialize(course, start_time, end_time, location)
     @course_title = course

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rhs-schedule
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Frank Matranga