petfinder-wrap 1.0.4 → 1.0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b729279226d673ca9c35950e91229ada36f12144
-  data.tar.gz: 842bc9e61d2313d8e854113a7303302eaaf6c497
+  metadata.gz: 422fe5f83754d0ad8cd64a7bf6aa0695d2508da2
+  data.tar.gz: 79e329e40b744b16fd525dc3dc083eb989887bf1
 SHA512:
-  metadata.gz: ac01f2a16a6a1c322e7532b4d66009f404fac52ef8977e7a976e90fee1fdc42ba2e167eaea1b4f9c4722effd75bc136c069685ff9e0efa7c43454e6b6ce6b189
-  data.tar.gz: 9514469cc125426604f98511d41eeb216ccaffde63b261037947e1105a830639c0f0e5ac2d8c528ada27d0592c940075b006ac3544fa097a3adf76328b095932
+  metadata.gz: 3fc59bed66043a984c75683e5c04ebbf8b9f5fbd1b145886b78e58735a5bff3f37e07adb6af698a9383131a02212f90da142b85a4fb16f782c4067f8351b1444
+  data.tar.gz: 6619711f9bee04a2b5069e2e13d0ece25731f79913d1f53dc6a19c12d049b2c6e5974ad2fb71c9489831aafaf8af1bdaed622eaf0b711947869221882249dbf7

data/lib/petfinder-wrap.rb

@@ -7,7 +7,7 @@ require_relative 'petfinder/breed'
 require 'open-uri'
 
 module Petfinder
-  VERSION = "1.0.4"
+  VERSION = "1.0.4.1"
 
   class Error < StandardError; end
 

data/lib/petfinder/breed.rb

@@ -1,9 +1,9 @@
 module Petfinder
   class Breed
-    attr_reader :animal, :name
-    def initialize breed, animal
-      @animal = animal
-      @name = breed
+    attr_reader :name
+    attr_accessor :animal
+    def initialize breed
+      @name = breed["$t"]
     end
   end
 end

data/lib/petfinder/client.rb

@@ -36,18 +36,7 @@ module Petfinder
       find_pets_request = API_BASE_URI + "pet.find?key=#{@api_key}&animal=#{animal}&location=#{zip_code}&output=basic&format=json"
       # p find_pets_request
       response = open(find_pets_request).read
-      res = []
-      if resp = JSON.parse(response)
-        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
+      parse_multiple response, "pet"
     end
 
     def get_shelter id
@@ -72,52 +61,23 @@ module Petfinder
     def get_shelter_pets shelter
       get_shelter_pets = API_BASE_URI + "shelter.getPets?key=#{@api_key}&id=#{shelter.id}&output=basic&format=json"
       response = open(get_shelter_pets).read
-      res = []
-      if resp = JSON.parse(response)
-        begin
-          resp["petfinder"]["pets"]["pet"].each do |pet|
-            res << Pet.new(pet)
-          end
-        rescue NoMethodError => e
-          puts e.message
-          puts "Invalid response received from API. Check your query"
-        end
-        res
-      end
+      parse_multiple response, "pet"
     end
 
     def find_shelters location
       find_shelters_request = API_BASE_URI + "shelter.find?key=#{@api_key}&location=#{location}&format=json"
       response = open(find_shelters_request).read
-      res = []
-      if resp = JSON.parse(response)
-        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
+      parse_multiple response, "shelter"
     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["$t"], 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"
+      resp = JSON.parse(response)
+      animal = (resp)["petfinder"]["breeds"]["@animal"] unless resp
+      res = parse_multiple response, "breed"
+      res.each do |breed|
+        breed.animal = animal
       end
       res
     end
@@ -141,5 +101,27 @@ module Petfinder
       end
       res
     end
+
+    private
+
+      def parse_multiple response, type
+        res = []
+        types = type.to_s + "s"
+        if resp = JSON.parse(response)
+          begin
+            resp["petfinder"]["#{types}"]["#{type}"].each do |t|
+              ruby = "Petfinder::#{type.capitalize}.new(t)"
+              res << eval(ruby)
+            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
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: petfinder-wrap
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.4.1
 platform: ruby
 authors:
 - Pedro De Ona