events_nearby 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2c75f592a260fb0503a0145f323e688d9d954bf0
-  data.tar.gz: ad8be8978d4d039f4348317149f704e8aab55b49
+SHA256:
+  metadata.gz: 88852aa7f3a5d1fde260b076cd68223d642f9165d6a03352dae0cd26a653f459
+  data.tar.gz: b5e140a36cea1ed0f14ccc02535996a49f196d5df6ea3f77d919398245cab708
 SHA512:
-  metadata.gz: a22619193d34593bbe2b0ef5a0078b1d4c2d115f4a907c10ba08818ae3b76c735f76d967437c2caacbbb525ca397699a2687d75f23fd676fbdc87b1644342a76
-  data.tar.gz: e035f08703ad39d4e98de22c57b725ebf4ef2039b73e97eec580fa6b2e0dc9349b884bdb44cfe68f73e48f5c26e76e65ce43fafbd151421d3b97ef0cddb53773
+  metadata.gz: 1ddead6ae46f39a03981776c13ac30edcfe535f085e4c30ed76c1fe7e32318a05ad36e78914b125d5c8d05e3dc9eb029d783aeb098e6479fe0ae3bb0fb9a78d3
+  data.tar.gz: 966564917b92816e98b9127bf535b5fb25a1454cea2e16c1efd7b0cffa70b99ad7f67b21f1a624daec25f9723034fdea85f70c48c64b704591e285eec4e4ba5d

data/README.md

@@ -2,7 +2,15 @@
 
 Welcome to 'Events Nearby'! In this directory, you'll find a CLI Ruby Gem. 'Events Nearby' lets you enter any location to retrieve a list of events that are near that location. Displayed will be the name of the events, when they are taking place, where exactly they are, and how much they cost. You can then choose one of the listed events to see details about that event and even open it in your browser.
 
-## Installation
+## Installation/Running the application
+
+### Option 1: Cloning the repository and running it directly
+* Clone this repository: `git clone https://github.com/amelieoller/events-nearby-cli-gem.git`
+* `cd` into the cloned directory
+* Run `bundle install` in your terminal
+* Then run the application with `bin/events_nearby`
+
+### Option 2: Add the gem to your gemfile
 
 Add this line to your application's Gemfile:
 
@@ -10,13 +18,11 @@ Add this line to your application's Gemfile:
 gem 'events_nearby'
 ```
 
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
+And then run:
+  $ bundle
 
-    $ gem install events_nearby
+### Option 3: Install it yourself
+  $ gem install events_nearby
 
 ## Usage
 
@@ -27,9 +33,9 @@ Or install it yourself as:
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/events_nearby. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/amelieoller/events-nearby-cli-gem. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/bin/console

@@ -2,7 +2,7 @@
 
 # require "bundler/setup"
 # require "events_nearby"
-require_relative '../config/environment'
+require_relative '../lib/environment'
 
 
 # You can add fixtures and/or initialization code here to make experimenting

data/bin/events_nearby

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
-# Load files
-require_relative '../config/environment'
+# Load our environment
+require_relative '../lib/environment'
 
-EventsNearby::CLI.new.call
+# Create new CLI instance and call choose_city to start app
+EventsNearby::CLI.new.choose_city

data/events_nearby.gemspec

@@ -12,12 +12,20 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Events Nearby will show you events nearby based on the location you enter.}
   spec.license       = "MIT"
 
+  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
+  # delete this section to allow pushing this gem to any host.
+  # if spec.respond_to?(:metadata)
+  #   spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
+  # else
+  #   raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
+  # end
+
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_dependency "nokogiri", "~> 1.8"
 end

data/lib/environment.rb

@@ -0,0 +1,14 @@
+# Module EventsNearby
+module EventsNearby
+end
+
+# Load gems
+require 'require_all'
+require 'nokogiri'
+require 'open-uri'
+require 'pry'
+require 'launchy'
+require 'colorize'
+
+# Load local files
+require_all './lib'

data/lib/events_nearby/city.rb

@@ -0,0 +1,44 @@
+# City model
+class EventsNearby::City
+	attr_accessor :name, :state, :events
+	@@all = []
+
+	def initialize(name, state)
+		@name = name
+		@state = state
+		@events = []
+		@@all << self
+	end
+
+	# Adds new event to city array
+	def add_event(event)
+		self.events << event unless self.events.include?(event)
+	end
+
+	def self.all
+		@@all
+	end
+
+	# Find city if city and state combination exist already
+	def self.find_by(name, state)
+		self.all.detect{|city| city.name == name && city.state == state}
+	end
+
+	# Parse user city input and return name of city and state
+	def self.parse_city_input(city_input)
+		data = city_input.split(/[\s,]+/)
+
+		if city_input.include?(",")
+				state = data.last.gsub(/[^0-9A-Za-z]/, '').upcase
+				city_array = data.first data.size - 1
+		else
+				city_array = data
+		end
+
+		name = city_array.collect do |item|
+				item.gsub(/[^0-9A-Za-z]/, '').capitalize
+		end.join(" ")
+
+		{name: name, state: state}
+	end
+end

data/lib/events_nearby/cli.rb

@@ -1,81 +1,83 @@
 # CLI Controller
-
 class EventsNearby::CLI
+	# Ask user for city input, find or create new city and set @city instance variable
+	def choose_city
+		puts "What city would you like to see events nearby? (e.g. 'San Francisco, CA')"
+
+		input = gets.strip.downcase
+		parsed_input = EventsNearby::City.parse_city_input(input)
+		name = parsed_input[:name]
+		state = parsed_input[:state]
+
+		if EventsNearby::City.find_by(name, state)
+			@city = EventsNearby::City.find_by(name, state)
+			list_events
+		else
+			@city = EventsNearby::Scraper.new.scrape_events(name, state)
+			@city == false ? choose_city : list_events
+		end
+	end
+
+	def list_events
+		separator
+		puts "These are the upcoming events for #{@city.name.bold}:".red
+		separator
 
-    def call 
-        choose_city
-    end
+		@city.events.each_with_index do |event, i|
+			puts "#{i+1}. #{event.format_event}"
+		end
 
-    def choose_city
-        puts "What city would you like to see events nearby? (e.g. 'San Francisco, CA')"
-        input = gets.strip.downcase
-        EventsNearby::Events.destroy_all
-        EventsNearby::Events.today(input)
-        input == "exit" ? goodbye : list_events(input)
-    end
+		menu
+	end
 
-    def list_events(city)
-        puts "These are the upcoming events for #{city}:"
-        
-        EventsNearby::Events.all.each_with_index do |event, i|
-            puts "#{i+1}. #{event.formatted_event}"
-        end
-        menu
-    end
+	def menu
+		separator
+		puts "What would you like to do next?"
+		puts "- Pick an event by entering a number".bold
+		puts "- Type " + "'city'".bold + " to choose a new city"
+		puts "- Type " + "'list'".bold + " to list all events again"
+		puts "- Type " + "'exit'".bold + " to exit"
+		separator
 
-    def menu
-        puts "Which event would you like to know more about? Enter a number, 'start' to start over, or 'exit'."
-        input = gets.strip
-        if input.to_i.between?(1, EventsNearby::Events.all.size)
-            event = EventsNearby::Events.all[input.to_i - 1]
-            show_details(event)
-        else
-            decision(input)
-        end
-    end
+		input = gets.strip
 
-    def show_details(event)
-        puts ""
-        puts "--- #{event.formatted_event} ---"
-        if event.content != ""
-            puts event.content
-            puts ""
-            puts "Would you like to open this event in your browser? Enter 'yes' to open, 'menu' to pick another event, 'start' to start over, or 'exit'."
-            input = gets.strip
-            open_in_browser_decision(input, event)
-        else
-            puts "There seems to be no description of this event. Would you like to open this event in your browser? Enter 'yes' to open, 'menu' to pick another event, 'start' to start over, or 'exit'."
-            input = gets.strip
-            open_in_browser_decision(input, event)
-        end
-    end
+		if input == "exit"
+			puts "See you later!"
+		elsif input == "list"
+			list_events
+		elsif input == "city"
+			choose_city
+		elsif input.to_i.between?(1, @city.events.size)
+			event = @city.events[input.to_i - 1]
+			EventsNearby::Scraper.new.scrape_event(event) unless event.content
+			show_details(event)
+		else
+			puts "Not sure what you mean..."
+			menu
+		end
+	end
 
-    def open_in_browser_decision(input, event)
-        if ['y', 'yes', 'open'].include?(input.downcase)
-            event.open_in_browser
-            puts ""
-            menu
-        else
-            decision(input)
-        end
-    end
+	def show_details(event)
+		puts ""
+		puts "--- #{event.format_event} ---".green
+		puts event.content
+		puts ""
+		separator
+		puts "Would you like to open this event in your browser? #{'yes'.bold} or #{'no'.bold}?"
+		separator
 
-    def decision(input)
-        case input
-        when "exit"
-            goodbye
-        when "menu"
-            menu
-        when "start"
-            choose_city
-        else
-            puts "Not sure what you mean. Enter 'menu' to pick another event, 'start' to start over, or 'exit'."
-            decision(gets.strip)
-        end
-    end
+		input = gets.strip.downcase
 
-    def goodbye
-        puts "See you later!"
-    end
+		if ["y", "yes", "open"].include?(input)
+			event.open_in_browser
+			puts ""
+			menu
+		else
+			menu
+		end
+	end
 
-end
+	def separator
+		puts "--------------**********--------------".red
+	end
+end

data/lib/events_nearby/event.rb

@@ -0,0 +1,26 @@
+# Event model
+class EventsNearby::Event
+	attr_accessor :name, :date, :price, :url, :city, :content
+	@@all = []
+
+	def initialize(name, date, price, url, city)
+		@name = name
+		@date = date
+		@price = price
+		@url = url
+		@city = city
+		@@all << self
+	end
+
+	def self.all
+		@@all
+	end
+
+	def format_event
+		"#{self.name} | #{self.date} | #{self.price}"
+	end
+
+	def open_in_browser
+		Launchy.open(url)
+	end
+end

data/lib/events_nearby/scraper.rb

@@ -1,47 +1,57 @@
-require_relative '../../config/environment'
-
 class EventsNearby::Scraper
-
-    def initialize(url = nil)
-        @url = url
-    end
-
-    def scrape_event
-        @doc = Nokogiri::HTML(open(@url))
-        @doc.search(".js-xd-read-more-contents p").text.strip[0..300].gsub(/\s\w+\s*$/,'...')
-    end
-
-    def scrape_events(location)
-        url = include_location_in_url(location)
-        @doc = Nokogiri::HTML(open("#{url}"))
-        @doc.search("div.js-event-list-container div.list-card-v2").each do |event_item|
-            event = EventsNearby::Events.new
-
-            event.name = event_item.search(".list-card__title").first.text.gsub("\n", "").strip
-            event.date = event_item.search(".list-card__date").first.text.gsub("\n", "").strip.split.join(" ")
-            event.price = event_item.search(".list-card__label").first.text.strip
-            event.url = event_item.attr("data-share-url").strip
-
-            event.save
-        end
-    end
-
-    def include_location_in_url(location)
-        data = location.split(/[\s,]+/)
-
-        if location.include?(",")
-            state = data.last.gsub(/[^0-9A-Za-z]/, '')
-            city_array = data.first data.size - 1
-        else
-            city_array = data
-        end
-        
-        city = city_array.collect do |item|
-            item.gsub(/[^0-9A-Za-z]/, '')
-        end.join("-")
-
-        url = "https://www.eventbrite.com/d/#{state}--#{city}/events/"
-        url
-    end
-    
-end
+	def scrape_events(name, state)
+		url = "https://www.eventbrite.com/d/#{state}--#{name.split(/[\s,]+/).join("-")}/all-events/"
+
+		# Check if url is valid or returns error. If valid, scrape city, if not return false
+		doc = nokogiri_error_handling(url)
+		return false if doc == false
+
+		city = EventsNearby::City.new(name, state)
+
+		doc.search(".search-event-card-wrapper").each do |event_data|
+			name = event_data.search(".card-text--truncated__three").text.strip
+			url = event_data.search(".eds-media-card-content__action-link").attr('href').value
+			date = event_data.search(".eds-text-bs--fixed")[0].text
+			price = event_data.search(".eds-text-bs--fixed")[2].text
+
+			event = EventsNearby::Event.new(name, date, price, url, city)
+			city.add_event(event)
+		end
+
+		city
+	end
+
+	def scrape_event(event)
+		doc = nokogiri_error_handling(event.url)
+		event.content = doc.search(".js-xd-read-more-contents p").text.strip[0..300].gsub(/\s\w+\s*$/,'...')
+	end
+
+	def nokogiri_error_handling(url)
+		openuri_params = {
+			# set timeout durations for HTTP connection
+			# default values for open_timeout and read_timeout is 60 seconds
+			:open_timeout => 1,
+			:read_timeout => 1,
+		}
+
+		attempt_count = 0
+		max_attempts  = 3
+
+		begin
+			attempt_count += 1
+			content = open(url, openuri_params).read
+		rescue OpenURI::HTTPError => e
+			# it's 404, etc. - puts out error & do nothing
+			puts "We encountered a 404 error, please try again."
+			false
+		rescue SocketError, Net::ReadTimeout => e
+			# server can't be reached or doesn't send any respones
+			puts "error: #{e}"
+			sleep 3
+			retry if attempt_count < max_attempts
+		else
+			# connection successful, content is fetched, parse content with Nokogiri
+			Nokogiri::HTML(content)
+		end
+	end
+end

data/lib/events_nearby/version.rb

@@ -1,3 +1,3 @@
 module EventsNearby
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: events_nearby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - amelieoller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-04 00:00:00.000000000 Z
+date: 2019-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -68,11 +68,11 @@ files:
 - bin/console
 - bin/events_nearby
 - bin/setup
-- config/environment.rb
 - events_nearby.gemspec
-- lib/events_nearby.rb
+- lib/environment.rb
+- lib/events_nearby/city.rb
 - lib/events_nearby/cli.rb
-- lib/events_nearby/events.rb
+- lib/events_nearby/event.rb
 - lib/events_nearby/scraper.rb
 - lib/events_nearby/version.rb
 - spec.md
@@ -95,8 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Events Nearby will show you events nearby based on the location you enter.

data/config/environment.rb

@@ -1,8 +0,0 @@
-# Load gems and modules
-require 'require_all'
-require 'nokogiri'
-require 'open-uri'
-# require 'pry'
-
-# Load files
-require_all './lib'

data/lib/events_nearby.rb

@@ -1,4 +0,0 @@
-require_relative '../config/environment'
-
-module EventsNearby
-end

data/lib/events_nearby/events.rb

@@ -1,35 +0,0 @@
-class EventsNearby::Events
-
-    attr_accessor :name, :date, :price, :url, :content
-
-    @@all = []
-
-    def save
-        @@all << self
-    end
-
-    def self.all
-        @@all
-    end
-
-    def self.destroy_all
-        self.all.clear
-    end
-
-    def self.today(input)
-        EventsNearby::Scraper.new.scrape_events(input)
-    end
-
-    def content
-        @content ||= EventsNearby::Scraper.new(url).scrape_event
-    end
-
-    def formatted_event
-        "#{self.name} | #{self.date} | #{self.price}"
-    end
-
-    def open_in_browser
-        system("xdg-open '#{url}'")
-    end
-
-end