petfinder-wrap 1.0.3 → 1.0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be970554bc2f200e07d158c15aee17718be772a7
-  data.tar.gz: e3848ebbf2b22b2e94dde6245162994140034873
+  metadata.gz: 5df78740476dae0993d17c929b69c4faa7680e6d
+  data.tar.gz: ffd6e169c9c58397d598558a1ec639896d8764e6
 SHA512:
-  metadata.gz: 2994500fa6b708894bc31b9abc3f81ba6ae66a91a58c5f0157f869f726577566223a669090062ef2b951156fd976c7178325af7eeba42ebef9fb9d46cfaa2b88
-  data.tar.gz: 866d9578f2285493f1da00adbf35d9adbc583a80b8f932d42b9ac9941456ea222b36676049ffe7f68c0705c7f59a7672875223713c759047a89d9f8fc96ae153
+  metadata.gz: 995c9da8d62ff6291928b1a71bcafe5dafec211b0fb6c8d3c5ce73ffff749d45b7d0e1a7727d35c74dcbc7f5aca44f10ad917ae98a8563ccb30fdcf24afd66bb
+  data.tar.gz: 6835b5409fd4b679408721523695235fb6b403780c8a83cf4b380f540db4ec99667f7752105b06b36a65c011941bb86e8c688a44f88acbe9d420e656ed039921

data/lib/petfinder-wrap.rb

@@ -3,10 +3,11 @@ require_relative 'petfinder/json-mapper'
 require_relative 'petfinder/pet'
 require_relative 'petfinder/shelter'
 require_relative 'petfinder/client'
+require_relative 'petfinder/breed'
 require 'open-uri'
 
 module Petfinder
-  VERSION = "1.0.3"
+  VERSION = "1.0.3.3"
 
   class Error < StandardError; end
 

data/lib/petfinder/breed.rb

@@ -0,0 +1,9 @@
+module Petfinder
+  class Breed
+
+    def initialize breed, animal
+      @animal = animal
+      @name = breed
+    end
+  end
+end

data/lib/petfinder/client.rb

@@ -17,9 +17,18 @@ module Petfinder
       find_pet_request = API_BASE_URI + "pet.get?key=#{@api_key}&id=#{id}&format=json"
       response = open(find_pet_request).read
       if resp = JSON.parse(response)
-        Petfinder::Pet.new(resp["petfinder"]["pet"])
+        begin
+          pet = Petfinder::Pet.new(resp["petfinder"]["pet"])
+          if pet.attributes.nil?
+            raise Petfinder::Error.new "Invalid response received from API. Check your query"
+          else
+            pet
+          end
+        rescue Petfinder::Error => e
+          puts e.message
+        end
       else
-        raise Petfinder::Error "No valid JSON response from API"
+        raise Petfinder::Error.new "No valid JSON response from API"
       end
     end
 
@@ -29,8 +38,13 @@ module Petfinder
       response = open(find_pets_request).read
       res = []
       if resp = JSON.parse(response)
-        resp["petfinder"]["pets"].each do |pet|
-          res << Petfinder::Pet.new(pet[1][0])
+        begin
+          resp["petfinder"]["pets"].each do |pet|
+            res << Petfinder::Pet.new(pet[1][0])
+          end
+        rescue NoMethodError => e
+          puts e.message
+          puts "Invalid response received from API. Check your query"
         end
       end
       res
@@ -40,9 +54,18 @@ module Petfinder
       get_shelter_request = API_BASE_URI + "shelter.get?key=#{@api_key}&id=#{id}&format=json"
       response = open(get_shelter_request).read
       if resp = JSON.parse(response)
-        Petfinder::Shelter.new(resp["petfinder"]["shelter"])
+        shelter = Petfinder::Shelter.new(resp["petfinder"]["shelter"])
+        begin
+          if shelter.attributes.nil?
+            raise Petfinder::Error.new "No pets received from API. Check your query"
+          else
+            shelter
+          end
+        rescue Petfinder::Error => e
+          puts e.message
+        end
       else
-        raise Petfinder::Error "No valid JSON response from API"
+        raise Petfinder::Error.new "No valid JSON response from API"
       end
     end
 
@@ -51,15 +74,35 @@ module Petfinder
       response = open(find_shelters_request).read
       res = []
       if resp = JSON.parse(response)
-        resp["petfinder"]["shelters"]["shelter"].each do |shelter|
-          res << Shelter.new(shelter)
+        begin
+          resp["petfinder"]["shelters"]["shelter"].each do |shelter|
+            res << Shelter.new(shelter)
+          end
+        rescue NoMethodError => e
+          puts e.message
+          puts "Invalid response received from API. Check your query"
         end
       end
       res
     end
 
+    def breeds animal
+      list_breeds_request = API_BASE_URI + "breed.list?key=#{@api_key}&animal=#{animal}&format=json"
+      response = open(list_breeds_request).read
+      res = []
+      if resp = JSON.parse(response)
+        begin
+          resp["petfinder"]["breeds"]["breed"].each do |breed|
+            res << Petfinder::Breed.new(breed, resp["petfinder"]["breeds"]["@animal"])
+          end
+        rescue NoMethodError => e
+          puts e.message
+          puts "Invalid response received from API. Check your query."
+        end
+      else
+        raise Petfinder::Error "No valid JSON response from API"
+      end
+      res
+    end
   end
-
-  private
-
 end

data/lib/petfinder/pet.rb

@@ -3,7 +3,7 @@ module Petfinder
   class Pet
     extend JsonMapper
 
-    json_attributes "name", "breed", "age", "size", "id", "shelter_id",
+    json_attributes "name", "breed", "age", "size", "id",
                     "description", "shelter_id"
 
     attr_reader :attributes, :contact_info

data/lib/petfinder/shelter.rb

@@ -1,8 +1,11 @@
 module Petfinder
   class Shelter
     extend JsonMapper
+
     json_attributes "country", "name", "phone", "state", "address", "email", "city", "zip", "id"
 
+    attr_reader :attributes
+
     def initialize attributes
       @attributes = attributes
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: petfinder-wrap
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.3.3
 platform: ruby
 authors:
 - Pedro De Ona
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-25 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,6 +110,7 @@ files:
 - bin/console
 - bin/setup
 - lib/petfinder-wrap.rb
+- lib/petfinder/breed.rb
 - lib/petfinder/client.rb
 - lib/petfinder/json-mapper.rb
 - lib/petfinder/pet.rb