dbc_today 1.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24654bc1b6f26d6b6945f88290f5167002e05cac
-  data.tar.gz: dddd8a69f02d7d264c9e9c460be4b5bd337f740c
+  metadata.gz: f6a8e58e4e02a14b674f97ab96e9f68502de0b74
+  data.tar.gz: 02cfad383a9a90010b280e569942cbd0f653ecee
 SHA512:
-  metadata.gz: d9365d4cb51e7ef22d41bdd42b00646bd2eee9c8cf9034821c179a77b83a5c2c8225e5895b7b1b891f983f507a60a802ffd42c4e80c71b2b4d95bac2218b8a6c
-  data.tar.gz: 6cd33d926c28df314810d755fffe60002c266d7b5c08adfce2f15f8da62fe6ef0b0bbaa483e26b9d4aa2ddbce87d90bab0d9f2f1e12a2e7b78a6981efd4d3b87
+  metadata.gz: 9509bca5e5d250ae9d54d8021d2ebd14997a4039a569952d089b827d3915143c76d9058e0334b71c2f25f304201d9e495d5bd9561136a26b74c85fa3899a544c
+  data.tar.gz: 972d5256a27c70fde75c4d9f750ec367f85491a278a758eba81f8e1f5f7825db110d1c1cd140bb7a69afdb769a0837b81eca1f3278572a558dadcfee052f5a3c

data/exe/dbctoday

@@ -1,12 +1,31 @@
 #!/usr/bin/env ruby
 # ^ The above comment tells the system
 # to read this file like a ruby file
-require_relative '../lib/dbc_today/controller'
+require_relative '../lib/dbc_today/controllers/events_controller'
+require_relative '../lib/dbc_today/controllers/topics_controller'
 
-phase = ARGV[0]
-week = ARGV[1]
-day = ARGV[2] || Date.today.wday.to_s
+phase, week, day = ARGV.select { |arg| arg =~ /\A\d\z/ }
+day ||= Date.today.wday.to_s
 
-controller = Controller.new
+topics_controller = TopicsController.new
+events_controller = EventsController.new
 
-controller.show_schedule(phase, week, day)
+if ARGV.find { |arg| arg == '-h' }
+  puts
+  puts "To run dbctoday:".bold
+  puts
+  puts "Run " + "dbctoday [phase] [week] [day]".white.bold + " to show the topics and schedule for that day"
+  puts "For example " + "dbctoday 1 1 1".white.bold + " will show the topics and schedule for phase 1 on day 1 of week 1"
+  puts "You can leave out the day (e.g. " + "dbctoday 1 1".white.bold + "), and it will show you info for today's day of the week"
+  puts "Pass a "+ "-t".white.bold + " flag to show only topics"
+  puts "Pass a " + "-s".white.bold + " flag to show only the schedule"
+  puts
+
+elsif ARGV.find { |arg| arg == '-t' }
+  topics_controller.show_topics(phase, week, day)
+elsif ARGV.find { |arg| arg == '-s' }
+  events_controller.show_schedule(phase, week, day)
+else
+  topics_controller.show_topics(phase, week, day)
+  events_controller.show_schedule(phase, week, day)
+end

data/lib/dbc_today/{controller.rb → controllers/events_controller.rb}

@@ -1,16 +1,16 @@
 require 'date'
-require_relative 'view'
-require_relative 'event'
+require_relative '../views/events_view'
+require_relative '../models/event'
 
-class Controller
+class EventsController
   attr_reader :view
 
   def initialize
-    @view = View.new
+    @view = EventsView.new
   end
 
   def show_schedule(phase, week, day)
     events = Event.where(phase: phase, week: week, day: day)
-    view.show_events(events)
+    view.display(events)
   end
 end

data/lib/dbc_today/controllers/topics_controller.rb

@@ -0,0 +1,15 @@
+require_relative '../views/topics_view'
+require_relative '../models/topic'
+
+class TopicsController
+  attr_reader :view
+
+  def initialize
+    @view = TopicsView.new
+  end
+
+  def show_topics(phase, week, day)
+    topics = Topic.where(phase: phase, week: week, day: day)
+    view.display(topics)
+  end
+end

data/lib/dbc_today/data/topics.csv

@@ -0,0 +1,78 @@
+phase,week,day,description
+
+1,1,1,introduction to phase 1
+1,1,1,how to work a challenge
+1,1,2,code flow and logic
+1,1,2,enumerable module
+1,1,3,recursion and iteration
+1,1,3,linear and binary search
+1,1,4,nested data structures
+1,1,4,nested iteration
+1,1,5,sudoku project
+
+1,2,1,creating classes
+1,2,1,working with multiple classes
+1,2,2,inheritance
+1,2,2,composition
+1,2,3,csv parsing
+1,2,3,argv
+1,2,3,csv writing
+1,2,4,mvc
+1,2,5,flash cards project
+
+1,3,1,schema design
+1,3,1,sql commands in psql
+1,3,2,sql with Ruby
+1,3,2,assessment preparation
+1,3,3,activerecord intro
+1,3,4,activerecord associations
+1,3,4,activerecord validation
+1,3,5,public api/raw data ruby
+
+2,1,1,http intro
+2,1,1,sinatra intro
+2,1,2,activerecord
+2,1,2,rest
+2,1,3,rest/crud
+2,1,4,sessions and cookies
+2,1,4,user auth
+2,1,5,git workflow
+
+2,2,1,html and css
+2,2,1,javascript
+2,2,2,jquery and events
+2,2,2,ajax
+2,2,3,event delegation
+2,2,3,polymorphic associations
+2,2,4,project qa
+2,2,5,project demos
+
+2,3,1,js constructor functions
+2,3,2,assessment preparation
+2,3,3,assessment
+2,3,4,apis
+2,3,5,project demos
+
+3,1,1,rails intro
+3,1,2,model/conroller testing
+3,1,2,feature testing
+3,1,3,client project intro
+3,1,3,project management
+3,1,4,ajax in rails
+3,1,5,client project demos
+
+3,2,1,javascript mvc
+3,2,1,js call apply and bind
+3,2,2,jquery deferred objects
+3,2,2,promises
+3,2,3,front end to api
+3,2,3,react intro
+3,2,4,pitch projects
+3,2,5,final project work
+
+3,3,1,final project work
+3,3,2,final project work
+3,3,3,final project work
+3,3,4,how to present
+3,3,5,final project presentations
+3,3,5,graduation

data/lib/dbc_today/{event.rb → models/event.rb}

@@ -33,7 +33,7 @@ class Event
     list = []
     
     CSV.foreach(
-      "#{current_directory}/schedule.csv",
+      "#{current_directory}/../data/schedule.csv",
       headers: true,
       header_converters: :symbol,
       skip_blanks: true

data/lib/dbc_today/models/topic.rb

@@ -0,0 +1,37 @@
+class Topic
+  attr_reader :phase, :week, :day, :description
+
+  def initialize(attributes)
+    @phase = attributes.fetch(:phase)
+    @week = attributes.fetch(:week)
+    @day = attributes.fetch(:day)
+    @description = attributes.fetch(:description)
+  end
+
+  def self.all
+    list = []
+    
+    CSV.foreach(
+      "#{current_directory}/../data/topics.csv",
+      headers: true,
+      header_converters: :symbol,
+      skip_blanks: true
+    ) do |row|
+      list << Topic.new(row)
+    end
+
+    list
+  end
+
+  def self.where(phase:, week:, day:)
+    all.select { |topic|
+      topic.phase == phase &&
+      topic.week == week &&
+      topic.day == day
+    }
+  end
+
+  def self.current_directory
+    File.expand_path File.dirname(__FILE__)    
+  end
+end

data/lib/dbc_today/version.rb

@@ -1,3 +1,3 @@
 module DbcToday
-  VERSION = "1.0.0"
+  VERSION = "2.0.1"
 end

data/lib/dbc_today/{view.rb → views/events_view.rb}

@@ -1,8 +1,9 @@
 require 'colorize'
 
-class View
-  def show_events(events)
-    puts "\n#{header_row}"
+class EventsView
+  def display(events)
+    puts "\nSCHEDULE".bold
+    puts "#{header_row}"
 
     events.each do |event|
       puts event_row(event)

data/lib/dbc_today/views/topics_view.rb

@@ -0,0 +1,8 @@
+require 'colorize'
+
+class TopicsView
+  def display(topics)
+    print "\nTOPIC(S): ".bold
+    puts topics.map { |topic| topic.description }.join(', ')
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbc_today
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Mark Stewart
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,13 +86,16 @@ files:
 - dbc_today.gemspec
 - exe/dbctoday
 - lib/dbc_today.rb
-- lib/dbc_today/Gemfile
-- lib/dbc_today/controller.rb
-- lib/dbc_today/event.rb
-- lib/dbc_today/schedule.csv
-- lib/dbc_today/timeable.rb
+- lib/dbc_today/controllers/events_controller.rb
+- lib/dbc_today/controllers/topics_controller.rb
+- lib/dbc_today/data/schedule.csv
+- lib/dbc_today/data/topics.csv
+- lib/dbc_today/models/event.rb
+- lib/dbc_today/models/timeable.rb
+- lib/dbc_today/models/topic.rb
 - lib/dbc_today/version.rb
-- lib/dbc_today/view.rb
+- lib/dbc_today/views/events_view.rb
+- lib/dbc_today/views/topics_view.rb
 homepage: https://github.com/Devbootcamp/dbc_today
 licenses:
 - MIT

data/lib/dbc_today/Gemfile

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-ruby '2.3'
-
-gem 'colorize'