ra_events 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b73936f62724eb100bade025ab74a22b078d955
-  data.tar.gz: 8a756a52598179effeb9176cff2e21cda9546d12
+  metadata.gz: 8ae17676f288c0d714600718b8e0894af795f8f6
+  data.tar.gz: 3b9c44d7e29dc7a922828b366e68680df61ff376
 SHA512:
-  metadata.gz: b4d8823a713e23ce13572368ee3e1bf99be09c49df89e3bd8e4e94a848f1c948b0e79ac92d956e10beb3c3fe06aba6e24d81f79af1d27a84bed2b9848ef11d58
-  data.tar.gz: 727edd037bf7eb4885464651183741b7fa2fd2e398528f2f6ea9aff57e6d251279c6d068e56fa050e87be53d33107248f963bc51813a29a00b19a567e6eae4b2
+  metadata.gz: 478285ff42881d57c325fd3c339946b85d4507c8aaa11551d11121c03edfd1a33391c9d5a10cd20ad92146bde591bb64bad921b1650aec63c5f72e394ab11fbf
+  data.tar.gz: 75728efe498e6d5d37d07f9b3045115e4d80b461dc91ff7aa6ce0f84f3ff5300db89f4e91202902c4845e8135f8eac83ea824be1c93f5ae51ba7e52a0064682b

data/lib/ra_events.rb

@@ -2,5 +2,3 @@ require_relative "./ra_events/version"
 require_relative './ra_events/cli'
 require_relative './ra_events/scraper'
 require_relative './ra_events/event'
-
-require 'nokogiri'

data/lib/ra_events/cli.rb

@@ -9,7 +9,6 @@ URL_BASE = "https://www.residentadvisor.net"
     welcome
     list_events(user_inputs_state)
     goto_event_url
-    exit_program
   end
 
   def welcome
@@ -28,34 +27,49 @@ URL_BASE = "https://www.residentadvisor.net"
   end
 
   def list_events(user_inputs_state)
-    
     display_events_this_week_text
     
-    Event.create_from_collection(Scraper.scrape_events_page(user_inputs_state))
+    events_by_week = Scraper.scrape_events_page(user_inputs_state)
+    Event.create_from_collection(events_by_week)
     Event.all.each.with_index(1) do |event, i|
-      i -= 1
-      if event.title != "" && event.location != ""
+      
+      if event.no_events_listed == true
+        puts "There are currently no events listed for this date range in this region."
+        puts
+        clear_events
+        call
+      else
         puts "#{i}. #{event.title} "
         puts "Location: #{event.location} " unless event.artists.nil?
         puts "Artists: #{event.artists}" unless event.artists.nil?
-        puts "Date: #{event.date.gsub("T00:00", "")}"
+        puts "Date: #{event.date.gsub("T00:00", "")}" 
         puts 
       end
     end
   end
 
   def goto_event_url
-    input = nil
-    while input != "exit"
-      puts "Type 1-#{Event.all.count} to view event page in your browser or type exit:"
-      input = gets.strip
-      if input.to_i > 0 && input.to_i < Event.all.count
+    puts "Type the event # you'd like to view in your browser, 'menu' or 'exit':"
+    input = gets.strip.downcase
+      
+      if input.to_i > 0 && input.to_i <= Event.all.count
         puts "Opening residentadvisor.net..."
-        event = Event.all[input.sub("goto ", "").to_i]
-        URL_BASE + event.url
+        event = Event.all[input.to_i - 1]
+        puts "#{URL_BASE + event.url}"
         `open #{URL_BASE + event.url}`
+        goto_event_url
+      elsif input == "exit"
+        exit_program
+      elsif input == "menu"
+        main_menu
+      else
+        puts "Invalid"
+        goto_event_url
       end
-    end
+  end
+
+  def main_menu
+    call
   end
 
   def display_events_this_week_text
@@ -69,7 +83,13 @@ URL_BASE = "https://www.residentadvisor.net"
   end
 
   def exit_program
-    puts "Bye, See you on the dance floor!"
+    clear_events
+    puts "Bye, see you on the dance floor!"
+    exit
+  end
+
+  def clear_events
+    Event.clear
   end
 
 end

data/lib/ra_events/event.rb

@@ -2,7 +2,7 @@ require 'pry'
 
 class Event
 
-  attr_accessor :date, :title, :location, :artists, :url
+  attr_accessor :date, :title, :location, :artists, :url, :no_events_listed
 
   @@all = []
 
@@ -23,4 +23,8 @@ class Event
   def self.all
     @@all
   end
+
+  def self.clear
+    self.all.clear
+  end
 end

data/lib/ra_events/scraper.rb

@@ -19,50 +19,33 @@ class Scraper
     end
 
     state_event_page_url 
-    binding.pry
   end
 
   def self.scrape_events_page(url)
     ra_events_page = Nokogiri::HTML(open(url))
     
     events = []
+    events << {no_events_listed: true} if self.is_real_event?(ra_events_page)
+    
+    ra_events_page.css("#items").each do |event_listings|
+      event_listings.css('li').each do |event|
+        event_date = event.css('time').text
+        event_title = event.css('div h1 a').text.gsub("#{event.css('span a').text}", "")
+        event_location = event.css('span a[1]').text + " " + event.css('a[2]').text unless event.css('span a').text.empty?
+        event_artists = event.css('div div').text unless event.css('div div').text.empty?
+        event_url = event.css('a').attr('href').text
+
+        if event_title != "" && event_location != ""  
+          events << {date: event_date, title: event_title, location: event_location, artists: event_artists, url: event_url}         
+        end
+      end
+    end
 
-    ra_events_page.css("#items").each do |event_listing|
-  
-          event_listing.css('li').each do |date| #until date.css('a').text == "Submit event"
-            # binding.pry
-              event_date = date.css('time').text
-              event_title = date.css('div h1 a').text.gsub("#{date.css('span a').text}", "")
-              event_location = date.css('span a').text unless date.css('span a').text.empty?
-              event_artists = date.css('div div').text unless date.css('div div').text.empty?
-              event_url = date.css('a').attr('href').text
-
-              events << {date: event_date, title: event_title, location: event_location, artists: event_artists, url: event_url}
-            # binding.pry
-          
-          end
+    events
+  end
 
-    end
-    events.compact
-    # binding.pry
+  def self.is_real_event?(ra_events_page)
+    ra_events_page.css('.pr8').first.text.include?("no events")
   end
 
 end
-
-
-# This will grab the Date of all of the listed shows
-
-# ra_events_page.css("#event-listing .date").each do |e|
-#   puts "#{e.css('a').text}"
-# end
-
-
-# ra_events_page.css("#items").each do |event_listing|
-# 
-
-# Title: date.css('a').text || date.css('div h1').text # ex: "Selector Dub Narcotic, This Saxophone Kills Fascists at Babycastles"
-# Artists: date.css('div div').text
-# Url: date.css('a').attr('href').text
-
-# unless date.css('a').text == "Submit event"
-

data/lib/ra_events/version.rb

@@ -1,3 +1,3 @@
 module RaEvents
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/ra_events.gemspec

@@ -11,7 +11,8 @@ Gem::Specification.new do |spec|
   spec.email         = ["mk.etlinger@gmail.com"]
 
   spec.summary       = %q{ra_events lists Resident Advisor events by state from the comfort of your CLI}
-  spec.description   = %q{Type `ra-events` after running `gem install ra_events`. Then type in your state, get a list of electronic music events by week, and open an event in your browser for more details.}
+  spec.description   = %q{*Disclaimer: ra_events uses the 'open' command to open an event URL in your browser. This will not work on Windows machines, however, the URL will be printed for easy copy/paste*
+    Type `ra-events` after running `gem install ra_events`. Then type in your state, get a list of electronic music events by week, and open an event in your browser for more details.}
   spec.homepage      = "https://github.com/Mk-Etlinger/ra-events-cli-app"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ra_events
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Mike Etlinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,9 +80,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.0
-description: Type `ra-events` after running `gem install ra_events`. Then type in
-  your state, get a list of electronic music events by week, and open an event in
-  your browser for more details.
+description: |-
+  *Disclaimer: ra_events uses the 'open' command to open an event URL in your browser. This will not work on Windows machines, however, the URL will be printed for easy copy/paste*
+      Type `ra-events` after running `gem install ra_events`. Then type in your state, get a list of electronic music events by week, and open an event in your browser for more details.
 email:
 - mk.etlinger@gmail.com
 executables: