sd_events 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57b9117def84fd8483551fd7e54c2a4457bde8954ed8cc830feb28e0e1f7adfe
-  data.tar.gz: 2f1b08b220b9c15e512dd4857b366d3b6d71dad322929b13f9757e7d32cd750d
+  metadata.gz: 6beaa3861f362715184d88a5edb21708d3b5342d208f2e7753f4d778b006436b
+  data.tar.gz: a7c46e39b8aada0a5a7d5f94e576a7fad24d447f7985c55a78e91bd84f27402c
 SHA512:
-  metadata.gz: 20e37f096b8f2d5728d2a01ccf9716c17408801e1af868b3e8ae5cdb1d2cbabecafb2ef994a20bf940befb5873616a588b1d3d7b05dede695cbd0f6101c5ebbc
-  data.tar.gz: '01846653fdf1dcddb37e5bb5283853163ec3797152ec9813707f4044328a50efda049dbca87fbe1f3c4bceb797ddce96ee504916242e4af0fee813a3a0d673cd'
+  metadata.gz: ad4005e22a30e0625f11b7d3db5b01690510e9e66d5db93085795bd9b6ae4e7c47f8c019aeea2e4d0e4c263ab365117c7de4d4fd258203aaf22a960d852a95b0
+  data.tar.gz: ce9740c895b86a8c7bc18a75e9321d509a94ef5770bb6a659685b5970c415f8d737890012563b292466b76b4b1c3840a627917710f3319b6653487fd2edc59c0

data/lib/sd_events/cli.rb

@@ -6,41 +6,40 @@ class SdEvents::CLI
 
   def start
     puts ""
-    puts "******* Events Happening Now in San Diego *******"
+    puts "******* Events Happening Now in San Diego *******".colorize(:blue)
     puts ""
     list_menu
   end
 
   def list_menu
-
-    puts "Hello, the time is now #{Time.now}."
-    puts "Please select which events you would like to see or type 'exit'"
+    puts "Hello, the time is now #{Time.now}.".colorize(:light_blue)
+    puts "Please select which events you would like to see or type 'exit'".colorize(:red)
     puts ""
-    puts "1. Morning Events"
-    puts "2. Afternoon Events"
-    puts "3. Evening Events"
-    puts "4. Late Night Events"
+    puts "1. Morning Events".colorize(:green)
+    puts "2. Afternoon Events".colorize(:green)
+    puts "3. Evening Events".colorize(:green)
+    puts "4. Late Night Events".colorize(:green)
     puts ""
 
     input = gets.strip.downcase
 
     if input == "1"
-      SdEvents::Events.create_morning_events
+      SdEvents::Events.create_daypart("morning")
       display_events
       event_menu
 
     elsif input == "2"
-      SdEvents::Events.create_afternoon_events
+      SdEvents::Events.create_daypart("afternoon")
       display_events
       event_menu
 
     elsif input == "3"
-      SdEvents::Events.create_evening_events
+      SdEvents::Events.create_daypart("evening")
       display_events
       event_menu
 
     elsif input == "4"
-      SdEvents::Events.create_night_events
+      SdEvents::Events.create_daypart("night")
       display_events
       event_menu
 
@@ -48,61 +47,69 @@ class SdEvents::CLI
       goodbye
 
     else
-        puts "Not sure what you're asking, here is the menu again:"
-        list_menu
+      puts "Not sure what you're asking, here is the menu again:".colorize(:red)
+      list_menu
     end
-
   end
 
   def display_events
     SdEvents::Events.all.each.with_index(1) do |event, i|
       puts "#{i}."
-      puts "Event: #{event.name.upcase}"
-      puts "Venue: #{event.venue}"
-      puts "Time: #{event.time}"
+      puts "Event: #{event.name.upcase}".colorize(:magenta)
+      puts "Venue: #{event.venue}".colorize(:magenta)
+      puts "Time: #{event.time}".colorize(:magenta)
       puts ""
     end
   end
 
   def event_menu
+    input = nil
+    while input != "exit"
+    puts ""
+    puts "To see more info about an event, please select the number of the event".colorize(:red)
     puts ""
-    puts "To see more info about an event, please select the number of the event:"
-    input = gets.downcase.to_i-1
-      SdEvents::Events.find(input)
+    puts "OR type 'menu' to see the menu again".colorize(:red)
+    puts "OR type 'exit' to exit the program".colorize(:red)
+    puts ""
+    input = gets.strip
+      if input == "menu"
+        list_menu
+      elsif input.to_i.between?(1, SdEvents::Events.all.size)
+        event = SdEvents::Events.find(input)
         puts ""
-        puts "Event: #{SdEvents::Events.all[input].name}"
-        puts "City: #{SdEvents::Events.all[input].city}"
-        puts "Category: #{SdEvents::Events.all[input].category}"
+        puts "Event: #{event.name}".colorize(:magenta)
+        puts "Location: #{event.location}".colorize(:magenta)
+        puts "Category: #{event.category}".colorize(:magenta)
         puts ""
-        puts "To see the menu again, type 'menu' or to exit type 'exit':"
         SdEvents::Events.all.clear
-          new_input = gets.downcase.strip
-          if new_input == "menu"
-            list_menu
-          elsif new_input == "exit"
-            goodbye
-          end
+      elsif input == "exit"
+        goodbye
+      else
+        puts "Not sure what you're asking, here is the menu again:".colorize(:red)
+        list_menu
+      end
     end
+  end
 
   def self.no_events
     puts ""
-    puts "Uh oh, looks like there are no events for that time..."
-    puts "Please return tomorrow for more events."
+    puts "Uh oh, looks like there are no events for that time...".colorize(:magenta)
+    puts "Please return tomorrow for more events.".colorize(:magenta)
     puts ""
-    puts "To see the menu again, type 'menu' or type 'exit':"
+    puts "To see the menu again, type 'menu' or type 'exit':".colorize(:red)
     input = gets.downcase.strip
     if input == "menu"
       self.new.list_menu
     elsif input == "exit"
       self.new.goodbye
     else
-      "Not sure what you're asking, here is the menu again:"
+      "Not sure what you're asking, here is the menu again:".colorize(:red)
       self.new.list_menu
     end
   end
 
   def goodbye
-    puts "Thanks for visiting SD Events!"
+    puts "Thanks for visiting SD Events!".colorize(:blue)
     exit
   end
 

data/lib/sd_events/events.rb

@@ -1,5 +1,5 @@
 class SdEvents::Events
-  attr_accessor :name, :venue, :city, :area, :category, :time
+  attr_accessor :name, :venue, :location, :category, :time
   @@all = []
 
   def initialize
@@ -15,35 +15,19 @@ class SdEvents::Events
   end
 
   def self.find(id)
-    self.all[id-1]
+    self.all[id.to_i-1]
   end
 
-  def self.create_morning_events
-    SdEvents::Scraper.scrape_morning
+  def self.empty?
     if @@all.empty?
       SdEvents::CLI.no_events
     end
   end
 
-  def self.create_afternoon_events
-    SdEvents::Scraper.scrape_afternoon
-    if @@all.empty?
-      SdEvents::CLI.no_events
-    end
-  end
-
-  def self.create_evening_events
-    SdEvents::Scraper.scrape_evening
-    if @@all.empty?
-      SdEvents::CLI.no_events
-    end
+  def self.create_daypart(event_time) #=> "afternoon"
+    SdEvents::Scraper.scrape_daypart(event_time) #=> "SdEvents::Scraper.scrape_daypart("afternoon")"
+    self.empty?
   end
 
-  def self.create_night_events
-    SdEvents::Scraper.scrape_night
-    if @@all.empty?
-      SdEvents::CLI.no_events
-    end
-  end
 
 end

data/lib/sd_events/scraper.rb

@@ -1,57 +1,22 @@
 class SdEvents::Scraper
 
   def self.scrape
-    @@doc = Nokogiri::HTML(open("https://www.sandiegoreader.com/events/#"))
+    Nokogiri::HTML(open("https://www.sandiegoreader.com/events/#"))
   end
 
-  def self.scrape_morning
-    self.scrape.css("div#body div#content.content div.daypart_morning .event_list").each do |event|
-      event.css("tr").collect do |attribute|
-        new_event = SdEvents::Events.new
-        new_event.name = attribute.css(".title").css("h4").text.strip
-        new_event.venue = attribute.css(".title").css("h5").text.strip
-        new_event.time = attribute.css("td.time").text.strip
-        new_event.city = attribute.css("td.city").text.strip
-        new_event.category = attribute.css("td.category").text.strip
-      end
-    end
-  end
-
-  def self.scrape_afternoon
-    self.scrape.css("div#body div#content.content div.daypart_afternoon .event_list").each do |event|
-      event.css("tr").collect do |attribute|
-        new_event = SdEvents::Events.new
-        new_event.name = attribute.css(".title").css("h4").text.strip
-        new_event.venue = attribute.css(".title").css("h5").text.strip
-        new_event.time = attribute.css("td.time").text.strip
-        new_event.city = attribute.css("td.city").text.strip
-        new_event.category = attribute.css("td.category").text.strip
-      end
-    end
-  end
-
-  def self.scrape_evening
-    self.scrape.css("div#body div#content.content div.daypart_evening .event_list").each do |event|
-      event.css("tr").collect do |attribute|
-        new_event = SdEvents::Events.new
-        new_event.name = attribute.css(".title").css("h4").text.strip
-        new_event.venue = attribute.css(".title").css("h5").text.strip
-        new_event.time = attribute.css("td.time").text.strip
-        new_event.city = attribute.css("td.city").text.strip
-        new_event.category = attribute.css("td.category").text.strip
-      end
-    end
+  def self.scrape_events(attribute)
+    new_event = SdEvents::Events.new
+    new_event.name = attribute.css(".title").css("h4").text.strip
+    new_event.venue = attribute.css(".title").css("h5").text.strip
+    new_event.time = attribute.css("td.time").text.strip
+    new_event.location = attribute.css("td.city").text.strip
+    new_event.category = attribute.css("td.category").text.strip
   end
 
-  def self.scrape_night
-    self.scrape.css("div#body div#content.content div.daypart_night .event_list").each do |event|
+  def self.scrape_daypart(event_time)
+    self.scrape.css("div#body div#content.content div.daypart_#{event_time} .event_list").each do |event|
       event.css("tr").collect do |attribute|
-        new_event = SdEvents::Events.new
-        new_event.name = attribute.css(".title").css("h4").text.strip
-        new_event.venue = attribute.css(".title").css("h5").text.strip
-        new_event.time = attribute.css("td.time").text.strip
-        new_event.city = attribute.css("td.city").text.strip
-        new_event.category = attribute.css("td.category").text.strip
+        self.scrape_events(attribute)
       end
     end
   end

data/lib/sd_events/version.rb

@@ -1,3 +1,3 @@
 module SdEvents
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/sd_events.rb

@@ -1,6 +1,7 @@
 require 'open-uri'
 require 'pry'
 require 'nokogiri'
+require 'colorize'
 
 require_relative './sd_events/version'
 require_relative './sd_events/cli'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sd_events
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Kayla Hansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-14 00:00:00.000000000 Z
+date: 2018-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: shiverr@gmail.com
 executables: