petfinder 0.1.3 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6c608d8186d68bebed5f5fc24de035840f20f056
+  data.tar.gz: dfc97ebbb1f073ccd408f71b81cd5b7827d57fc0
+SHA512:
+  metadata.gz: 96fa520e5b8105fef2b023f7c12e5d560bbf820639846dc86e793c1698836c52d18a02113fc5659521bd2a1ea1dc956ab4d2db593067b7995e315555b3a0fe6a
+  data.tar.gz: aa4117a1be4cf278b48b3be8a8d88e7d4e8e0a3876c0de7d2721717b99f6a6df92a44116ad8e438dea91ed1e701f2ce3d649c4415b08ae1c16a8885dda3c2ae2

data/.gitignore

@@ -5,4 +5,5 @@ tmp/*
 *.gem
 .bundle
 .rvmrc
-rdoc/*
+rdoc/*
+bin

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+1.0.0
+-----
+* New gem dependencies: nokogiri and excon
+* `Pet#pictures` is now `Pet#photos`
+* `Pet#description_sanitized` offers html-free description compared to `Pet#description`
+* Cleaned up internals

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
-gemspec
+gemspec

data/Gemfile.lock

@@ -1,37 +1,49 @@
 PATH
   remote: .
   specs:
-    petfinder (0.1.2)
-      happymapper
-      httparty
+    petfinder (0.1.3)
+      excon
+      nokogiri
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    diff-lcs (1.1.3)
-    fakeweb (1.3.0)
-    happymapper (0.4.0)
-      libxml-ruby (~> 2.0)
-    httparty (0.9.0)
-      multi_json (~> 1.0)
-      multi_xml
-    libxml-ruby (2.3.3)
-    multi_json (1.3.6)
-    multi_xml (0.5.1)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
+    addressable (2.3.5)
+    coderay (1.0.9)
+    crack (0.4.1)
+      safe_yaml (~> 0.9.0)
+    diff-lcs (1.2.4)
+    excon (0.26.0)
+    method_source (0.8.2)
+    mini_portile (0.5.1)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rake (10.1.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+    safe_yaml (0.9.7)
+    slop (3.4.6)
+    webmock (1.13.0)
+      addressable (>= 2.2.7)
+      crack (>= 0.3.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler
-  fakeweb
+  bundler (~> 1.3)
   petfinder!
+  pry
+  rake
   rspec
+  webmock

data/{LICENSE → LICENSE.txt}

@@ -1,4 +1,6 @@
-Copyright (c) Eric Hutzelman
+Copyright (c) 2013 Eric Hutzelman
+
+MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -0,0 +1,68 @@
+# Petfinder
+
+Ruby gem wrapper for the [Petfinder API](http://www.petfinder.com/developers/api-docs).
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'petfinder'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install petfinder
+
+## Get your API key
+
+Get your Petfinder API key at: http://www.petfinder.com/developers/api-key
+
+## Usage
+
+### Instantiate a client
+
+    petfinder = Petfinder::Client.new('your_api_key', 'your_api_secret')
+
+### or configure once
+
+    Petfinder.configure do |config|
+      config.api_key = 'your_api_key'
+      config.api_secret = 'your_api_secret'
+    end
+    petfinder = Petfinder::Client.new
+
+## Examples
+
+#### Return a list of dogs in the "90210" zip code
+
+    pets = petfinder.find_pets('dog', '90210')
+    pets.count
+    # => "25"
+
+    pets.first.name
+    # => "Petey"
+
+    pets.first.shelterid
+    # => "CA123"
+
+#### Return information about the shelter with id "CA123"
+
+    shelter = petfinder.shelter('CA123')
+    shelter.name
+    # => "Melrose Place SPCA"
+
+## TODO
+
+* Implement use of security token when Petfinder requires it
+* Support paging for results
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

@@ -1,12 +1,6 @@
-require 'rake'
-require 'rspec'
-require 'rspec/core/rake_task'
-require 'bundler'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
-Bundler::GemHelper.install_tasks
-
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = "spec/**/*_spec.rb"
-end
+RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec

data/lib/petfinder.rb

@@ -1,8 +1,9 @@
-require 'httparty'
-require 'happymapper'
+require 'excon'
+require 'nokogiri'
 require 'digest/md5'
 
 require 'petfinder/client'
+require 'petfinder/xml_mapper'
 require 'petfinder/pet'
 require 'petfinder/breeds'
 require 'petfinder/shelter'
@@ -10,7 +11,7 @@ require 'petfinder/auth'
 
 module Petfinder
 
-  class PetfinderError < StandardError; end
+  class Error < StandardError; end
 
   class << self
     attr_accessor :api_key, :api_secret

data/lib/petfinder/auth.rb

@@ -1,13 +1,12 @@
 module Petfinder
-  
   class Auth
-    include HappyMapper
+    extend XmlMapper
 
-    tag 'auth'
-    element :key, String
-    element :token, String
-    element :expires, String
-    element :expiresString, String
-  end
+    xml_attributes :key, :token, :expires, :expires_string
+
+    def initialize(xml)
+      @xml = xml
+    end
 
+  end
 end

data/lib/petfinder/breeds.rb

@@ -1,10 +1,13 @@
 module Petfinder
-
   class Breeds
-    include HappyMapper
-    tag 'breeds'
 
-    has_many :breeds, String, :tag => 'breed'
-  end
+    def initialize(xml)
+      @xml = xml
+    end
 
-end
+    def breeds
+      @xml.xpath("//breeds/breed").map(&:text)
+    end
+
+  end
+end

data/lib/petfinder/client.rb

@@ -1,71 +1,65 @@
 module Petfinder
-
   class Client
-    include HTTParty
-    format :xml
-    base_uri "http://api.petfinder.com"
 
     def initialize(api_key = Petfinder.api_key, api_secret = Petfinder.api_secret)
       @api_key, @api_secret = api_key, api_secret
-      raise "API key is required" unless @api_key
-
-      self.class.default_params :key => api_key
+      raise Petfinder::Error.new("API key is required") unless @api_key
     end
 
     # Valid animal types: barnyard, bird, cat, dog, horse, pig, reptile, smallfurry
     def breeds(animal_type)
-      response = perform_get("/breed.list", :query => {:animal => animal_type})
-      Breeds.parse(response, :single => true).breeds
+      response = perform_get("/breed.list", { :animal => animal_type })
+      Breeds.new(response).breeds
     end
 
     def pet(id)
-      response = perform_get("/pet.get", :query => {:id => id})
-      Pet.parse(response, :single => true)
+      response = perform_get("/pet.get", { :id => id })
+      Pet.new(response)
     end
 
     # Options available: animal, breed, size, sex, location, shelterid
     def random_pet(options = {})
       query = options.merge(:output => 'full')
-      response = perform_get("/pet.getRandom", :query => query)
-      Pet.parse(response, :single => true)
+      response = perform_get("/pet.getRandom", query)
+      Pet.new(response)
     end
 
     # Options available: breed, size, sex, age, offset, count
     def find_pets(animal_type, location, options = {})
       query = options.merge(:animal => animal_type, :location => location)
-      response = perform_get("/pet.find", :query => query)
-      Pet.parse(response)
+      response = perform_get("/pet.find", query)
+      Pet.multiple(response)
     end
 
     def shelter(id)
-      response = perform_get("/shelter.get", :query => {:id => id})
-      Shelter.parse(response, :single => true)
+      response = perform_get("/shelter.get", { :id => id })
+      Shelter.new(response)
     end
 
     # Options available: name, offset, count
     def find_shelters(location, options = {})
       query = options.merge(:location => location)
-      response = perform_get("/shelter.find", :query => query)
-      Shelter.parse(response)
+      response = perform_get("/shelter.find", query)
+      Shelter.multiple(response)
     end
 
     # Options available: offset, count
     def find_shelters_by_breed(animal_type, breed, options = {})
       query = options.merge(:animal => animal_type, :breed => breed)
-      response = perform_get("/shelter.listByBreed", :query => query)
-      Shelter.parse(response)
+      response = perform_get("/shelter.listByBreed", query)
+      Shelter.multiple(response)
     end
 
     # Options available: status, offset, count
     def shelter_pets(id, options = {})
       query = options.merge(:id => id)
-      response = perform_get("/shelter.getPets", :query => query)
-      Pet.parse(response)
+      response = perform_get("/shelter.getPets", query)
+      Pet.multiple(response)
     end
 
     def token
-      response = perform_get("/auth.getToken", :query => {:sig => digest_key_and_secret})
-      Auth.parse(response, :single => true).token
+      response = perform_get("/auth.getToken", { :sig => digest_key_and_secret })
+      Auth.new(response).token
     end
 
     private
@@ -76,20 +70,25 @@ module Petfinder
     end
 
     def perform_get(uri, options = {})
-      response = self.class.get(uri, options)
-      raise_errors(response)
-      response.body
+      connection = Excon.new("http://api.petfinder.com", omit_default_port: true)
+      response = connection.get(path: uri, query: options.merge(key: @api_key))
+
+      raise "Bad http status response from server: #{response.status}" if response.status != 200
+      @xml = Nokogiri::XML(response.body)
+      raise "#{petfinder_status_code}: #{petfinder_status_message}" if petfinder_status_code != 100
+
+      @xml
+    rescue RuntimeError => ex
+      raise Petfinder::Error.new(ex.message)
     end
 
-    def raise_errors(response)
-      if response.code.to_i == 200
-        status = response['petfinder']['header']['status']
-        raise PetfinderError.new("(#{status['code']}) #{status['message']}") if status['code'].to_i != 100
-      else
-        raise RuntimeError.new("Invalid response from server: #{response.code}")
-      end
+    def petfinder_status_code
+      @xml.xpath("//header/status/code").text.to_i
     end
 
-  end
+    def petfinder_status_message
+      @xml.xpath("//header/status/message").text
+    end
 
+  end
 end

data/lib/petfinder/pet.rb

@@ -1,77 +1,72 @@
 module Petfinder
-  
-  class Photo
-    include HappyMapper
+  class Pet
+    extend XmlMapper
 
-    tag 'photo'
-    attribute :id, String
-    attribute :size, String
-    element :url, String, :tag => '.'
-  end
+    xml_attributes :id, :name, :animal, :mix, :age, :shelter_id, :shelter_pet_id,
+      :sex, :size, :description, :last_update, :status
 
-  class Pet
-    include HappyMapper
-    attr_accessor :pictures
-    
-    tag 'pet'
-    element :id, Integer
-    element :shelter_id, String, :tag => 'shelterId'
-    element :shelter_pet_id, String, :tag => 'shelterPetId'
-    element :name, String
-    element :animal, String
-    has_many :breeds, String, :tag => 'breed', :deep => true
-    element :mix, String
-    element :age, String
-    element :sex, String
-    element :size, String
-    has_many :options, String, :tag => 'option', :deep => true
-    element :description, String
-    element :last_update, DateTime, :tag => 'lastUpdate'
-    element :status, String
-    has_many :photos, Photo, :tag => 'photo', :deep => true
+    attr_reader :photos
 
-    private :photos
+    def initialize(xml)
+      @xml = xml
+    end
 
-    after_parse do |pet|
-      pet.remove_link_from_description
-      pet.consolidate_photos
+    def self.multiple(xml)
+      xml.xpath("//pets/pet").map do |node|
+        Pet.new(Nokogiri::XML(node.to_xml))
+      end
     end
-    
-    def remove_link_from_description
-      self.description = description[0..description.index("\n") - 1] if description.index("\n")
+
+    def description_sanitized
+      Nokogiri::HTML(CGI.unescapeHTML(description)).content
     end
-    
-    def consolidate_photos
-      @pictures = []
-      photos.map {|photo| photo.id}.uniq.each do |id|
-        @pictures << Picture.new(photos.select {|photo| photo.id == id})
+
+    def breeds
+      @xml.xpath("//pet/breeds/breed").map(&:text)
+    end
+
+    def options
+      @xml.xpath("//pet/options/option").map(&:text)
+    end
+
+    def photos
+      parse_photos unless @photos
+      @photos
+    end
+
+    private
+
+    def parse_photos
+      @photos = []
+      @xml.xpath("//pet/media/photos/photo").each do |node|
+        add_photo(node.attr("id"), node.attr("size"), node.text)
       end
     end
-  end
 
-  class Picture
-    attr_reader :large, :medium, :small, :thumbnail, :tiny
-  
-    def initialize(photos)
-      photos.each do |photo|
-        case photo.size
-        when "x"
-          @large = photo.url
-        when "pn"
-          @medium = photo.url
-        when "fpm"
-          @small = photo.url
-        when "pnt"
-          @thumbnail = photo.url
-        when "t"
-          @tiny = photo.url
-        end
+    def add_photo(id, size, url)
+      photo = @photos.find { |photo| photo.id == id } || Photo.new(id)
+      case size
+      when "x"
+        photo.large = url
+      when "pn"
+        photo.medium = url
+      when "fpm"
+        photo.small = url
+      when "pnt"
+        photo.thumbnail = url
+      when "t"
+        photo.tiny = url
       end
+      @photos << photo unless @photos.include?(photo)
     end
-  
-    def to_s
-      large
-    end    
-  end
 
+    class Photo
+      attr_accessor :id, :large, :medium, :small, :thumbnail, :tiny
+
+      def initialize(id)
+        @id = id
+      end
+    end
+
+  end
 end

data/lib/petfinder/shelter.rb

@@ -1,22 +1,19 @@
 module Petfinder
-  
   class Shelter
-    include HappyMapper
+    extend XmlMapper
 
-    tag 'shelter'
-    element :id, String
-    element :name, String
-    element :address1, String
-    element :address2, String
-    element :city, String
-    element :state, String
-    element :zip, String
-    element :country, String
-    element :latitude, String
-    element :longitude, String
-    element :phone, String
-    element :fax, String
-    element :email, String    
-  end
+    xml_attributes :id, :name, :address1, :address2, :city, :state, :zip, :country,
+      :latitude, :longitude, :phone, :fax, :email
+
+    def initialize(xml)
+      @xml = xml
+    end
 
+    def self.multiple(xml)
+      xml.xpath("//shelters/shelter").map do |node|
+        Shelter.new(Nokogiri::XML(node.to_xml))
+      end
+    end
+
+  end
 end

data/lib/petfinder/version.rb

@@ -1,3 +1,3 @@
 module Petfinder
-  VERSION = "0.1.3"
+  VERSION = "1.0.0"
 end

data/lib/petfinder/xml_mapper.rb

@@ -0,0 +1,21 @@
+module Petfinder
+  module XmlMapper
+
+    def xml_attributes(*names)
+      names.each { |name| xml_attribute(name) }
+    end
+
+    def xml_attribute(name, xml_name = nil)
+      klass = self.name.split('::').last.downcase
+      xml_name ||= camel_case_lower(name.to_s)
+      define_method(name) do
+        @xml.xpath("//#{klass}/#{xml_name}").text
+      end
+    end
+
+    def camel_case_lower(name)
+      name.split('_').inject([]) { |buffer, e| buffer.push(buffer.empty? ? e : e.capitalize) }.join
+    end
+
+  end
+end

data/petfinder.gemspec

@@ -1,31 +1,28 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path("../lib/petfinder/version", __FILE__)
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'petfinder/version'
 
-Gem::Specification.new do |s|
-  s.name              = "petfinder"
-  s.rubyforge_project = "petfinder"
-  s.version           = Petfinder::VERSION
-  s.authors           = ["Eric Hutzelman"]
-  s.email             = ["ehutzelman@gmail.com"]
-  s.homepage          = "http://github.com/ehutzelman/petfinder"
-  s.summary           = "Ruby gem wrapper for the Petfinder API."
-  s.description       = "REST client for the Petfinder published API."
+Gem::Specification.new do |spec|
+  spec.name          = "petfinder"
+  spec.version       = Petfinder::VERSION
+  spec.authors       = ["Eric Hutzelman"]
+  spec.email         = ["ehutzelman@gmail.com"]
+  spec.description   = "REST client for the Petfinder published API."
+  spec.summary       = "Ruby gem wrapper for the Petfinder API."
+  spec.homepage      = "http://github.com/ehutzelman/petfinder"
+  spec.license       = "MIT"
 
-  # Dependencies (pullled into Gemfile with "gemspec")
-  s.add_dependency "happymapper"
-  s.add_dependency "httparty"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "fakeweb"
-  s.add_development_dependency "bundler"
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  # Standard setup that should not need modification
-  s.required_rubygems_version = ">= 1.3.6"
-  s.platform      = Gem::Platform::RUBY
-  s.require_path  = 'lib'
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
-
-  s.extra_rdoc_files = %w[README.rdoc LICENSE]
-  s.rdoc_options     = ["--charset=UTF-8"]
+  spec.add_dependency "excon"
+  spec.add_dependency "nokogiri"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
 end

data/spec/{petfinder_spec.rb → client_spec.rb}

@@ -1,44 +1,28 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe Petfinder::Client do
   before do
     @client = Petfinder::Client.new('1234567', 'mysekrit')
   end
 
-  it "should get a random pet" do
-    stub_get("http://api.petfinder.com/pet.getRandom?key=1234567&output=full", "pet.xml")
-    pet = @client.random_pet
-    pet.name.should == 'Charlie'
-  end
-  
   it "should get a specific pet by id" do
     stub_get("http://api.petfinder.com/pet.get?key=1234567&id=123", "pet.xml")
     pet = @client.pet(123)
     pet.name.should == 'Charlie'
   end
-  
+
+  it "should get a random pet" do
+    stub_get("http://api.petfinder.com/pet.getRandom?key=1234567&output=full", "pet.xml")
+    pet = @client.random_pet
+    pet.name.should == 'Charlie'
+  end
+
   it "should find pets matching a query" do
     stub_get("http://api.petfinder.com/pet.find?key=1234567&animal=dog&location=77007", "pet_list.xml")
     pets = @client.find_pets('dog', '77007')
-    pets.first.name.should == 'Petey'    
-  end
-  
-  describe "retrieving a pet" do
-    before do
-      stub_get("http://api.petfinder.com/pet.getRandom?key=1234567&output=full", "pet.xml")
-      @pet = @client.random_pet      
-    end
-    
-    it "should hide photos collection" do
-      @pet.should_not respond_to(:photos)
-    end
-    
-    it "should reorganize photos for pet as pictures" do
-      @pet.pictures[0].thumbnail.should == 'http://photocache.petfinder.com/fotos/IL173/IL173.10141994-1-pnt.jpg'
-      @pet.pictures[1].large.should == 'http://photocache.petfinder.com/fotos/IL173/IL173.10141994-2-x.jpg'
-    end
+    pets.first.name.should == 'Petey'
   end
-  
+
   it "should get the list of breeds for the given animal type" do
     stub_get("http://api.petfinder.com/breed.list?key=1234567&animal=horse", "breed_list.xml")
     breeds = @client.breeds('horse')
@@ -62,17 +46,17 @@ describe Petfinder::Client do
     shelters = @client.find_shelters_by_breed('horse', 'arabian')
     shelters.first.name.should == 'Pup Squad Animal Rescue'
   end
-  
+
   it "should get the list of pets available for the given shelter" do
     stub_get("http://api.petfinder.com/shelter.getPets?key=1234567&id=123", "pet_list.xml")
     pets = @client.shelter_pets(123)
-    pets.first.name.should == 'Petey'    
+    pets.first.name.should == 'Petey'
   end
-  
+
   it "should get an authorization token" do
     digest = @client.send(:digest_key_and_secret)
     stub_get("http://api.petfinder.com/auth.getToken?key=1234567&sig=#{digest}", "auth.xml")
     @client.token.should == '39038a000f404335d90bab019c0c7e2d'
   end
-  
-end
+
+end

data/spec/fixtures/pet.xml

@@ -25,8 +25,7 @@
       <option>hasShots</option>
       <option>altered</option>
     </options>
-    <description><![CDATA[Charlie is an outgoing cat who just loves to be around all the attention.  He runs around and chases anything that moves.  We think he'd be great in an active household!
-<br/><a href="http://www.petfinder.com/petdetail/10141994">View this pet on Petfinder.com</a>
+    <description><![CDATA[<div><p><br />Tucker is an absolutely handsome seal point siamese boy&nbsp;who was surrendered along with his sister, Tupence. Both cats are front paw declawed. Tupence and Tucker have been together for 9 years so they&#39;d prefer to be adopted together. (but if 2 wonderful homes come along we might consider seperation) Both cats have a wonderful demeanor and would love to be in a home where there&#39;s lots of awesome places to take cat naps! If interested in adopting Tucker please fill out an adoption application to get the ball rolling, then our adoption coordinator will call you to set up a time to meet the cat(s). <br /><br /><strong>TUCKER is in a foster home, call to learn how to meet him. <br /></strong><br />To fill out an adoption or foster application please visit our website at: <a href=\"http://www.alleganshelter.com\" onclick=\"pageTracker._trackPageview(&#39;outbound/petnoteslinks&#39;);\" target=\"_blank\">http://www.alleganshelter.com</a><br /></div>
 ]]></description>
     <lastUpdate>2010-04-07T13:43:33Z</lastUpdate>
     <status>A</status>
@@ -45,4 +44,4 @@
       </photos>
     </media>
   </pet>
-</petfinder>
+</petfinder>

data/spec/fixtures/shelter.xml

@@ -12,15 +12,15 @@
     <id>TX1356</id>
     <name>Lucky Dog Rescue</name>
     <address1>P.O. Box 56512</address1>
-    <address2/>
+    <address2>Apt 25</address2>
     <city>Houston</city>
     <state>TX</state>
     <zip>77019</zip>
-    <country/>
+    <country>USA</country>
     <latitude>29.75239944</latitude>
     <longitude>-95.40170288</longitude>
-    <phone/>
-    <fax/>
+    <phone>555-555-5555</phone>
+    <fax>666-666-6666</fax>
     <email>millicentgerdes@gmail.com</email>
   </shelter>
-</petfinder>
+</petfinder>

data/spec/pet_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe Petfinder::Pet do
+  before do
+    @pet = Petfinder::Pet.new(Nokogiri::XML(fixture_file('pet.xml')))
+  end
+
+  it "should populate collection of photos" do
+    [:large, :medium, :small, :thumbnail, :tiny].each do |size|
+      @pet.photos[0].send(size).should =~ /http:\/\/photocache.petfinder.com\/fotos\/IL173\/*./
+    end
+  end
+
+  it "should populate attributes of pet" do
+    [:id, :name, :animal, :mix, :age, :shelter_id, :shelter_pet_id, :sex, :size, :description, :last_update, :status].each do |attr|
+      @pet.send(attr).should_not == ""
+    end
+  end
+
+  it "should populate array of breeds" do
+    @pet.breeds.should include("Domestic Short Hair-black")
+
+  end
+
+  it "should populate array of options" do
+    @pet.options.should include("hasShots", "altered")
+  end
+
+  it "should return a sanitized version of the description" do
+    @pet.description_sanitized.should_not =~ /<div>/
+  end
+
+  it "should populate multiple pet objects" do
+    pets = Petfinder::Pet.multiple(Nokogiri::XML(fixture_file('pet_list.xml')))
+    pets.should have(25).items
+  end
+
+end

data/spec/shelter_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Petfinder::Pet do
+  before do
+    @shelter = Petfinder::Shelter.new(Nokogiri::XML(fixture_file('shelter.xml')))
+  end
+
+  it "should populate attributes of shelter" do
+    [:id, :name, :address1, :address2, :city, :state, :zip, :country, :latitude, :longitude, :phone, :fax, :email].each do |attr|
+      @shelter.send(attr).should_not == ""
+    end
+  end
+
+  it "should populate multiple shelter objects" do
+    shelters = Petfinder::Shelter.multiple(Nokogiri::XML(fixture_file('shelter_list.xml')))
+    shelters.should have(25).items
+  end
+
+end
+

data/spec/spec_helper.rb

@@ -1,17 +1,11 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'rubygems'
 require 'petfinder'
 require 'rspec'
-require 'fakeweb'
+require 'webmock/rspec'
 
 def fixture_file(filename)
   File.read(File.dirname(__FILE__) + "/fixtures/#{filename}")
 end
 
-def stub_get(url, filename, options={})
-  opts = {:body => fixture_file(filename)}.merge(options)
-
-  FakeWeb.register_uri(:get, url, opts)
-end
+def stub_get(url, filename)
+  stub_request(:get, url).to_return(body: fixture_file(filename), status: 200)
+end

metadata

@@ -1,94 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: petfinder
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Eric Hutzelman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-08 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: happymapper
+  name: excon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: REST client for the Petfinder published API.
@@ -96,16 +113,15 @@ email:
 - ehutzelman@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.rdoc
-- LICENSE
+extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
-- LICENSE
-- README.rdoc
+- LICENSE.txt
+- README.md
 - Rakefile
 - lib/petfinder.rb
 - lib/petfinder/auth.rb
@@ -114,46 +130,50 @@ files:
 - lib/petfinder/pet.rb
 - lib/petfinder/shelter.rb
 - lib/petfinder/version.rb
+- lib/petfinder/xml_mapper.rb
 - petfinder.gemspec
+- spec/client_spec.rb
 - spec/fixtures/auth.xml
 - spec/fixtures/breed_list.xml
 - spec/fixtures/pet.xml
 - spec/fixtures/pet_list.xml
 - spec/fixtures/shelter.xml
 - spec/fixtures/shelter_list.xml
-- spec/petfinder_spec.rb
+- spec/pet_spec.rb
+- spec/shelter_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/ehutzelman/petfinder
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options:
-- --charset=UTF-8
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
-rubyforge_project: petfinder
-rubygems_version: 1.8.24
+rubyforge_project: 
+rubygems_version: 2.1.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby gem wrapper for the Petfinder API.
 test_files:
+- spec/client_spec.rb
 - spec/fixtures/auth.xml
 - spec/fixtures/breed_list.xml
 - spec/fixtures/pet.xml
 - spec/fixtures/pet_list.xml
 - spec/fixtures/shelter.xml
 - spec/fixtures/shelter_list.xml
-- spec/petfinder_spec.rb
+- spec/pet_spec.rb
+- spec/shelter_spec.rb
 - spec/spec_helper.rb

data/README.rdoc

@@ -1,63 +0,0 @@
-= Petfinder
-
-Ruby gem wrapper for the {Petfinder API}[http://www.petfinder.com/developers/api-docs].
-
-== Installation
-
-  sudo gem install petfinder
-
-== Get your API key
-
-Get your Petfinder API key at: http://www.petfinder.com/developers/api-key
-
-== Usage
-
-=== Instantiate a client
-
-  petfinder = Petfinder::Client.new('your_api_key', 'your_api_secret')
-    
-=== or configure once
-
-  Petfinder.configure do |config|
-    config.api_key = 'your_api_key'
-    config.api_secret = 'your_api_secret'
-  end
-  petfinder = Petfinder::Client.new
-    
-== Examples
-
-==== Return a list of dogs in the "90210" zip code
-
-  pets = petfinder.find_pets('dog', '90210')
-  pets.count
-  # => "25"
-  
-  pets.first.name
-  # => "Petey"
-
-  pets.first.shelterid
-  # => "CA123"
-
-==== Return information about the shelter with id "CA123"
-
-  shelter = petfinder.shelter('CA123')
-  shelter.name
-  # => "Melrose Place SPCA"
-
-== TODO
-
-* Implement use of security token when Petfinder requires it
-
-== Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-== Copyright
-
-Copyright (c) 2010 Eric Hutzelman. See LICENSE for details.