PetSearch 0.0.7.9 → 0.0.8.2.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmQ0ODUyOGNiY2I5OGEwMzdkZTg2OTVlMGUwNmY3ZjBmNjU1MTdmMw==
+    OGUwODQ5YTVhOTNmZjViOGEwYzYzZTZkNDI5ZWVhM2JkZDNjNWZiYQ==
   data.tar.gz: !binary |-
-    ODY1MzU5YzQ2OGI0N2E0OTg0NTU5ZTczMjFlZGMwYWZmMmRkMWVhMQ==
+    NWFiOWUzYjVmNzFiYzU1ZDVjYTllNzc1NTlmZTcyZjRjZjlhNjViOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTcxM2QwZDRkYzc0YTRjMzhmMDY3NWJmYTdmNzc3YmViMDNjMWZkODE3ODE2
-    ZTIzODliNzU2ZGYxOWU4NzJlNDE0ZTQyNzk4MGU1NGQ3ODY2OGJjZWRhMGVm
-    YTkzZWE2MzEzZmNlNjI1OGU1Nzc0YTE4YjNlMWMyODQxMjJhMTQ=
+    ODk1MTg5Yjg3OTZmYmU4MjE2NDAwMjgyMTc3NzUxYWVhMjljMmQzYzJiN2Yz
+    YjY4OWFjZDNiMTMyNzIxZDRkYzQ0NjExZGE0NzEyZTljNzFjMDQ1MTg4NTA2
+    OTliMWU0OTA1MmJiYmU4OTEyM2IxYjY0YzcxMTUwNDJmZTY5NTQ=
   data.tar.gz: !binary |-
-    NmQ5ZDdlMGY5ZjUwOTE5ZTA0NjBjZmY2ZjVhYjQ4NWY2NGQ1MDcwYmQxM2Mz
-    NDMxNjQxNjZmMTFkZjY3Nzg1YWYwZWFjNzdkOWI1NGNhOTAyYzA4NGY1YmRh
-    MjVjMmQwMGNmMDlmYTU1MzgyNzBkM2Y0ZjNmY2YxMWM4NTBjMDY=
+    MmY4YjBlMWFkYmQyODYwMWE2ZjhmMGZlY2UxYjc5ZmM5NjUzMGZkOTRmNDI4
+    OTNhMTUyYTRjNjhkODkyMDIyZWQ5ZGJkZjNjNmYyZjc3MGM5YTU2NDM5NzEw
+    ZWRjNmU4ZjgwOThiYjlkZjA1YWYxYTAxNDE3YjVmYmRkZDllN2I=

data/lib/petsearch.rb

@@ -8,7 +8,7 @@ require 'petsearch/pet'
 
 
 class PetSearch
-  attr_accessor :dog, :cat, :bird, :reptile, :horse, :pig, :barnyard, :smallfurry
+  attr_accessor :dog, :cat, :bird, :reptile, :horse, :pig, :barnyard, :smallfurry, :api_key, :api_secret
   def initialize
     @dog = {:name => 'dog', :breeds => []}
     @cat = {:name => 'cat', :breeds => []}
@@ -20,27 +20,34 @@ class PetSearch
     @smallfurry = {:name => 'smallfurry', :breeds => []}
   end
 
-
   def self.init_options(*args)
     @@options = Hash.new
     begin
       @@options[:breeds] = args.grep(/[Bb]reeds/).first.downcase.match(/(?<=breeds=).*/)[0].split(',') if args.grep(/[Bb]reeds/).first
       @@options[:animal] = args.grep(/[Dd]og|[Cc]at|[Bb]ird|[Rr]eptile|[Hh]orse|[Pp]ig|[Bb]arnyard|[Ss]mallfurry/).first
       @@options[:age] = args.grep(/[Bb]aby|[Yy]oung|[Aa]dult|[Ss]enior/).first
-      @@options[:location] = args.grep(/[1..9]/).first
+      @@options[:location] = args.grep(/\d{5}/).first.strip
       @@options[:sex] = args.grep(/[Ss]ex/).first.downcase.match(/(?<=sex=).*/)[0].upcase if args.grep(/[Ss]ex/).first
-      @@options[:size] = args.grep(/[Ss]m|[Mm]dm|[Ll]rg|[Xx]l/).first.downcase if args.grep(/[Ss]m|[Mm]dm|[Ll]rg|[Xx]l/).first
-        case (@@options[:size])
-          when 'sm'
-            @@options[:size] = 'S'
-          when 'mdm'
-            @@options[:size] = 'M'
-          when 'lrg'
-            @@options[:size] = 'L'
-          when 'xl'
-              @@options[:size] = 'XL'
-        end
-      @@options[:random] = args.grep(/[Tt]rue|[Ff]alse/).first
+
+      if (args.grep(/[Ss]m|[Mm]dm|[Ll]rg|[Xx]l/).length == 2)
+        @@options[:size] = args.grep(/[Ss]m|[Mm]dm|[Ll]rg|[Xx]l/)[1].downcase
+      elsif (args.grep(/[Ss]m|[Mm]dm|[Ll]rg|[Xx]l/).length == 1)
+        @@options[:size] = args.grep(/[Ss]m|[Mm]dm|[Ll]rg|[Xx]l/).first.downcase
+      else
+        @@options[:size]=nil
+      end
+
+      case (@@options[:size])
+      when 'sm'
+        @@options[:size] = 'S'
+      when 'mdm'
+        @@options[:size] = 'M'
+      when 'lrg'
+        @@options[:size] = 'L'
+      when 'xl'
+          @@options[:size] = 'XL'
+      end
+  @@options[:random] = args.grep(/[Tt]rue|[Ff]alse/).first
       @@options[:offset] = args.grep(/[Oo]ff/).first.downcase.match(/(?<=off).*/)[0] if args.grep(/[Oo]ff/).first
       @@options[:count] = args.grep(/[Cc]t/).first.downcase.match(/(?<=ct).*/)[0] if args.grep(/[Cc]t/).first
     rescue NoMethodError
@@ -57,10 +64,6 @@ class PetSearch
 
   end
 
-  def self.get_token
-    PetClient.get_token
-  end
-
 
 end
 

data/lib/petsearch/pet.rb

@@ -28,7 +28,7 @@ class Pet
   def self.pets
     @@pets
   end
-
+  #(?<=\&)(\d{5})(?=\&)
   ##### RAILS ONLY - FOR SEARCHING WITH URLS
   def self.make_search(options)
     animal = options.match(/animal=(.*?)&/).nil? ? "ERROR" : options.match(/animal=(.*?)&/)[1]
@@ -37,8 +37,15 @@ class Pet
     offset = options.match(/&off(.*?)&/).nil? ? "" : options.match(/&off(.*?)&/)[1]
     count = options.match(/&ct(.*?)&/).nil? ? "" : options.match(/&ct(.*?)&/)[1]
     sex = options.match(/&sex=(.*?)&/).nil? ? "" : options.match(/&sex=(.*?)&/)[1]
-    location = options.match(/((?:\d\d+)+)/).nil? ? "" : options.match(/((?:\d\d+)+)/)[1]
-    PetSearch.init_options("#{animal}", "#{location}", "ct#{count}", "#{sex}", "off#{offset}")
+    location = options.match(/(?<=\&)(\d{5})(?=\&)/).nil? ? "" : options.match(/(?<=\&)(\d{5})(?=\&)/)[1]
+    if options.match(/(?=)([Ss]m|[Mm]dm|[Ll]rg|[Xx]l)/).nil?
+      size = ""
+    elsif options.match(/(?=)([Ss]m|[Mm]dm|[Ll]rg|[Xx]l)/).length > 3
+      size = options.match(/(?=)([Ss]m|[Mm]dm|[Ll]rg|[Xx]l)/)[2]
+    else
+      size = options.match(/(?=)([Ss]m|[Mm]dm|[Ll]rg|[Xx]l)/)[1]
+    end
+    PetSearch.init_options("#{animal}", "#{location}", "ct#{count}", "#{size}", "#{sex}", "off#{offset}")
     PetSearch.options[:breeds] = breeds.nil? ? [] : breeds
     result = PetSearch.search
     make_pet(result)
@@ -46,21 +53,36 @@ class Pet
 
   def self.make_pet(result)
     @@pets = []
-    result[0]['petfinder']['pets']['pet'].each do |pet|
+    return [{'code' => '999', 'message' => 'Cannot Make Pet. Bad parameters or no results'}] if ((!result[0]['code'].nil? || result[0]['petfinder']['header']['status']['code']['$t'].to_i != 100) == true)
+    if result[0]['petfinder']['lastOffset']['$t'].to_i > 1
+      petresult =  result[0]['petfinder']['pets']['pet']
+    elsif result[0]['petfinder']['lastOffset']['$t'].to_i == 1
+      petresult = [[]]
+      petresult[0] << result[0]['petfinder']['pets']['pet']
+      petresult = petresult[0]
+    else
+    end
+    resultsize = result[0]['petfinder']['lastOffset']['$t'].to_i
+
+    petresult.each do |pet|
         p = Pet.new
-        if pet['options']['option'].class == Hash
+
+        if (pet['options']['option'].class == Hash)
           p.options << pet['options']['option']['$t']
-        elsif pet['options']['option'].class == Array
+        elsif (pet['options']['option'].class == Array)
           p.options = pet['options']['option'].map { |t|
               t['$t'] }
         else
           p.options = []
         end
-        if pet['breeds']['breed'].class == Hash
-          p.options << pet['breeds']['breed']['$t']
-        else
+
+        if (pet['breeds']['breed'].class == Hash)
+          p.breeds << pet['breeds']['breed']['$t']
+        elsif (pet['breeds']['breed'].class == Array)
          p.breeds = pet['breeds']['breed'].map { |t|
           t['$t']}
+        else
+         p.breeds = []
         end
         p.shelter_pet_id = pet['shelterPetId'] ? pet['shelterPetId']['$t'] : ""
         p.status = pet['status']['$t']
@@ -86,10 +108,11 @@ class Pet
           p.images = []
         end
         p.petfinder_id = pet['id']['$t']
-       @@pets << p
 
+       @@pets << p
      end
     return @@pets
+
   end
 
 end

data/lib/petsearch/petclient.rb

@@ -4,8 +4,14 @@ require 'digest/md5'
 require 'nokogiri'
 require 'date'
 
-class PetClient
 
+class NoRecordError < Exception
+end
+
+class BadKeyError < Exception
+end
+
+class PetClient
   @@token_hash = Hash.new
 
   def initialize
@@ -15,50 +21,77 @@ class PetClient
     @@token_hash
   end
 
-  def self.get_token
-    key_secret="#{ENV['PET_SECRET']}key=#{ENV['PET_KEY']}"
+  def self.get_token(api_key=nil, api_secret=nil)
+   begin
+    key_status = 'bad' if ((api_key==nil ||  api_secret==nil) && (ENV['PET_SECRET']==nil || ENV['PET_KEY']==nil))
+    raise BadKeyError, "API KEY ERROR" if key_status=='bad'
+    key_secret =  (api_key.nil? || api_secret.nil?) ? ("#{ENV['PET_SECRET']}key=#{ENV['PET_KEY']}") : (api_secret+"key="+api_key)
     md5 = Digest::MD5.hexdigest(key_secret)
     @@token_hash = Hash.new
     @@token_hash[:md5] = md5
     @@token_hash[:time] = Time.now
-    expires = Date.new
-    url = "http://api.petfinder.com/auth.getToken?key=#{ENV['PET_KEY']}&sig=#{@@token_hash[:md5]}"
+    url = (api_key.nil? || api_secret.nil?) ? "http://api.petfinder.com/auth.getToken?key=#{ENV['PET_KEY']}&sig=#{@@token_hash[:md5]}" : "http://api.petfinder.com/auth.getToken?key=#{api_key}&sig=#{@@token_hash[:md5]}"
     updated_url = URI.encode(url)
     result = Nokogiri::XML(open(updated_url.strip).read)
     @@token_hash[:token] = result.xpath("//auth//token/text()").text.strip
     parsed_date = Time.at(result.xpath("//auth/expires/text()").text.strip.to_i)
     @@token_hash[:expires] = Time.parse(parsed_date.strftime('%a %d %b %Y %I:%M:%S %p'))
+    puts ("Your token expires at #{@@token_hash[:expires]}")
+    raise BadKeyError, "API KEY ERROR" if @@token_hash[:expires] < Time.now
+    rescue
+       "Re-check your keys"
+    end
   end
 
-
   def self.breed_list(animal)
-    search_string = "#{ENV['PET_SECRET']}key=#{ENV['PET_KEY']}&animal=#{animal}&format=json&token=#{@@token_hash[:token]}"
-    sig = Digest::MD5.hexdigest(search_string)
-    url = "http://api.petfinder.com/breed.list?key=#{ENV['PET_KEY']}&animal=#{animal}&format=json&token=#{@@token_hash[:token]}&sig=#{sig}"
-    updated_url = URI.encode(url)
-    result = JSON.parse(open(updated_url.strip).read)
+    begin
+      raise ArgumentError if (@@token_hash[:expires].nil?  || @@token_hash[:expires] < Time.now )
+      search_string = "#{ENV['PET_SECRET']}key=#{ENV['PET_KEY']}&animal=#{animal}&format=json&token=#{@@token_hash[:token]}"
+      sig = Digest::MD5.hexdigest(search_string)
+      url = "http://api.petfinder.com/breed.list?key=#{ENV['PET_KEY']}&animal=#{animal}&format=json&token=#{@@token_hash[:token]}&sig=#{sig}"
+      updated_url = URI.encode(url)
+      result = JSON.parse(open(updated_url.strip).read)
+    rescue ArgumentError
+       "Key Error.  Did you do PetClient.get_token(key, secret) or use PetClient.get_token with ENV variables?"
+      return false
+    end
   end
 
   ##load all the breeds
   def self.load_breeds(pet)
-    pet[:breeds] = breed_list(pet[:name])['petfinder']['breeds']['breed'].map { |b|
-        b["$t"]
-    }
+    if breed_list(pet[:name]) == false
+      puts("You have a key error")
+    else
+      pet[:breeds] = breed_list(pet[:name])['petfinder']['breeds']['breed'].map { |b|
+          b["$t"]
+     }
+   end
   end
 
   ## DRY-ish method for API lookup
   def self.build_url(search_string, random=nil, id=nil)
-    sig = Digest::MD5.hexdigest(search_string)
-    partial_string = search_string.scan(/key.*/)[0]
-    if random && id.nil? == true
-      url = "http://api.petfinder.com/pet.getRandom?"+ partial_string+"&sig=#{sig}"
-    elsif !random && id.nil? == true
-      url = "http://api.petfinder.com/pet.find?"+ partial_string+"&sig=#{sig}"
-    else
-      url = "http://api.petfinder.com/pet.get?"+ partial_string+"&sig=#{sig}"
-    end
-    updated_url = URI.encode(url)
-    JSON.parse(open(updated_url.strip).read)
+   begin
+      sig = Digest::MD5.hexdigest(search_string)
+      partial_string = search_string.scan(/key.*/)[0]
+      if random && id.nil? == true
+        url = "http://api.petfinder.com/pet.getRandom?"+ partial_string+"&sig=#{sig}"
+      elsif !random && id.nil? == true
+        url = "http://api.petfinder.com/pet.find?"+ partial_string+"&sig=#{sig}"
+      else
+        url = "http://api.petfinder.com/pet.get?"+ partial_string+"&sig=#{sig}"
+      end
+      updated_url = URI.encode(url)
+    result = JSON.parse(open(updated_url.strip).read)
+    raise NoMethodError if result['petfinder']['header']['status']['code']['$t'].to_i == 200
+    raise NoRecordError if result['petfinder']['header']['status']['code']['$t'].to_i == 201
+    result
+   rescue NoMethodError
+     return {'code' => '999', 'message' => "You typed in your options incorrectly"}
+   rescue NoRecordError
+     return {'code' => '201', 'message' => 'No results found'}
+   rescue
+     return {'code' => '999', 'message' => "Invalid token.  Did you do PetClient.get_token(key, secret) or use PetClient.get_token with ENV variables?" }
+   end
   end
 
   def self.get_pet(id)
@@ -88,19 +121,23 @@ class PetClient
         ## must have separate random search because do not want to pass in parameters that will break api call, even if empty strings
         if random
          search_string = "#{ENV['PET_SECRET']}key=#{ENV['PET_KEY']}&animal=#{animal}&size=#{size}&breed=#{breed}&sex=#{sex}&location=#{location}&output=full&format=json&token=#{@@token_hash[:token]}"
-         result_set << build_url(search_string, random)
+         result = build_url(search_string, random)
+         result_set << result
         else
          search_string = "#{ENV['PET_SECRET']}key=#{ENV['PET_KEY']}&animal=#{animal}&size=#{size}&breed=#{breed}&sex=#{sex}&location=#{location}&age=#{age}&offset=#{offset}&count=#{count}&output=full&format=json&token=#{@@token_hash[:token]}"
-         result_set << build_url(search_string)
+         result = build_url(search_string)
+         result_set <<  result
        end
       }
     else
       if random
         search_string = "#{ENV['PET_SECRET']}key=#{ENV['PET_KEY']}&animal=#{animal}&size=#{size}&sex=#{sex}&location=#{location}&output=full&format=json&token=#{@@token_hash[:token]}"
-        result_set << build_url(search_string, random)
+        result = build_url(search_string, random)
+        result_set <<  result
       else
         search_string = "#{ENV['PET_SECRET']}key=#{ENV['PET_KEY']}&animal=#{animal}&size=#{size}&sex=#{sex}&location=#{location}&age=#{age}&offset=#{offset}&count=#{count}&output=full&format=json&token=#{@@token_hash[:token]}"
-        result_set << build_url(search_string)
+        result = build_url(search_string)
+        result_set <<  result
       end
     end
     return result_set

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: PetSearch
 version: !ruby/object:Gem::Version
-  version: 0.0.7.9
+  version: 0.0.8.2.3
 platform: ruby
 authors:
 - Lior Bendat, Sharif Hadidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-31 00:00:00.000000000 Z
+date: 2013-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri