earth 0.12.1 → 0.12.2

data/data/automobile/annual_emission_controls.csv

@@ -1,4 +1,4 @@
-name,type_name,fuel_group,year,control_name,total_travel_percent,source,source_detail,source_url
+name,type_name,fuel_family,year,control_name,total_travel_percent,source,source_detail,source_url
 Light-duty trucks diesel 1985 moderate,Light-duty trucks,diesel,1985,moderate,1,EPA (2012) Table A-102,U.S. EPA (2012) Inventory of U.S. Greenhouse Gas Emissions and Sinks: 1990-2010,http://www.epa.gov/climatechange/emissions/usinventoryreport.html
 Light-duty trucks diesel 1986 moderate,Light-duty trucks,diesel,1986,moderate,1,EPA (2012) Table A-102,U.S. EPA (2012) Inventory of U.S. Greenhouse Gas Emissions and Sinks: 1990-2010,http://www.epa.gov/climatechange/emissions/usinventoryreport.html
 Light-duty trucks diesel 1987 moderate,Light-duty trucks,diesel,1987,moderate,1,EPA (2012) Table A-102,U.S. EPA (2012) Inventory of U.S. Greenhouse Gas Emissions and Sinks: 1990-2010,http://www.epa.gov/climatechange/emissions/usinventoryreport.html

data/data/automobile/annual_fuel_consumption.csv

@@ -1,4 +1,4 @@
-name,activity_year,type_name,fuel_group,fuel_consumption,fuel_consumption_units,source,source_detail,source_url
+name,activity_year,type_name,fuel_family,fuel_consumption,fuel_consumption_units,source,source_detail,source_url
 1990 Light-duty trucks diesel,1990,Light-duty trucks,diesel,1118.5,million_gallons,EPA (2012) Table A-88,U.S. EPA (2012) Inventory of U.S. Greenhouse Gas Emissions and Sinks: 1990-2010,http://www.epa.gov/climatechange/emissions/usinventoryreport.html
 1991 Light-duty trucks diesel,1991,Light-duty trucks,diesel,1107.8,million_gallons,EPA (2012) Table A-88,U.S. EPA (2012) Inventory of U.S. Greenhouse Gas Emissions and Sinks: 1990-2010,http://www.epa.gov/climatechange/emissions/usinventoryreport.html
 1992 Light-duty trucks diesel,1992,Light-duty trucks,diesel,1224.7,million_gallons,EPA (2012) Table A-88,U.S. EPA (2012) Inventory of U.S. Greenhouse Gas Emissions and Sinks: 1990-2010,http://www.epa.gov/climatechange/emissions/usinventoryreport.html

data/data/automobile/auto_fuel_data.csv

@@ -1,4 +1,4 @@
-name,code,group,distance_key,base_fuel_name,blend_fuel_name,blend_portion
+name,code,family,distance_key,base_fuel_name,blend_fuel_name,blend_portion
 B100,BP-B100,b100,diesel,Biodiesel
 B20,BP-B20,b20,diesel,Distillate Fuel Oil No. 2,Biodiesel,0.2
 B5,BP-B5,b5,diesel,Distillate Fuel Oil No. 2,Biodiesel,0.05

data/data/automobile/emission_control_techs.csv

@@ -1,4 +1,4 @@
-name,type_name,fuel_group,control_name,ch4_emission_factor,ch4_emission_factor_units,n2o_emission_factor,n2o_emission_factor_units,source,source_detail,source_url
+name,type_name,fuel_family,control_name,ch4_emission_factor,ch4_emission_factor_units,n2o_emission_factor,n2o_emission_factor_units,source,source_detail,source_url
 Light-duty trucks diesel advanced,Light-duty trucks,diesel,advanced,0.001,grams_per_mile,0.0015,grams_per_mile,EPA (2012) Table A-103,U.S. EPA (2012) Inventory of U.S. Greenhouse Gas Emissions and Sinks: 1990-2010,http://www.epa.gov/climatechange/emissions/usinventoryreport.html
 Light-duty trucks diesel moderate,Light-duty trucks,diesel,moderate,0.0009,grams_per_mile,0.0014,grams_per_mile,EPA (2012) Table A-103,U.S. EPA (2012) Inventory of U.S. Greenhouse Gas Emissions and Sinks: 1990-2010,http://www.epa.gov/climatechange/emissions/usinventoryreport.html
 Light-duty trucks diesel uncontrolled,Light-duty trucks,diesel,uncontrolled,0.0011,grams_per_mile,0.0017,grams_per_mile,EPA (2012) Table A-103,U.S. EPA (2012) Inventory of U.S. Greenhouse Gas Emissions and Sinks: 1990-2010,http://www.epa.gov/climatechange/emissions/usinventoryreport.html

data/lib/earth/automobile/automobile_activity_year_type_fuel.rb

@@ -9,7 +9,7 @@ class AutomobileActivityYearTypeFuel < ActiveRecord::Base
   col :name
   col :activity_year, :type => :integer
   col :type_name
-  col :fuel_group
+  col :fuel_family
   col :distance, :type => :float
   col :distance_units
   col :fuel_consumption, :type => :float

data/lib/earth/automobile/automobile_activity_year_type_fuel/data_miner.rb

@@ -14,7 +14,7 @@ AutomobileActivityYearTypeFuel.class_eval do
         key   'name', :synthesize => proc { |row| "#{row['Year']} #{type} gasoline" }
         store 'activity_year', :field_name => 'Year'
         store 'type_name', :static => type
-        store 'fuel_group', :static => 'gasoline'
+        store 'fuel_family', :static => 'gasoline'
         store 'distance', :field_name => type, :from_units => :billion_miles, :to_units => :kilometres
       end
       
@@ -27,7 +27,7 @@ AutomobileActivityYearTypeFuel.class_eval do
         key   'name', :synthesize => proc { |row| "#{row['Year']} #{type} diesel" }
         store 'activity_year', :field_name => 'Year'
         store 'type_name', :static => type
-        store 'fuel_group', :static => 'diesel'
+        store 'fuel_family', :static => 'diesel'
         store 'distance', :field_name => type, :from_units => :billion_miles, :to_units => :kilometres
       end
       
@@ -40,7 +40,7 @@ AutomobileActivityYearTypeFuel.class_eval do
         key   'name', :synthesize => proc { |row| "#{row['Year']} #{type} alternative" }
         store 'activity_year', :field_name => 'Year'
         store 'type_name', :static => type
-        store 'fuel_group', :static => 'alternative'
+        store 'fuel_family', :static => 'alternative'
         store 'distance', :field_name => type, :from_units => :billion_miles, :to_units => :kilometres
       end
     end
@@ -50,7 +50,7 @@ AutomobileActivityYearTypeFuel.class_eval do
       key   'name'
       store 'activity_year'
       store 'type_name'
-      store 'fuel_group'
+      store 'fuel_family'
       store 'fuel_consumption', :from_units => :million_gallons, :to_units => :litres
     end
   end

data/lib/earth/automobile/automobile_fuel.rb

@@ -8,7 +8,7 @@ class AutomobileFuel < ActiveRecord::Base
   belongs_to :blend_fuel, :class_name => 'Fuel', :foreign_key => 'blend_fuel_name'
   
   # for calculating gas and diesel annual distance and ch4 + n2o efs
-  has_many :type_fuels, :foreign_key => :fuel_group, :primary_key => :group, :class_name => 'AutomobileTypeFuel'
+  has_many :type_fuels, :foreign_key => :fuel_family, :primary_key => :family, :class_name => 'AutomobileTypeFuel'
   
   # for fallback
   class << self
@@ -68,7 +68,7 @@ class AutomobileFuel < ActiveRecord::Base
   
   col :name
   col :code
-  col :group
+  col :family
   col :distance_key
   col :base_fuel_name
   col :blend_fuel_name
@@ -89,7 +89,7 @@ class AutomobileFuel < ActiveRecord::Base
   col :total_consumption_units
   
   warn_unless_size 12
-  warn_if_blanks :code, :group, :distance_key
+  warn_if_blanks :code, :family, :distance_key
   warn_if do
     if exists?("name != 'electricity' AND base_fuel_name IS NULL")
       "Records missing #{col}"

data/lib/earth/automobile/automobile_fuel/data_miner.rb

@@ -10,7 +10,7 @@ AutomobileFuel.class_eval do
            :url => "file://#{Earth::DATA_DIR}/automobile/auto_fuel_data.csv" do
       key   'name'
       store 'code'
-      store 'group'
+      store 'family'
       store 'distance_key'
       store 'base_fuel_name', :nullify => true
       store 'blend_fuel_name', :nullify => true

data/lib/earth/automobile/automobile_type_fuel.rb

@@ -3,12 +3,12 @@ class AutomobileTypeFuel < ActiveRecord::Base
   
   # for calculating vehicles
   def latest_activity_year_type_fuel
-    AutomobileActivityYearTypeFuel.latest.where(:type_name => type_name, :fuel_group => fuel_group).first
+    AutomobileActivityYearTypeFuel.latest.where(:type_name => type_name, :fuel_family => fuel_family).first
   end
   
   col :name
   col :type_name
-  col :fuel_group
+  col :fuel_family
   col :annual_distance, :type => :float
   col :annual_distance_units
   col :fuel_consumption, :type => :float

data/lib/earth/automobile/automobile_type_fuel/data_miner.rb

@@ -13,9 +13,9 @@ AutomobileTypeFuel.class_eval do
         :src => AutomobileTypeFuelYear,
         :dest => AutomobileTypeFuel,
         :cols => {
-          [:type_name, :fuel_group] => :name,
+          [:type_name, :fuel_family] => :name,
           :type_name => :type_name,
-          :fuel_group => :fuel_group
+          :fuel_family => :fuel_family
         }
       )
     end
@@ -23,7 +23,7 @@ AutomobileTypeFuel.class_eval do
     process "Derive annual distance and emission factors from AutomobileTypeFuelYear" do
       type_fuels = arel_table
       type_fuel_years = AutomobileTypeFuelYear.arel_table
-      join_relation = type_fuel_years[:type_name].eq(type_fuels[:type_name]).and(type_fuel_years[:fuel_group].eq(type_fuels[:fuel_group]))
+      join_relation = type_fuel_years[:type_name].eq(type_fuels[:type_name]).and(type_fuel_years[:fuel_family].eq(type_fuels[:fuel_family]))
       
       %w{ annual_distance ch4_emission_factor n2o_emission_factor }.each do |item|
         item_sql = AutomobileTypeFuelYear.where(join_relation).weighted_average_relation(:"#{item}", :weighted_by => :share_of_type).to_sql

data/lib/earth/automobile/automobile_type_fuel_control.rb

@@ -3,7 +3,7 @@ class AutomobileTypeFuelControl < ActiveRecord::Base
 
   col :name
   col :type_name
-  col :fuel_group
+  col :fuel_family
   col :control_name
   col :ch4_emission_factor, :type => :float
   col :ch4_emission_factor_units

data/lib/earth/automobile/automobile_type_fuel_control/data_miner.rb

@@ -7,7 +7,7 @@ AutomobileTypeFuelControl.class_eval do
            :url => "file://#{Earth::DATA_DIR}/automobile/emission_control_techs.csv" do
       key   'name'
       store 'type_name'
-      store 'fuel_group'
+      store 'fuel_family'
       store 'control_name'
       store 'ch4_emission_factor', :from_units => :grams_per_mile, :to_units => :kilograms_per_kilometre
       store 'n2o_emission_factor', :from_units => :grams_per_mile, :to_units => :kilograms_per_kilometre

data/lib/earth/automobile/automobile_type_fuel_year.rb

@@ -2,22 +2,22 @@ class AutomobileTypeFuelYear < ActiveRecord::Base
   self.primary_key = "name"
   
   # Used by Automobile and AutomobileTrip
-  def self.find_by_type_name_and_fuel_group_and_closest_year(type_name, fuel_group, year)
+  def self.find_by_type_name_and_fuel_family_and_closest_year(type_name, fuel_family, year)
     if year > maximum(:year)
-      where(:type_name => type_name, :fuel_group => fuel_group, :year => maximum(:year)).first
+      where(:type_name => type_name, :fuel_family => fuel_family, :year => maximum(:year)).first
     else
-      where(:type_name => type_name, :fuel_group => fuel_group, :year => [year, minimum(:year)].max).first
+      where(:type_name => type_name, :fuel_family => fuel_family, :year => [year, minimum(:year)].max).first
     end
   end
   
   # for calculating ch4 and n2o ef
   def type_fuel_year_controls
-    AutomobileTypeFuelYearControl.find_all_by_type_name_and_fuel_group_and_closest_year(type_name, fuel_group, year)
+    AutomobileTypeFuelYearControl.find_all_by_type_name_and_fuel_family_and_closest_year(type_name, fuel_family, year)
   end
   
   col :name
   col :type_name
-  col :fuel_group
+  col :fuel_family
   col :year, :type => :integer
   col :share_of_type, :type => :float
   col :annual_distance, :type => :float

data/lib/earth/automobile/automobile_type_fuel_year/data_miner.rb

@@ -16,7 +16,7 @@ AutomobileTypeFuelYear.class_eval do
                :select => proc { |row| row['age'].to_i.to_s == row['age'] } do
           key 'name', :synthesize => proc { |row| "#{type} #{fuel} #{2009 - row['age'].to_i}" }
           store 'type_name', :static => type
-          store 'fuel_group', :static => fuel
+          store 'fuel_family', :static => fuel
           store 'year', :synthesize => proc { |row| 2009 - row['age'].to_i }
           store 'share_of_type', :synthesize => proc { |row| row[code].to_f / (code == 'LDDV' ? 57.5 : 100) } # total percent only sums to 57.5 for diesel cars
         end

data/lib/earth/automobile/automobile_type_fuel_year_control.rb

@@ -5,11 +5,11 @@ class AutomobileTypeFuelYearControl < ActiveRecord::Base
   belongs_to :type_fuel_control, :foreign_key => :type_fuel_control_name, :class_name => 'AutomobileTypeFuelControl'
   
   # Used by AutomobileTypeFuelYear
-  def self.find_all_by_type_name_and_fuel_group_and_closest_year(type_name, fuel_group, year)
+  def self.find_all_by_type_name_and_fuel_family_and_closest_year(type_name, fuel_family, year)
     if year > maximum(:year)
-      where(:type_name => type_name, :fuel_group => fuel_group, :year => maximum(:year))
+      where(:type_name => type_name, :fuel_family => fuel_family, :year => maximum(:year))
     else
-      where(:type_name => type_name, :fuel_group => fuel_group, :year => [year, minimum(:year)].max)
+      where(:type_name => type_name, :fuel_family => fuel_family, :year => [year, minimum(:year)].max)
     end
   end
   
@@ -26,7 +26,7 @@ class AutomobileTypeFuelYearControl < ActiveRecord::Base
   
   col :name
   col :type_name
-  col :fuel_group
+  col :fuel_family
   col :year, :type => :integer
   col :control_name
   col :type_fuel_control_name

data/lib/earth/automobile/automobile_type_fuel_year_control/data_miner.rb

@@ -8,10 +8,10 @@ AutomobileTypeFuelYearControl.class_eval do
            :url => "file://#{Earth::DATA_DIR}/automobile/annual_emission_controls.csv" do
       key   'name'
       store 'type_name'
-      store 'fuel_group'
+      store 'fuel_family'
       store 'year'
       store 'control_name'
-      store 'type_fuel_control_name', :synthesize => proc { |row| [row['type_name'], row['fuel_group'], row['control_name']].join(' ') }
+      store 'type_fuel_control_name', :synthesize => proc { |row| [row['type_name'], row['fuel_family'], row['control_name']].join(' ') }
       store 'total_travel_percent'
     end
   end

data/lib/earth/version.rb

@@ -1,3 +1,3 @@
 module Earth
-  VERSION = "0.12.1"
+  VERSION = "0.12.2"
 end

data/spec/earth/automobile/automobile_activity_year_type_fuel_spec.rb

@@ -16,7 +16,7 @@ describe AutomobileActivityYearTypeFuel do
   describe 'verify', :sanity => true do
     it { AAYTF.count.should == 120 }
     it { AAYTF.where(:distance => nil).count.should == 0 }
-    it { AAYTF.where("fuel_group != 'alternative' AND fuel_consumption IS NULL").count.should == 0 }
+    it { AAYTF.where("fuel_family != 'alternative' AND fuel_consumption IS NULL").count.should == 0 }
   end
   
   describe '.latest' do

data/spec/earth/automobile/automobile_fuel_spec.rb

@@ -54,7 +54,7 @@ describe AutomobileFuel do
     
     it "all grades of gasoline should have same annual distance and emission factors" do
       AutomobileFuel.where("name LIKE '%gasoline'").each do |fuel|
-        fuel.group.should == 'gasoline'
+        fuel.family.should == 'gasoline'
         fuel.annual_distance.should == AutomobileFuel.gasoline.annual_distance
         fuel.co2_emission_factor.should == AutomobileFuel.gasoline.co2_emission_factor
         fuel.ch4_emission_factor.should == AutomobileFuel.gasoline.ch4_emission_factor

data/spec/earth/automobile/automobile_type_fuel_spec.rb

@@ -37,7 +37,7 @@ describe AutomobileTypeFuel do
     it 'should always be a match from 2009' do
       AutomobileTypeFuel.find_each do |atf|
         atf.latest_activity_year_type_fuel.type_name.should == atf.type_name
-        atf.latest_activity_year_type_fuel.fuel_group.should == atf.fuel_group
+        atf.latest_activity_year_type_fuel.fuel_family.should == atf.fuel_family
         atf.latest_activity_year_type_fuel.activity_year.should == 2009
       end
     end

data/spec/earth/automobile/automobile_type_fuel_year_control_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'earth/automobile/automobile_type_fuel_year_control'
 
 describe AutomobileTypeFuelYearControl do
-  let(:test_year_control) { ATFYC.where(:type_name => 'Passenger cars', :fuel_group => 'gasoline', :year => 2005).first }
+  let(:test_year_control) { ATFYC.where(:type_name => 'Passenger cars', :fuel_family => 'gasoline', :year => 2005).first }
   
   before :all do
     Earth.init :automobile, :load_data_miner => true
@@ -19,7 +19,7 @@ describe AutomobileTypeFuelYearControl do
     it { ATFYC.count.should == 142 }
     
     it 'total travel percent should sum to 1' do
-      ATFYC.group([:type_name, :fuel_group, :year]).sum(:total_travel_percent).each do |grouping_criteria, total|
+      ATFYC.group([:type_name, :fuel_family, :year]).sum(:total_travel_percent).each do |grouping_criteria, total|
         total.should be_within(1e-5).of(1.0)
       end
     end
@@ -27,10 +27,10 @@ describe AutomobileTypeFuelYearControl do
     it { ATFYC.where(:type_fuel_control_name => nil).count.should == 0 }
   end
   
-  describe '.find_all_by_type_name_and_fuel_group_and_closest_year' do
-    it { ATFYC.find_all_by_type_name_and_fuel_group_and_closest_year('Passenger cars', 'gasoline', 1980).should == ATFYC.find_all_by_type_name_and_fuel_group_and_year('Passenger cars', 'gasoline', 1985) }
-    it { ATFYC.find_all_by_type_name_and_fuel_group_and_closest_year('Passenger cars', 'gasoline', 2005).should == ATFYC.find_all_by_type_name_and_fuel_group_and_year('Passenger cars', 'gasoline', 2005) }
-    it { ATFYC.find_all_by_type_name_and_fuel_group_and_closest_year('Passenger cars', 'gasoline', 2012).should == ATFYC.find_all_by_type_name_and_fuel_group_and_year('Passenger cars', 'gasoline', 2010) }
+  describe '.find_all_by_type_name_and_fuel_family_and_closest_year' do
+    it { ATFYC.find_all_by_type_name_and_fuel_family_and_closest_year('Passenger cars', 'gasoline', 1980).should == ATFYC.find_all_by_type_name_and_fuel_family_and_year('Passenger cars', 'gasoline', 1985) }
+    it { ATFYC.find_all_by_type_name_and_fuel_family_and_closest_year('Passenger cars', 'gasoline', 2005).should == ATFYC.find_all_by_type_name_and_fuel_family_and_year('Passenger cars', 'gasoline', 2005) }
+    it { ATFYC.find_all_by_type_name_and_fuel_family_and_closest_year('Passenger cars', 'gasoline', 2012).should == ATFYC.find_all_by_type_name_and_fuel_family_and_year('Passenger cars', 'gasoline', 2010) }
   end
   
   describe '#ch4_emission_factor' do

data/spec/earth/automobile/automobile_type_fuel_year_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'earth/automobile/automobile_type_fuel_year'
 
 describe AutomobileTypeFuelYear do
-  let(:test_atfy) { ATFY.where(:type_name => 'Passenger cars', :fuel_group => 'gasoline', :year => 2005).first }
+  let(:test_atfy) { ATFY.where(:type_name => 'Passenger cars', :fuel_family => 'gasoline', :year => 2005).first }
   
   before :all do
     Earth.init :automobile, :load_data_miner => true
@@ -19,7 +19,7 @@ describe AutomobileTypeFuelYear do
     it { ATFY.count.should == 124 }
     
     it 'shares should sum to 1' do
-      ATFY.sum(:share_of_type, :group => [:type_name, :fuel_group]).each do |groupers, total|
+      ATFY.sum(:share_of_type, :group => [:type_name, :fuel_family]).each do |groupers, total|
         total.should be_within(1e-2).of(1.0)
       end
     end
@@ -37,10 +37,10 @@ describe AutomobileTypeFuelYear do
     it { test_atfy.n2o_emission_factor_units.should == 'kilograms_co2e_per_kilometre' }
   end
   
-  describe '.find_by_type_name_and_fuel_group_and_closest_year' do
-    it { ATFY.find_by_type_name_and_fuel_group_and_closest_year('Passenger cars', 'gasoline', 1970).should == ATFY.find_by_type_name_and_fuel_group_and_year('Passenger cars', 'gasoline', 1979) }
-    it { ATFY.find_by_type_name_and_fuel_group_and_closest_year('Passenger cars', 'gasoline', 2005).should == ATFY.find_by_type_name_and_fuel_group_and_year('Passenger cars', 'gasoline', 2005) }
-    it { ATFY.find_by_type_name_and_fuel_group_and_closest_year('Passenger cars', 'gasoline', 2012).should == ATFY.find_by_type_name_and_fuel_group_and_year('Passenger cars', 'gasoline', 2009) }
+  describe '.find_by_type_name_and_fuel_family_and_closest_year' do
+    it { ATFY.find_by_type_name_and_fuel_family_and_closest_year('Passenger cars', 'gasoline', 1970).should == ATFY.find_by_type_name_and_fuel_family_and_year('Passenger cars', 'gasoline', 1979) }
+    it { ATFY.find_by_type_name_and_fuel_family_and_closest_year('Passenger cars', 'gasoline', 2005).should == ATFY.find_by_type_name_and_fuel_family_and_year('Passenger cars', 'gasoline', 2005) }
+    it { ATFY.find_by_type_name_and_fuel_family_and_closest_year('Passenger cars', 'gasoline', 2012).should == ATFY.find_by_type_name_and_fuel_family_and_year('Passenger cars', 'gasoline', 2009) }
   end
   
   describe '#type_fuel_year_controls' do

data/spec/earth/electricity/electric_market_spec.rb

@@ -18,7 +18,7 @@ describe ElectricMarket do
     
     it { ElectricMarket.where(:electric_utility_eia_id => nil).count.should == 0 } # some ids aren't found in our electric_utilities table
     
-    it 'Properly links 53704 to MG&E' do
+    it 'links 53704 to MG&E' do
       ZipCode.find('53704').electric_utilities.should include(ElectricUtility.find 11479)
     end
   end

data/spec/earth/locality/country_spec.rb

@@ -71,12 +71,12 @@ describe Country do
       it { Country.where("rail_trip_co2_emission_factor > 0").count.should == 26 }
       
       # spot checks
-      it { us.rail_passengers.should == 4467000000 }
+      it { us.rail_passengers.should be_within(10_000).of(4_466_991_391) }
       it { us.rail_trip_distance.should be_within(5e-5).of(12.9952) }
       it { us.rail_speed.should be_within(5e-5).of(32.4972) }
-      it { us.rail_trip_electricity_intensity.should be_within(5e-5).of(0.140512) }
-      it { us.rail_trip_diesel_intensity.should be_within(5e-5).of(0.0194) }
-      it { us.rail_trip_co2_emission_factor.should be_within(5e-5).of(0.0958) }
+      it { us.rail_trip_electricity_intensity.should be_within(5e-5).of(0.14051) }
+      it { us.rail_trip_diesel_intensity.should be_within(5e-5).of(0.01942) }
+      it { us.rail_trip_co2_emission_factor.should be_within(5e-5).of(0.0909) }
       
       it { uk.rail_passengers.should == 1352150000 }
       it { uk.rail_trip_distance.should be_within(5e-5).of(40.6904) }

data/spec/earth/locality/zip_code_spec.rb

@@ -16,7 +16,7 @@ describe ZipCode do
     it { ZipCode.count.should == 43770 }
     it { ZipCode.where(:state_postal_abbreviation => nil).count.should == 0 }
     it { ZipCode.where('latitude IS NOT NULL AND longitude IS NOT NULL').count.should == 43191 }
-    it { ZipCode.where('egrid_subregion_abbreviation IS NOT NULL').count.should == 41334 }
+    it { ZipCode.where('egrid_subregion_abbreviation IS NOT NULL').count.should == 41333 }
     it { ZipCode.where('climate_division_name IS NOT NULL').count.should == 41358 }
     it { ZipCode.where('population IS NOT NULL').count.should == 33120 }
   end
@@ -34,8 +34,8 @@ describe ZipCode do
   
   describe '#latitude_longitude' do
     it 'should return the lat and lng as an array of strings' do
-      ZipCode.find('00001').latitude_longitude.should == ['55.856236', '21.0960915']
-      ZipCode.find('00002').latitude_longitude.should == [nil, nil]
+      ZipCode.find('00001').latitude_longitude.should == [nil, nil]
+      ZipCode.find('00210').latitude_longitude.should == ['43.005895', '-71.013202']
     end
   end
   

metadata

@@ -2,7 +2,7 @@
 name: earth
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-14 00:00:00 Z
+date: 2012-06-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -681,7 +681,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2226829993572844929
+      hash: 2577779194019475364
       segments: 
       - 0
       version: "0"
@@ -690,7 +690,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2226829993572844929
+      hash: 2577779194019475364
       segments: 
       - 0
       version: "0"