earth 0.5.2 → 0.5.3

data/lib/earth/automobile/automobile_make.rb

@@ -6,7 +6,7 @@ class AutomobileMake < ActiveRecord::Base
   has_many :fleet_years,              :class_name => 'AutomobileMakeFleetYear',        :foreign_key => 'make_name'
   has_many :make_model_year_variants, :class_name => 'AutomobileMakeModelYearVariant', :foreign_key => 'make_name'
 
-  create_table do
+  force_schema do
     string  'name'
     float   'fuel_efficiency'
     string  'fuel_efficiency_units'

data/lib/earth/automobile/automobile_make_fleet_year.rb

@@ -4,7 +4,7 @@ class AutomobileMakeFleetYear < ActiveRecord::Base
   belongs_to :make,      :class_name => 'AutomobileMake',     :foreign_key => 'make_name'
   belongs_to :make_year, :class_name => 'AutomobileMakeYear', :foreign_key => 'make_year_name'
 
-  create_table do
+  force_schema do
     string   'name'
     string   'make_year_name'
     string   'make_name'

data/lib/earth/automobile/automobile_make_model.rb

@@ -4,7 +4,7 @@ class AutomobileMakeModel < ActiveRecord::Base
   belongs_to :make,                   :class_name => 'AutomobileMake',                 :foreign_key => 'make_name'
   has_many :make_model_year_variants, :class_name => 'AutomobileMakeModelYearVariant', :foreign_key => 'make_model_name'
 
-  create_table do
+  force_schema do
     string  'name' # make + model
     string  'make_name'
     string  'model_name' # model only

data/lib/earth/automobile/automobile_make_model_year.rb

@@ -4,7 +4,7 @@ class AutomobileMakeModelYear < ActiveRecord::Base
   belongs_to :make_year,              :class_name => 'AutomobileMakeYear',             :foreign_key => 'make_year_name'
   has_many :make_model_year_variants, :class_name => 'AutomobileMakeModelYearVariant', :foreign_key => 'make_model_year_name'
   
-  create_table do
+  force_schema do
     string   'name' # make + model + year
     string   'make_name'
     string   'model_name'

data/lib/earth/automobile/automobile_make_model_year_variant.rb

@@ -6,7 +6,7 @@ class AutomobileMakeModelYearVariant < ActiveRecord::Base
   belongs_to :make_model_year, :class_name => 'AutomobileMakeModelYear', :foreign_key => 'make_model_year_name'
   belongs_to :fuel,            :class_name => 'AutomobileFuel',          :foreign_key => 'fuel_code', :primary_key => 'code'
   
-  create_table do
+  force_schema do
     string   'row_hash'
     string   'name' # short name!
     string   'make_name'

data/lib/earth/automobile/automobile_make_year.rb

@@ -4,7 +4,7 @@ class AutomobileMakeYear < ActiveRecord::Base
   belongs_to :make,      :class_name => 'AutomobileMake',          :foreign_key => 'make_name'
   has_many :fleet_years, :class_name => 'AutomobileMakeFleetYear', :foreign_key => 'make_year_name'
 
-  create_table do
+  force_schema do
     string   'name'
     string   'make_name'
     integer  'year'

data/lib/earth/automobile/automobile_size_class.rb

@@ -6,7 +6,7 @@ class AutomobileSizeClass < ActiveRecord::Base
                 :conventional_fuel_efficiency_city_multiplier => 0.987,
                 :conventional_fuel_efficiency_highway_multiplier => 0.996
   
-  create_table do
+  force_schema do
     string 'name'
     string 'type_name'
     float  'annual_distance'

data/lib/earth/automobile/automobile_size_class_year.rb

@@ -1,7 +1,7 @@
 class AutomobileSizeClassYear < ActiveRecord::Base
   set_primary_key :name
 
-  create_table do
+  force_schema do
     string  'name'
     string  'size_class_name'
     integer 'year'

data/lib/earth/automobile/automobile_type_fuel_age.rb

@@ -2,7 +2,7 @@
 class AutomobileTypeFuelAge < ActiveRecord::Base
   set_primary_key :name
   
-  create_table do
+  force_schema do
     string  'name'
     string  'type_name'
     string  'fuel_common_name'

data/lib/earth/automobile/automobile_type_fuel_control.rb

@@ -1,6 +1,6 @@
 class AutomobileTypeFuelControl < ActiveRecord::Base
   set_primary_key :name
-  create_table do
+  force_schema do
     string  'name'
     string  'type_name'
     string  'fuel_common_name'

data/lib/earth/automobile/automobile_type_fuel_year.rb

@@ -4,7 +4,7 @@ class AutomobileTypeFuelYear < ActiveRecord::Base
   has_many :year_controls, :class_name => 'AutomobileTypeFuelYearControl', :foreign_key => 'type_fuel_year_name'
   belongs_to :type_year, :class_name => 'AutomobileTypeYear', :foreign_key => 'type_year_name'
   
-  create_table do
+  force_schema do
     string  'name'
     string  'type_name'
     string  'fuel_common_name'

data/lib/earth/automobile/automobile_type_fuel_year_age.rb

@@ -3,7 +3,7 @@ class AutomobileTypeFuelYearAge < ActiveRecord::Base
   
   belongs_to :type_fuel_year, :class_name => 'AutomobileTypeFuelYear', :foreign_key => 'type_fuel_year_name'
 
-  create_table do
+  force_schema do
     string  'name'
     string  'type_name'
     string  'fuel_common_name'

data/lib/earth/automobile/automobile_type_fuel_year_control.rb

@@ -3,7 +3,7 @@ class AutomobileTypeFuelYearControl < ActiveRecord::Base
   
   belongs_to :control, :class_name => 'AutomobileTypeFuelControl', :foreign_key => 'type_fuel_control_name'
   
-  create_table do
+  force_schema do
     string  'name'
     string  'type_name'
     string  'fuel_common_name'

data/lib/earth/automobile/automobile_type_year.rb

@@ -3,7 +3,7 @@ class AutomobileTypeYear < ActiveRecord::Base
   
   has_many :type_fuel_years, :class_name => 'AutomobileTypeFuelYear', :foreign_key => 'type_year_name'
 
-  create_table do
+  force_schema do
     string  'name'
     string  'type_name'
     integer 'year'

data/lib/earth/bus/bus_class.rb

@@ -28,7 +28,7 @@ class BusClass < ActiveRecord::Base
                 :alternative_fuels_intensity => 0.04632038.gallons_per_mile.to(:litres_per_kilometre), # deprecated
                 :alternative_fuels_intensity_units => 'litres_per_kilometre' # deprecated
   
-  create_table do
+  force_schema do
     string 'name'
     float  'distance'
     string 'distance_units'

data/lib/earth/bus/bus_fuel.rb

@@ -8,7 +8,7 @@ class BusFuel < ActiveRecord::Base
     fuel_year_controls.where(:year => fuel_year_controls.maximum('year'))
   end
   
-  create_table do
+  force_schema do
     string 'name'
     string 'fuel_name'
     float  'energy_content'

data/lib/earth/bus/bus_fuel_control.rb

@@ -1,6 +1,6 @@
 class BusFuelControl < ActiveRecord::Base
   set_primary_key :name
-  create_table do
+  force_schema do
     string 'name'
     string 'bus_fuel_name'
     string 'control'

data/lib/earth/bus/bus_fuel_year_control.rb

@@ -3,7 +3,7 @@ class BusFuelYearControl < ActiveRecord::Base
   
   belongs_to :fuel_control, :class_name => 'BusFuelControl', :foreign_key => 'bus_fuel_control_name'
 
-  create_table do
+  force_schema do
     string  'name'
     string  'bus_fuel_name'
     integer 'year'

data/lib/earth/computation/computation_carrier.rb

@@ -4,7 +4,7 @@ class ComputationCarrier < ActiveRecord::Base
   falls_back_on :name => 'fallback',
                 :power_usage_effectiveness => lambda { ComputationCarrier.maximum('power_usage_effectiveness') }
   
-  create_table do
+  force_schema do
     string 'name'
     float  'power_usage_effectiveness'
   end

data/lib/earth/computation/computation_carrier_instance_class.rb

@@ -7,7 +7,7 @@ class ComputationCarrierInstanceClass < ActiveRecord::Base
                 :electricity_intensity => lambda { ComputationCarrierInstanceClass.find_by_name('Amazon m1.small').electricity_intensity },
                 :electricity_intensity_units => lambda { ComputationCarrierInstanceClass.find_by_name('Amazon m1.small').electricity_intensity_units }
   
-  create_table do
+  force_schema do
     string 'name'
     string 'computation_carrier_name'
     string 'instance_class'

data/lib/earth/computation/computation_carrier_region.rb

@@ -3,7 +3,7 @@ class ComputationCarrierRegion < ActiveRecord::Base
   
   belongs_to :egrid_subregion, :foreign_key => 'egrid_subregion_abbreviation'
 
-  create_table do
+  force_schema do
     string 'name'
     string 'computation_carrier_name'
     string 'region'

data/lib/earth/conversions_ext.rb

@@ -25,6 +25,7 @@ Conversions.register(:joules, :litres_of_fuel_oil, 1.0 / (138_690.0 * 3.78541178
 Conversions.register(:joules, :kilograms_of_coal, 1.0 / (22_342_000.0 * 0.00110231131 * 1_055.05585)) # should only be used for RECS 2005
 
 Conversions.register(:kilograms, :lbs, 2.20462262)
+Conversions.register(:metric_tonnes, :kilograms, 1_000.0)
 Conversions.register(:kbtus, :btus, 1_000.0)
 Conversions.register(:square_feet, :square_metres, 0.09290304)
 Conversions.register(:pounds_per_square_foot, :kilograms_per_square_metre, 4.88242764)

data/lib/earth/diet/diet_class.rb

@@ -7,7 +7,7 @@ class DietClass < ActiveRecord::Base
     end
   end
   
-  create_table do
+  force_schema do
     string 'name'
     float  'intensity'
     string 'intensity_units'

data/lib/earth/diet/food_group.rb

@@ -11,7 +11,7 @@ class FoodGroup < ActiveRecord::Base
     end
   end
   
-  create_table do
+  force_schema do
     string  'name'
     float   'intensity'
     string  'intensity_units'

data/lib/earth/fuel/fuel.rb

@@ -3,7 +3,7 @@ class Fuel < ActiveRecord::Base
   
   has_many :fuel_years, :foreign_key => 'fuel_name'
   
-  create_table do
+  force_schema do
     string 'name'
     float  'density'
     string 'density_units'

data/lib/earth/fuel/fuel_price.rb

@@ -3,7 +3,7 @@ class FuelPrice < ActiveRecord::Base
   
   belongs_to :fuel_type, :foreign_key => 'name' # weird
   
-  create_table do
+  force_schema do
     string  'name'
     float   'price'
     string  'price_units'

data/lib/earth/fuel/fuel_type.rb

@@ -12,7 +12,7 @@ class FuelType < ActiveRecord::Base
     prices.average :price
   end
   
-  create_table do
+  force_schema do
     string 'name'
     float  'emission_factor'
     string 'emission_factor_units'

data/lib/earth/fuel/fuel_year.rb

@@ -1,7 +1,7 @@
 class FuelYear < ActiveRecord::Base
   set_primary_key :name
   
-  create_table do
+  force_schema do
     string  'name'
     string  'fuel_name'
     integer 'year'

data/lib/earth/fuel/greenhouse_gas.rb

@@ -7,7 +7,7 @@ class GreenhouseGas < ActiveRecord::Base
     end
   end
   
-  create_table do
+  force_schema do
     string  'name'
     string  'abbreviation'
     string  'ipcc_report'

data/lib/earth/hospitality/lodging_class.rb

@@ -1,7 +1,7 @@
 class LodgingClass < ActiveRecord::Base
   set_primary_key :name
   
-  create_table do
+  force_schema do
     string 'name'
     float  'electricity_intensity'
     string 'electricity_intensity_units'

data/lib/earth/industry/industry.rb

@@ -9,7 +9,7 @@ class Industry < ActiveRecord::Base
   has_many :industry_sectors, :foreign_key => 'naics_code'
   has_many :sectors, :through => :industry_sectors
   
-  create_table do
+  force_schema do
     string 'naics_code'
     string 'description'
   end

data/lib/earth/industry/industry_product.rb

@@ -5,7 +5,7 @@ class IndustryProduct < ActiveRecord::Base
   
   belongs_to :industry, :foreign_key => 'naics_code'
   
-  create_table do
+  force_schema do
     string 'naics_product_code'
     string 'description'
     float  'value'

data/lib/earth/industry/industry_product_line.rb

@@ -4,7 +4,7 @@ class IndustryProductLine < ActiveRecord::Base
   belongs_to :industry,     :foreign_key => 'naics_code'
   belongs_to :product_line, :foreign_key => 'ps_code'
 
-  create_table do
+  force_schema do
     string 'row_hash'
     string 'naics_code'
     float  'ratio'

data/lib/earth/industry/industry_sector.rb

@@ -4,7 +4,7 @@ class IndustrySector < ActiveRecord::Base
   belongs_to :industry,  :foreign_key => 'naics_code'
   belongs_to :sector,    :foreign_key => 'io_code'
 
-  create_table do
+  force_schema do
     string 'row_hash'
     string 'naics_code'
     float  'ratio'

data/lib/earth/industry/merchant.rb

@@ -3,7 +3,7 @@ class Merchant < ActiveRecord::Base
   
   belongs_to :merchant_category, :foreign_key => 'mcc'
 
-  create_table do
+  force_schema do
     string 'id'
     string 'name'
     string 'mcc'

data/lib/earth/industry/merchant_category.rb

@@ -8,7 +8,7 @@ class MerchantCategory < ActiveRecord::Base
     description
   end
 
-  create_table do
+  force_schema do
     string 'mcc'
     string 'description'
   end

data/lib/earth/industry/merchant_category_industry.rb

@@ -4,7 +4,7 @@ class MerchantCategoryIndustry < ActiveRecord::Base
   belongs_to :merchant_category, :foreign_key => 'mcc'
   belongs_to :industry,          :foreign_key => 'naics_code'
 
-  create_table do
+  force_schema do
     string 'row_hash'
     string 'mcc'
     float  'ratio'

data/lib/earth/industry/product_line.rb

@@ -6,7 +6,7 @@ class ProductLine < ActiveRecord::Base
   has_many :product_line_industry_products, :foreign_key => 'ps_code'
   has_many :industry_products, :through => :product_line_industry_products
   
-  create_table do
+  force_schema do
     string 'ps_code'
     string 'description'
     string 'broadline' # FIXME TODO do we need this?

data/lib/earth/industry/product_line_industry_product.rb

@@ -4,7 +4,7 @@ class ProductLineIndustryProduct < ActiveRecord::Base
   belongs_to :product_line,     :foreign_key => 'ps_code'
   belongs_to :industry_product, :foreign_key => 'naics_product_code'
 
-  create_table do
+  force_schema do
     string 'row_hash'
     string 'ps_code'
     float  'ratio'

data/lib/earth/industry/sector.rb

@@ -3,7 +3,7 @@ class Sector < ActiveRecord::Base
 
   has_many :industry_sectors, :foreign_key => 'io_code'
   
-  create_table do
+  force_schema do
     string 'io_code'
     string 'description'
     float  'value'

data/lib/earth/locality/census_division.rb

@@ -13,7 +13,7 @@ class CensusDivision < ActiveRecord::Base
                 :meeting_building_electricity_intensity => 0.0084323684 / 1.square_feet.to(:square_metres),
                 :meeting_building_district_heat_intensity => 0.0004776370.kbtus.to(:megajoules) / 1.square_feet.to(:square_metres)
   
-  create_table do
+  force_schema do
     integer 'number'
     string  'name'
     string  'census_region_name'

data/lib/earth/locality/census_region.rb

@@ -7,7 +7,7 @@ class CensusRegion < ActiveRecord::Base
   # has_many :zip_codes, :through => :census_divisions
   has_many :residential_energy_consumption_survey_responses, :foreign_key => 'census_region_number'
   
-  create_table do
+  force_schema do
     integer  'number'
     string   'name'
   end

data/lib/earth/locality/climate_division.rb

@@ -6,7 +6,7 @@ class ClimateDivision < ActiveRecord::Base
   
   RADIUS = 750
 
-  create_table do
+  force_schema do
     string   'name'
     float    'heating_degree_days'
     float    'cooling_degree_days'

data/lib/earth/locality/country.rb

@@ -19,7 +19,7 @@ class Country < ActiveRecord::Base
     end
   end
   
-  create_table do
+  force_schema do
     string 'iso_3166_code'
     string 'name'
     float  'automobile_urbanity'

data/lib/earth/locality/egrid_region.rb

@@ -7,7 +7,7 @@ class EgridRegion < ActiveRecord::Base
   falls_back_on :name => 'fallback',
                 :loss_factor => 0.061879 # calculated using above formula 2/21/2011
   
-  create_table do
+  force_schema do
     string   'name'
     float    'loss_factor'
   end

data/lib/earth/locality/egrid_region/data_miner.rb

@@ -10,6 +10,16 @@ EgridRegion.class_eval do
       store 'loss_factor', :field_name => '2005 grid gross loss factor'
     end
     
+    # resurrected from a7bb363f10d951957dd051ff3cfb81c280f61151
+    import "the US average grid loss factor derived eGRID 2007 data",
+           :url => 'http://www.epa.gov/cleanenergy/documents/egridzips/eGRID2007_Version1-1.zip',
+           :filename => 'eGRID2007_Version1-1/eGRID2007V1_1_year0504_STIE_USGC.xls',
+           :sheet => 'USGC',
+           :skip => 5 do
+      key 'name', :static => 'US'
+      store 'loss_factor', :synthesize => lambda { |row| (row['USTNGN05'].to_f + row['USTNFI05'].to_f - row['USTCON05'].to_f) / row['USTNGN05'].to_f }
+    end
+
     verify "Loss factor should be greater than zero and less than one" do
       EgridRegion.all.each do |region|
         unless region.loss_factor > 0 and region.loss_factor < 1