blue_cross_pets 0.0.4 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df56e425a1d81d1c1f37a73c6bba9b4c8ed4aeb60e87727f1add909d759ace4f
-  data.tar.gz: 75affdcf65076d2248318615a674ede0e01adb59091f754337992e16d13a59cb
+  metadata.gz: 23822b1062b0a6f43f623f970a9186bd17caca3461efb57760935d65ad0d983a
+  data.tar.gz: 24602f0003f6480ba21a3d0329942053e6952755b1bf1b76f82d37454f01be3a
 SHA512:
-  metadata.gz: 95869a893986b51249e662c39e808277a61c33e58db03f42ca8b0ed6467d35f6ead320e6bb10c74fdac6a3e97d106e85b494a56a312c3d0b75cb1eb0acaf083e
-  data.tar.gz: 65066f6ebc8adcd49d7b1646945eaf1618d78d9c366ef824b78ab1396069c8da72e8cc9d8b180ac7a13c35315d59bbe5aedd55d7c5d549a239ba0b2e24b12317
+  metadata.gz: 14a589f90250e6e72f38c5c3c42e05197ef08c29454f7ae0faab9effdff249baba6f58bb9e45814e24d09b94335bfe0f55b63a983108247c30ee1f9abd5e46f6
+  data.tar.gz: d230a672142366197031077b2c3abb470aec687a50629dafdff1b58816c46d184715ffea794979098488d230253656c2ec76fb0cb73bd9cb952752d5f28b0900

data/lib/blue_cross_pets.rb

@@ -3,10 +3,6 @@ require 'nokogiri'
 require 'pry'
 require 'colorize'
 
-module BlueCrossPets
-  # Your code goes here...
-end
-
 require_relative "./blue_cross_pets/version"
 require_relative "./blue_cross_pets/cli"
 require_relative "./blue_cross_pets/scraper"

data/lib/blue_cross_pets/cat.rb

@@ -1,4 +1,4 @@
-require_relative "./pet"
+#require_relative "./pet"
 
 class BlueCrossPets::Cat < BlueCrossPets::Pet
 
@@ -16,48 +16,11 @@ class BlueCrossPets::Cat < BlueCrossPets::Pet
     @@cats
   end
 
-  def self.list_all
-    self.all.each_with_index do |cat, index|
-      puts "#{index + 1}. ".blue + "#{cat.name} - #{cat.breed} - #{cat.gender} - #{cat.age} - #{cat.availability}"
-    end
-  end
-
-  def self.scrape_cats
-
+  def self.create_cats
     if all.length == 0
-      cat_array = BlueCrossPets::Scraper.scrape_index("https://www.bluecross.org.uk/rehome/cat")
+      cat_array = BlueCrossPets::Scraper.new.scrape_index("https://www.bluecross.org.uk/rehome/cat")
       create_from_index(cat_array)
-      list_all
-    elsif all.length > 0
-      list_all
-    end
-
-  end
-
-  def self.get_more_info(input)
-
-    index = input.to_i - 1
-    cat = all[index]
-
-    if !cat.reference
-      attribute_hash = BlueCrossPets::Scraper.scrape_profile(cat.profile_url)
-      cat.add_attributes(attribute_hash)
-    elsif cat.reference
     end
-
-    puts "----------------------------- All about #{cat.name} -----------------------------".blue
-    puts "Age: ".light_white + "#{cat.age}"
-    puts "Gender: ".light_white + "#{cat.gender}"
-    puts "Availability: ".light_white + "#{cat.availability}"
-    puts "Breed & colour: ".light_white + "#{cat.breed_and_colour}"
-
-    if cat.can_live_with
-      puts "Can live with: ".light_white + "#{cat.can_live_with}"
-    end
-
-    puts "Bio: ".light_white + "#{cat.bio}"
-    puts "Animal reference number: ".light_white + "#{cat.reference}"
-    puts "Visit my page: ".light_white + "#{cat.profile_url}"
   end
 
 end

data/lib/blue_cross_pets/cli.rb

@@ -17,12 +17,14 @@ class BlueCrossPets::CLI
         when "dogs"
           @current_animal = "dog"
           puts "----------------------------- Our dogs: -----------------------------".blue
-          BlueCrossPets::Dog.scrape_dogs
+          BlueCrossPets::Dog.create_dogs
+          list_all
           choose_animal
         when "cats"
           @current_animal = "cat"
           puts "----------------------------- Our cats: -----------------------------".blue
-          BlueCrossPets::Cat.scrape_cats
+          BlueCrossPets::Cat.create_cats
+          list_all
           choose_animal
         when "exit"
         else
@@ -31,6 +33,19 @@ class BlueCrossPets::CLI
       end
   end
 
+  def list_all
+    if @current_animal == "dog"
+      BlueCrossPets::Dog.all.each.with_index(1) do |dog, index|
+        puts "#{index}. ".blue + "#{dog.name} - #{dog.breed} - #{dog.gender} - #{dog.age} - #{dog.availability}"
+      end
+
+    elsif @current_animal == "cat"
+      BlueCrossPets::Cat.all.each.with_index(1) do |dog, index|
+        puts "#{index}. ".blue + "#{dog.name} - #{dog.breed} - #{dog.gender} - #{dog.age} - #{dog.availability}"
+      end
+    end 
+  end 
+
   def number?(input)
     input = input.to_s unless input.is_a? String
     !!(/\A[+-]?\d+\z/.match(input))
@@ -41,12 +56,9 @@ class BlueCrossPets::CLI
     input = gets.strip.downcase
 
     if number?(input) == true
-      if @current_animal == "dog" && input.to_i.between?(1, BlueCrossPets::Dog.all.length)
-        puts "Paw-fect choice!".light_white
-        BlueCrossPets::Dog.get_more_info(input)
-      elsif @current_animal == "cat" && input.to_i.between?(1, BlueCrossPets::Cat.all.length)
+      if @current_animal == "dog" && input.to_i.between?(1, BlueCrossPets::Dog.all.length) || @current_animal == "cat" && input.to_i.between?(1, BlueCrossPets::Cat.all.length)
         puts "Paw-fect choice!".light_white
-        BlueCrossPets::Cat.get_more_info(input)
+        list_additional_info(input)
       else
         puts "Sorry, we didn't understand that!".red
       end
@@ -63,6 +75,32 @@ class BlueCrossPets::CLI
     end
   end
 
+  def list_additional_info(input)
+    index = input.to_i - 1
+
+    if @current_animal == "dog" && input.to_i.between?(1, BlueCrossPets::Dog.all.length)
+      pet_choice = BlueCrossPets::Dog.all[index]
+    elsif @current_animal == "cat" && input.to_i.between?(1, BlueCrossPets::Cat.all.length)
+      pet_choice = BlueCrossPets::Cat.all[index]
+    end 
+
+    pet_choice.get_more_info 
+    
+    puts "----------------------------- All about #{pet_choice.name} -----------------------------".blue
+    puts "Age: ".light_white + "#{pet_choice.age}"
+    puts "Gender: ".light_white + "#{pet_choice.gender}"
+    puts "Availability: ".light_white + "#{pet_choice.availability}"
+    puts "Breed & colour: ".light_white + "#{pet_choice.breed_and_colour}"
+
+    if pet_choice.can_live_with
+      puts "Can live with: ".light_white + "#{pet_choice.can_live_with}"
+    end
+
+    puts "Bio: ".light_white + "#{pet_choice.bio}"
+    puts "Animal reference number: ".light_white + "#{pet_choice.reference}"
+    puts "Visit my page: ".light_white + "#{pet_choice.profile_url}"
+  end 
+
   def goodbye
     puts "Thanks for stopping by! Have a great day!".blue.bold
     text = <<-TEXT

data/lib/blue_cross_pets/dog.rb

@@ -1,4 +1,4 @@
-require_relative "./pet"
+#require_relative "./pet"
 
 class BlueCrossPets::Dog < BlueCrossPets::Pet
 
@@ -16,48 +16,15 @@ class BlueCrossPets::Dog < BlueCrossPets::Pet
     @@dogs
   end
 
-  def self.list_all
-    self.all.each_with_index do |dog, index|
-      puts "#{index + 1}. ".blue + "#{dog.name} - #{dog.breed} - #{dog.gender} - #{dog.age} - #{dog.availability}"
-    end
-  end
-
-  def self.scrape_dogs
+  def self.sorted_array
+    self.all.sort { |dog1, dog2| dog1.name <=> dog2.name }
+  end 
 
+  def self.create_dogs
     if all.length == 0
-      dog_array = BlueCrossPets::Scraper.scrape_index("https://www.bluecross.org.uk/rehome/dog")
+      dog_array = BlueCrossPets::Scraper.new.scrape_index("https://www.bluecross.org.uk/rehome/dog")
       create_from_index(dog_array)
-      list_all
-    elsif all.length > 0
-      list_all
     end
-
-  end
-
-  def self.get_more_info(input)
-
-    index = input.to_i - 1
-    dog = all[index]
-
-    if !dog.reference
-      attribute_hash = BlueCrossPets::Scraper.scrape_profile(dog.profile_url)
-      dog.add_attributes(attribute_hash)
-    elsif dog.reference
-    end
-
-    puts "----------------------------- All about #{dog.name} -----------------------------".blue
-    puts "Age: ".light_white + "#{dog.age}"
-    puts "Gender: ".light_white + "#{dog.gender}"
-    puts "Availability: ".light_white + "#{dog.availability}"
-    puts "Breed & colour: ".light_white + "#{dog.breed_and_colour}"
-
-    if dog.can_live_with
-      puts "Can live with: ".light_white + "#{dog.can_live_with}"
-    end
-
-    puts "Bio: ".light_white + "#{dog.bio}"
-    puts "Animal reference number: ".light_white + "#{dog.reference}"
-    puts "Visit my page: ".light_white + "#{dog.profile_url}"
   end
 
 end

data/lib/blue_cross_pets/pet.rb

@@ -8,6 +8,13 @@ class BlueCrossPets::Pet
     end
   end
 
+  def get_more_info
+    if !self.reference
+      attribute_hash = BlueCrossPets::Scraper.new.scrape_profile(self.profile_url)
+      self.add_attributes(attribute_hash)
+    end 
+  end 
+  
   def add_attributes(attribute_hash)
     attribute_hash.each do |attribute, value|
       self.send("#{attribute}=".to_sym, value)

data/lib/blue_cross_pets/scraper.rb

@@ -1,14 +1,11 @@
 class BlueCrossPets::Scraper
 
-  def self.scrape_index(index_url)
+  def scrape_index(index_url)
     html = open(index_url)
 
     pet_index = Nokogiri::HTML(html)
-    pets = []
-
-    profile_url =
-
-    pet_index.css("a.item__link").each do |pet_info|
+    
+    pet_index.css("a.item__link").collect do |pet_info|
       name = pet_info.css("h3.item__title").text
       breed = pet_info.css("ul.item__body li")[0].text
       gender = pet_info.css("ul.item__body li")[1].text
@@ -21,20 +18,16 @@ class BlueCrossPets::Scraper
         availability = "Available"
       end
 
-      pets << {name: name, breed: breed, gender: gender, age: age, profile_url: profile_url, availability: availability}
+      {name: name, breed: breed, gender: gender, age: age, profile_url: profile_url, availability: availability}
     end
-
-    pets
   end
 
-  def self.scrape_profile(profile_url)
+  def scrape_profile(profile_url)
     pet_profile = Nokogiri::HTML(open(profile_url))
 
     attributes_hash = {}
 
-    if pet_profile.css("div.column-main p").length > 0
-      attributes_hash[:bio] = pet_profile.css("div.column-main p").text
-    end
+    attributes_hash[:bio] = pet_profile.css("div.column-main p").text
 
     pet_profile.css("div.column-aside").each do |attribute|
       attributes_hash[:breed_and_colour] = attribute.css("li.pet-details_species").text.split(" - ")[1].strip

data/lib/blue_cross_pets/version.rb

@@ -1,3 +1,3 @@
 module BlueCrossPets
-  VERSION = "0.0.4"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blue_cross_pets
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.1
 platform: ruby
 authors:
 - "'Jessica Gomes-Ng'"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-18 00:00:00.000000000 Z
+date: 2020-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: CLI that display Blue Cross UK adoptable dogs/cats