avvo_api 0.1.1 → 0.2.0

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    avvo_api (0.1.1)
+    avvo_api (0.2.0)
+      activeresource (~> 3.0.0)
       reactive_resource (~> 0.5)
 
 GEM

data/README.rdoc

@@ -2,7 +2,7 @@
 
 This gem provides an
 {ActiveResource}[http://api.rubyonrails.org/classes/ActiveResource/Base.html]-based
-client to information on {Avvo}[http://www.avvo.com], a directory of lawyers and doctors. 
+client to information on {Avvo}[http://www.avvo.com], a directory of lawyers.
 
 == Requirements
 
@@ -50,14 +50,14 @@ or
 
   AvvoApi::Headshot.find(:one, :params => {:lawyer_id => 28995}).headshot_url
 
-=== Getting a list of addresses for a doctor
+=== Getting a list of addresses for a lawyer
 
-  addresses = AvvoApi::Doctor.find(1).addresses
+  addresses = AvvoApi::Lawyer.find(28995).addresses
 
 or
 
-  addresses = AvvoApi::Address.find(:all, :params => {:doctor_id => doctor.id})
+  addresses = AvvoApi::Address.find(:all, :params => {:lawyer_id => lawyer.id})
 
-=== Getting the main address for a doctor
+=== Getting the main address for a lawyer
 
-  main_address = AvvoApi::Address.main(:doctor_id => doctor.id)
+  main_address = AvvoApi::Address.main(:lawyer_id => lawyer.id)

data/avvo_api.gemspec

@@ -12,10 +12,11 @@ Gem::Specification.new do |s|
   s.summary     = %q{An ActiveResource client to the Avvo API}
   s.description = %q{An ActiveResource client to the Avvo API}
 
+  s.add_dependency "activeresource", '~> 3.0.0'
   s.add_dependency "reactive_resource", '~> 0.5'
   s.add_development_dependency "shoulda", '~> 2.11.3'
   s.add_development_dependency "webmock", '~> 1.6.1'
-  
+
   s.rubyforge_project = "avvo_api"
 
   s.files         = `git ls-files`.split("\n")

data/examples/avvo_cli.rb

@@ -9,16 +9,13 @@ require 'avvo_api'
 professional_klass = nil
 professional_param = nil
 
-opts = OptionParser.new("Usage: avvo_cli.rb [options] ID")
-opts.on("-l", "--lawyer", "Get details about a lawyer") { professional_klass = AvvoApi::Lawyer; professional_param = :lawyer_id }
-opts.on("-d", "--doctor", "Get details about a doctor") { professional_klass = AvvoApi::Doctor; professional_param = :doctor_id }
+opts = OptionParser.new("Usage: avvo_cli.rb ID")
 rest = opts.parse ARGV
 
-if !professional_klass
-  puts "You must specify either --lawyer or --doctor"
-  puts opts
-  exit(1)
-elsif !rest.first
+professional_klass = AvvoApi::Lawyer
+professional_param = :lawyer_id
+
+if !rest.first
   puts "You must specify the ID of the professional you are looking for"
   puts opts
   exit(1)
@@ -32,8 +29,8 @@ password: your_avvo_password"
     exit(1)
   end
   AvvoApi.setup(config["email"], config["password"])
-  AvvoApi::Base.site = 'http://localhost.local:3000'
-  
+  AvvoApi::Base.site = 'https://api.avvo.com/'
+
   professional = professional_klass.find(rest.first)
 
   address = AvvoApi::Address.main(professional_param => professional.id)
@@ -55,12 +52,12 @@ password: your_avvo_password"
   phones.each do |phone|
     printf format, "#{phone.phone_type}:", phone.phone_number
   end
-  
+
   specialties.each_with_index do |specialty, i|
     header = i == 0 ? "Specialties:" : ""
     printf format, header, "#{specialty.specialty_name.strip} (#{specialty.specialty_percent}%)"
   end
-  
+
   puts
   printf format, "Reviews ", ''
   reviews.each do |review|
@@ -68,7 +65,7 @@ password: your_avvo_password"
     printf format, "Title:", review.title
     printf format, "URL:", review.url
     printf format, "By:", review.posted_by
-    puts 
+    puts
   end
-  
+
 end

data/lib/avvo_api.rb

@@ -1,20 +1,17 @@
 require 'avvo_api/base'
-require 'avvo_api/professional_methods'
 
 # The Avvo API Client. All API models live in this module.
 module AvvoApi
 
   autoload :Lawyer, 'avvo_api/lawyer'
-  autoload :Doctor, 'avvo_api/doctor'
   autoload :School, 'avvo_api/school'
   autoload :Address, 'avvo_api/address'
   autoload :Phone, 'avvo_api/phone'
   autoload :Language, 'avvo_api/language'
   autoload :Specialty, 'avvo_api/specialty'
   autoload :Headshot, 'avvo_api/headshot'
-  autoload :AdvancedTraining, 'avvo_api/advanced_training'
   autoload :Review, 'avvo_api/review'
-  
+
   # Tells this client to use +email+ and +password+ to authenticate to
   # the Avvo API.
   def self.setup(email, password)

data/lib/avvo_api/address.rb

@@ -1,7 +1,6 @@
-# Represents an address. One of the following attributes MUST
+# Represents an address. The following attribute MUST
 # be set when using this model:
-# 
-# * doctor_id
+#
 # * lawyer_id
 #
 # This model has the following attributes:
@@ -14,10 +13,9 @@
 # * postal_code
 # * latitude
 # * longitude
-# 
+#
 class AvvoApi::Address < AvvoApi::Base
   belongs_to :lawyer
-  belongs_to :doctor
   has_many :phones
 
   # Returns the 'main' address associated with the passed in

data/lib/avvo_api/headshot.rb

@@ -3,18 +3,16 @@
 #
 #   AvvoApi::Headshot.find(:one, :lawyer_id => l.id)
 #
-# When using this model, one of the following attributes MUST be set:
-# 
-# * doctor_id
+# When using this model, The following attribute MUST be set:
+#
 # * lawyer_id
 #
 # This model has the following attribute:
 #
 # * headshot_url: The url to the standard-size headshot.
-# 
+#
 class AvvoApi::Headshot < AvvoApi::Base
   singleton
 
   belongs_to :lawyer
-  belongs_to :doctor
 end

data/lib/avvo_api/language.rb

@@ -1,16 +1,14 @@
-# Represents a language. One of the following attributes MUST
+# Represents a language. The following attribute MUST
 # be set when using this model:
-# 
-# * doctor_id
+#
 # * lawyer_id
 #
 # This model has the following attributes:
 #
-# * id 
+# * id
 # * name: The language name.
 # * specialty_id: The language id. 'name' takes priority over this if both are set.
-# 
+#
 class AvvoApi::Language < AvvoApi::Base
   belongs_to :lawyer
-  belongs_to :doctor
 end

data/lib/avvo_api/lawyer.rb

@@ -1,5 +1,5 @@
 # Represents a lawyer on Avvo. Attributes include:
-# 
+#
 # * id: The id of this lawyer
 # * firstname: the first name of this lawyer
 # * middlename: the middle name of this lawyer
@@ -9,12 +9,53 @@
 # * website_url
 #
 class AvvoApi::Lawyer < AvvoApi::Base
-  
+
   has_many :addresses
   has_many :reviews
   has_many :schools
   has_many :languages
   has_many :specialties
   has_one :headshot
-  include AvvoApi::ProfessionalMethods
+
+  # Search avvo for a list of the top 10 professionals matching the
+  # passed-in parameters. Accepts the following parameters:
+  #
+  # [q] The search query
+  # [loc] The location to search in
+  #
+  # These parameters match the search boxes on the Avvo website.
+  #
+  # This method pre-dates the REST API, and thus returns a hash of
+  # data rather than API objects. Hopefully, we'll eventually come
+  # up with something better. To see an actual response, look at
+  # http://api.avvo.com/docs/get/lawyers/search.html
+  def self.search(params)
+    response = self.get(:search, params)
+
+    if response && response['num_results']
+      response
+    else
+      raise ActiveResource::ResourceNotFound.new(response)
+    end
+  end
+
+  # Attempts to find a professional on Avvo that matches the
+  # passed-in params. Currently accepts the following params:
+  #
+  # [name] The full name of the lawyer you are trying to find
+  # [phone] The phone number of the lawyer, in the format XXX-XXX-XXXX
+  # [fax] The fax number of the lawyer, in the format XXX-XXX-XXXX
+  # [address] The full address of the lawyer
+  # [zip_code] The zip code of the lawyer
+  # [email_address] The e-mail address of the lawyer
+  def self.resolve(params)
+    response = self.get(:resolve, :params => params)
+    if response && response[collection_name]
+      response[collection_name].map do |params|
+        new(params.merge({"annotation" => response['annotation']}))
+      end
+    else
+      raise ActiveResource::ResourceNotFound.new(response)
+    end
+  end
 end

data/lib/avvo_api/phone.rb

@@ -14,19 +14,15 @@ module AvvoApi::PhoneType
   MOBILE = 4
 end
 
-# Represents a phone number tied to an address. One of the
-# following attributes MUST be set when using this model:
-# 
-# * doctor_id
-# * lawyer_id
+# Represents a phone number tied to an address. The following
+# attributes MUST be set when using this model:
 #
-# Additionally, the following attribute MUST be set when using this model:
-# 
+# * lawyer_id
 # * address_id
 #
 # This model has the following attributes:
 #
-# * id 
+# * id
 # * phone_number:  The phone number. Will be normalized by Avvo.
 # * phone_type_id: The type of the phone number, as an AvvoApi::PhoneType
 #   constant. (Only applicable when creating or updating records)

data/lib/avvo_api/review.rb

@@ -1,12 +1,11 @@
-# Represents a review for a professional. One of the following
-# attributes MUST be set when using this model:
-# 
-# * doctor_id
+# Represents a review for a professional. The following attribute
+# MUST be set when using this model:
+#
 # * lawyer_id
 #
 # This model has the following attributes:
 #
-# * id 
+# * id
 # * overall_rating: The overall rating (out of 5 stars) given by this review.
 # * title: The review's title
 # * body: The first 150 characters of the review's body
@@ -14,8 +13,7 @@
 # * posted_by: The author of the review
 # * posted_at: The date this review was posted
 # * updated_at: The last time this review was updated
-# 
+#
 class AvvoApi::Review < AvvoApi::Base
   belongs_to :lawyer
-  belongs_to :doctor
 end

data/lib/avvo_api/school.rb

@@ -1,18 +1,16 @@
-# Represents a school attended by a professional. One of the following
-# attributes MUST be set when using this model:
-# 
-# * doctor_id
+# Represents a school attended by a professional. The following
+# attribute MUST be set when using this model:
+#
 # * lawyer_id
 #
 # This model has the following attributes:
 #
-# * id 
+# * id
 # * name: The name of the school. When set, this will be resolved by Avvo.
 # * degree_level_name: The level of degree awarded at this school. BA, BS, JD, etc. Will be resolved by Avvo.
-# * degree_area_name: Major or area of study. Will be resolved by Avvo. 
+# * degree_area_name: Major or area of study. Will be resolved by Avvo.
 # * graduation_date: The date the professional graduated from this school.
-# 
+#
 class AvvoApi::School < AvvoApi::Base
   belongs_to :lawyer
-  belongs_to :doctor
 end

data/lib/avvo_api/specialty.rb

@@ -1,19 +1,17 @@
-# Represents a specialty. One of the following attributes MUST
-# be set when using this model:
-# 
-# * doctor_id
+# Represents a specialty. The following attribute MUST be set when
+# using this model:
+#
 # * lawyer_id
 #
 # This model has the following attributes:
 #
-# * id 
-# * specialty_name: The name of this specialty. 
+# * id
+# * specialty_name: The name of this specialty.
 # * specialty_percent: The percent of time this professional spends in this specialty
 # * specialty_start_date: When this professional started practicing this specialty.
 # * number_cases_handled: The number of cases handled within this specialty
 # * description: Additional information about this specialty.
-# 
+#
 class AvvoApi::Specialty < AvvoApi::Base
   belongs_to :lawyer
-  belongs_to :doctor
 end

data/lib/avvo_api/version.rb

@@ -1,3 +1,3 @@
 module AvvoApi
-  VERSION = "0.1.1" # :nodoc:
+  VERSION = "0.2.0" # :nodoc:
 end

data/test/unit/address_test.rb

@@ -6,23 +6,20 @@ class AvvoApi::AddressTest < Test::Unit::TestCase
     should "belong_to :lawyer" do
       assert_contains(AvvoApi::Address.belongs_to_associations.map(&:attribute), :lawyer)
     end
-    should "belong_to :doctor" do
-      assert_contains(AvvoApi::Address.belongs_to_associations.map(&:attribute), :doctor)
-    end
   end
 
-  context "AvvoApi::Address.main" do 
-    
-    setup do 
+  context "AvvoApi::Address.main" do
+
+    setup do
       stub_request(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/1/addresses/main.json").to_return(:body => {:id => '1', :postal_code => '98122'}.to_json)
       @address = AvvoApi::Address.main(:lawyer_id => 1)
     end
-    
+
     should "hit the correct url" do
       assert_requested(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/1/addresses/main.json")
     end
 
-    should "setup the object correctly" do 
+    should "setup the object correctly" do
       assert_equal '98122', @address.postal_code
       assert_equal 1, @address.prefix_options[:lawyer_id]
     end

data/test/unit/base_test.rb

@@ -3,21 +3,21 @@ require 'test_helper'
 class AvvoApi::BaseTest < Test::Unit::TestCase
 
   context "A resource that inherits from AvvoApi::Base" do
-    
+
     setup do
       @object = AvvoApi::Lawyer.new
     end
-    
+
     should "hit the Avvo API with the correct URL when saved" do
       stub_request(:post, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers.json")
       @object.save
       assert_requested(:post, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers.json")
     end
 
-    should "hit the Avvo API with the correct URL when retrieved" do 
+    should "hit the Avvo API with the correct URL when retrieved" do
       stub_request(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/1.json").to_return(:body => {:id => '1'}.to_json)
       AvvoApi::Lawyer.find(1)
-      assert_requested(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/1.json")      
+      assert_requested(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/1.json")
     end
 
     context "with a has_many relationship to another object" do
@@ -39,26 +39,26 @@ class AvvoApi::BaseTest < Test::Unit::TestCase
     end
 
     context "with a belongs_to association and correct parameters" do
-      setup do 
+      setup do
         @object = AvvoApi::Specialty.new(:lawyer_id => 2)
       end
-      
+
       should "hit the Avvo API with the correct URL when saved" do
         stub_request(:post, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/2/specialties.json")
         @object.save
         assert_requested(:post, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/2/specialties.json")
       end
-      
-      should "hit the Avvo API with the correct URL when retrieved" do 
+
+      should "hit the Avvo API with the correct URL when retrieved" do
         stub_request(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/2/specialties/3.json").to_return(:body => {:id => '3'}.to_json)
         AvvoApi::Specialty.find(3, :params => {:lawyer_id => 2})
-        assert_requested(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/2/specialties/3.json")      
+        assert_requested(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/2/specialties/3.json")
       end
 
-      should "hit the Avvo API with the correct URL when updated" do 
+      should "hit the Avvo API with the correct URL when updated" do
         stub_request(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/2/specialties/3.json").to_return(:body => {:id => '3', :specialty_id => "88", :specialty_id => '88', :specialty_percent => '100'}.to_json)
         license = AvvoApi::Specialty.find(3, :params => {:lawyer_id => 2})
-        assert_requested(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/2/specialties/3.json")  
+        assert_requested(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/2/specialties/3.json")
         stub_request(:put, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/2/specialties/3.json")
         license.save
         assert_requested(:put, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/2/specialties/3.json")
@@ -71,63 +71,63 @@ class AvvoApi::BaseTest < Test::Unit::TestCase
 
         assert_equal "/api/1/lawyers/2/specialties/2.json", @object.send(:element_path)
       end
-      
+
     end
 
-    context "with a belongs_to hierarchy and correct parameters" do 
+    context "with a belongs_to hierarchy and correct parameters" do
 
-      setup do 
-        @object = AvvoApi::Phone.new(:doctor_id => 2, :address_id => 3)
+      setup do
+        @object = AvvoApi::Phone.new(:lawyer_id => 2, :address_id => 3)
       end
 
       should "allow setting the prefix options after creation" do
         @object = AvvoApi::Phone.new
-        @object.doctor_id = 2
+        @object.lawyer_id = 2
         @object.address_id = 3
-        stub_request(:post, "https://test_account%40avvo.com:password@api.avvo.com/api/1/doctors/2/addresses/3/phones.json")
+        stub_request(:post, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/2/addresses/3/phones.json")
         @object.save
-        assert_requested(:post, "https://test_account%40avvo.com:password@api.avvo.com/api/1/doctors/2/addresses/3/phones.json")
+        assert_requested(:post, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/2/addresses/3/phones.json")
       end
 
       should "allow following +belongs_to+ associations" do
         @object = AvvoApi::Phone.new
-        @object.doctor_id = 2
+        @object.lawyer_id = 2
         @object.address_id = 3
         assert_equal 3, @object.address_id
-        stub_request(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/doctors/2/addresses/3.json").to_return(:body => {:id => '3'}.to_json)
+        stub_request(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/2/addresses/3.json").to_return(:body => {:id => '3'}.to_json)
         @object.address
         @object.address
-        assert_requested(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/doctors/2/addresses/3.json", :times => 1)
+        assert_requested(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/2/addresses/3.json", :times => 1)
       end
-      
+
       should "hit the Avvo API with the correct URL when saved" do
-        stub_request(:post, "https://test_account%40avvo.com:password@api.avvo.com/api/1/doctors/2/addresses/3/phones.json")
+        stub_request(:post, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/2/addresses/3/phones.json")
         @object.save
-        assert_requested(:post, "https://test_account%40avvo.com:password@api.avvo.com/api/1/doctors/2/addresses/3/phones.json")
+        assert_requested(:post, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/2/addresses/3/phones.json")
       end
 
-      should "hit the Avvo API with the correct URL when updated" do 
-        stub_request(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/doctors/2/addresses/3/phones/4.json").to_return(:body => {:id => '4'}.to_json)
-        phone = AvvoApi::Phone.find(4, :params => {:doctor_id => 2, :address_id => 3})
-        assert_requested(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/doctors/2/addresses/3/phones/4.json")
+      should "hit the Avvo API with the correct URL when updated" do
+        stub_request(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/2/addresses/3/phones/4.json").to_return(:body => {:id => '4'}.to_json)
+        phone = AvvoApi::Phone.find(4, :params => {:lawyer_id => 2, :address_id => 3})
+        assert_requested(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/2/addresses/3/phones/4.json")
 
-        stub_request(:put, "https://test_account%40avvo.com:password@api.avvo.com/api/1/doctors/2/addresses/3/phones/4.json")
+        stub_request(:put, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/2/addresses/3/phones/4.json")
         phone.save
-        assert_requested(:put, "https://test_account%40avvo.com:password@api.avvo.com/api/1/doctors/2/addresses/3/phones/4.json")
+        assert_requested(:put, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/2/addresses/3/phones/4.json")
       end
 
       should "set the prefix parameters correctly when saved" do
-        stub_request(:post, "https://test_account%40avvo.com:password@api.avvo.com/api/1/doctors/2/addresses/3/phones.json").to_return(:body => {:phone_type_id=>2, :id=>4, :phone_number=>"206-728-0588"}.to_json)
+        stub_request(:post, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/2/addresses/3/phones.json").to_return(:body => {:phone_type_id=>2, :id=>4, :phone_number=>"206-728-0588"}.to_json)
         @object.save
-        assert_requested(:post, "https://test_account%40avvo.com:password@api.avvo.com/api/1/doctors/2/addresses/3/phones.json")
+        assert_requested(:post, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/2/addresses/3/phones.json")
 
-        assert_equal "/api/1/doctors/2/addresses/3/phones/4.json", @object.send(:element_path)
+        assert_equal "/api/1/lawyers/2/addresses/3/phones/4.json", @object.send(:element_path)
       end
-      
-      should "hit the Avvo API with the correct URL when retrieved" do 
-        stub_request(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/doctors/2/addresses/3/phones/4.json").to_return(:body => {:id => '4'}.to_json)
-        AvvoApi::Phone.find(4, :params => {:doctor_id => 2, :address_id => 3})
-        assert_requested(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/doctors/2/addresses/3/phones/4.json")      
+
+      should "hit the Avvo API with the correct URL when retrieved" do
+        stub_request(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/2/addresses/3/phones/4.json").to_return(:body => {:id => '4'}.to_json)
+        AvvoApi::Phone.find(4, :params => {:lawyer_id => 2, :address_id => 3})
+        assert_requested(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/2/addresses/3/phones/4.json")
       end
     end
 

data/test/unit/headshot_test.rb

@@ -3,10 +3,6 @@ require 'test_helper'
 class AvvoApi::HeadshotTest < Test::Unit::TestCase
 
   context "AvvoApi::Headshot" do
-    
-    should "belong_to :doctor" do
-      assert_contains(AvvoApi::Headshot.belongs_to_associations.map(&:attribute), :doctor)
-    end
 
     should "belong_to :lawyer" do
       assert_contains(AvvoApi::Headshot.belongs_to_associations.map(&:attribute), :lawyer)
@@ -38,7 +34,7 @@ class AvvoApi::HeadshotTest < Test::Unit::TestCase
       @headshot = AvvoApi::Headshot.find(:one, :params => {:lawyer_id => 1})
       stub_request(:delete, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/1/headshot.json")
       @headshot.destroy
-      assert_requested(:delete, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/1/headshot.json")      
+      assert_requested(:delete, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/1/headshot.json")
     end
 
   end

data/test/unit/language_test.rb

@@ -6,9 +6,6 @@ class AvvoApi::LanguageTest < Test::Unit::TestCase
     should "belong_to :lawyer" do
       assert_contains(AvvoApi::Language.belongs_to_associations.map(&:attribute), :lawyer)
     end
-    should "belong_to :doctor" do
-      assert_contains(AvvoApi::Language.belongs_to_associations.map(&:attribute), :doctor)
-    end
   end
 
 end

data/test/unit/phone_test.rb

@@ -6,14 +6,14 @@ class AvvoApi::PhoneTest < Test::Unit::TestCase
     should "belong_to :address" do
       assert_contains(AvvoApi::Phone.belongs_to_associations.map(&:attribute), :address)
     end
-    
+
     should "build successfully with PhoneType constants" do
       phone = AvvoApi::Phone.new(:phone_number => '2125551212', :phone_type_id => AvvoApi::PhoneType::OFFICE, :address_id => 1, :lawyer_id => 1)
       assert_equal 2, phone.phone_type_id
     end
 
     should "be able to return a reasonable string for a phone type id" do
-      stub_request(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/1/addresses/1/phones/1.json").to_return(:body => {:id => 1, :phone_number => '212-555-1212', :phone_type => 'Office', :updated_at => Time.now}.to_json)
+      stub_request(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/lawyers/1/addresses/1/phones/1.json").to_return(:body => {:id => 1, :phone_number => '212-555-1212', :phone_type => 'Office', :updated_at => Time.now.to_s}.to_json)
       phone = AvvoApi::Phone.find(1, :params => {:lawyer_id => 1, :address_id => 1})
       assert_equal "Office", phone.phone_type
     end

data/test/unit/review_test.rb

@@ -6,9 +6,6 @@ class AvvoApi::ReviewTest < Test::Unit::TestCase
     should "belong_to :lawyer" do
       assert_contains(AvvoApi::Review.belongs_to_associations.map(&:attribute), :lawyer)
     end
-    should "belong_to :doctor" do
-      assert_contains(AvvoApi::Review.belongs_to_associations.map(&:attribute), :doctor)
-    end
   end
 
 end

data/test/unit/school_test.rb

@@ -6,9 +6,6 @@ class AvvoApi::SchoolTest < Test::Unit::TestCase
     should "belong_to :lawyer" do
       assert_contains(AvvoApi::School.belongs_to_associations.map(&:attribute), :lawyer)
     end
-    should "belong_to :doctor" do
-      assert_contains(AvvoApi::School.belongs_to_associations.map(&:attribute), :doctor)
-    end
   end
 
 end

data/test/unit/specialty_test.rb

@@ -6,9 +6,6 @@ class AvvoApi::SpecialtyTest < Test::Unit::TestCase
     should "belong_to :lawyer" do
       assert_contains(AvvoApi::Specialty.belongs_to_associations.map(&:attribute), :lawyer)
     end
-    should "belong_to :doctor" do
-      assert_contains(AvvoApi::Specialty.belongs_to_associations.map(&:attribute), :doctor)
-    end
   end
 
 end

metadata

@@ -1,76 +1,87 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: avvo_api
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Justin Weiss
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-13 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activeresource
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
   name: reactive_resource
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        version: "0.5"
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 11
-        - 3
+      - !ruby/object:Gem::Version
         version: 2.11.3
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.3
+- !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.6.1
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.1
 description: An ActiveResource client to the Avvo API
-email: 
+email:
 - jweiss@avvo.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -80,23 +91,18 @@ files:
 - examples/avvo_cli.rb
 - lib/avvo_api.rb
 - lib/avvo_api/address.rb
-- lib/avvo_api/advanced_training.rb
 - lib/avvo_api/base.rb
-- lib/avvo_api/doctor.rb
 - lib/avvo_api/headshot.rb
 - lib/avvo_api/language.rb
 - lib/avvo_api/lawyer.rb
 - lib/avvo_api/phone.rb
-- lib/avvo_api/professional_methods.rb
 - lib/avvo_api/review.rb
 - lib/avvo_api/school.rb
 - lib/avvo_api/specialty.rb
 - lib/avvo_api/version.rb
 - test/test_helper.rb
 - test/unit/address_test.rb
-- test/unit/advanced_training_test.rb
 - test/unit/base_test.rb
-- test/unit/doctor_test.rb
 - test/unit/headshot_test.rb
 - test/unit/language_test.rb
 - test/unit/lawyer_test.rb
@@ -104,46 +110,40 @@ files:
 - test/unit/review_test.rb
 - test/unit/school_test.rb
 - test/unit/specialty_test.rb
-has_rdoc: true
 homepage: http://api.avvo.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3149627312389362997
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3858919658491321272
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3149627312389362997
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -3858919658491321272
 requirements: []
-
 rubyforge_project: avvo_api
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: An ActiveResource client to the Avvo API
-test_files: 
+test_files:
 - test/test_helper.rb
 - test/unit/address_test.rb
-- test/unit/advanced_training_test.rb
 - test/unit/base_test.rb
-- test/unit/doctor_test.rb
 - test/unit/headshot_test.rb
 - test/unit/language_test.rb
 - test/unit/lawyer_test.rb

data/lib/avvo_api/advanced_training.rb

@@ -1,35 +0,0 @@
-# Constants representing the possible values of the
-# advanced_training_type_id parameter of AvvoApi::AdvancedTraining
-module AvvoApi::AdvancedTrainingType
-  
-  # Unknown training type
-  UNKNOWN = 1 
-
-  # Represents an internship
-  INTERNSHIP = 2
-  
-  # Represents a residency
-  RESIDENCY = 3
-
-  # Represents a fellowship
-  FELLOWSHIP = 4
-end
-
-# Represents advanced training, like residencies, for doctors. This
-# model is only applicable to doctors. The following attributes MUST
-# be set when using this model:
-# 
-# * doctor_id
-#
-# This model has the following attributes:
-#
-# * id - The model's id
-# * advanced_training_type_id -  an AvvoApi::AdvancedTrainingType constant
-# * specialty_name - The name of the specialty this advanced training is in
-# * hospital_name - The normalized name of the hospital. This will be
-#   resolved by Avvo when it is set by this client.
-# * graduation_date - The date this training was completed
-# 
-class AvvoApi::AdvancedTraining < AvvoApi::Base
-  belongs_to :doctor
-end

data/lib/avvo_api/doctor.rb

@@ -1,22 +0,0 @@
-# Represents a doctor on Avvo. Attributes include:
-# 
-# * id: The id of this doctor
-# * firstname: the first name of this doctor
-# * middlename: the middle name of this doctor
-# * lastname: the last name of this doctor
-# * suffix: the suffix of the doctor's name
-# * avvo_rating: The doctor's Avvo Rating, from 0.0 to 10.0
-# * email_address
-# * website_url
-# * profile_url
-#
-class AvvoApi::Doctor < AvvoApi::Base
-  has_many :addresses
-  has_many :reviews
-  has_many :schools
-  has_many :languages
-  has_many :specialties
-  has_many :advanced_trainings
-  has_one :headshot
-  include AvvoApi::ProfessionalMethods
-end

data/lib/avvo_api/professional_methods.rb

@@ -1,52 +0,0 @@
-module AvvoApi::ProfessionalMethods # :nodoc:
-
-  # Methods that are shared between professionals. 
-  module ClassMethods
-
-    # Search avvo for a list of the top 10 professionals matching the
-    # passed-in parameters. Accepts the following parameters:
-    #
-    # [q] The search query
-    # [loc] The location to search in
-    #
-    # These parameters match the search boxes on the Avvo website.
-    #
-    # This method pre-dates the REST API, and thus returns a hash of
-    # data rather than API objects. Hopefully, we'll eventually come
-    # up with something better. To see an actual response, look at
-    # http://api.avvo.com/docs/get/lawyers/search.html
-    def search(params)
-      response = self.get(:search, params)
-      
-      if response && response['num_results']
-        response
-      else
-        raise ActiveResource::ResourceNotFound.new(response)
-      end
-    end
-
-    # Attempts to find a professional on Avvo that matches the
-    # passed-in params. Currently accepts the following params:
-    #
-    # [name] The full name of the lawyer you are trying to find
-    # [phone] The phone number of the lawyer, in the format XXX-XXX-XXXX
-    # [fax] The fax number of the lawyer, in the format XXX-XXX-XXXX
-    # [address] The full address of the lawyer
-    # [zip_code] The zip code of the lawyer
-    # [email_address] The e-mail address of the lawyer
-    def resolve(params)
-      response = self.get(:resolve, :params => params)
-      if response && response[collection_name]
-        response[collection_name].map do |params|
-          new(params.merge({"annotation" => response['annotation']}))
-        end
-      else
-        raise ActiveResource::ResourceNotFound.new(response)
-      end
-    end
-  end
-
-  def self.included(base)
-    base.send(:extend, ClassMethods)
-  end
-end

data/test/unit/advanced_training_test.rb

@@ -1,11 +0,0 @@
-require 'test_helper'
-
-class AvvoApi::AdvancedTrainingTest < Test::Unit::TestCase
-
-  context "AvvoApi::AdvancedTraining" do
-    should "belong_to :doctor" do
-      assert_contains(AvvoApi::AdvancedTraining.belongs_to_associations.map(&:attribute), :doctor)
-    end
-  end
-
-end

data/test/unit/doctor_test.rb

@@ -1,46 +0,0 @@
-require 'test_helper'
-
-class AvvoApi::DoctorTest < Test::Unit::TestCase
-
-  context "A valid doctor object" do 
-    setup do 
-      @doctor = AvvoApi::Doctor.new(valid_doctor_params)
-      stub_request(:post, "https://test_account%40avvo.com:password@api.avvo.com/api/1/doctors.json").to_return(:body => doctor_1.to_json)
-    end
-    
-    should "#save successfully" do
-      assert @doctor.save, "doctor could not be saved"
-      assert_requested(:post, "https://test_account%40avvo.com:password@api.avvo.com/api/1/doctors.json")
-      assert_equal "1", @doctor.id
-    end
-  end
-  
-  context "AvvoApi::Doctor.resolve" do
-    
-    should "return the appropriate doctors" do
-      stub_request(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/doctors/resolve.json?params%5Bname%5D=Mark%20Britton&params%5Bzip_code%5D=98101").to_return(:body => {:doctors => [{:id => 1}]}.to_json)
-      doctors = AvvoApi::Doctor.resolve({:name => 'Mark Britton', :zip_code => 98101})
-      assert_requested(:get, "https://test_account%40avvo.com:password@api.avvo.com/api/1/doctors/resolve.json?params%5Bname%5D=Mark%20Britton&params%5Bzip_code%5D=98101")
-      assert_equal 1, doctors.length
-    end
-  end
-
-  private
-
-  def valid_doctor_params
-    {
-      :firstname => 'Bob',
-      :lastname => 'Bobson',
-      :npi_number => '123456'
-    }
-  end
-  
-  def doctor_1
-    {
-      :firstname => 'Bob',
-      :lastname => 'Bobson',
-      :id => '1'
-    }
-  end
-  
-end