concensus 0.0.5 → 0.0.6

data/README.md

@@ -1,6 +1,6 @@
 # Concensus
 
-Concensus is a gem for reading the United States Census Bureau's TIGER/Line Shapefiles.
+Concensus is a gem for reading the United States Census Bureau's [TIGER/Line Shapefiles](http://www.census.gov/geo/www/tiger/).
 
 It uses the [georuby](http://rubygems.org/gems/georuby) gem to convert the shapefiles, which leaves you with access to all of the methods in the [georuby API](http://www.ruby-doc.org/gems/docs/g/georuby-1.9.7/GeoRuby/SimpleFeatures/MultiPolygon.html).
 
@@ -12,10 +12,18 @@ It uses the [georuby](http://rubygems.org/gems/georuby) gem to convert the shape
 ## Use
 
 	Concensus::Place.find("CA", "Berkeley")
-		=> #<Concensus::Resource>
+		=> #<Concensus::Place>
 		
 	Concensus::Place.find_all("CA")
-		=> [#<Concensus::Resource>, #<Concensus::Resource>, etc...]	
+		=> [#<Concensus::Place>, #<Concensus::Place>, etc...]
+			
+	Concensus::configuration.year = 2011
+		=> all subsequent requests will be for 2011
+		
+	Concensus::Place.find("NY", "New York")
+		=> 2011 Boundaries for New York City
+		
+	Concensus::configuration.year = 2010
 	
 	california = Concensus::State.find("CA")
 	
@@ -27,10 +35,73 @@ It uses the [georuby](http://rubygems.org/gems/georuby) gem to convert the shape
 		
 	california.geometry.to_array[0]
 		=> [[-119.000932, 33.535895], [-119.000932, 33.535823], ... ] 
+		
+
+### List of Resources
+
+<table style="text-align: left;" cellpadding="5" border="1">
+	<tr>
+		<th></th>
+		<th>2011</th>
+		<th>2010</th>
+	</tr>
+    <tr>
+    	<th>Concensus::Congressional</th>
+    	<td></td>
+    	<td>✓</td>
+    </tr>
+
+    <tr>
+    	<th>Concensus::County</th>
+    	<td></td>
+    	<td>✓</td>
+    </tr>
+    <tr>
+        <th>Concensus::Place</th>
+        <td>✓</td>
+        <td>✓</td>
+    </tr>
+    <tr>
+    	<th>Concensus::School::Elementary</th>
+    	<td>✓</td>
+    	<td>✓</td>
+    </tr>
+    <tr>
+    	<th>Concensus::School::Secondary</th>
+    	<td>✓</td>
+    	<td>✓</td>
+    </tr>
+    <tr>
+    	<th>Concensus::School::Unified</th>
+    	<td>✓</td>
+    	<td>✓</td>
+    </tr>
+    <tr>
+    	<th>Concensus::State</th>
+    	<td></td>
+    	<td>✓</td>
+    </tr>
+    <tr>
+    	<th>Concensus::StateLegislative::Upper</th>
+    	<td>✓</td>
+    	<td>✓</td>
+    </tr>
+    <tr>
+    	<th>Concensus::StateLegislative::Lower</th>
+    	<td>✓</td>
+    	<td>✓</td>
+    </tr>
+    <tr>
+    	<th>Concensus::Zipcode</th>
+    	<td></td>
+    	<td>✓</td>
+    </tr>
+</table>
+
 
 
 ### Full Documentation
-[http://www.googl.com]()
+[http://rubydoc.info/github/adamjacobbecker/concensus/](http://rubydoc.info/github/adamjacobbecker/concensus/)
 
 ### Notes
 
@@ -40,8 +111,7 @@ If you're using Rails, you'll probably want to create an initializer with `Conce
 
 #### Todo
 
-- Add support for switching Census year (already started, not fully implemented yet.)
 - Add more geographic areas, we only have a small bit of [what's available](http://www.census.gov/geo/www/tiger/tgrshp2010/availability.html).
 - Add support for storing downloaded and uncompressed .zips on S3. (Heroku has no persistent writable file storage.)
 
-**Support development by sending links to sick house music mixes:** [@AdamJacobBecker](http://www.twitter.com/AdamJacobBecker)
+**Support development by sending links to siiick house mixes:** [@AdamJacobBecker](http://www.twitter.com/AdamJacobBecker)

data/concensus.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
     gem.add_development_dependency x
   end
   
-  %w{rspec activesupport rubyzip georuby dbf}.each do |x|
+  %w{activesupport rubyzip georuby dbf}.each do |x|
     gem.add_dependency x
   end
 end

data/lib/concensus.rb

@@ -1,16 +1,25 @@
-require "concensus/version"
 require "concensus/configuration"
 require "concensus/resource"
-require "concensus/place"
+require "concensus/version"
+
+require "concensus/congressional"
 require "concensus/county"
+require "concensus/place"
+require "concensus/school"
 require "concensus/state"
 require "concensus/state_legislative"
-require "concensus/congressional"
-require "concensus/school"
+require "concensus/zipcode"
+
 require "geo_ruby/simple_features"
-require "active_support"
 require "zip/zip"
 
 module Concensus
+  class ConcensusError < StandardError; end
+
+  class ShapeNotFound < ConcensusError; end
+  
+  class YearNotSupported < ConcensusError; end
+  
+  class NoResourceForYear < ConcensusError; end 
 end
 

data/lib/concensus/configuration.rb

@@ -1,7 +1,6 @@
 module Concensus
   class Configuration
-    attr_accessor :year, :census_state_ids
-    attr_reader :tmp_dir, :default_tmp_dir
+    attr_reader :tmp_dir, :default_tmp_dir, :year, :census_state_ids
     
     # Temporary directory for storing .zip files and their contents.
     # It's best if this directory persists as a "cache" of sorts, so
@@ -14,10 +13,22 @@ module Concensus
       FileUtils.mkdir_p(@tmp_dir)
     end
     
+    def year=(x)
+      if [2010, 2011].include?(x)
+        @year = x
+      else
+        raise YearNotSupported
+      end
+    end
+    
     # This will become useful once we can switch years...
     def root_url
       "http://www2.census.gov/geo/tiger/TIGER#{@year}/"
     end
+    
+    def short_year
+      @year.to_s[-2, 2]
+    end
 
     def initialize
       @year = 2010

data/lib/concensus/congressional.rb

@@ -1,13 +1,16 @@
 module Concensus
   class Congressional < Resource
     
-    # @return [Concensus::Resource] matched congressional district
     def self.find(state, name = nil)
-      shp_file_path = get_and_unzip("CD/111/tl_2010_#{state_code_to_id(state)}_cd111.zip")
-      return process_find(shp_file_path, "NAMELSAD10", state, name)      
+      if Concensus::configuration.year == 2010
+        attribute_key = "NAMELSAD10"
+        shp_file_path = get_and_unzip("CD/111/tl_2010_#{state_code_to_id(state)}_cd111.zip")
+        return process_find("Congressional", shp_file_path, attribute_key, state, name)  
+      else
+        raise NoResourceForYear
+      end
     end
-    
-    # @return [Array] array of all congressional districts for a state
+
     def self.find_all(state)
       find(state)       
     end

data/lib/concensus/county.rb

@@ -1,13 +1,16 @@
 module Concensus
   class County < Resource
-  
-    # @return [Concensus::Resource] matched county
+    
     def self.find(state, name = nil)
-      shp_file_path = get_and_unzip("COUNTY/2010/tl_2010_#{state_code_to_id(state)}_county10.zip")
-      return process_find(shp_file_path, "NAME10", state, name)      
+      if Concensus::configuration.year == 2010
+        attribute_key = "NAME10"
+        shp_file_path = get_and_unzip("COUNTY/2010/tl_2010_#{state_code_to_id(state)}_county10.zip")
+        return process_find("County", shp_file_path, attribute_key, state, name)  
+      else
+        raise NoResourceForYear
+      end
     end
-    
-    # @return [Array] all counties for a state
+
     def self.find_all(state)
       find(state)       
     end

data/lib/concensus/place.rb

@@ -1,13 +1,20 @@
 module Concensus
   class Place < Resource
-  
-    # @return [Concensus::Resource] matched place
+    
     def self.find(state, name = nil)
-      shp_file_path = get_and_unzip("PLACE/2010/tl_2010_#{state_code_to_id(state)}_place10.zip")
-      return process_find(shp_file_path, "NAME10", state, name)      
+      
+      if Concensus::configuration.year == 2011
+        attribute_key = "NAMELSAD"
+        shp_file_path = get_and_unzip("PLACE/tl_2011_#{state_code_to_id(state)}_place.zip")
+      elsif Concensus::configuration.year == 2010
+        attribute_key = "NAME10"
+        shp_file_path = get_and_unzip("PLACE/2010/tl_2010_#{state_code_to_id(state)}_place10.zip")
+      end
+
+      return process_find("Place", shp_file_path, attribute_key, state, name)      
+      
     end
     
-    # @return [Array] all places for a state
     def self.find_all(state)
       find(state)       
     end

data/lib/concensus/resource.rb

@@ -2,6 +2,8 @@ require "zip/zip"
 require "geo_ruby"
 require "geo_ruby/shp"
 require "open-uri"
+require "active_support"
+require 'active_support/inflector'
 
 module Concensus  
   class Resource
@@ -60,7 +62,7 @@ module Concensus
     # 
     # @return [Array] returns array if we're looking for mulitple regions
     # @return [Resource] returns resource if we're looking for a specific region
-    def self.process_find(shp_file_path, identifier, state, name = nil)
+    def self.process_find(class_name, shp_file_path, identifier, state, name = nil)
       
       # Prevent annoying georuby error messages
       previous_stderr, $stderr = $stderr, StringIO.new
@@ -68,13 +70,13 @@ module Concensus
       if name
         GeoRuby::Shp4r::ShpFile.open(shp_file_path) do |shp|
           matched_shape = shp.find {|x| x.data[identifier].match(name) }
-          raise StandardError if !matched_shape
-          return Resource.new(matched_shape.data[identifier], matched_shape.geometry, state)
+          raise ShapeNotFound if !matched_shape
+          return class_name.split('::').reduce(Concensus){|cls, c| cls.const_get(c) }.new(matched_shape.data[identifier], matched_shape.geometry, state)
         end
       else
         places = []
         GeoRuby::Shp4r::ShpFile.open(shp_file_path).each do |shp|
-          places << Resource.new(shp.data[identifier], shp.geometry, state)
+          places << class_name.split('::').reduce(Concensus){|cls, c| cls.const_get(c) }.new(shp.data[identifier], shp.geometry, state)
         end
         return places
       end

data/lib/concensus/school.rb

@@ -2,39 +2,54 @@ module Concensus
   class School < Resource
     
     class Elementary < School
-      # @return [Concensus::Resource] matched elementary school district
       def self.find(state, name = nil)
-        shp_file_path = get_and_unzip("ELSD/2010/tl_2010_#{state_code_to_id(state)}_elsd10.zip")
-        return process_find(shp_file_path, "NAME10", state, name)      
+        if Concensus::configuration.year == 2010
+          attribute_key = "NAME10"
+          shp_file_path = get_and_unzip("ELSD/2010/tl_2010_#{state_code_to_id(state)}_elsd10.zip")
+        elsif Concensus::configuration.year == 2011
+          attribute_key = "name"
+          shp_file_path = get_and_unzip("ELSD/tl_2011_#{state_code_to_id(state)}_elsd.zip")
+        end
+        
+        return process_find("School::Elementary", shp_file_path, attribute_key, state, name)  
       end
 
-      # @return [Array] all elementary school districts for a state
       def self.find_all(state)
         find(state)       
       end
     end
     
     class Secondary < School
-      # @return [Concensus::Resource] matched secondary school district
       def self.find(state, name = nil)
-        shp_file_path = get_and_unzip("SCSD/2010/tl_2010_#{state_code_to_id(state)}_scsd10.zip")
-        return process_find(shp_file_path, "NAME10", state, name)      
+        if Concensus::configuration.year == 2010
+          attribute_key = "NAME10"
+          shp_file_path = get_and_unzip("SCSD/2010/tl_2010_#{state_code_to_id(state)}_scsd10.zip")
+        elsif Concensus::configuration.year == 2011
+          attribute_key = "name"
+          shp_file_path = get_and_unzip("SCSD/tl_2011_#{state_code_to_id(state)}_scsd.zip")
+        end
+        
+        return process_find("School::Secondary", shp_file_path, attribute_key, state, name)  
       end
-      
-      # @return [Array] all secondary school districts for a state
+
       def self.find_all(state)
         find(state)       
       end
     end
     
     class Unified < School
-      # @return [Concensus::Resource] matched unified school district
       def self.find(state, name = nil)
-        shp_file_path = get_and_unzip("UNSD/2010/tl_2010_#{state_code_to_id(state)}_unsd10.zip")
-        return process_find(shp_file_path, "NAME10", state, name)      
+        if Concensus::configuration.year == 2010
+          attribute_key = "NAME10"
+          shp_file_path = get_and_unzip("UNSD/2010/tl_2010_#{state_code_to_id(state)}_unsd10.zip")
+        elsif Concensus::configuration.year == 2011
+          attribute_key = "name"
+          shp_file_path = get_and_unzip("UNSD/tl_2011_#{state_code_to_id(state)}_unsd.zip")
+        end
+        
+        return process_find("School::Unified", shp_file_path, attribute_key, state, name)  
       end
 
-      # @return [Array] all unified school districts for a state
       def self.find_all(state)
         find(state)       
       end

data/lib/concensus/state.rb

@@ -1,10 +1,16 @@
 module Concensus
   class State < Resource
-  
+      
     # @return [Concensus::Resource] matched state
     def self.find(state)
-      shp_file_path = get_and_unzip("STATE/2010/tl_2010_#{state_code_to_id(state)}_state10.zip")
-      return process_find(shp_file_path, "NAME10", state)[0]      
+      
+      if Concensus::configuration.year == 2010
+        shp_file_path = get_and_unzip("STATE/2010/tl_2010_#{state_code_to_id(state)}_state10.zip")
+        return process_find("State", shp_file_path, "NAME10", state)[0]  
+      else
+        raise NoResourceForYear
+      end
+          
     end
     
     # @return [Array] all states

data/lib/concensus/state_legislative.rb

@@ -2,26 +2,36 @@ module Concensus
   class StateLegislative < Resource
     
     class Upper < StateLegislative
-      # @return [Concensus::Resource] matched state upper legislative district
       def self.find(state, name = nil)
-        shp_file_path = get_and_unzip("SLDU/2010/tl_2010_#{state_code_to_id(state)}_sldu10.zip")
-        return process_find(shp_file_path, "NAMELSAD10", state, name)      
+        if Concensus::configuration.year == 2011
+          attribute_key = "NAMELSAD"
+          shp_file_path = get_and_unzip("SLDU/tl_2011_#{state_code_to_id(state)}_sldu.zip")
+        elsif Concensus::configuration.year == 2010
+          attribute_key = "NAMELSAD10"
+          shp_file_path = get_and_unzip("SLDU/2010/tl_2010_#{state_code_to_id(state)}_sldu10.zip")
+        end
+
+        return process_find("StateLegislative::Upper", shp_file_path, attribute_key, state, name)      
       end
 
-      # @return [Array] all state's upper legislative districts
       def self.find_all(state)
         find(state)       
-      end
+      end      
     end
     
     class Lower < StateLegislative
-      # @return [Concensus::Resource] matched state lower legislative district
       def self.find(state, name = nil)
-        shp_file_path = get_and_unzip("SLDL/2010/tl_2010_#{state_code_to_id(state)}_sldl10.zip")
-        return process_find(shp_file_path, "NAMELSAD10", state, name)      
+        if Concensus::configuration.year == 2011
+          attribute_key = "NAMELSAD"
+          shp_file_path = get_and_unzip("SLDL/tl_2011_#{state_code_to_id(state)}_sldl.zip")
+        elsif Concensus::configuration.year == 2010
+          attribute_key = "NAMELSAD10"
+          shp_file_path = get_and_unzip("SLDL/2010/tl_2010_#{state_code_to_id(state)}_sldl10.zip")
+        end
+
+        return process_find("StateLegislative::Lower", shp_file_path, attribute_key, state, name)      
       end
 
-      # @return [Array] all state's lower legislative district
       def self.find_all(state)
         find(state)       
       end      

data/lib/concensus/version.rb

@@ -1,3 +1,3 @@
 module Concensus
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/concensus/zipcode.rb

@@ -0,0 +1,22 @@
+module Concensus
+  class Zipcode < Resource
+    
+    def self.find(state, name = nil)
+      
+      if Concensus::configuration.year == 2010
+        attribute_key = "ZCTA5CE10"
+        shp_file_path = get_and_unzip("ZCTA5/2010/tl_2010_#{state_code_to_id(state)}_zcta510.zip")
+      else
+        raise NoResourceForYear
+      end
+
+      return process_find("Zipcode", shp_file_path, attribute_key, state, name)      
+      
+    end
+    
+    def self.find_all(state)
+      find(state)       
+    end
+    
+  end
+end

data/spec/concensus/configuration_spec.rb

@@ -1,12 +1,16 @@
 require 'concensus'
 
 describe Concensus do
-
+  
   describe "configuration" do
     it "should have a root url" do
       Concensus::configuration.root_url.should_not be_empty
     end
     
+    it "should have a short year" do
+      Concensus::configuration.short_year.should == "10"
+    end
+    
     describe "should be able to manually set the tmp file" do
       before { Concensus::configuration.tmp_dir = "tmp/concensustest/" }
       after do
@@ -24,14 +28,24 @@ describe Concensus do
     end
     
     describe "should be able to manually set the year" do
-      before { Concensus::configuration.year = 2000 }
+      before { Concensus::configuration.year = 2011 }
       after { Concensus::configuration.year = 2010 }
       
       it "should be updated" do
-        Concensus::configuration.year.should == 2000
-        Concensus::configuration.root_url.should match(/2000/)
+        Concensus::configuration.year.should == 2011
+        Concensus::configuration.root_url.should match(/2011/)
       end
     end
+    
+    it "should raise error for not supported years" do
+      expect do
+        Concensus::configuration.year = 2000
+      end.to raise_error(Concensus::YearNotSupported)
+    end
+    
+    it "shouldn't have changed the year" do
+      Concensus::configuration.year.should == 2010      
+    end
   end  
    
 end

data/spec/concensus/congressional_spec.rb

@@ -4,7 +4,7 @@ describe Concensus do
   describe "congressional districts" do
   
     it "should be able to find a congressional district district for a state" do
-      Concensus::Congressional.find("CA", "13").should be_instance_of(Concensus::Resource)
+      Concensus::Congressional.find("CA", "13").should be_instance_of(Concensus::Congressional)
     end
 
     it "should be able to find all upper legislative districts for a state" do

data/spec/concensus/county_spec.rb

@@ -8,7 +8,7 @@ describe Concensus do
     end
 
     it "should be able to find one county for a state" do
-      Concensus::County.find("CA", "Alameda").should be_instance_of(Concensus::Resource)
+      Concensus::County.find("CA", "Alameda").should be_instance_of(Concensus::County)
     end
         
   end

data/spec/concensus/place_spec.rb

@@ -3,12 +3,28 @@ require 'concensus'
 describe Concensus do
   describe "places" do
     
-    it "should be able to find all places for a state" do
-      Concensus::Place.find_all("CA").should be_instance_of(Array)
+    describe "2010" do
+      before { Concensus::configuration.year = 2010 }
+      
+      it "should be able to find all places for a state" do
+        Concensus::Place.find_all("CA").should be_instance_of(Array)
+      end
+
+      it "should be able to find one places for a state" do
+        Concensus::Place.find("CA", "Berkeley").should be_instance_of(Concensus::Place)
+      end
     end
+    
+    describe "2011" do
+      before { Concensus::configuration.year = 2011 }
+      
+      it "should be able to find all places for a state" do
+        Concensus::Place.find_all("CA").should be_instance_of(Array)
+      end
 
-    it "should be able to find one places for a state" do
-      Concensus::Place.find("CA", "Berkeley").should be_instance_of(Concensus::Resource)
+      it "should be able to find one places for a state" do
+        Concensus::Place.find("CA", "Berkeley").should be_instance_of(Concensus::Place)
+      end
     end
     
   end

data/spec/concensus/school_spec.rb

@@ -3,33 +3,71 @@ require 'concensus'
 describe Concensus do
   describe "school districts" do
     
-    describe "elementary" do
-      it "should be able to find an elementary school district for a state" do
-        Concensus::School::Elementary.find("AZ", "San Fernando").should be_instance_of(Concensus::Resource)
-      end
+    describe "2011" do
+      before { Concensus::configuration.year = 2011 }
+      
+      describe "elementary" do
+        it "should be able to find an elementary school district for a state" do
+          Concensus::School::Elementary.find("AZ", "San Fernando").should be_instance_of(Concensus::School::Elementary)
+        end
 
-      it "should be able to find all elementary school districts for a state" do
-        Concensus::School::Elementary.find_all("AZ").should be_instance_of(Array)
+        it "should be able to find all elementary school districts for a state" do
+          Concensus::School::Elementary.find_all("AZ").should be_instance_of(Array)
+        end
       end
-    end
-    
-    describe "elementary" do
-      it "should be able to find a secondary school district for a state" do
-        Concensus::School::Secondary.find("AZ", "Tempe Union").should be_instance_of(Concensus::Resource)
+
+      describe "secondary" do
+        it "should be able to find a secondary school district for a state" do
+          Concensus::School::Secondary.find("AZ", "Tempe Union").should be_instance_of(Concensus::School::Secondary)
+        end
+
+        it "should be able to find all secondary school districts for a state" do
+          Concensus::School::Secondary.find_all("AZ").should be_instance_of(Array)
+        end
       end
 
-      it "should be able to find all secondary school districts for a state" do
-        Concensus::School::Secondary.find_all("AZ").should be_instance_of(Array)
+      describe "unified" do
+        it "should be able to find a unified school district for a state" do
+          Concensus::School::Unified.find("AZ", "Chandler").should be_instance_of(Concensus::School::Unified)
+        end
+
+        it "should be able to find all unified school districts for a state" do
+          Concensus::School::Unified.find_all("AZ").should be_instance_of(Array)
+        end
       end
     end
     
-    describe "unified" do
-      it "should be able to find a unified school district for a state" do
-        Concensus::School::Unified.find("AZ", "Chandler").should be_instance_of(Concensus::Resource)
+    describe "2010" do
+      before { Concensus::configuration.year = 2010 }
+      
+      describe "elementary" do
+        it "should be able to find an elementary school district for a state" do
+          Concensus::School::Elementary.find("AZ", "San Fernando").should be_instance_of(Concensus::School::Elementary)
+        end
+
+        it "should be able to find all elementary school districts for a state" do
+          Concensus::School::Elementary.find_all("AZ").should be_instance_of(Array)
+        end
       end
 
-      it "should be able to find all unified school districts for a state" do
-        Concensus::School::Unified.find_all("AZ").should be_instance_of(Array)
+      describe "secondary" do
+        it "should be able to find a secondary school district for a state" do
+          Concensus::School::Secondary.find("AZ", "Tempe Union").should be_instance_of(Concensus::School::Secondary)
+        end
+
+        it "should be able to find all secondary school districts for a state" do
+          Concensus::School::Secondary.find_all("AZ").should be_instance_of(Array)
+        end
+      end
+
+      describe "unified" do
+        it "should be able to find a unified school district for a state" do
+          Concensus::School::Unified.find("AZ", "Chandler").should be_instance_of(Concensus::School::Unified)
+        end
+
+        it "should be able to find all unified school districts for a state" do
+          Concensus::School::Unified.find_all("AZ").should be_instance_of(Array)
+        end
       end
     end
     

data/spec/concensus/state_legislative_spec.rb

@@ -3,24 +3,56 @@ require 'concensus'
 describe Concensus do
   describe "state legislative districts" do
     
-    describe "upper" do
-      it "should be able to find an upper legislative district for a state" do
-        Concensus::StateLegislative::Upper.find("CA", "13").should be_instance_of(Concensus::Resource)
+    describe "2011" do
+      
+      before { Concensus::configuration.year = 2011 }
+      
+      describe "upper" do
+        it "should be able to find an upper legislative district for a state" do
+          Concensus::StateLegislative::Upper.find("CA", "13").should be_instance_of(Concensus::StateLegislative::Upper)
+        end
+
+        it "should be able to find all upper legislative districts for a state" do
+          Concensus::StateLegislative::Upper.find_all("CA").should be_instance_of(Array)
+        end
       end
+    
+      describe "lower" do
+        it "should be able to find a lower legislative district for a state" do
+          Concensus::StateLegislative::Lower.find("CA", "13").should be_instance_of(Concensus::StateLegislative::Lower)
+        end
 
-      it "should be able to find all upper legislative districts for a state" do
-        Concensus::StateLegislative::Upper.find_all("CA").should be_instance_of(Array)
+        it "should be able to find all lower legislative districts for a state" do
+          Concensus::StateLegislative::Lower.find_all("CA").should be_instance_of(Array)
+        end
       end
     end
     
-    describe "lower" do
-      it "should be able to find a lower legislative district for a state" do
-        Concensus::StateLegislative::Lower.find("CA", "13").should be_instance_of(Concensus::Resource)
+    describe "2010" do
+      
+      before { Concensus::configuration.year = 2010 }
+      
+      describe "upper" do
+        it "should be able to find an upper legislative district for a state" do
+          Concensus::StateLegislative::Upper.find("CA", "13").should be_instance_of(Concensus::StateLegislative::Upper)
+        end
+
+        it "should be able to find all upper legislative districts for a state" do
+          Concensus::StateLegislative::Upper.find_all("CA").should be_instance_of(Array)
+        end
       end
+    
+      describe "lower" do
+        it "should be able to find a lower legislative district for a state" do
+          Concensus::StateLegislative::Lower.find("CA", "13").should be_instance_of(Concensus::StateLegislative::Lower)
+        end
 
-      it "should be able to find all lower legislative districts for a state" do
-        Concensus::StateLegislative::Lower.find_all("CA").should be_instance_of(Array)
+        it "should be able to find all lower legislative districts for a state" do
+          Concensus::StateLegislative::Lower.find_all("CA").should be_instance_of(Array)
+        end
       end
     end
+    
+    
   end
 end

data/spec/concensus/state_spec.rb

@@ -4,7 +4,7 @@ describe Concensus do
   describe "states" do
     
     it "should be able to find a state" do
-      Concensus::State.find("CA").should be_instance_of(Concensus::Resource)
+      Concensus::State.find("CA").should be_instance_of(Concensus::State)
     end  
     
   end

data/spec/concensus/year_spec.rb

@@ -0,0 +1,39 @@
+require 'concensus'
+
+describe Concensus do
+
+  describe "years" do
+    
+    after { Concensus::configuration.year = 2010 }
+    
+    it "should throw an error when a state is requested for 2011" do
+      expect do
+        Concensus::configuration.year = 2011
+        Concensus::State.find("CA")
+      end.to raise_error Concensus::NoResourceForYear
+    end
+    
+    it "should throw an error when a county is requested for 2011" do
+      expect do
+        Concensus::configuration.year = 2011
+        Concensus::County.find("CA")
+      end.to raise_error Concensus::NoResourceForYear
+    end
+        
+    it "should throw an error when a congressional district is requested for 2011" do
+      expect do
+        Concensus::configuration.year = 2011
+        Concensus::Congressional.find("CA")
+      end.to raise_error Concensus::NoResourceForYear
+    end
+    
+    it "should throw an error when a zipcode is requested for 2011" do
+      expect do
+        Concensus::configuration.year = 2011
+        Concensus::Zipcode.find("CA")
+      end.to raise_error Concensus::NoResourceForYear
+    end
+    
+  end
+  
+end

data/spec/concensus/zipcode_spec.rb

@@ -0,0 +1,19 @@
+require 'concensus'
+
+describe Concensus do
+  describe "zipcodes" do
+    
+    describe "2010" do
+      before { Concensus::configuration.year = 2010 }
+      
+      it "should be able to find all zipcodes for a state" do
+        Concensus::Zipcode.find_all("CO").should be_instance_of(Array)
+      end
+
+      it "should be able to find one zipcode for a state" do
+        Concensus::Zipcode.find("CO", "80022").should be_instance_of(Concensus::Zipcode)
+      end
+    end
+    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: concensus
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70135306169280 !ruby/object:Gem::Requirement
+  requirement: &70200645061180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135306169280
+  version_requirements: *70200645061180
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70135306168460 !ruby/object:Gem::Requirement
+  requirement: &70200645060720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135306168460
+  version_requirements: *70200645060720
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70135306167620 !ruby/object:Gem::Requirement
+  requirement: &70200645060160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135306167620
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70135306166780 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70135306166780
+  version_requirements: *70200645060160
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70135306166200 !ruby/object:Gem::Requirement
+  requirement: &70200645059520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135306166200
+  version_requirements: *70200645059520
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70135306165640 !ruby/object:Gem::Requirement
+  requirement: &70200645058760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135306165640
+  version_requirements: *70200645058760
 - !ruby/object:Gem::Dependency
   name: georuby
-  requirement: &70135306164940 !ruby/object:Gem::Requirement
+  requirement: &70200645058220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135306164940
+  version_requirements: *70200645058220
 - !ruby/object:Gem::Dependency
   name: dbf
-  requirement: &70135306164140 !ruby/object:Gem::Requirement
+  requirement: &70200645057820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135306164140
+  version_requirements: *70200645057820
 description: ! '"A small tool for reading United States Census TIGER/Line Shapefiles."'
 email:
 - ad@mbecker.cc
@@ -123,6 +112,7 @@ files:
 - lib/concensus/state.rb
 - lib/concensus/state_legislative.rb
 - lib/concensus/version.rb
+- lib/concensus/zipcode.rb
 - lib/geo_ruby/simple_features.rb
 - spec/concensus/accuracy_spec.rb
 - spec/concensus/configuration_spec.rb
@@ -132,6 +122,8 @@ files:
 - spec/concensus/school_spec.rb
 - spec/concensus/state_legislative_spec.rb
 - spec/concensus/state_spec.rb
+- spec/concensus/year_spec.rb
+- spec/concensus/zipcode_spec.rb
 homepage: https://github.com/adamjacobbecker/concensus
 licenses: []
 post_install_message: 
@@ -165,4 +157,6 @@ test_files:
 - spec/concensus/school_spec.rb
 - spec/concensus/state_legislative_spec.rb
 - spec/concensus/state_spec.rb
+- spec/concensus/year_spec.rb
+- spec/concensus/zipcode_spec.rb
 has_rdoc: