technicalpickles-daywalker 0.1.1 → 0.1.2

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 1
-:patch: 1
+:patch: 2
 :major: 0

data/lib/daywalker.rb

@@ -12,6 +12,7 @@ module Daywalker
   def self.api_key=(api_key)
     @api_key = api_key
   end
+
   # Get the API to be used
   def self.api_key
     @api_key

data/lib/daywalker/legislator.rb

@@ -77,7 +77,9 @@ module Daywalker
     # Find one or many legislators, based on a set of conditions. See 
     # VALID_ATTRIBUTES for possible attributes you can search for.
     # 
-    # If you want one legislators, and you expect there is exactly one legislator, use :one. An error will be raised if there are more than one result.
+    # If you want one legislators, and you expect there is exactly one
+    # legislator, use :one. An error will be raised if there are more than
+    # one result. An ArgumentErrror will be raised if multiple results come back.
     #
     #   Daywalker::Legislator.find(:one, :state => 'NY', :district => 4)
     #
@@ -115,7 +117,6 @@ module Daywalker
         super
       end
     end
-
     
     def self.respond_to?(method_id) # :nodoc:
       match = DynamicFinderMatch.new(method_id)
@@ -128,6 +129,13 @@ module Daywalker
 
     protected
 
+    def self.handle_bad_request(body) # :nodoc:
+      case body
+      when "Multiple Legislators Returned" then raise(ArgumentError, "The conditions provided returned multiple results, by only one is expected")
+      else super
+      end
+    end
+
     
     def self.create_finder_method(method, finder, attribute_names) # :nodoc:
       class_eval %{

data/spec/daywalker/legislator_spec.rb

@@ -76,6 +76,18 @@ describe Daywalker::Legislator do
           }.should raise_error(Daywalker::BadApiKey) 
         end
       end
+
+      describe 'by state and district, with multiple results' do
+        before do
+          register_uri_with_response 'legislators.get.xml?state=NY&title=Sen&apikey=redacted', 'legislators_find_one_by_ny_senators.xml'
+        end
+
+        it 'should raise an error about multiple legislators returned' do
+          lambda {
+            Daywalker::Legislator.find(:one, :state => 'NY', :title => :senator)
+          }.should raise_error(ArgumentError, "The conditions provided returned multiple results, by only one is expected")
+        end
+      end
     end
   end
 

data/spec/fixtures/legislators_find_one_by_ny_senators.xml

@@ -0,0 +1,9 @@
+HTTP/1.1 400 Bad Request
+Date: Fri, 13 Feb 2009 22:01:26 GMT
+Server: Apache/2.2.3 (Debian) mod_python/3.2.10 Python/2.4.4 PHP/5.2.0-8+etch11
+Content-Type: text/html; charset=utf-8
+Vary: Accept-Encoding
+Connection: close
+Transfer-Encoding: chunked
+
+Multiple Legislators Returned

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: technicalpickles-daywalker
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Josh Nichols
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-10 00:00:00 -08:00
+date: 2009-02-13 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -50,6 +50,7 @@ files:
 - spec/fixtures/legislators_find_by_ny_district_4_bad_api.xml
 - spec/fixtures/legislators_find_ny_senators.xml
 - spec/fixtures/legislators_find_ny_senators_bad_api.xml
+- spec/fixtures/legislators_find_one_by_ny_senators.xml
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/technicalpickles/daywalker