hoverbird-ny-times-congress 1.2.1 → 1.2.2

data/TODO

@@ -1,2 +1,3 @@
 * Auto-fill current session number based on the year.
-* Select congress members by state.
+* Select congress members by state.
+* A Position should fetch the RollCallVote on which it is based

data/VERSION.yml

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

data/lib/ny-times/congress/legislator.rb

@@ -13,37 +13,34 @@ module NYTimes
       
       def self.find(id)
         response = invoke("members/#{id}.json")
-        require 'ruby-debug'
-        debugger if response.inspect unless response.has_key?('results')
 				new(response['results'].first)
       end
 		  attr_reader :attributes, :id
-		  
-			def initialize(args={})
-        @attributes = {}
-  			@id = args.delete('id') || args.delete('member_id')
-  			transformed = transform(args, ATTRIBUTE_MAP)
-				transformed.each_pair do |attribute_name, attribute_value|
-				  attributes[attribute_name.to_sym] = attribute_value
-				end
-				@fully_loaded = false
-			end
       
       def positions
-        response = Base.invoke("members/#{id}/votes.json")
-        response = response['results'].first['votes']
-        positions_for(response)
+        @positions ||= fetch_positions
       end
+      alias votes positions
       
-      def votes
-        response = Base.invoke("members/#{id}/votes.json")
-        response = response['results'].first['votes']
-        votes_for(response)
-      end
-  		
+  		def initialize(args={})
+  		  prepare_arguments(args)
+  		  @attributes = {}
+				@transformed_arguments.each_pair do |name, value|
+				  attributes[name.to_sym] = value
+				end
+				@fully_loaded = false
+			end
+    			
 			private
 			  attr_reader :fully_loaded
 			  
+			  def prepare_arguments(hash)
+			    args = hash.dup
+    			@id = args.delete('member_id') || args.delete('id')
+    			raise ArgumentError, "could not assign ID" unless @id.is_a?(String)
+    			@transformed_arguments = transform(args, ATTRIBUTE_MAP)
+    	  end
+			  
 			  def fully_loaded?
 			    fully_loaded
 			  end
@@ -53,7 +50,12 @@ module NYTimes
 	  		  attributes.merge!(full_legislator.attributes)
 	  		  @fully_loaded = true
   			end
-
+        
+        def fetch_positions
+          response = Base.invoke("members/#{id}/votes.json")
+          response = response['results'].first['votes']
+          positions_for(response)
+        end
     end
   end
 end

data/spec/example_data/example_data.rb

@@ -86,4 +86,52 @@ def role_response_fragment
        "end_date":"2009-01-20"
     }
   JSON
+end
+
+def member_positions_response
+  <<-JSON
+  {
+     "status":"OK",
+     "copyright":"Copyright (c) 2009 The New York Times Company.  All Rights Reserved.",
+     "results":[
+        {
+           "member_id":"N000147",
+           "total_votes":"100",
+           "offset":"0",
+           "votes":[
+             {
+                "member_id":"N000147",
+                "chamber":"House",
+                "congress":"111",
+                "session":"1",
+                "roll_call":"23",
+                "date":"2009-01-21",
+                "time":"15:37:00",
+                "position":"Yes"
+             },
+             {
+                "member_id":"N000147",
+                "chamber":"House",
+                "congress":"111",
+                "session":"1",
+                "roll_call":"19",
+                "date":"2009-01-15",
+                "time":"13:37:00",
+                "position":"Yes"
+             },
+             {
+                "member_id":"N000147",
+                "chamber":"House",
+                "congress":"110",
+                "session":"1",
+                "roll_call":"1031",
+                "date":"2007-11-01",
+                "time":"14:21:00",
+                "position":"No"
+             }
+           ]
+        }
+     ]
+  }
+  JSON
 end

data/spec/legislator_spec.rb

@@ -1,8 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe Legislator do
-  attr_reader :legislator, :role, :parsed_data
-  
+describe Legislator do  
   describe ".find" do
 	  attr_reader :joe
 	  
@@ -28,13 +26,15 @@ describe Legislator do
 	
 	describe "#initialize" do
 	  context "with limited params hash" do
+	    attr_reader :legislator, :role, :parsed_data
+      
   	  def example_data
         limited_legislator_attributes
   		end
   		
 		  before do
-  	    @parsed_data  = JSON.parse(example_data)
-    	  @legislator   = Legislator.new(parsed_data)	    
+  	    @parsed_data = JSON.parse(example_data)
+    	  @legislator  = Legislator.new(parsed_data)	    
     	end
     	
   		it "assigns attributes as expected" do
@@ -63,7 +63,8 @@ describe Legislator do
     	end
 	  end
 		
-    describe "with full bio and roles hash" do
+    context "with full bio and roles hash" do
+      attr_reader :legislator, :role, :parsed_data
       
       def example_data
         full_legislator_attributes
@@ -87,26 +88,51 @@ describe Legislator do
         legislator.roles.size.should == 2
         legislator.roles.each {|role| role.should be_kind_of(Role)}      
       end
+      
+      it "raises an error if it's unable to assign an id" do
+        data = @parsed_data.dup.delete('member_id')
+        lambda {Legislator.new(dat)}.should raise_error
+      end
+      
   	end
   end
 	
   describe "#positions" do
-    it "needs specs"
-  end
-  
-  describe "#roles" do
+    attr_reader :legislator, :legislator_id, :role, :positions, :parsed_data
+    
     def example_data
-      limited_legislator_attributes
-		end
+      full_legislator_attributes
+    end
     
     before do
-	    @parsed_data = JSON.parse(example_data)
-  	  @legislator  = Legislator.new(parsed_data)
+      @legislator_id = 'L000304'
+      FakeWeb.clean_registry
+	    FakeWeb.register_uri(api_url_for("members/#{legislator_id}/votes.json"), :string => member_positions_response)
+    	FakeWeb.register_uri(api_url_for("members/#{legislator_id}.json"), :string => member_response)
+  	  @legislator   = Legislator.find(legislator_id)
   	end
   	
+    it "returns an Array of Positions for the given Legislator" do
+      legislator.positions.should_not be_nil
+      legislator.positions.size.should == 3
+    end
+    
+  end
+  
+  
+  describe "#roles" do
+
     context "when bio and roles haven't been populated" do
-  		
+  		attr_reader :legislator, :role, :parsed_data
+      def example_data
+        limited_legislator_attributes
+  		end
+      
   		before do
+  		  @parsed_data = JSON.parse(example_data)
+  	    @parsed_data['id'].should_not be_nil
+    	  @legislator  = Legislator.new(parsed_data)
+    	  
   		  legislator.attributes[:roles].should be_nil
   		  legislator.attributes[:url].should be_nil
   		  legislator.attributes[:birthdate].should be_nil
@@ -124,6 +150,8 @@ describe Legislator do
     end
     
     context "when bio and roles have already been loaded" do
+      attr_reader :legislator, :role, :parsed_data
+  		
     	def example_data
         full_legislator_attributes
   		end
@@ -139,7 +167,6 @@ describe Legislator do
   		  legislator.date_of_birth.should_not be_nil
       end
     end
-    
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hoverbird-ny-times-congress
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - Patrick Ewing
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-20 00:00:00 -08:00
+date: 2009-03-10 00:00:00 -07:00
 default_executable: congresh
 dependencies: 
 - !ruby/object:Gem::Dependency