ra_events 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 396b7904c8a35238dde3b7002ddfa97764110c47
-  data.tar.gz: e279cd0059739fea2c1f867c8e909cf0cee82bc5
+  metadata.gz: 8d65f49870422d789deafd5388e2eb9b837c2ee5
+  data.tar.gz: c5729f8d1c37c4774c13e9a171c6d2177bbbdfb3
 SHA512:
-  metadata.gz: 912eb5fb31dcf51a41f18a211fea4b0eb486d34dcca78a505b8434fc6e2cb53cc7ae65dd1710502d149ca11f6b0d4ca407d39a6673134b85fa6dec3acea4d676
-  data.tar.gz: b533f11473949a030ed9e78542a5912e89ab845faee4868f1d8620b715b048676e1cd24dcd7d33b542b9188b41165c3502d703be4a8269d065c17c434ff8328e
+  metadata.gz: 88aa2c5c57af9bfe0fb9ca2aa6a1c1c8b19eff28373fbf38c6efc5374e5dcd783278844544658261629c6f51c41ee093418261c5ead7bdc963176cb9f4e09ffd
+  data.tar.gz: b9f3c2e75ce9ff84caf7c09c11a7e78f2882e936b5e94f1d04078edfc22d7c831fff697fbb611e516697ae4f6df0d5f3d134396723f19a678af3c08dac1bd98f

data/Gemfile

@@ -1,7 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in ra_events.gemspec
-gemspec
-
-# Do I need this pointing to GH? 
-# gem 'ra_events', :git => "git://github.com/Mk-Etlinger/ra-events-cli-app.git"
+gemspec

data/README.md

@@ -1,28 +1,14 @@
 # RaEvents
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/ra_events`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+*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.
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'ra_events'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
     $ gem install ra_events
 
 ## Usage
-
-TODO: Write usage instructions here
+    To run the program from terminal, type:
+     $ ra-events
 
 ## Development
 

data/bin/ra-events

@@ -2,8 +2,6 @@
 
 require_relative '../lib/ra_events' 
 require "bundler/setup"
-# require "ra_events"
-
 
 RaEvents::CLI.new.call
 

data/lib/ra_events.rb

@@ -1,4 +1,6 @@
-require_relative "./ra_events/version"
-require_relative './ra_events/cli'
-require_relative './ra_events/scraper'
-require_relative './ra_events/event'
+module RaEvents
+  require_relative 'ra_events/cli'
+  require_relative 'ra_events/version'
+  require_relative 'ra_events/scraper'
+  require_relative 'ra_events/event'
+end

data/lib/ra_events/cli.rb

@@ -2,12 +2,12 @@ require 'pry'
 
 class RaEvents::CLI
 
-STATES_AND_LINKS = {"AL"=>"/events.aspx?ai=108", "AK"=>"/events.aspx?ai=109", "AZ"=>"/events.aspx?ai=102", "AR"=>"/events.aspx?ai=110", "CA"=>"/events.aspx?ai=308", "CO"=>"/events.aspx?ai=82", "CT"=>"/events.aspx?ai=111", "DE"=>"/events.aspx?ai=112", "DC"=>"District of Columbia", "FL"=>"/events.aspx?ai=317", "GA"=>"/events.aspx?ai=64", "HI"=>"/events.aspx?ai=133", "ID"=>"/events.aspx?ai=113", "IL"=>"/events.aspx?ai=359", "IN"=>"/events.aspx?ai=85", "IA"=>"/events.aspx?ai=114", "KS"=>"/events.aspx?ai=90", "KY"=>"/events.aspx?ai=115", "LA"=>"/events.aspx?ai=65", "ME"=>"/events.aspx?ai=116", "MD"=>"/events.aspx?ai=117", "MA"=>"/events.aspx?ai=79", "MI"=>"/events.aspx?ai=360", "MN"=>"/events.aspx?ai=81", "MS"=>"/events.aspx?ai=103", "MO"=>"/events.aspx?ai=118", "MT"=>"/events.aspx?ai=119", "NE"=>"/events.aspx?ai=120", "NV"=>"/events.aspx?ai=47", "NH"=>"/events.aspx?ai=121", "NJ"=>"/events.aspx?ai=48", "NM"=>"/events.aspx?ai=122", "NY"=>"/events.aspx?ai=8", "NC"=>"/events.aspx?ai=123", "ND"=>"/events.aspx?ai=124", "OH"=>"/events.aspx?ai=84", "OK"=>"/events.aspx?ai=104", "OR"=>"/events.aspx?ai=125", "PA"=>"/events.aspx?ai=80", "RI"=>"/events.aspx?ai=127", "SC"=>"/events.aspx?ai=105", "SD"=>"/events.aspx?ai=128", "TN"=>"/events.aspx?ai=72", "TX"=>"/events.aspx?ai=318", "UT"=>"/events.aspx?ai=106", "VT"=>"/events.aspx?ai=129", "VA"=>"/events.aspx?ai=130", "WA"=>"Washington", "WV"=>"/events.aspx?ai=131", "WI"=>"/events.aspx?ai=107", "WY"=>"/events.aspx?ai=132"}
+EVENT_LINKS_BY_STATE = {"AL"=>"/events.aspx?ai=108", "AK"=>"/events.aspx?ai=109", "AZ"=>"/events.aspx?ai=102", "AR"=>"/events.aspx?ai=110", "CA"=>"/events.aspx?ai=308", "CO"=>"/events.aspx?ai=82", "CT"=>"/events.aspx?ai=111", "DE"=>"/events.aspx?ai=112", "DC"=>"District of Columbia", "FL"=>"/events.aspx?ai=317", "GA"=>"/events.aspx?ai=64", "HI"=>"/events.aspx?ai=133", "ID"=>"/events.aspx?ai=113", "IL"=>"/events.aspx?ai=359", "IN"=>"/events.aspx?ai=85", "IA"=>"/events.aspx?ai=114", "KS"=>"/events.aspx?ai=90", "KY"=>"/events.aspx?ai=115", "LA"=>"/events.aspx?ai=65", "ME"=>"/events.aspx?ai=116", "MD"=>"/events.aspx?ai=117", "MA"=>"/events.aspx?ai=79", "MI"=>"/events.aspx?ai=360", "MN"=>"/events.aspx?ai=81", "MS"=>"/events.aspx?ai=103", "MO"=>"/events.aspx?ai=118", "MT"=>"/events.aspx?ai=119", "NE"=>"/events.aspx?ai=120", "NV"=>"/events.aspx?ai=47", "NH"=>"/events.aspx?ai=121", "NJ"=>"/events.aspx?ai=48", "NM"=>"/events.aspx?ai=122", "NY"=>"/events.aspx?ai=8", "NC"=>"/events.aspx?ai=123", "ND"=>"/events.aspx?ai=124", "OH"=>"/events.aspx?ai=84", "OK"=>"/events.aspx?ai=104", "OR"=>"/events.aspx?ai=125", "PA"=>"/events.aspx?ai=80", "RI"=>"/events.aspx?ai=127", "SC"=>"/events.aspx?ai=105", "SD"=>"/events.aspx?ai=128", "TN"=>"/events.aspx?ai=72", "TX"=>"/events.aspx?ai=318", "UT"=>"/events.aspx?ai=106", "VT"=>"/events.aspx?ai=129", "VA"=>"/events.aspx?ai=130", "WA"=>"Washington", "WV"=>"/events.aspx?ai=131", "WI"=>"/events.aspx?ai=107", "WY"=>"/events.aspx?ai=132"}
 URL_BASE = "https://www.residentadvisor.net"
 
   def call
     welcome
-    list_events(user_inputs_state)
+    list_events
     goto_event_url
   end
 
@@ -15,48 +15,29 @@ URL_BASE = "https://www.residentadvisor.net"
     puts "Welcome to ra_events! A gem that lists electronic music events."
   end
 
-  def user_inputs_state
-    puts "Please enter your state(ex: MI, NY, CA):"
-    input = gets.strip.upcase
-    if STATES_AND_LINKS.key?(input)
-      url = URL_BASE + STATES_AND_LINKS[input]
-    else
-      puts "Invalid"
-      user_inputs_state
-    end
-  end
-
-  def list_events(user_inputs_state)
+  def list_events
+    scrape_events
     display_events_this_week_text
     
-    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|
-      
+    Event.all.each.with_index(1) do |event, i|      
       if event.no_events_listed == true
-        puts "There are currently no events listed for this date range in this region."
-        puts
+        no_events_listed_message
         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 
+        display_and_format_event(event, i)
       end
     end
   end
 
   def goto_event_url
-    puts "Type the event # you'd like to view in your browser, 'menu' or 'exit':"
+    prompt_for_event_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.to_i - 1]
-        puts "#{URL_BASE + event.url}"
-        `open #{URL_BASE + event.url}`
+        print_url(event)
+        open_url_in_browser(event)
         goto_event_url
       elsif input == "exit"
         exit_program
@@ -69,20 +50,71 @@ URL_BASE = "https://www.residentadvisor.net"
       end
   end
 
+  def get_event_url
+    prompt_for_state
+    state = gets.strip.upcase
+    if EVENT_LINKS_BY_STATE.key?(state)
+      url = URL_BASE + EVENT_LINKS_BY_STATE[state]
+    else
+      puts "Invalid"
+      get_event_url
+    end
+  end
+
   def main_menu
     call
   end
 
   def display_events_this_week_text
     puts "Events this week:"
-    puts "****************"
-    puts "*************"
-    puts "**********"
-    puts "*******"
-    puts "****"
-    puts "**"
+    puts "****************" 
+    sleep 0.1
+    puts "*************" 
+    sleep 0.1
+    puts "**********" 
+    sleep 0.1
+    puts "*******" 
+    sleep 0.1
+    puts "****" 
+    sleep 0.1
+    puts "**"  
+    sleep 0.1 
   end
 
+  def scrape_events
+    Scraper.scrape_events_page(get_event_url)
+  end
+
+  def prompt_for_state
+    puts "Please enter your state(ex: MI, NY, CA):"
+  end
+
+  def no_events_listed_message
+    puts "There are currently no events listed for this month in this region."
+    puts
+  end
+
+  def display_and_format_event(event, i)
+    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 
+  end
+  
+  def prompt_for_event_menu_or_exit
+    puts "Type the event # you'd like to view in your browser, 'menu' or 'exit':"
+  end  
+  
+  def print_url(event)
+    puts "Opening residentadvisor.net..."
+    puts "#{URL_BASE + event.url}"
+  end
+
+  def open_url_in_browser(event)
+    `open #{URL_BASE + event.url}`
+  end
+  
   def exit_program
     clear_events
     puts "Bye, see you on the dance floor!"

data/lib/ra_events/event.rb

@@ -27,4 +27,11 @@ class Event
   def self.clear
     self.all.clear
   end
+
+  # def self.includes_artist(artist)
+  #   Event.all.select do |event|
+  #     event.artists.include?(artist)
+  #   end    
+  # end
+  
 end

data/lib/ra_events/scraper.rb

@@ -3,29 +3,21 @@ require 'open-uri'
 require 'nokogiri'
 
 class Scraper
-
-  attr_accessor 
-
-  def initialize
-
-  end
   
   def self.scrape_links(index_url)
     state_event_page_url = {}
-    ra_events_page = Nokogiri::HTML(open("https://www.residentadvisor.net/events.aspx"))
+    ra_events_page = Nokogiri::HTML(open(index_url))
 
     ra_events_page.css("li.parent a").each do |e|
       state_event_page_url[e.children.text] = e['href'] unless e.children.text == "Washington DC"
     end
-
     state_event_page_url 
   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)
+    Event.new({no_events_listed: true}) if self.no_events_listed(ra_events_page)
     
     ra_events_page.css("#items").each do |event_listings|
       event_listings.css('li').each do |event|
@@ -36,15 +28,13 @@ class Scraper
         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}         
+          Event.new({date: event_date, title: event_title, location: event_location, artists: event_artists, url: event_url})        
         end
       end
     end
-
-    events
   end
 
-  def self.is_real_event?(ra_events_page)
+  def self.no_events_listed(ra_events_page)
     ra_events_page.css('.pr8').first.text.include?("no events")
   end
 

data/lib/ra_events/version.rb

@@ -1,3 +1,3 @@
 module RaEvents
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/ra_events.gemspec

@@ -2,7 +2,7 @@
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ra_events/version'
-require 'pry'
+
 
 Gem::Specification.new do |spec|
   spec.name          = "ra_events"
@@ -31,13 +31,14 @@ Gem::Specification.new do |spec|
   spec.bindir        = "bin"
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  
+  spec.add_runtime_dependency "nokogiri", ">= 1.7.1"
 
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "pry", ">= 0.9.0"
+  spec.add_development_dependency 'pry', '~> 0.9.12'
   spec.add_development_dependency "rspec", ">= 3.2.0"
+  spec.add_development_dependency "coderay", "~> 1.1.1"
   
-  spec.add_runtime_dependency "nokogiri", ">= 1.7.0"
-
 end
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ra_events
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Mike Etlinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2017-07-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +56,16 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.12
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -67,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: coderay
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
-  type: :runtime
+        version: 1.1.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.1.1
 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.
@@ -129,10 +143,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: ra_events lists Resident Advisor events by state from the comfort of your
   CLI
 test_files: []
-has_rdoc: