top-travel-destinations-cli-gem 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e8a820e99855dde9db204f393c40bbedd3d730c
-  data.tar.gz: 255dfa7e4d16aabe03daddb76f40cb81aa53027d
+  metadata.gz: 41c5b40a871276d4b88a3596a8ad47927f4e05db
+  data.tar.gz: d98d9d4c25ba8a46f7a1531df6520fb2b6440c54
 SHA512:
-  metadata.gz: 974d7ee2b07c7e9a2e7e9b89f09bc6edfc8824766cfe038fd887a4df0ed463ff9eb04c51d9bc5dd31fe47095c26102c32f41af2434b695673d9953b50a68c0ee
-  data.tar.gz: d1ca9ac4d7384d9fa29373480eadfff7c209454fe229abde580cd8b27e447fe714886c4a27b60e18835dc8118be7cae898722ab04c98e76012ee5c8849e7145b
+  metadata.gz: ddac693af27ea32d6c9a9c642f41f7b9619592a1fa68cb350cbe40b51ea7d8890c951ff5903e13fa8c1b748cc83cfe9e5058e1ee9d1b44753ed91d5fb13ca988
+  data.tar.gz: 7479d3c7c958a724e847a40204d20b5b948e52cc274e9ff76d59914ef12dde84ce8ee317bd4598288489ce9867693a18f0cdaf4577c7aaf1cd50031df37ab8d1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    top-travel-destinations-cli-gem (1.2.0)
+    top-travel-destinations-cli-gem (1.3.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,6 +1,6 @@
 # TopTravelDestinations
 
-Welcome to the Top Travel Destinations CLI gem! This gem was inspired by a love for traveling the world and learning about new cultures and experiences. The gem uses information from the TripAdvisor Travelers' Choice Destinations website (http://www.tripadvisor.com/TravelersChoice-Destinations) to provide you with easy-access to two levels of information: (1) the regions of the world; and (2) the top destinations of that region, as provided by TripAdvisor.  The world is your oyster. Safe travels and thank you for using the Top Travel Destinations CLI gem.  
+Welcome to the Top Travel Destinations CLI gem! This gem was inspired by a love for traveling the world and learning about new cultures and experiences. The gem uses information from the TripAdvisor Travelers' Choice Destinations website (http://www.tripadvisor.com/TravelersChoice-Destinations) to provide you with easy-access to three levels of information: (1) the regions of the world; (2) the top destinations of that region; and (3) a description of each top destination, as provided by TripAdvisor.  The world is your oyster. Safe travels and thank you for using the Top Travel Destinations CLI gem.  
 
 ## Installation
 
@@ -22,10 +22,11 @@ Or install it yourself as:
 
 The Top Travel Destinations CLI gem has simple instructions:
 1) At the "Here are the Regions of the World" prompt, enter an alphanumeric number (i.e., 1-9) to select a region.
-2) The gem will automatically generate the Top Travel Destinations for that region.
-3) After viewing Top Destinations for one region, either enter:
-    (a)'list' to return to the list of regions;
-    (b) 'exit' to leave the gem.
+2) At the "Here are the Top Travel Destinations For the Region" prompt, enter an alphanumeric number to select a destination.
+3) Other options for viewing various menus, include:
+    (a) 'regions' to return to the list of regions;
+    (b) 'destinations' to return to the list of destinations for a region;
+    (c) 'exit' to leave the gem.
 
 ## Development
 

data/config/environment.rb

@@ -5,4 +5,5 @@ require 'open-uri'
 require_relative "../lib/top_travel_destinations/version"
 require_relative '../lib/top_travel_destinations/cli'
 require_relative '../lib/top_travel_destinations/scraper'
-require_relative '../lib/top_travel_destinations/region'
+require_relative '../lib/top_travel_destinations/region'
+require_relative '../lib/top_travel_destinations/destination'

data/lib/top_travel_destinations/cli.rb

@@ -2,9 +2,8 @@ class TopTravelDestinations::CLI
   
   def call
     welcome_screen
-    make_regions
+    make_regions_and_destinations
     list_regions
-    select_region
   end
 
   def welcome_screen
@@ -21,9 +20,10 @@ class TopTravelDestinations::CLI
     puts "          `-....-'"
   end
 
-  def make_regions
-    region_array = TopTravelDestinations::Region.get_regions
-    TopTravelDestinations::Region.create_from_array(region_array)
+  def make_regions_and_destinations
+    regions_array = TopTravelDestinations::Region.get_regions
+    TopTravelDestinations::Region.create_from_array(regions_array)
+    #Destination instances are instantiated within the Region Class, after each Region instance is instantiated
   end
 
   def list_regions
@@ -32,40 +32,69 @@ class TopTravelDestinations::CLI
     TopTravelDestinations::Region.all.each_with_index do |region, index|
       puts "#{index+1}. #{region.name}"
     end
+    select_region
   end
 
   def select_region
-    input = nil
-    while input != "exit"
+    #input = nil
+    #while input != "exit"
       puts "\n"
-      puts "Enter the number of the region for which you would like the Top Travel Destinations."
-      puts "Enter 'list' to see the regions again OR type 'exit'."
+      puts "Enter the number of the region (1-#{TopTravelDestinations::Region.all.count}) for which you would like the Top Travel Destinations."
+      puts "Enter 'regions' to see the regions again OR type 'exit'."
       input = gets.strip.downcase 
       if (1..TopTravelDestinations::Region.all.count).to_a.include?(input.to_i)
-        index_value = input.to_i-1
-        show_top_destinations(index_value)
-      elsif input == "list"
+        region_index = input.to_i-1
+        list_destinations(region_index)
+      elsif input == "regions"
         list_regions
+        select_region
       elsif input == "exit"
         goodbye
       else
         puts "\n"
         puts "Please input a valid command."
-      end #end case
-    end #end while loop
+        select_region
+      end #end if statement
+    #end #end while loop
   end #end method
 
-  def show_top_destinations(index_value)
-    #refactored calling the specific region and set equal to local variable 'region_instance'
-    region_instance = TopTravelDestinations::Region.all[index_value]
+  def list_destinations(region_index)
+    region = TopTravelDestinations::Region.all[region_index]
     puts "\n"
-    puts "The Top Destinations For the #{region_instance.name} region are:"
+    puts "Here are the Top #{region.destinations.count} Travel Destinations For the #{region.name} Region:"
     counter = 1
-    region_instance.destinations.each do |destination|
+    region.destination_names.each do |destination|
       puts "#{counter}. #{destination}"
       counter +=1
     end
+    select_destination(region_index)
   end
+  
+  def select_destination(region_index)
+    region = TopTravelDestinations::Region.all[region_index]
+    puts "\n"
+    puts "Enter the number of the Top #{region.name} Travel Destination (1-#{region.destinations.count}) for which you would like a description."
+    puts "Enter 'destinations' to see the list of #{region.name} destinations again OR 'regions' to go back to the regions OR 'exit'."
+      input = gets.strip.downcase
+      if input == "regions"
+        list_regions
+      elsif input == "destinations"
+        list_destinations(region_index)
+      elsif input == "exit"
+        goodbye
+      elsif (1..region.destinations.count).to_a.include?(input.to_i)
+        destination_index = input.to_i-1
+        puts "\n"
+        puts "Destination: #{region.destinations[destination_index].name}, Region: #{region.name}"
+        puts "\n"
+        puts "Summary: #{region.destinations[destination_index].description}"
+        select_destination(region_index) 
+      else
+        puts "\n"
+        puts "Please input a valid command."
+        select_destination(region_index)
+      end #end if statement
+  end #end method
 
   def goodbye
     puts "\n"
@@ -80,6 +109,7 @@ class TopTravelDestinations::CLI
                                                  _/____/
     
     DOC
+    puts "                        Information from TripAdvisor"
   end
 
 end

data/lib/top_travel_destinations/destination.rb

@@ -0,0 +1,23 @@
+class TopTravelDestinations::Destination
+
+  #creates "belongs to" relationship to instance of Region
+  attr_accessor :name, :region, :description
+
+  @@all = []
+
+  def initialize(destination_hash)
+    self.create_attributes_from_hash(destination_hash)
+    self.class.all << self
+  end
+
+  def create_attributes_from_hash(destination_hash)
+    destination_hash.each do |key, value|
+      self.send(("#{key}="), value)
+    end
+  end
+
+  def self.all
+    @@all
+  end
+
+end

data/lib/top_travel_destinations/region.rb

@@ -11,8 +11,8 @@ class TopTravelDestinations::Region
     self.class.all << self
   end
 
-  def self.create_from_array(region_array)
-    region_array.each do |region_hash|
+  def self.create_from_array(regions_array)
+    regions_array.each do |region_hash|
       TopTravelDestinations::Region.new(region_hash)
     end
   end
@@ -31,18 +31,57 @@ class TopTravelDestinations::Region
     @@all
   end
 
+  def self.get_regions
+    TopTravelDestinations::Scraper.scrape_regions_array
+  end
+
   def get_destinations
+    destinations_array = self.scrape_destinations_array
+    self.add_destinations(destinations_array)
+  end
+
+  def scrape_destinations_array
     html = open(self.region_url)
     doc = Nokogiri::HTML(html)
-    
-    doc.search("div.winnerName div.mainName a").collect do |destination|
-      name = destination.text
-      self.destinations << name
-    end#end iterator
+
+    destinations_array = []
+
+    doc.css("div#WINNERVIEWER").children.each do |destination|
+      name = destination.search("div.mainName a").text
+      description = destination.search("div.descr_lb").text      
+      
+      if name != "" && description !=""
+        destinations_array << {
+          :name => name,
+          :description => description}
+      end
+    end #end iterator
+    destinations_array
+  end #end method
+
+  #creates "has many" relationship to instance of Region
+  def add_destinations(destinations_array)
+    destinations_array.each do |destination_hash|
+      destination = TopTravelDestinations::Destination.new(destination_hash) 
+      self.destinations << destination
+      destination.region = self
+    end
   end
 
-  def self.get_regions
-    TopTravelDestinations::Scraper.scrape_regions_array
+  def destination_names
+    destinations_names_array = [] 
+    self.destinations.each do |destination|
+      destinations_names_array << destination.name
+    end
+    destinations_names_array 
+  end
+
+  def destination_descriptions
+    destinations_descriptions_array = []
+    self.destinations.each do |destination|
+      destinations_descriptions_array << destination.description 
+    end
+    destinations_descriptions_array
   end
 
 end

data/lib/top_travel_destinations/scraper.rb

@@ -5,17 +5,17 @@ class TopTravelDestinations::Scraper
     html = open(index_url)
     doc = Nokogiri::HTML(html)
 
-    region_array = []
+    regions_array = []
 
-    doc.search("#tcRegions .tocContainer a").collect do |regionnode|
+    doc.search("div.cont a").collect do |regionnode|
       name = regionnode.text
       sub_url = regionnode.attribute("href").value
-      region_array << {
+      regions_array << {
         :name => name,
         :region_url => "https://www.tripadvisor.com#{sub_url}"
       }
     end #end iterator
-    region_array
+    regions_array
   end #end method
 
 end #end Class

data/lib/top_travel_destinations/version.rb

@@ -1,3 +1,3 @@
 module TopTravelDestinations
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: top-travel-destinations-cli-gem
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Antonio David
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,12 +99,13 @@ files:
 - bin/top-travel-destinations
 - config/environment.rb
 - lib/top_travel_destinations/cli.rb
+- lib/top_travel_destinations/destination.rb
 - lib/top_travel_destinations/region.rb
 - lib/top_travel_destinations/scraper.rb
 - lib/top_travel_destinations/version.rb
-- pkg/top-travel-destinations-cli-gem-1.2.0.gem
 - top-travel-destinations-cli-gem-1.0.0.gem
 - top-travel-destinations-cli-gem-1.1.0.gem
+- top-travel-destinations-cli-gem-1.2.0.gem
 - top_travel_destinations.gemspec
 homepage: https://github.com/agdavid/top-travel-destinations-cli-gem
 licenses: