pets_seeking_people 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 647f7ade4a1c9e592cf714b64c52e039ecc32a32a3d32b360dfcd1dabd5cb7e3
-  data.tar.gz: 06ca761b7f436bf29d82622e7d7ed5a0bbdd22f598754f3c3f5aef0d82912760
+  metadata.gz: 66b99d7db1a44914d2ea092f42af2b249adb064523d39a71fc74fa7a563cba9e
+  data.tar.gz: 44cbbf3185528432de8618c1c50c5d6ee156c9b2e8a9388e99a940202d948002
 SHA512:
-  metadata.gz: 2ee65b82ade99ebe5a33413606c663c345d31da41ea740c78c2c91e7a520fc346d0762290cce1dabb3737624c172c51ad930f79229b79c39b58b456be2f9097f
-  data.tar.gz: 680cdf9b31b0b695b11fa9152ead5d670d8ab2dd962730e731f90ca516bc690e8e533e2fe3f20c10140ec4de53fe87c2605b9cc89d413ea161708cb678c8299e
+  metadata.gz: be5417bf4d1fc7c84df5402bac5ab730525c455fae5261f342d29a154870636205cfa4c97855de53bb12568dc2a2fad585bcfa8990d5f97e500dec7873be0f88
+  data.tar.gz: 7a3c57403c803b7f38fa632058da8b421a099fc98d123f20993e5b16a73e670ab4a320bc8edb948fe953450b26bd60520937daa468cb90a01db7683ca73018e5

data/Gemfile

@@ -3,4 +3,4 @@ source "https://rubygems.org"
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in pets_seeking_people.gemspec
-gemspec
+gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pets_seeking_people (0.2.0)
+    pets_seeking_people (0.3.0)
       nokogiri
 
 GEM
@@ -11,7 +11,7 @@ GEM
     diff-lcs (1.3)
     method_source (0.9.0)
     mini_portile2 (2.3.0)
-    nokogiri (1.8.1)
+    nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     pry (0.11.3)
       coderay (~> 1.1.0)

data/bin/pets_seeking_people

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby 
 
 require "bundler/setup"
-require "pets_seeking_people"
+require_relative "../lib/pets_seeking_people.rb"
 
 
 PetsSeekingPeople::CLI.new.call

data/lib/pets_seeking_people/cli.rb

@@ -1,10 +1,6 @@
-# This is the toolkit key for cats as of 1/30/18. It may change. toolkitKey=6REv6Spa
-# This is the toolkit key for dogs as of 1/30/18. It may change. toolkitKey=zu8atrEs
-# Adjust toolkit keys on line 50 as needed. 
-
 class PetsSeekingPeople::CLI
 
-	attr_accessor :pet_input, :zip_input
+  attr_accessor :pet_input, :zip_input
 
   def call
   	puts "Welcome to pets seeking people!"
@@ -51,16 +47,14 @@ class PetsSeekingPeople::CLI
 	end
 
 	def find_available_pets
-		pet_input == "cat" ? pet_type_input = "6REv6Spa" : pet_type_input = "zu8atrEs"
-		animals_array = PetsSeekingPeople::Scraper.scrape_index_page("https://toolkit.rescuegroups.org/j/3/grid1_layout.php?&location_0=#{zip_input}&toolkitIndex=0&toolkitKey=#{pet_type_input}", pet_type_input)
+		animals_array = PetsSeekingPeople::Scraper.scrape_index_page(zip_input, pet_input)
 		PetsSeekingPeople::Pets.create_from_collection(animals_array)
 	end
 
-	def add_info_about_pet(pet_number)
-		  search_pet = PetsSeekingPeople::Pets.all[pet_number]
-		  if !PetsSeekingPeople::Pets.all[pet_number].info 
-				info = PetsSeekingPeople::Scraper.scrape_animal_page(search_pet.animal_url)
-				search_pet.add_animal_attributes(info)
+	def add_info_about_pet(list_pet)
+		  if !list_pet.info 
+				info = PetsSeekingPeople::Scraper.scrape_animal_page(list_pet.animal_url)
+				list_pet.add_animal_attributes(info)
 			end
 	end
 
@@ -73,23 +67,22 @@ class PetsSeekingPeople::CLI
 		end
 	end
 
-	def list_details(pet_number)
-		add_info_about_pet(pet_number)
-		pet = PetsSeekingPeople::Pets.all[pet_number]
+	def list_details(list_pet)
+		add_info_about_pet(list_pet)
 		puts ""
-		puts "-------------------  Here's info on #{pet.name}:  ---------------------"
+		puts "-------------------  Here's info on #{list_pet.name}:  ---------------------"
 		puts ""
 		puts "Some deets you should know:"
-		pet.info.each {|pet_fact| puts "#{pet_fact}"}
+		list_pet.info.each {|pet_fact| puts "#{pet_fact}"}
 		puts ""
 		puts "--------------------------------------------------------------------------"
 		puts ""
-		puts "If you want to adopt #{pet.name}, contact:"
-		pet.adoption_contact.each {|contact| puts "#{contact}"}
+		puts "If you want to adopt #{list_pet.name}, contact:"
+		list_pet.adoption_contact.each {|contact| puts "#{contact}"}
 		puts ""
 		puts "--------------------------------------------------------------------------"
 		puts ""
-		puts "For more details on #{pet.name}, go to: #{pet.adoption_website}"
+		puts "For more details on #{list_pet.name}, go to: #{list_pet.adoption_website}"
 	end
 
 	def menu
@@ -107,9 +100,9 @@ class PetsSeekingPeople::CLI
 			puts ""
 			input = gets.strip.downcase
 
-				if input.to_i > 0 && input.to_i <= 24
-					pet_number = input.to_i-1
-					list_details(pet_number)
+				if input.to_i > 0 && input.to_i <= PetsSeekingPeople::Pets.all.size
+					list_pet = PetsSeekingPeople::Pets.find(input)
+					list_details(list_pet)
 				elsif input == "list"
 					list_pets
 				end

data/lib/pets_seeking_people/pets.rb

@@ -1,6 +1,6 @@
 class PetsSeekingPeople::Pets
 
-	attr_accessor :name, :breed, :age, :gender, :animal_url, :info, :detailed_info, :adoption_contact, :adoption_website
+  attr_accessor :name, :breed, :age, :gender, :animal_url, :info, :detailed_info, :adoption_contact, :adoption_website
 
 	@@all = []
 
@@ -24,5 +24,9 @@ class PetsSeekingPeople::Pets
 		@@all
 	end
 
+	def self.find(input)
+		self.all[input.to_i-1]
+	end
+
 end
 

data/lib/pets_seeking_people/scraper.rb

@@ -1,6 +1,12 @@
+# This is the toolkit key for cats as of 1/30/18. It may change. toolkitKey=6REv6Spa
+# This is the toolkit key for dogs as of 1/30/18. It may change. toolkitKey=zu8atrEs
+# Adjust toolkit keys on line 8 as needed. 
+
 class PetsSeekingPeople::Scraper
 
-  def self.scrape_index_page(index_url, pet_type_input)
+  def self.scrape_index_page(zip_input, pet_input)
+    pet_input == "cat" ? pet_type_input = "6REv6Spa" : pet_type_input = "zu8atrEs"
+    index_url = "https://toolkit.rescuegroups.org/j/3/grid1_layout.php?&location_0=#{zip_input}&toolkitIndex=0&toolkitKey=#{pet_type_input}"
   	doc = Nokogiri::HTML(open(index_url))
     animals = []
 
@@ -56,5 +62,6 @@ class PetsSeekingPeople::Scraper
     animal[:adoption_website] = profile_doc.xpath("//*[@id='rgtkPetFieldOrgUrl_0']/a").text #org website
     animal
   end
+
 end 
 

data/lib/pets_seeking_people/version.rb

@@ -1,3 +1,3 @@
 module PetsSeekingPeople
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec.md

@@ -1,5 +1,3 @@
-Specifications for the CLI Assessment
-
 Specs:
 
 [X] Have a CLI for interfacing with the application
@@ -10,8 +8,8 @@ Specs:
 	4) Inputting a number from the list to access more details about that animal,
 	5) Using the menu options to view the list again, view detailed info on another animal, or exit
 [X] Pull data from an external source
-  Pull data from ASPCA site based on dog v. cat input & zip code input. Pull from index/search page and from detailed page specific to each animal.
+    Pull data from ASPCA site based on dog v. cat input & zip code input. Pull from index/search page and from detailed page specific to each animal.
 [X] Implement both list and detail views
 	List view displays basic info about animals available for adoption (name, breed, age, gender). 
 	Detail view displays list of additional facts, and contact info (name, address, phone, email) for organization people can connect with to adopt that pet. 
-	Additional option to pull in detailed paragraphs about animal. Commented out in scraper & CLI as it's likely too much info for terminal view. Can comment back in to view. 
+	Additional option to pull in detailed paragraphs about animal. Commented out in scraper as it's likely too much info for terminal view. Can comment back in to view. 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pets_seeking_people
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Autumn J
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler