brewery_search 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dd6e5adb32494110641bf24cb1c7593fc473adf
-  data.tar.gz: 47e0692432f79def8dc30b842d444ac1bc9a67cb
+  metadata.gz: 578c2464bb9048a6758fb13eca2d9ac70ddd651d
+  data.tar.gz: 3ac18b0061c01c338c5ccdd8b72a60340fe7a30b
 SHA512:
-  metadata.gz: 7494dec5ff0718015dcbd85e26151ce10b330c7eadf8c4e87b7654db1b4d5649452358def5e92e907a27c7605da3c28981521f365b5189d8fb9bc889a53e9372
-  data.tar.gz: c2be5751795e5f4065d0255919a5d79e1b2a9649a02b456aeca7217bf28a1c0be1d0b0a40a34338235d6dd46e0581dfc878d466e24d418671efaa11a3a8a3d75
+  metadata.gz: bfbdf4f520031a0b59566f9eaf369a6fbcc6030b30aab2c4eab1e5598c711d0d59ecba6bed8073587ca8ce25019fefb4b2053ffb59c0422e680aac033c3d10b6
+  data.tar.gz: 99f258025db39cb530a5623a3803452ae2c9d0e2debf015f81688343e3f7c37a8df54e40599375c0afd9b5d8ed542af8963029019dfa12683155c816faedab1b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    brewery_search (0.1.0)
+    brewery_search (0.1.1)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -24,7 +24,7 @@ Type the following to get started:
 
     $ brewery-search
 
-Follow the on-screen prompts to continue.
+A user will be greeted with a welcome screen. Follow the on-screen prompts to continue.
 
 Users will have the ability to search by state abbreviations (case senstitive). From there a user will be presented with a list of all registered breweries in that state. A user can call 
 
@@ -32,6 +32,22 @@ Users will have the ability to search by state abbreviations (case senstitive).
 
 to receive a prompt to filter by a specific city, otherwise they can select the number of any brewery for more information.
 
+Additional commands from the menu include:
+
+    $ new search
+    $ exit
+
+New search will bring the user back to the beginning to search for a different state. Exit will quit the program.
+
+When viewing additional information for any brewery, a user will be able to do any of the following commands (if that information is made available) to either launch the corresponding page, return, or exit the program:
+            
+    $ Website
+    $ Facebook
+    $ Twitter
+    $ Instagram
+    $ Menu
+    $ Exit
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/bin/brewery-search

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-# require "bundler/setup"
-# require "./config/environment.rb"
+require "bundler/setup"
+require "./config/environment.rb"
 require_relative "../lib/brewery_search"
 
 BrewerySearch::CLI.new.welcome_screen

data/brewery_search.gemspec

@@ -9,12 +9,10 @@ Gem::Specification.new do |spec|
   spec.email         = ["btmcco8@gmail.com"]
 
   spec.summary       = "A CLI brewery directory leveraging BrewBound"
-  spec.description   = "Allows a user to search for breweries by state by utilizing the www.brewbound.com brewery database. A user can filter by city and obtain additional info about any entry."
+  spec.description   = "Allows a user to search for breweries by state by utilizing the www.brewbound.com brewery database. Results will be returned as a numbered list. Contains a welcome screen upon launch and will have several prompts for a user to follow."
   spec.homepage      = "https://github.com/btmccollum/brewery_search"
   spec.license       = "MIT"
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
     spec.metadata["allowed_push_host"] = "https://rubygems.org"
   else
@@ -22,22 +20,18 @@ Gem::Specification.new do |spec|
       "public gem pushes."
   end
 
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "bin"
   spec.executables   = ["brewery-search"]
-  # spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  # spec.executables << "brewery-search"
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "require_all", "~> 2.0"
   spec.add_development_dependency "nokogiri", "~> 1.8", ">= 1.8.4"
   spec.add_development_dependency "launchy", "~> 2.4", ">= 2.4.3"
-  spec.add_development_dependency "require_all", "~> 2.0"
   
 end

data/config/environment.rb

@@ -3,6 +3,7 @@ Bundler.require
 
 require_all 'lib'
 
+require_relative '../lib/brewery_search.rb'
 require_relative '../lib/brewery_search/brewery.rb'
 require_relative '../lib/brewery_search/cli.rb'
 require_relative '../lib/brewery_search/scraper.rb'

data/lib/brewery_search/brewery.rb

@@ -4,6 +4,7 @@ class BrewerySearch::Brewery
 
     @@all = []
 
+    #creates a brewery entry for every result returned by the scraped state
     def self.create_from_state_scrape(input)
         search_state = BrewerySearch::Scraper.scrape_by_state(input)
         search_state.pages.each do |page|
@@ -25,22 +26,34 @@ class BrewerySearch::Brewery
     def create_profile_attributes
         profile = BrewerySearch::Scraper.scrape_by_profile(self.site_url)
         
-        if profile.css("div #overview dl dd")[0].text.include?("JOB")
-            self.address = profile.css("div #overview dl dd")[3].css("a").attr("href").text.gsub(/\bhttps:.*=+./, '')
+        #determining address based one one of several formats the site can use
+        if (profile.css("div #overview dl dd dt").text.include?("PARENT") || profile.css("div #overview dl dd dt").text.include?("Founded")) && !!profile.css("div #overview dl dd")[0].text.match(/[0-9]/) == true
+            self.address = profile.css("div #overview dl dd")[3].css("a").attr("href").text.gsub(/\bhttps:.*=(?:,)?/, '')
+        elsif profile.css("div #overview dl dd dt").text.include?("PARENT") || profile.css("div #overview dl dd dt").text.include?("Founded")
+            self.address = profile.css("div #overview dl dd")[2].css("a").attr("href").text.gsub(/\bhttps:.*=(?:,)?/, '')
+        elsif profile.css("div #overview dl dd")[0].text.include?("JOB") && !!profile.css("div #overview dl dd")[0].text.match(/[0-9]/) == true
+            self.address = profile.css("div #overview dl dd")[3].css("a").attr("href").text.gsub(/\bhttps:.*=(?:,)?/, '')
         else
-            self.address = profile.css("div #overview dl dd")[2].css("a").attr("href").text.gsub(/\bhttps:.*=+./, '')
+            self.address = profile.css("div #overview dl dd")[2].css("a").attr("href").text.gsub(/\bhttps:.*=(?:,)?/, '')
         end
 
-        if profile.css("div #overview dl dd")[0].text.include?("JOB")
+        #determining overview based on one of several formats the site can use
+        if (profile.css("div #overview dl dd dt").text.include?("PARENT") || profile.css("div #overview dl dd dt").text.include?("Founded")) && !!profile.css("div #overview dl dd")[0].text.match(/[0-9]/) == true
+            self.overview = profile.css("div #overview dl dd")[4].text
+        elsif profile.css("div #overview dl dd dt").text.include?("PARENT") || profile.css("div #overview dl dd dt").text.include?("Founded")
+            self.overview = profile.css("div #overview dl dd")[3].text
+        elsif profile.css("div #overview dl dd")[0].text.include?("JOB") && !!profile.css("div #overview dl dd")[0].text.match(/[0-9]/) == true
             self.overview = profile.css("div #overview dl dd")[4].text
         else
             self.overview = profile.css("div #overview dl dd")[3].text
         end
-        
+
+        #determine phone number
         if profile.css("div.contact dt")[1].text == "Phone"
             self.phone = profile.css("div.contact dd")[1].text
         end
 
+        #determine external website
         self.external_site = profile.css("div.contact a").attr("href").text
         
         #grab social media links depending on what they have available

data/lib/brewery_search/cli.rb

@@ -50,9 +50,6 @@ class BrewerySearch::CLI
         @last_searched_state = input
             if VALID_STATES.include?(input)
                 list_breweries(input)
-            elsif
-                puts "Invalid entry received."
-                self.start
             elsif input == "exit"
                 self.quit
             elsif input == "BrewBound"
@@ -158,7 +155,7 @@ class BrewerySearch::CLI
         input = gets.strip
 
         #has to use @last_brew_list_searched in order to continue to use state specific results
-        if input.to_i > 0
+        if (input.to_i > 0) && (input.to_i <= @last_brew_list_searched.size)
             brewery = @last_brew_list_searched[input.to_i - 1]
             brewery.create_profile_attributes
           
@@ -205,7 +202,7 @@ class BrewerySearch::CLI
         input = gets.strip
 
         #has to utilize @last_city_list_searched in order to continue to use city specific results
-        if input.to_i > 0
+        if (input.to_i > 0) && (input.to_i <= @last_city_list_searched.size)
             brewery = @last_city_list_searched[input.to_i - 1]
             brewery.create_profile_attributes
           
@@ -214,16 +211,16 @@ class BrewerySearch::CLI
             input = gets.strip
                 if input == "Website"
                     Launchy.open("#{brewery.external_site}") {|exception| puts "Attempted to open #{brewery.external_site} but failed due to : #{exception}"}
-                    self.menu
+                    self.city_menu 
                 elsif input == "Facebook"
                     Launchy.open("#{brewery.facebook_link}") {|exception| puts "Attempted to open #{brewery.facebook_link} but failed due to : #{exception}"}
-                    self.menu
+                    self.city_menu 
                 elsif input == "Twitter"
                     Launchy.open("#{brewery.twitter_link}") {|exception| puts "Attempted to open #{brewery.twitter_link} but failed due to : #{exception}"}
-                    self.menu
+                    self.city_menu 
                 elsif input == "Instagram"
                     Launchy.open("#{brewery.insta_link}") {|exception| puts "Attempted to open #{brewery.insta_link} but failed due to : #{exception}"}
-                    self.menu
+                    self.city_menu 
                 elsif input == "Youtube"
                     Launchy.open("#{brewery.youtube_link}") {|exception| puts "Attempted to open #{brewery.youtube_link} but failed due to : #{exception}"}
                     self.city_menu 

data/lib/brewery_search/scraper.rb

@@ -16,10 +16,11 @@ class BrewerySearch::Scraper
         
         page = 2
 
+        #all state search pages use same HTML format, user input for state abbreviation is injected
         doc = Nokogiri::HTML(open("https://www.brewbound.com/mvc/Breweries/state/#{input}?displayOutOfBiz=False"))
         state_object.pages << doc
 
-        #is able to scrape data from additional pages when applicable
+        #is able to scrape data from additional pages when applicable, all pages use same format for additional page results, # and user input are injected
         while doc.css("table.breweries-list tfoot p.text-center").text.include?("Next") do
             doc = Nokogiri::HTML(open("https://www.brewbound.com/mvc/Breweries/state/#{input}/page/#{page}?displayOutOfBiz=False"))
             state_object.pages << doc

data/lib/brewery_search/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brewery_search
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - btmccollum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-08 00:00:00.000000000 Z
+date: 2018-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: require_all
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -92,23 +106,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.3
-- !ruby/object:Gem::Dependency
-  name: require_all
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 description: Allows a user to search for breweries by state by utilizing the www.brewbound.com
-  brewery database. A user can filter by city and obtain additional info about any
-  entry.
+  brewery database. Results will be returned as a numbered list. Contains a welcome
+  screen upon launch and will have several prompts for a user to follow.
 email:
 - btmcco8@gmail.com
 executables:
@@ -126,6 +126,7 @@ files:
 - bin/brewery-search
 - bin/console
 - bin/setup
+- brewery_search-0.1.0.gem
 - brewery_search.gemspec
 - config/environment.rb
 - lib/brewery_search.rb