dbc_today 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 872881a17240d9c8b62125e12a8a778c6ddfba67
-  data.tar.gz: 1d1ea3ee40aa22ffd9cf5583c8a9919c94a47963
+  metadata.gz: a845a25b6bc2af798044d250bb59a4211cb7c467
+  data.tar.gz: b5d8b220a4c1322f94a269784a4b9e811c12805c
 SHA512:
-  metadata.gz: 318c5d54b2e294786f0c6dbe672a3bc94748ccf14c21be5535217f3873480174725d57a015d717e77ad8685b8f80aa5c9c70ef9d3b0d8cc1249cfd660b4f244c
-  data.tar.gz: 7d3e15ab9c5e68fc533fbe2a114360fd329c435d868cc5b7207179c748559ce051b214c7100d7f57d9b57f535847a251b278e9628a86c8cdc175dc75a74635af
+  metadata.gz: 423b337a27e0859bef975a957d35309deb98f8cff29914bdaae84e77aedba72c3a21dc26b6e6d8fb25255b43d6e92d523f22d51d57beb839796277a623a94636
+  data.tar.gz: 2e6254eeafb03f2fecb81a95dbef6254df5a8e6093f6d77f410b59450d37dbb0bd8ca3b5828c58a5e9dea661080575f278336f954905238aac4eea73e822e5d8

data/lib/dbc_today/models/event.rb

@@ -9,9 +9,9 @@ class Event
     @phase = attributes.fetch(:phase)
     @week = attributes.fetch(:week)
     @day = attributes.fetch(:day)
-    @description = attributes.fetch(:description, nil)
-    @start_time = attributes.fetch(:start_time, nil)
-    @end_time = attributes.fetch(:end_time, nil)
+    @description = attributes.fetch(:description)
+    @start_time = attributes.fetch(:start_time)
+    @end_time = attributes.fetch(:end_time)
   end
 
   def all_day?
@@ -47,22 +47,23 @@ class Event
   def self.where(args)
     all.select { |event|
       nil_or_match(event.phase, args[:phase]) &&
-      nil_or_match(event.week, args[:week]) &&
-      nil_or_match(event.day, args[:day])
+        nil_or_match(event.week, args[:week]) &&
+        nil_or_match(event.day, args[:day])
     }.sort_by { |e| e.start_time_military }
   end
 
   private
 
   def starts_at_day_start?
-    start_time.start_with?('9:00a') ||
-      start_time.start_with?('9a')
+    return false if start_time.nil?
+
+    start_time.start_with?('9:00a', '9a')
   end
 
   def ends_at_day_end?
-    end_time.nil? ||
-      end_time.start_with?('6:00p') ||
-      end_time.start_with?('6p')
+    return false if end_time.nil?
+
+    end_time.start_with?('6:00p', '6p')
   end
 
   def self.nil_or_match(attribute_value, value_to_match)

data/lib/dbc_today/models/topic.rb

@@ -26,12 +26,12 @@ class Topic
   def self.where(args)
     all.select { |topic|
       topic.phase == args[:phase] &&
-      topic.week == args[:week] &&
-      topic.day == args[:day]
+        topic.week == args[:week] &&
+        topic.day == args[:day]
     }
   end
 
   def self.current_directory
-    File.expand_path File.dirname(__FILE__)    
+    File.expand_path File.dirname(__FILE__)
   end
 end

data/lib/dbc_today/version.rb

@@ -1,3 +1,3 @@
 module DbcToday
-  VERSION = "2.0.5"
+  VERSION = "2.0.6"
 end

data/lib/dbc_today/views/events_view.rb

@@ -3,7 +3,7 @@ require 'colorize'
 class EventsView
   def display(events)
     puts "\nSCHEDULE".bold
-    puts "#{header_row}"
+    puts header_row
 
     events.each do |event|
       puts event_row(event)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dbc_today
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Mark Stewart