hoverbird-ny-times-congress 1.1.0 → 1.2.0

data/spec/example_data/roll_call_votes.json

@@ -344,4 +344,4 @@
                 "state": "NY"                              }              ]
                      }
     }
-}
+}

data/spec/legislator_spec.rb

@@ -20,34 +20,34 @@ describe Legislator do
     end
     
     it "should return the Legislator's roles" do
-      joe.roles.size.should be 11
+      joe.roles.size.should        == 11
       joe.roles.first.title.should == "Senator, 1st Class"
       joe.roles.first.state.should == "CT"
     end
 	end
 	
 	describe "#initialize" do
-	  before do
-	    @parsed_data  = JSON.parse(example_data)
-  	  @legislator   = Legislator.new(parsed_data)
-  	end
-    
 	  context "with limited params hash" do
   	  def example_data
         limited_legislator_attributes
   		end
-		
+  		
+		  before do
+  	    @parsed_data  = JSON.parse(example_data)
+    	  @legislator   = Legislator.new(parsed_data)	    
+    	end
+    	
   		it "assigns attributes as expected" do
-  		  legislator.id.should eql "B000444"
-        legislator.name.should eql "Joseph Biden"
-        legislator.party.should eql "D"
-        legislator.state.should eql "DE"
+  		  legislator.id.should == "L000304"
+        legislator.name.should == "Joseph I. Lieberman"
+        legislator.party.should == "ID"
+        legislator.state.should == "CT"
   		end
   		
   		describe ":id and :member_id attributes" do
   		  attr_reader :identifier
   		  
-  		  setup do
+  		  before do
   		    @identifier = "H00HAA"
   		  end
   		  
@@ -63,80 +63,83 @@ describe Legislator do
     	end
 	  end
 		
-    describe "initializing with full bio and roles hash" do
+    describe "with full bio and roles hash" do
+      
       def example_data
         full_legislator_attributes
       end
+      
+		  before do
+  	    @parsed_data = JSON.parse(example_data)['results'].first
+    	  @legislator  = Legislator.new(parsed_data)	    
+    	end
 
-      it "assigns attributes as expected" do  
-        legislator.id.should eql "B000444"
-        legislator.name.should eql "Joseph Biden"
-        legislator.gender.should eql "M"
-        legislator.govtrack_id.should eql 300008
-        legislator.url.should eql "http://biden.senate.gov"
-        legislator.date_of_birth.should eql Date.parse("1942-11-20")
-        legislator.district.should be_nil
+      it "assigns attributes as expected" do
+        legislator.id.should == "L000304"
+        legislator.name.should == "Joseph I. Lieberman"
+        legislator.gender.should == "M"
+        legislator.govtrack_id.should == 300067
+        legislator.url.should == "http://lieberman.senate.gov/"
+        legislator.date_of_birth.should == Date.parse("1942-02-24")
       end
     
       it "assigns a number of Roles to the Legislator" do
         legislator.roles.size.should == 2
-        legislator.roles.each {|role| role.should be_kind_of Role}      
+        legislator.roles.each {|role| role.should be_kind_of(Role)}      
       end
   	end
   end
 	
   describe "#positions" do
-    
+    it "needs specs"
   end
   
   describe "#roles" do
+    def example_data
+      limited_legislator_attributes
+		end
     
     before do
-	    @parsed_data  = JSON.parse(example_data)
-  	  @legislator   = Legislator.new(parsed_data)
-  	  FakeWeb.clean_registry 
+	    @parsed_data = JSON.parse(example_data)
+  	  @legislator  = Legislator.new(parsed_data)
   	end
   	
-    context "when  bio and roles haven't been populated"
-      def example_data
-        limited_legislator_attributes
-  		end
+    context "when bio and roles haven't been populated" do
   		
   		before do
-  		  legislator.instance_variable_get("@roles").should be_nil
-  		  legislator.instance_variable_get("@url").should be_nil
-  		  legislator.instance_variable_get("@birthdate").should be_nil
-  		  
-  		  FakeWeb.register_uri(api_url_for('members/B000444.json'), :string => full_legislator_attributes)
+  		  legislator.attributes[:roles].should be_nil
+  		  legislator.attributes[:url].should be_nil
+  		  legislator.attributes[:birthdate].should be_nil
+  		  FakeWeb.clean_registry
+  		  FakeWeb.register_uri(api_url_for('members/L000304.json'), :string => member_response)
   		end
   		
-      it "makes an API request for bio and roles fields" do
+      it "makes second API request when one attempts to read those attributes" do        
         legislator.roles
-        roles = legislator.instance_variable_get("@roles").should_not be_nil
-  		  
-  		  legislator.url.should eql Date.parse("1942-11-20")
-        legislator.date_of_birth.should == Date.parse("http://biden.senate.gov")
+        roles = legislator.attributes[:roles].should_not be_nil
+  		  legislator.date_of_birth.should == Date.parse("1942-02-24")
+        legislator.url.should =="http://lieberman.senate.gov/"
       end
       
     end
     
     context "when bio and roles have already been loaded" do
-      def example_data
+    	def example_data
         full_legislator_attributes
   		end
   		
-  		before do
-  		  legislator.instance_variable_get("@roles").should_not be_nil
-  		  legislator.birthdate.should_not be_nil
-  		end
-      
-      it "does not make another API request" do
-        legislator.roles
-  		  legislator.instance_variable_get("@roles").should_not be_nil
-  		  legislator.instance_variable_get("@url").should be_nil
-  		  legislator.instance_variable_get("@birthdate").should be_nil  		  
+    	before do
+  	    @parsed_data = JSON.parse(example_data)['results'].first
+    	  @legislator  = Legislator.new(parsed_data)
+    	end
+  		
+      it "does not make another API request when accessing attributes" do
+        legislator.roles.should_not be_nil
+  		  legislator.url.should_not be_nil
+  		  legislator.date_of_birth.should_not be_nil
       end
     end
     
   end
-	
+
+end

data/spec/role_spec.rb

@@ -9,7 +9,7 @@ describe NYTimes::Congress::Role do
 	
 	context "initializing with params hash", :shared => true do
 		before do
-		  @role = Role.new(JSON.parse example_data)
+		  @role = Role.new(JSON.parse(example_data))
 		end
 		
 		it "should set String attributes" do 
@@ -71,7 +71,7 @@ describe NYTimes::Congress::Role do
      end
     
     before do     
-      @legislator = Legislator.new(JSON.parse example_data)
+      @legislator = Legislator.new(JSON.parse(example_data))
       legislator.roles.should_not be_nil
       @role = legislator.roles.sort_by{|r| r.congress}.first
     end
@@ -97,7 +97,7 @@ describe NYTimes::Congress::Role do
     end
     
     it "can be found through the Legislator" do
-      legislator.roles.should include role
+      legislator.roles.should include(role)
     end    
 		
   end

data/spec/roll_call_vote_spec.rb

@@ -4,7 +4,7 @@ describe RollCallVote do
   attr_reader :congress, :vote
   
   def example_data
-    File.read('example_data/roll_call_votes.json')
+    roll_call_votes_response
   end
   
   before do

data/spec/spec_helper.rb

@@ -1,8 +1,9 @@
 require File.dirname(__FILE__) + '/../lib/ny-times-congress'
+require File.dirname(__FILE__) + '/example_data/example_data'
+
 require "rubygems"
 require "spec"
 require 'fake_web'
-require 'example_data/example_data'
 
 gem 'rr'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hoverbird-ny-times-congress
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Patrick Ewing
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-11 00:00:00 -08:00
+date: 2009-02-17 00:00:00 -08:00
 default_executable: congresh
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -33,6 +34,7 @@ files:
 - LICENSE
 - Rakefile
 - README.mkdn
+- TODO
 - VERSION.yml
 - bin/congresh
 - bin/setup.rb