Brew_Finder 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcaa9f2cc367a46534ff08ea636feafa44065189
-  data.tar.gz: 14c5bd6dd95c26c6a119e7729e7007e118c309c8
+  metadata.gz: d5d3b767bf66d9b98b0137354042cdfded186b72
+  data.tar.gz: 9dcd8f08adb932f0271e67a62bd72b8fd1aa0e01
 SHA512:
-  metadata.gz: c4cc13d5ae97c9c309f5fe70052d268be57873c2e14ade6bb175d165e7cf07e28f24afe886783b4810e440b47720985687a2eac032dfad664dbee657c7dd70ae
-  data.tar.gz: 80806cb22c53f8ba1504fe3a051671b73eacfdf96de94246c67efc1ab8756536d7bc188c7e6f87a5d6c62169a9be8f8c42cf12b758b0d48a19088a71dd720c87
+  metadata.gz: ce07650410b13b98fa6336482194832be698ede8bfa3a52a336c0837ee6c23f0a3298f97fc8f4aca616085cd246ca7efb4aa759fc5524fb68655e2bec54c54cc
+  data.tar.gz: aa260ce400312c5316be577144b477e0748ce64f478001e332399c19ca5946da0318aad06a915e8d2f22087650a63bb999a8d998c3e2f0846a644bc5aa7139ae

data/Gemfile.lock

@@ -2,11 +2,13 @@ PATH
   remote: .
   specs:
     Brew_Finder (0.1.0)
+      colorize
       nokogiri
 
 GEM
   remote: https://rubygems.org/
   specs:
+    colorize (0.8.1)
     mini_portile2 (2.1.0)
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)

data/bin/brew-finder

@@ -6,4 +6,4 @@
 require_relative "../lib/brew_finder"
 
 
-BrewFinder::CommandLineInterface.new.welcome
+CommandLineInterface.new.welcome

data/bin/setup

@@ -1,4 +1,4 @@
-
+s
 #!/usr/bin/env bash
 set -euo pipefail
 IFS=$'\n\t'

data/brew_finder.gemspec

@@ -21,4 +21,5 @@ require 'Brew_Finder/version'
    spec.add_development_dependency "bundler", "~> 1.5"
    spec.add_development_dependency "rake"
    spec.add_dependency "nokogiri"
+   spec.add_dependency "colorize"
  end

data/lib/Brew_Finder/brewery_fetcher.rb

@@ -1,12 +1,10 @@
 require 'open-uri'
 require 'nokogiri'
-require 'pry'
 
 class Brewery_Fetcher
 
   def self.query_api(api_query)
     returned_request = Nokogiri::HTML(open(api_query))
-    puts "#{returned_request}"
     breweries = []
     #we gotta use something called xpath?
     returned_request.xpath("//location").each do |location|
@@ -27,19 +25,28 @@ class Brewery_Fetcher
   def self.fetch_score_info(score_request)
     returned_scores = Nokogiri::HTML(open(score_request))
     #brewery score profile
-    score_location = returned_scores.xpath("//location")
-    score_profile = {
-    #overall_score, selection, service, atmosphere, food, review_count
-      :overall_score => score_location.xpath("child::overall").text.to_f.round(1),
-      :selection => score_location.xpath("child::selection").text.to_f.round(2),
-      :service => score_location.xpath("child::service").text.to_f.round(2),
-      :atmosphere => score_location.xpath("child::atmosphere").text.to_f.round(2),
-      :review_count => score_location.xpath("child::reviewcount").text.to_i,
-      :food=>score_location.xpath("child::food").text.to_f.round(2)
-      }
+    score_location = returned_scores.xpath("//location/*")
+
+    if (score_location.xpath("//overall").text.to_i == 0)
+      #puts "fetcher error"
+
+      score_profile = nil
+    else
+      #puts "#{score_location.xpath("//overall").text}"
+      score_profile = {
+
+      #overall_score, selection, service, atmosphere, food, review_count
+        :overall_score => score_location.xpath("//overall").text.to_f.round(1),
+        :selection => score_location.xpath("//selection").text.to_f.round(2),
+        :service => score_location.xpath("//service").text.to_f.round(2),
+        :atmosphere => score_location.xpath("//atmosphere").text.to_f.round(2),
+        :review_count => score_location.xpath("//reviewcount").text.to_i,
+        :food=>score_location.xpath("//food").text.to_f.round(2)
+        }
+        score_profile
+    end
+
 
-    #return brewery score profile
-    return score_profile
 
   end
 

data/lib/Brew_Finder/brewery_info.rb

@@ -8,14 +8,20 @@ class Brewery
 
   def initialize(brewery_hash)
     #puts "#{brewery_hash}"
+    count = 0
     brewery_hash.each do |key, value|
-      #puts "#{key} #{value}"
+      #puts "#{key}: #{value}"
+      #value.each do |key,value|
+      #  puts "#{key},#{value}"
+      #end
+      #puts "count = #{count}"
+      count += 1
       self.send(("#{key}="), value)
-      #puts "#{self.phone}"
+      #puts "#{self.street_address}"
 
     end
     @@all << self
-    #puts "#{@@all}"
+    #puts "#{self.inspect}"
   end
 
   #change students_array to brewery_array
@@ -25,13 +31,19 @@ class Brewery
       #Brewery.new
       #puts "#{brewery_hash} #{index}"
       Brewery.new(brewery_hash)
+      #puts "#{self.name} #{self.id}"
     end
   end
 
   #change to add_brewery_info, score_hash
   def add_score_info(score_hash)
+    if (score_hash == nil)
+      #puts "nildorado"
+    end
+    #puts "#{score_hash}"
     score_hash.each do |key, value|
       self.send(("#{key}="), value)
+      #puts "#{key}= #{value}"
     end
   end
 

data/lib/Brew_Finder/command_line_interface.rb

@@ -1,7 +1,4 @@
-require_relative "../lib/brewery_fetcher.rb"
-require_relative "../lib/brewery_info.rb"
-require 'nokogiri'
-require 'colorize'
+
 
 class CommandLineInterface
 #change this to base api query
@@ -13,9 +10,7 @@ class CommandLineInterface
       #first welcome user
       puts "\e[H\e[2J"
       puts <<-DOC
-                        o©ºº©oo©oº°©
-                        /           \
-                        |___________|____
+                        o©ºº©oo©oº°©oo____
                         |            |____)
                         |  WELCOME   |  | |
                         |            |  | |
@@ -39,6 +34,7 @@ class CommandLineInterface
       case input
       when /search/
         return_search
+        #Brewery.all.each {|brewery| puts "#{brewery.inspect}"}
         display_breweries
         score_menu
       when /exit/
@@ -66,11 +62,13 @@ class CommandLineInterface
       input = gets.chomp
       case input
       when /scores/
+        #Brewery.all.each {|brewery| puts "#{brewery.inspect}"}
         return_scores
         end_menu
       when /search/
         return_search
-        scores_menu
+        display_breweries
+        score_menu
       when /exit/
         puts "Goodbye!"
         exit
@@ -91,6 +89,7 @@ class CommandLineInterface
         score_menu
       when /search/
         return_search
+        display_breweries
         score_menu
       when /exit/
         puts "Goodbye!"
@@ -102,8 +101,14 @@ class CommandLineInterface
   end
 
   def return_scores
-    scores = get_brewery_score(formatted_score)
-    scored_brewery = add_scores_to_brewery(first_score_query, scores)
+    id = get_score_query
+    #puts "id:#{id}"
+    formatted_scores = format_score_query(id)
+    scores = get_brewery_score(formatted_scores)
+    #puts "#{scores}"
+    #Brewery.all.each {|brewery| puts "#{brewery.inspect}"}
+    scored_brewery = add_scores_to_brewery(id, scores)
+    #puts "#{scored_brewery.name}"
     display_score(scored_brewery)
   end
 
@@ -150,34 +155,57 @@ class CommandLineInterface
 #take the requested brewery and add additional info
   def get_brewery_score(formatted_score)
     #take the brewery instance and give it more attributes
-    scores = Brewery_Fetcher.fetch_score_info(score_query)
+    scores = Brewery_Fetcher.fetch_score_info(formatted_score)
     scores
   end
 
   def add_scores_to_brewery(brewery_id, score_hash)
-    scored_brewery = Brewery.all.detect{|brewery| brewery.id = brewery_id}
-    scored_brewery.add_score_info(score_hash)
-    scored_brewery
+    #puts "brewery_id #{brewery_id.class} score hash #{score_hash}"
+    #Brewery.all.each {|brewery|puts "#{brewery.inspect}"}
+    scored_brewery_array = Brewery.all.select {|brewery| brewery.id == brewery_id.to_i}
+    #puts "#{scored_brewery_array}"
+    scored_brewery = scored_brewery_array[0]
+    #puts "#{scored_brewery.class}"
+    if (score_hash == nil)
+      #puts "nildred"
+      scored_brewery
+
+    else
+      scored_brewery.add_score_info(score_hash)
+      scored_brewery
+    end
   end
 
   def display_breweries
     Brewery.all.each do |brewery|
-      puts "#{brewery.name}".colorize(:purple)
+      print "Establishment: ".colorize(:light_yellow)
+      puts "#{brewery.name}".colorize(:yellow)
+      print "ID: ".colorize(:light_green)
       puts "#{brewery.id}".colorize(:green)
-      puts "#{brewery.street_address}".colorize(:blue)
-      puts "#{brewery.phone}".colorize(:orange)
+      puts "#{brewery.street_address}".colorize(:cyan)
+      puts "#{brewery.phone}".colorize(:light_blue)
     end
   end
 
 #display additional requested brewery info
   def display_score(scored_brewery)
-    puts "#{scored_brewery.name}".colorize(:purple)
-    puts "Overall score: #{scored_brewery.overall_score}".colorize(:red)
-    puts "Selection: #{scored_brewery.selection}"
-    puts "Service: #{scored_brewery.service}"
-    puts "Atmosphere: #{scored_brewery.atmosphere}"
-    puts "Number of reviews: #{scored_brewery.review_count}"
-    puts "Food: #{scored_brewery.food}"
+    if (scored_brewery.overall_score == nil)
+      puts "No scores seem to be available for this brewery."
+    else
+      puts "#{scored_brewery.name}".colorize(:light_magenta)
+      print "Overall score: "
+      puts "#{scored_brewery.overall_score}".colorize(:light_yellow)
+      print "Selection: "
+      puts "#{scored_brewery.selection}".colorize(:light_yellow)
+      print "Service: "
+      puts "#{scored_brewery.service}".colorize(:light_yellow)
+      print "Atmosphere: "
+      puts "#{scored_brewery.atmosphere}".colorize(:light_yellow)
+      print "Number of reviews: "
+      puts"#{scored_brewery.review_count}".colorize(:light_yellow)
+      print "Food (if available): "
+      puts "#{scored_brewery.food}".colorize(:light_yellow)
+    end
   end
 
 end

data/lib/Brew_Finder/version.rb

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

data/lib/brew_finder.rb

@@ -1,5 +1,6 @@
 require 'nokogiri'
 require 'open-uri'
+require 'colorize'
 
 require_relative './Brew_Finder/brewery_fetcher'
 require_relative './Brew_Finder/brewery_info'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Brew_Finder
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kathleen DaSilva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,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: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Search by city/state to find local breweries/brewpubs, also view rating
   information for indiviual locations.
 email:
@@ -108,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Search for breweries/brewpubs using the Beer Mapping Project API
@@ -116,3 +130,4 @@ test_files:
 - spec/brewery_fetcher_spec.rb
 - spec/brewery_spec.rb
 - spec/spec_helper.rb
+has_rdoc: